From owner-svn-src-projects@FreeBSD.ORG Sun Oct 6 09:37:59 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 08AFDB4B; Sun, 6 Oct 2013 09:37:59 +0000 (UTC) (envelope-from markm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E92B220E0; Sun, 6 Oct 2013 09:37:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r969bwx7038065; Sun, 6 Oct 2013 09:37:58 GMT (envelope-from markm@svn.freebsd.org) Received: (from markm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r969bw3v038058; Sun, 6 Oct 2013 09:37:58 GMT (envelope-from markm@svn.freebsd.org) Message-Id: <201310060937.r969bw3v038058@svn.freebsd.org> From: Mark Murray Date: Sun, 6 Oct 2013 09:37:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256080 - in projects/random_number_generator: lib/libvmmapi sys/amd64/amd64 sys/amd64/include sys/amd64/vmm sys/amd64/vmm/amd sys/amd64/vmm/intel sys/amd64/vmm/io sys/cam/ctl sys/conf ... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Oct 2013 09:37:59 -0000 Author: markm Date: Sun Oct 6 09:37:57 2013 New Revision: 256080 URL: http://svnweb.freebsd.org/changeset/base/256080 Log: MFC - tracking commit Deleted: projects/random_number_generator/sys/kern/uipc_cow.c Modified: projects/random_number_generator/lib/libvmmapi/vmmapi.c projects/random_number_generator/lib/libvmmapi/vmmapi.h projects/random_number_generator/sys/amd64/amd64/machdep.c projects/random_number_generator/sys/amd64/amd64/pmap.c projects/random_number_generator/sys/amd64/amd64/trap.c projects/random_number_generator/sys/amd64/include/pcpu.h projects/random_number_generator/sys/amd64/include/pmap.h projects/random_number_generator/sys/amd64/include/vmm.h (contents, props changed) projects/random_number_generator/sys/amd64/include/vmm_dev.h (contents, props changed) projects/random_number_generator/sys/amd64/include/vmm_instruction_emul.h (contents, props changed) projects/random_number_generator/sys/amd64/vmm/amd/amdv.c projects/random_number_generator/sys/amd64/vmm/intel/ept.c projects/random_number_generator/sys/amd64/vmm/intel/ept.h projects/random_number_generator/sys/amd64/vmm/intel/vmcs.c projects/random_number_generator/sys/amd64/vmm/intel/vmcs.h projects/random_number_generator/sys/amd64/vmm/intel/vmx.c projects/random_number_generator/sys/amd64/vmm/intel/vmx.h projects/random_number_generator/sys/amd64/vmm/intel/vmx_genassym.c projects/random_number_generator/sys/amd64/vmm/intel/vmx_support.S projects/random_number_generator/sys/amd64/vmm/io/ppt.c projects/random_number_generator/sys/amd64/vmm/io/ppt.h projects/random_number_generator/sys/amd64/vmm/vmm.c projects/random_number_generator/sys/amd64/vmm/vmm_dev.c projects/random_number_generator/sys/amd64/vmm/vmm_instruction_emul.c projects/random_number_generator/sys/amd64/vmm/vmm_mem.c projects/random_number_generator/sys/amd64/vmm/vmm_mem.h projects/random_number_generator/sys/cam/ctl/ctl_frontend_iscsi.c projects/random_number_generator/sys/conf/files projects/random_number_generator/sys/dev/e1000/if_igb.c projects/random_number_generator/sys/dev/hyperv/vmbus/hv_hv.c projects/random_number_generator/sys/dev/ixgbe/ixgbe.c projects/random_number_generator/sys/dev/virtio/network/if_vtnet.c projects/random_number_generator/sys/dev/xen/timer/timer.c projects/random_number_generator/sys/i386/include/pcpu.h projects/random_number_generator/sys/i386/xen/mp_machdep.c projects/random_number_generator/sys/i386/xen/mptable.c projects/random_number_generator/sys/kern/kern_malloc.c projects/random_number_generator/sys/x86/acpica/madt.c projects/random_number_generator/sys/x86/xen/hvm.c projects/random_number_generator/sys/x86/xen/xen_intr.c projects/random_number_generator/usr.sbin/bhyve/bhyverun.c projects/random_number_generator/usr.sbin/bhyve/pci_emul.c projects/random_number_generator/usr.sbin/bhyve/rtc.c projects/random_number_generator/usr.sbin/bhyvectl/bhyvectl.c projects/random_number_generator/usr.sbin/bhyveload/bhyveload.c Directory Properties: projects/random_number_generator/ (props changed) projects/random_number_generator/lib/libvmmapi/ (props changed) projects/random_number_generator/sys/ (props changed) projects/random_number_generator/sys/amd64/vmm/ (props changed) projects/random_number_generator/sys/conf/ (props changed) projects/random_number_generator/sys/dev/hyperv/ (props changed) projects/random_number_generator/usr.sbin/bhyve/ (props changed) projects/random_number_generator/usr.sbin/bhyvectl/ (props changed) projects/random_number_generator/usr.sbin/bhyveload/ (props changed) Modified: projects/random_number_generator/lib/libvmmapi/vmmapi.c ============================================================================== --- projects/random_number_generator/lib/libvmmapi/vmmapi.c Sun Oct 6 06:57:28 2013 (r256079) +++ projects/random_number_generator/lib/libvmmapi/vmmapi.c Sun Oct 6 09:37:57 2013 (r256080) @@ -124,7 +124,8 @@ vm_destroy(struct vmctx *vm) } int -vm_get_memory_seg(struct vmctx *ctx, vm_paddr_t gpa, size_t *ret_len) +vm_get_memory_seg(struct vmctx *ctx, vm_paddr_t gpa, size_t *ret_len, + int *wired) { int error; struct vm_memory_segment seg; @@ -133,6 +134,8 @@ vm_get_memory_seg(struct vmctx *ctx, vm_ seg.gpa = gpa; error = ioctl(ctx->fd, VM_GET_MEMORY_SEG, &seg); *ret_len = seg.len; + if (wired != NULL) + *wired = seg.wired; return (error); } @@ -741,3 +744,23 @@ vcpu_reset(struct vmctx *vmctx, int vcpu done: return (error); } + +int +vm_get_gpa_pmap(struct vmctx *ctx, uint64_t gpa, uint64_t *pte, int *num) +{ + int error, i; + struct vm_gpa_pte gpapte; + + bzero(&gpapte, sizeof(gpapte)); + gpapte.gpa = gpa; + + error = ioctl(ctx->fd, VM_GET_GPA_PMAP, &gpapte); + + if (error == 0) { + *num = gpapte.ptenum; + for (i = 0; i < gpapte.ptenum; i++) + pte[i] = gpapte.pte[i]; + } + + return (error); +} Modified: projects/random_number_generator/lib/libvmmapi/vmmapi.h ============================================================================== --- projects/random_number_generator/lib/libvmmapi/vmmapi.h Sun Oct 6 06:57:28 2013 (r256079) +++ projects/random_number_generator/lib/libvmmapi/vmmapi.h Sun Oct 6 09:37:57 2013 (r256080) @@ -45,9 +45,11 @@ enum vm_mmap_style { int vm_create(const char *name); struct vmctx *vm_open(const char *name); void vm_destroy(struct vmctx *ctx); -int vm_get_memory_seg(struct vmctx *ctx, vm_paddr_t gpa, size_t *ret_len); +int vm_get_memory_seg(struct vmctx *ctx, vm_paddr_t gpa, size_t *ret_len, + int *wired); int vm_setup_memory(struct vmctx *ctx, size_t len, enum vm_mmap_style s); void *vm_map_gpa(struct vmctx *ctx, vm_paddr_t gaddr, size_t len); +int vm_get_gpa_pmap(struct vmctx *, uint64_t gpa, uint64_t *pte, int *num); uint32_t vm_get_lowmem_limit(struct vmctx *ctx); void vm_set_lowmem_limit(struct vmctx *ctx, uint32_t limit); int vm_set_desc(struct vmctx *ctx, int vcpu, int reg, Modified: projects/random_number_generator/sys/amd64/amd64/machdep.c ============================================================================== --- projects/random_number_generator/sys/amd64/amd64/machdep.c Sun Oct 6 06:57:28 2013 (r256079) +++ projects/random_number_generator/sys/amd64/amd64/machdep.c Sun Oct 6 09:37:57 2013 (r256080) @@ -1574,7 +1574,7 @@ getmemsize(caddr_t kmdp, u_int64_t first /* * map page into kernel: valid, read/write,non-cacheable */ - *pte = pa | PG_V | PG_RW | PG_N; + *pte = pa | PG_V | PG_RW | PG_NC_PWT | PG_NC_PCD; invltlb(); tmp = *(int *)ptr; Modified: projects/random_number_generator/sys/amd64/amd64/pmap.c ============================================================================== --- projects/random_number_generator/sys/amd64/amd64/pmap.c Sun Oct 6 06:57:28 2013 (r256079) +++ projects/random_number_generator/sys/amd64/amd64/pmap.c Sun Oct 6 09:37:57 2013 (r256080) @@ -76,6 +76,8 @@ * SUCH DAMAGE. */ +#define AMD64_NPT_AWARE + #include __FBSDID("$FreeBSD$"); @@ -143,6 +145,120 @@ __FBSDID("$FreeBSD$"); #include #endif +static __inline boolean_t +pmap_emulate_ad_bits(pmap_t pmap) +{ + + return ((pmap->pm_flags & PMAP_EMULATE_AD_BITS) != 0); +} + +static __inline pt_entry_t +pmap_valid_bit(pmap_t pmap) +{ + pt_entry_t mask; + + switch (pmap->pm_type) { + case PT_X86: + mask = X86_PG_V; + break; + case PT_EPT: + if (pmap_emulate_ad_bits(pmap)) + mask = EPT_PG_EMUL_V; + else + mask = EPT_PG_READ; + break; + default: + panic("pmap_valid_bit: invalid pm_type %d", pmap->pm_type); + } + + return (mask); +} + +static __inline pt_entry_t +pmap_rw_bit(pmap_t pmap) +{ + pt_entry_t mask; + + switch (pmap->pm_type) { + case PT_X86: + mask = X86_PG_RW; + break; + case PT_EPT: + if (pmap_emulate_ad_bits(pmap)) + mask = EPT_PG_EMUL_RW; + else + mask = EPT_PG_WRITE; + break; + default: + panic("pmap_rw_bit: invalid pm_type %d", pmap->pm_type); + } + + return (mask); +} + +static __inline pt_entry_t +pmap_global_bit(pmap_t pmap) +{ + pt_entry_t mask; + + switch (pmap->pm_type) { + case PT_X86: + mask = X86_PG_G; + break; + case PT_EPT: + mask = 0; + break; + default: + panic("pmap_global_bit: invalid pm_type %d", pmap->pm_type); + } + + return (mask); +} + +static __inline pt_entry_t +pmap_accessed_bit(pmap_t pmap) +{ + pt_entry_t mask; + + switch (pmap->pm_type) { + case PT_X86: + mask = X86_PG_A; + break; + case PT_EPT: + if (pmap_emulate_ad_bits(pmap)) + mask = EPT_PG_READ; + else + mask = EPT_PG_A; + break; + default: + panic("pmap_accessed_bit: invalid pm_type %d", pmap->pm_type); + } + + return (mask); +} + +static __inline pt_entry_t +pmap_modified_bit(pmap_t pmap) +{ + pt_entry_t mask; + + switch (pmap->pm_type) { + case PT_X86: + mask = X86_PG_M; + break; + case PT_EPT: + if (pmap_emulate_ad_bits(pmap)) + mask = EPT_PG_WRITE; + else + mask = EPT_PG_M; + break; + default: + panic("pmap_modified_bit: invalid pm_type %d", pmap->pm_type); + } + + return (mask); +} + #if !defined(DIAGNOSTIC) #ifdef __GNUC_GNU_INLINE__ #define PMAP_INLINE __attribute__((__gnu_inline__)) inline @@ -247,6 +363,8 @@ static struct md_page *pv_table; pt_entry_t *CMAP1 = 0; caddr_t CADDR1 = 0; +static int pmap_flags = PMAP_PDE_SUPERPAGE; /* flags for x86 pmaps */ + static struct unrhdr pcid_unr; static struct mtx pcid_mtx; int pmap_pcid_enabled = 1; @@ -306,12 +424,12 @@ static void pmap_fill_ptp(pt_entry_t *fi static int pmap_insert_pt_page(pmap_t pmap, vm_page_t mpte); static void pmap_kenter_attr(vm_offset_t va, vm_paddr_t pa, int mode); static vm_page_t pmap_lookup_pt_page(pmap_t pmap, vm_offset_t va); -static void pmap_pde_attr(pd_entry_t *pde, int cache_bits); +static void pmap_pde_attr(pd_entry_t *pde, int cache_bits, int mask); static void pmap_promote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va, struct rwlock **lockp); static boolean_t pmap_protect_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t sva, vm_prot_t prot); -static void pmap_pte_attr(pt_entry_t *pte, int cache_bits); +static void pmap_pte_attr(pt_entry_t *pte, int cache_bits, int mask); static int pmap_remove_pde(pmap_t pmap, pd_entry_t *pdq, vm_offset_t sva, struct spglist *free, struct rwlock **lockp); static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva, @@ -323,7 +441,7 @@ static boolean_t pmap_try_insert_pv_entr vm_page_t m, struct rwlock **lockp); static void pmap_update_pde(pmap_t pmap, vm_offset_t va, pd_entry_t *pde, pd_entry_t newpde); -static void pmap_update_pde_invalidate(vm_offset_t va, pd_entry_t newpde); +static void pmap_update_pde_invalidate(pmap_t, vm_offset_t va, pd_entry_t pde); static vm_page_t _pmap_allocpte(pmap_t pmap, vm_pindex_t ptepindex, struct rwlock **lockp); @@ -416,7 +534,9 @@ static __inline pdp_entry_t * pmap_pdpe(pmap_t pmap, vm_offset_t va) { pml4_entry_t *pml4e; + pt_entry_t PG_V; + PG_V = pmap_valid_bit(pmap); pml4e = pmap_pml4e(pmap, va); if ((*pml4e & PG_V) == 0) return (NULL); @@ -438,7 +558,9 @@ static __inline pd_entry_t * pmap_pde(pmap_t pmap, vm_offset_t va) { pdp_entry_t *pdpe; + pt_entry_t PG_V; + PG_V = pmap_valid_bit(pmap); pdpe = pmap_pdpe(pmap, va); if (pdpe == NULL || (*pdpe & PG_V) == 0) return (NULL); @@ -460,7 +582,9 @@ static __inline pt_entry_t * pmap_pte(pmap_t pmap, vm_offset_t va) { pd_entry_t *pde; + pt_entry_t PG_V; + PG_V = pmap_valid_bit(pmap); pde = pmap_pde(pmap, va); if (pde == NULL || (*pde & PG_V) == 0) return (NULL); @@ -490,6 +614,8 @@ vtopte(vm_offset_t va) { u_int64_t mask = ((1ul << (NPTEPGSHIFT + NPDEPGSHIFT + NPDPEPGSHIFT + NPML4EPGSHIFT)) - 1); + KASSERT(va >= VM_MAXUSER_ADDRESS, ("vtopte on a uva/gpa 0x%0lx", va)); + return (PTmap + ((va >> PAGE_SHIFT) & mask)); } @@ -498,6 +624,8 @@ vtopde(vm_offset_t va) { u_int64_t mask = ((1ul << (NPDEPGSHIFT + NPDPEPGSHIFT + NPML4EPGSHIFT)) - 1); + KASSERT(va >= VM_MAXUSER_ADDRESS, ("vtopde on a uva/gpa 0x%0lx", va)); + return (PDmap + ((va >> PDRSHIFT) & mask)); } @@ -601,22 +729,24 @@ create_pagetables(vm_paddr_t *firstaddr) /* XXX not fully used, underneath 2M pages */ pt_p = (pt_entry_t *)KPTphys; for (i = 0; ptoa(i) < *firstaddr; i++) - pt_p[i] = ptoa(i) | PG_RW | PG_V | PG_G; + pt_p[i] = ptoa(i) | X86_PG_RW | X86_PG_V | X86_PG_G; /* Now map the page tables at their location within PTmap */ pd_p = (pd_entry_t *)KPDphys; for (i = 0; i < nkpt; i++) - pd_p[i] = (KPTphys + ptoa(i)) | PG_RW | PG_V; + pd_p[i] = (KPTphys + ptoa(i)) | X86_PG_RW | X86_PG_V; /* Map from zero to end of allocations under 2M pages */ /* This replaces some of the KPTphys entries above */ for (i = 0; (i << PDRSHIFT) < *firstaddr; i++) - pd_p[i] = (i << PDRSHIFT) | PG_RW | PG_V | PG_PS | PG_G; + pd_p[i] = (i << PDRSHIFT) | X86_PG_RW | X86_PG_V | PG_PS | + X86_PG_G; /* And connect up the PD to the PDP (leaving room for L4 pages) */ pdp_p = (pdp_entry_t *)(KPDPphys + ptoa(KPML4I - KPML4BASE)); for (i = 0; i < nkpdpe; i++) - pdp_p[i + KPDPI] = (KPDphys + ptoa(i)) | PG_RW | PG_V | PG_U; + pdp_p[i + KPDPI] = (KPDphys + ptoa(i)) | X86_PG_RW | X86_PG_V | + PG_U; /* * Now, set up the direct map region using 2MB and/or 1GB pages. If @@ -630,36 +760,36 @@ create_pagetables(vm_paddr_t *firstaddr) for (i = NPDEPG * ndm1g, j = 0; i < NPDEPG * ndmpdp; i++, j++) { pd_p[j] = (vm_paddr_t)i << PDRSHIFT; /* Preset PG_M and PG_A because demotion expects it. */ - pd_p[j] |= PG_RW | PG_V | PG_PS | PG_G | - PG_M | PG_A; + pd_p[j] |= X86_PG_RW | X86_PG_V | PG_PS | X86_PG_G | + X86_PG_M | X86_PG_A; } pdp_p = (pdp_entry_t *)DMPDPphys; for (i = 0; i < ndm1g; i++) { pdp_p[i] = (vm_paddr_t)i << PDPSHIFT; /* Preset PG_M and PG_A because demotion expects it. */ - pdp_p[i] |= PG_RW | PG_V | PG_PS | PG_G | - PG_M | PG_A; + pdp_p[i] |= X86_PG_RW | X86_PG_V | PG_PS | X86_PG_G | + X86_PG_M | X86_PG_A; } for (j = 0; i < ndmpdp; i++, j++) { pdp_p[i] = DMPDphys + ptoa(j); - pdp_p[i] |= PG_RW | PG_V | PG_U; + pdp_p[i] |= X86_PG_RW | X86_PG_V | PG_U; } /* And recursively map PML4 to itself in order to get PTmap */ p4_p = (pml4_entry_t *)KPML4phys; p4_p[PML4PML4I] = KPML4phys; - p4_p[PML4PML4I] |= PG_RW | PG_V | PG_U; + p4_p[PML4PML4I] |= X86_PG_RW | X86_PG_V | PG_U; /* Connect the Direct Map slot(s) up to the PML4. */ for (i = 0; i < ndmpdpphys; i++) { p4_p[DMPML4I + i] = DMPDPphys + ptoa(i); - p4_p[DMPML4I + i] |= PG_RW | PG_V | PG_U; + p4_p[DMPML4I + i] |= X86_PG_RW | X86_PG_V | PG_U; } /* Connect the KVA slots up to the PML4 */ for (i = 0; i < NKPML4E; i++) { p4_p[KPML4BASE + i] = KPDPphys + ptoa(i); - p4_p[KPML4BASE + i] |= PG_RW | PG_V | PG_U; + p4_p[KPML4BASE + i] |= X86_PG_RW | X86_PG_V | PG_U; } } @@ -705,6 +835,7 @@ pmap_bootstrap(vm_paddr_t *firstaddr) CPU_FILL(&kernel_pmap->pm_active); /* don't allow deactivation */ CPU_ZERO(&kernel_pmap->pm_save); TAILQ_INIT(&kernel_pmap->pm_pvchunk); + kernel_pmap->pm_flags = pmap_flags; /* * Initialize the global pv list lock. @@ -948,35 +1079,131 @@ SYSCTL_ULONG(_vm_pmap_pdpe, OID_AUTO, de * Low level helper routines..... ***************************************************/ +static pt_entry_t +pmap_swap_pat(pmap_t pmap, pt_entry_t entry) +{ + int x86_pat_bits = X86_PG_PTE_PAT | X86_PG_PDE_PAT; + + switch (pmap->pm_type) { + case PT_X86: + /* Verify that both PAT bits are not set at the same time */ + KASSERT((entry & x86_pat_bits) != x86_pat_bits, + ("Invalid PAT bits in entry %#lx", entry)); + + /* Swap the PAT bits if one of them is set */ + if ((entry & x86_pat_bits) != 0) + entry ^= x86_pat_bits; + break; + case PT_EPT: + /* + * Nothing to do - the memory attributes are represented + * the same way for regular pages and superpages. + */ + break; + default: + panic("pmap_switch_pat_bits: bad pm_type %d", pmap->pm_type); + } + + return (entry); +} + /* * Determine the appropriate bits to set in a PTE or PDE for a specified * caching mode. */ static int -pmap_cache_bits(int mode, boolean_t is_pde) +pmap_cache_bits(pmap_t pmap, int mode, boolean_t is_pde) { int cache_bits, pat_flag, pat_idx; if (mode < 0 || mode >= PAT_INDEX_SIZE || pat_index[mode] < 0) panic("Unknown caching mode %d\n", mode); - /* The PAT bit is different for PTE's and PDE's. */ - pat_flag = is_pde ? PG_PDE_PAT : PG_PTE_PAT; + switch (pmap->pm_type) { + case PT_X86: + /* The PAT bit is different for PTE's and PDE's. */ + pat_flag = is_pde ? X86_PG_PDE_PAT : X86_PG_PTE_PAT; + + /* Map the caching mode to a PAT index. */ + pat_idx = pat_index[mode]; + + /* Map the 3-bit index value into the PAT, PCD, and PWT bits. */ + cache_bits = 0; + if (pat_idx & 0x4) + cache_bits |= pat_flag; + if (pat_idx & 0x2) + cache_bits |= PG_NC_PCD; + if (pat_idx & 0x1) + cache_bits |= PG_NC_PWT; + break; + + case PT_EPT: + cache_bits = EPT_PG_IGNORE_PAT | EPT_PG_MEMORY_TYPE(mode); + break; - /* Map the caching mode to a PAT index. */ - pat_idx = pat_index[mode]; + default: + panic("unsupported pmap type %d", pmap->pm_type); + } - /* Map the 3-bit index value into the PAT, PCD, and PWT bits. */ - cache_bits = 0; - if (pat_idx & 0x4) - cache_bits |= pat_flag; - if (pat_idx & 0x2) - cache_bits |= PG_NC_PCD; - if (pat_idx & 0x1) - cache_bits |= PG_NC_PWT; return (cache_bits); } +static int +pmap_cache_mask(pmap_t pmap, boolean_t is_pde) +{ + int mask; + + switch (pmap->pm_type) { + case PT_X86: + mask = is_pde ? X86_PG_PDE_CACHE : X86_PG_PTE_CACHE; + break; + case PT_EPT: + mask = EPT_PG_IGNORE_PAT | EPT_PG_MEMORY_TYPE(0x7); + break; + default: + panic("pmap_cache_mask: invalid pm_type %d", pmap->pm_type); + } + + return (mask); +} + +static __inline boolean_t +pmap_ps_enabled(pmap_t pmap) +{ + + return (pg_ps_enabled && (pmap->pm_flags & PMAP_PDE_SUPERPAGE) != 0); +} + +static void +pmap_update_pde_store(pmap_t pmap, pd_entry_t *pde, pd_entry_t newpde) +{ + + switch (pmap->pm_type) { + case PT_X86: + break; + case PT_EPT: + /* + * XXX + * This is a little bogus since the generation number is + * supposed to be bumped up when a region of the address + * space is invalidated in the page tables. + * + * In this case the old PDE entry is valid but yet we want + * to make sure that any mappings using the old entry are + * invalidated in the TLB. + * + * The reason this works as expected is because we rendezvous + * "all" host cpus and force any vcpu context to exit as a + * side-effect. + */ + atomic_add_acq_long(&pmap->pm_eptgen, 1); + break; + default: + panic("pmap_update_pde_store: bad pm_type %d", pmap->pm_type); + } + pde_store(pde, newpde); +} + /* * After changing the page size for the specified virtual address in the page * table, flush the corresponding entries from the processor's TLB. Only the @@ -985,8 +1212,17 @@ pmap_cache_bits(int mode, boolean_t is_p * The calling thread must be pinned to a processor. */ static void -pmap_update_pde_invalidate(vm_offset_t va, pd_entry_t newpde) +pmap_update_pde_invalidate(pmap_t pmap, vm_offset_t va, pd_entry_t newpde) { + pt_entry_t PG_G; + + if (pmap->pm_type == PT_EPT) + return; + + KASSERT(pmap->pm_type == PT_X86, + ("pmap_update_pde_invalidate: invalid type %d", pmap->pm_type)); + + PG_G = pmap_global_bit(pmap); if ((newpde & PG_PS) == 0) /* Demotion: flush a specific 2MB page mapping. */ @@ -1048,12 +1284,61 @@ pmap_invalidate_page_pcid(pmap_t pmap, v * immutable. The kernel page table is always active on every * processor. */ + +/* + * Interrupt the cpus that are executing in the guest context. + * This will force the vcpu to exit and the cached EPT mappings + * will be invalidated by the host before the next vmresume. + */ +static __inline void +pmap_invalidate_ept(pmap_t pmap) +{ + + sched_pin(); + KASSERT(!CPU_ISSET(curcpu, &pmap->pm_active), + ("pmap_invalidate_ept: absurd pm_active")); + + /* + * The TLB mappings associated with a vcpu context are not + * flushed each time a different vcpu is chosen to execute. + * + * This is in contrast with a process's vtop mappings that + * are flushed from the TLB on each context switch. + * + * Therefore we need to do more than just a TLB shootdown on + * the active cpus in 'pmap->pm_active'. To do this we keep + * track of the number of invalidations performed on this pmap. + * + * Each vcpu keeps a cache of this counter and compares it + * just before a vmresume. If the counter is out-of-date an + * invept will be done to flush stale mappings from the TLB. + */ + atomic_add_acq_long(&pmap->pm_eptgen, 1); + + /* + * Force the vcpu to exit and trap back into the hypervisor. + * + * XXX this is not optimal because IPI_AST builds a trapframe + * whereas all we need is an 'eoi' followed by 'iret'. + */ + ipi_selected(pmap->pm_active, IPI_AST); + sched_unpin(); +} + void pmap_invalidate_page(pmap_t pmap, vm_offset_t va) { cpuset_t other_cpus; u_int cpuid; + if (pmap->pm_type == PT_EPT) { + pmap_invalidate_ept(pmap); + return; + } + + KASSERT(pmap->pm_type == PT_X86, + ("pmap_invalidate_page: invalid type %d", pmap->pm_type)); + sched_pin(); if (pmap == kernel_pmap || !CPU_CMP(&pmap->pm_active, &all_cpus)) { if (!pmap_pcid_enabled) { @@ -1124,6 +1409,14 @@ pmap_invalidate_range(pmap_t pmap, vm_of vm_offset_t addr; u_int cpuid; + if (pmap->pm_type == PT_EPT) { + pmap_invalidate_ept(pmap); + return; + } + + KASSERT(pmap->pm_type == PT_X86, + ("pmap_invalidate_range: invalid type %d", pmap->pm_type)); + sched_pin(); if (pmap == kernel_pmap || !CPU_CMP(&pmap->pm_active, &all_cpus)) { if (!pmap_pcid_enabled) { @@ -1175,6 +1468,14 @@ pmap_invalidate_all(pmap_t pmap) uint64_t cr3; u_int cpuid; + if (pmap->pm_type == PT_EPT) { + pmap_invalidate_ept(pmap); + return; + } + + KASSERT(pmap->pm_type == PT_X86, + ("pmap_invalidate_all: invalid type %d", pmap->pm_type)); + sched_pin(); cpuid = PCPU_GET(cpuid); if (pmap == kernel_pmap || @@ -1243,6 +1544,7 @@ pmap_invalidate_cache(void) struct pde_action { cpuset_t invalidate; /* processors that invalidate their TLB */ + pmap_t pmap; vm_offset_t va; pd_entry_t *pde; pd_entry_t newpde; @@ -1255,7 +1557,7 @@ pmap_update_pde_action(void *arg) struct pde_action *act = arg; if (act->store == PCPU_GET(cpuid)) - pde_store(act->pde, act->newpde); + pmap_update_pde_store(act->pmap, act->pde, act->newpde); } static void @@ -1264,7 +1566,7 @@ pmap_update_pde_teardown(void *arg) struct pde_action *act = arg; if (CPU_ISSET(PCPU_GET(cpuid), &act->invalidate)) - pmap_update_pde_invalidate(act->va, act->newpde); + pmap_update_pde_invalidate(act->pmap, act->va, act->newpde); } /* @@ -1286,7 +1588,7 @@ pmap_update_pde(pmap_t pmap, vm_offset_t cpuid = PCPU_GET(cpuid); other_cpus = all_cpus; CPU_CLR(cpuid, &other_cpus); - if (pmap == kernel_pmap) + if (pmap == kernel_pmap || pmap->pm_type == PT_EPT) active = all_cpus; else { active = pmap->pm_active; @@ -1296,6 +1598,7 @@ pmap_update_pde(pmap_t pmap, vm_offset_t act.store = cpuid; act.invalidate = active; act.va = va; + act.pmap = pmap; act.pde = pde; act.newpde = newpde; CPU_SET(cpuid, &active); @@ -1303,9 +1606,9 @@ pmap_update_pde(pmap_t pmap, vm_offset_t smp_no_rendevous_barrier, pmap_update_pde_action, pmap_update_pde_teardown, &act); } else { - pde_store(pde, newpde); + pmap_update_pde_store(pmap, pde, newpde); if (CPU_ISSET(cpuid, &active)) - pmap_update_pde_invalidate(va, newpde); + pmap_update_pde_invalidate(pmap, va, newpde); } sched_unpin(); } @@ -1318,8 +1621,17 @@ PMAP_INLINE void pmap_invalidate_page(pmap_t pmap, vm_offset_t va) { - if (pmap == kernel_pmap || !CPU_EMPTY(&pmap->pm_active)) - invlpg(va); + switch (pmap->pm_type) { + case PT_X86: + if (pmap == kernel_pmap || !CPU_EMPTY(&pmap->pm_active)) + invlpg(va); + break; + case PT_EPT: + pmap->pm_eptgen++; + break; + default: + panic("pmap_invalidate_page: unknown type: %d", pmap->pm_type); + } } PMAP_INLINE void @@ -1327,17 +1639,35 @@ pmap_invalidate_range(pmap_t pmap, vm_of { vm_offset_t addr; - if (pmap == kernel_pmap || !CPU_EMPTY(&pmap->pm_active)) - for (addr = sva; addr < eva; addr += PAGE_SIZE) - invlpg(addr); + switch (pmap->pm_type) { + case PT_X86: + if (pmap == kernel_pmap || !CPU_EMPTY(&pmap->pm_active)) + for (addr = sva; addr < eva; addr += PAGE_SIZE) + invlpg(addr); + break; + case PT_EPT: + pmap->pm_eptgen++; + break; + default: + panic("pmap_invalidate_range: unknown type: %d", pmap->pm_type); + } } PMAP_INLINE void pmap_invalidate_all(pmap_t pmap) { - if (pmap == kernel_pmap || !CPU_EMPTY(&pmap->pm_active)) - invltlb(); + switch (pmap->pm_type) { + case PT_X86: + if (pmap == kernel_pmap || !CPU_EMPTY(&pmap->pm_active)) + invltlb(); + break; + case PT_EPT: + pmap->pm_eptgen++; + break; + default: + panic("pmap_invalidate_all: unknown type %d", pmap->pm_type); + } } PMAP_INLINE void @@ -1351,9 +1681,9 @@ static void pmap_update_pde(pmap_t pmap, vm_offset_t va, pd_entry_t *pde, pd_entry_t newpde) { - pde_store(pde, newpde); + pmap_update_pde_store(pmap, pde, newpde); if (pmap == kernel_pmap || !CPU_EMPTY(&pmap->pm_active)) - pmap_update_pde_invalidate(va, newpde); + pmap_update_pde_invalidate(pmap, va, newpde); else CPU_ZERO(&pmap->pm_save); } @@ -1455,10 +1785,11 @@ pmap_extract(pmap_t pmap, vm_offset_t va { pdp_entry_t *pdpe; pd_entry_t *pde; - pt_entry_t *pte; + pt_entry_t *pte, PG_V; vm_paddr_t pa; pa = 0; + PG_V = pmap_valid_bit(pmap); PMAP_LOCK(pmap); pdpe = pmap_pdpe(pmap, va); if (pdpe != NULL && (*pdpe & PG_V) != 0) { @@ -1493,12 +1824,14 @@ vm_page_t pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot) { pd_entry_t pde, *pdep; - pt_entry_t pte; + pt_entry_t pte, PG_RW, PG_V; vm_paddr_t pa; vm_page_t m; pa = 0; m = NULL; + PG_RW = pmap_rw_bit(pmap); + PG_V = pmap_valid_bit(pmap); PMAP_LOCK(pmap); retry: pdep = pmap_pde(pmap, va); @@ -1571,16 +1904,18 @@ pmap_kenter(vm_offset_t va, vm_paddr_t p pt_entry_t *pte; pte = vtopte(va); - pte_store(pte, pa | PG_RW | PG_V | PG_G); + pte_store(pte, pa | X86_PG_RW | X86_PG_V | X86_PG_G); } static __inline void pmap_kenter_attr(vm_offset_t va, vm_paddr_t pa, int mode) { pt_entry_t *pte; + int cache_bits; pte = vtopte(va); - pte_store(pte, pa | PG_RW | PG_V | PG_G | pmap_cache_bits(mode, 0)); + cache_bits = pmap_cache_bits(kernel_pmap, mode, 0); + pte_store(pte, pa | X86_PG_RW | X86_PG_V | X86_PG_G | cache_bits); } /* @@ -1629,20 +1964,22 @@ pmap_qenter(vm_offset_t sva, vm_page_t * { pt_entry_t *endpte, oldpte, pa, *pte; vm_page_t m; + int cache_bits; oldpte = 0; pte = vtopte(sva); endpte = pte + count; while (pte < endpte) { m = *ma++; - pa = VM_PAGE_TO_PHYS(m) | pmap_cache_bits(m->md.pat_mode, 0); - if ((*pte & (PG_FRAME | PG_PTE_CACHE)) != pa) { + cache_bits = pmap_cache_bits(kernel_pmap, m->md.pat_mode, 0); + pa = VM_PAGE_TO_PHYS(m) | cache_bits; + if ((*pte & (PG_FRAME | X86_PG_PTE_CACHE)) != pa) { oldpte |= *pte; - pte_store(pte, pa | PG_G | PG_RW | PG_V); + pte_store(pte, pa | X86_PG_G | X86_PG_RW | X86_PG_V); } pte++; } - if (__predict_false((oldpte & PG_V) != 0)) + if (__predict_false((oldpte & X86_PG_V) != 0)) pmap_invalidate_range(kernel_pmap, sva, sva + count * PAGE_SIZE); } @@ -1841,6 +2178,7 @@ pmap_pinit0(pmap_t pmap) TAILQ_INIT(&pmap->pm_pvchunk); bzero(&pmap->pm_stats, sizeof pmap->pm_stats); pmap->pm_pcid = pmap_pcid_enabled ? 0 : -1; + pmap->pm_flags = pmap_flags; } /* @@ -1848,9 +2186,10 @@ pmap_pinit0(pmap_t pmap) * such as one in a vmspace structure. */ int -pmap_pinit(pmap_t pmap) +pmap_pinit_type(pmap_t pmap, enum pmap_type pm_type, int flags) { vm_page_t pml4pg; + vm_paddr_t pml4phys; int i; /* @@ -1860,41 +2199,61 @@ pmap_pinit(pmap_t pmap) VM_ALLOC_NOOBJ | VM_ALLOC_WIRED | VM_ALLOC_ZERO)) == NULL) VM_WAIT; - pmap->pm_cr3 = VM_PAGE_TO_PHYS(pml4pg); - pmap->pm_pml4 = (pml4_entry_t *)PHYS_TO_DMAP(pmap->pm_cr3); + pml4phys = VM_PAGE_TO_PHYS(pml4pg); + pmap->pm_pml4 = (pml4_entry_t *)PHYS_TO_DMAP(pml4phys); + pmap->pm_pcid = -1; + pmap->pm_cr3 = ~0; /* initialize to an invalid value */ if ((pml4pg->flags & PG_ZERO) == 0) pagezero(pmap->pm_pml4); - /* Wire in kernel global address entries. */ - for (i = 0; i < NKPML4E; i++) { - pmap->pm_pml4[KPML4BASE + i] = (KPDPphys + (i << PAGE_SHIFT)) | - PG_RW | PG_V | PG_U; - } - for (i = 0; i < ndmpdpphys; i++) { - pmap->pm_pml4[DMPML4I + i] = (DMPDPphys + (i << PAGE_SHIFT)) | - PG_RW | PG_V | PG_U; - } + /* + * Do not install the host kernel mappings in the nested page + * tables. These mappings are meaningless in the guest physical + * address space. + */ + if ((pmap->pm_type = pm_type) == PT_X86) { + pmap->pm_cr3 = pml4phys; + + /* Wire in kernel global address entries. */ + for (i = 0; i < NKPML4E; i++) { + pmap->pm_pml4[KPML4BASE + i] = (KPDPphys + ptoa(i)) | + X86_PG_RW | X86_PG_V | PG_U; + } + for (i = 0; i < ndmpdpphys; i++) { + pmap->pm_pml4[DMPML4I + i] = (DMPDPphys + ptoa(i)) | + X86_PG_RW | X86_PG_V | PG_U; + } + + /* install self-referential address mapping entry(s) */ + pmap->pm_pml4[PML4PML4I] = VM_PAGE_TO_PHYS(pml4pg) | + X86_PG_V | X86_PG_RW | X86_PG_A | X86_PG_M; - /* install self-referential address mapping entry(s) */ - pmap->pm_pml4[PML4PML4I] = VM_PAGE_TO_PHYS(pml4pg) | PG_V | PG_RW | PG_A | PG_M; + if (pmap_pcid_enabled) { + pmap->pm_pcid = alloc_unr(&pcid_unr); + if (pmap->pm_pcid != -1) + pmap->pm_cr3 |= pmap->pm_pcid; + } + } pmap->pm_root.rt_root = 0; CPU_ZERO(&pmap->pm_active); TAILQ_INIT(&pmap->pm_pvchunk); bzero(&pmap->pm_stats, sizeof pmap->pm_stats); - if (pmap_pcid_enabled) { - pmap->pm_pcid = alloc_unr(&pcid_unr); - if (pmap->pm_pcid != -1) - pmap->pm_cr3 |= pmap->pm_pcid; - } else { - pmap->pm_pcid = -1; - } + pmap->pm_flags = flags; + pmap->pm_eptgen = 0; CPU_ZERO(&pmap->pm_save); return (1); } +int +pmap_pinit(pmap_t pmap) +{ + + return (pmap_pinit_type(pmap, PT_X86, pmap_flags)); +} + /* * This routine is called if the desired page table page does not exist. * @@ -1910,9 +2269,15 @@ static vm_page_t _pmap_allocpte(pmap_t pmap, vm_pindex_t ptepindex, struct rwlock **lockp) { vm_page_t m, pdppg, pdpg; + pt_entry_t PG_A, PG_M, PG_RW, PG_V; PMAP_LOCK_ASSERT(pmap, MA_OWNED); + PG_A = pmap_accessed_bit(pmap); + PG_M = pmap_modified_bit(pmap); + PG_V = pmap_valid_bit(pmap); + PG_RW = pmap_rw_bit(pmap); + /* * Allocate a page table page. */ @@ -2040,9 +2405,11 @@ static vm_page_t pmap_allocpde(pmap_t pmap, vm_offset_t va, struct rwlock **lockp) { vm_pindex_t pdpindex, ptepindex; - pdp_entry_t *pdpe; + pdp_entry_t *pdpe, PG_V; vm_page_t pdpg; + PG_V = pmap_valid_bit(pmap); + retry: pdpe = pmap_pdpe(pmap, va); if (pdpe != NULL && (*pdpe & PG_V) != 0) { @@ -2064,9 +2431,11 @@ static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va, struct rwlock **lockp) { vm_pindex_t ptepindex; - pd_entry_t *pd; + pd_entry_t *pd, PG_V; vm_page_t m; + PG_V = pmap_valid_bit(pmap); + /* * Calculate pagetable page index */ @@ -2140,7 +2509,7 @@ pmap_release(pmap_t pmap) pmap_invalidate_all(pmap); } - m = PHYS_TO_VM_PAGE(pmap->pm_pml4[PML4PML4I] & PG_FRAME); + m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pmap->pm_pml4)); for (i = 0; i < NKPML4E; i++) /* KVA */ pmap->pm_pml4[KPML4BASE + i] = 0; @@ -2211,7 +2580,7 @@ pmap_growkernel(vm_offset_t addr) addr = kernel_map->max_offset; while (kernel_vm_end < addr) { pdpe = pmap_pdpe(kernel_pmap, kernel_vm_end); - if ((*pdpe & PG_V) == 0) { + if ((*pdpe & X86_PG_V) == 0) { /* We need a new PDP entry */ nkpg = vm_page_alloc(NULL, kernel_vm_end >> PDPSHIFT, VM_ALLOC_INTERRUPT | VM_ALLOC_NOOBJ | @@ -2221,12 +2590,12 @@ pmap_growkernel(vm_offset_t addr) if ((nkpg->flags & PG_ZERO) == 0) pmap_zero_page(nkpg); paddr = VM_PAGE_TO_PHYS(nkpg); - *pdpe = (pdp_entry_t) - (paddr | PG_V | PG_RW | PG_A | PG_M); + *pdpe = (pdp_entry_t)(paddr | X86_PG_V | X86_PG_RW | + X86_PG_A | X86_PG_M); continue; /* try again */ } pde = pmap_pdpe_to_pde(pdpe, kernel_vm_end); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Sun Oct 6 09:55:31 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D6FC21000; Sun, 6 Oct 2013 09:55:31 +0000 (UTC) (envelope-from markm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B457521C0; Sun, 6 Oct 2013 09:55:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r969tVHV047718; Sun, 6 Oct 2013 09:55:31 GMT (envelope-from markm@svn.freebsd.org) Received: (from markm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r969tTmH047691; Sun, 6 Oct 2013 09:55:29 GMT (envelope-from markm@svn.freebsd.org) Message-Id: <201310060955.r969tTmH047691@svn.freebsd.org> From: Mark Murray Date: Sun, 6 Oct 2013 09:55:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256081 - projects/random_number_generator/sys/dev/random X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Oct 2013 09:55:31 -0000 Author: markm Date: Sun Oct 6 09:55:28 2013 New Revision: 256081 URL: http://svnweb.freebsd.org/changeset/base/256081 Log: SNAPSHOT. Simplify the malloc pools; We only need one for this device. Simplify the harvest queue. Marginally improve the entropy pool hashing, making it a bit faster in the process. Connect up the hardware "live" source harvesting. This is simplistic for now, and will need to be made rate-adaptive. All of the above passes a compile test but needs to be debugged. Modified: projects/random_number_generator/sys/dev/random/dummy_rng.c projects/random_number_generator/sys/dev/random/ivy.c projects/random_number_generator/sys/dev/random/live_entropy_sources.c projects/random_number_generator/sys/dev/random/live_entropy_sources.h projects/random_number_generator/sys/dev/random/nehemiah.c projects/random_number_generator/sys/dev/random/random_adaptors.c projects/random_number_generator/sys/dev/random/random_harvestq.c projects/random_number_generator/sys/dev/random/randomdev.c projects/random_number_generator/sys/dev/random/randomdev.h projects/random_number_generator/sys/dev/random/randomdev_soft.c projects/random_number_generator/sys/dev/random/randomdev_soft.h projects/random_number_generator/sys/dev/random/yarrow.c Modified: projects/random_number_generator/sys/dev/random/dummy_rng.c ============================================================================== --- projects/random_number_generator/sys/dev/random/dummy_rng.c Sun Oct 6 09:37:57 2013 (r256080) +++ projects/random_number_generator/sys/dev/random/dummy_rng.c Sun Oct 6 09:55:28 2013 (r256081) @@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: projects/random_number_generator/sys/dev/random/ivy.c ============================================================================== --- projects/random_number_generator/sys/dev/random/ivy.c Sun Oct 6 09:37:57 2013 (r256080) +++ projects/random_number_generator/sys/dev/random/ivy.c Sun Oct 6 09:55:28 2013 (r256081) @@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -40,9 +41,11 @@ __FBSDID("$FreeBSD$"); #include #include +#include +#include +#include #include #include -#include #define RETRY_COUNT 10 Modified: projects/random_number_generator/sys/dev/random/live_entropy_sources.c ============================================================================== --- projects/random_number_generator/sys/dev/random/live_entropy_sources.c Sun Oct 6 09:37:57 2013 (r256080) +++ projects/random_number_generator/sys/dev/random/live_entropy_sources.c Sun Oct 6 09:55:28 2013 (r256081) @@ -40,9 +40,12 @@ __FBSDID("$FreeBSD$"); #include #include +#include + #include #include #include +#include #include "live_entropy_sources.h" @@ -52,9 +55,6 @@ static struct sx les_lock; /* need a sle #define LES_THRESHOLD 10 -MALLOC_DEFINE(M_LIVE_ENTROPY_SRCS, "live_entropy_sources", - "Live Entropy Sources"); - void live_entropy_source_register(struct random_hardware_source *rsource) { @@ -62,8 +62,7 @@ live_entropy_source_register(struct rand KASSERT(rsource != NULL, ("invalid input to %s", __func__)); - les = malloc(sizeof(struct live_entropy_sources), M_LIVE_ENTROPY_SRCS, - M_WAITOK); + les = malloc(sizeof(struct live_entropy_sources), M_ENTROPY, M_WAITOK); les->rsource = rsource; sx_xlock(&les_lock); @@ -82,7 +81,7 @@ live_entropy_source_deregister(struct ra LIST_FOREACH(les, &sources, entries) { if (les->rsource == rsource) { LIST_REMOVE(les, entries); - free(les, M_LIVE_ENTROPY_SRCS); + free(les, M_ENTROPY); break; } } @@ -136,12 +135,16 @@ live_entropy_sources_init(void *unused) * number of rounds, which should be a multiple of the number * of entropy accumulation pools in use; 2 for Yarrow and 32 * for Fortuna. + * + * BEWARE!!! + * This function runs inside the RNG thread! Don't do anything silly! */ void -live_entropy_sources_feed(int rounds) +live_entropy_sources_feed(int rounds, event_proc_f entropy_processor) { + static struct harvest event; + static uint8_t buf[HARVESTSIZE]; struct live_entropy_sources *les; - uint8_t buf[HARVESTSIZE]; int i, n; sx_slock(&les_lock); @@ -157,14 +160,19 @@ live_entropy_sources_feed(int rounds) * This should be quick, since it's a live entropy * source. */ - n = les->rsource->read(buf, sizeof(buf)); /* FIXME: Whine loudly if this didn't work. */ + n = les->rsource->read(buf, sizeof(buf)); + n = MIN(n, HARVESTSIZE); + + event.somecounter = get_cyclecount(); + event.size = n; + event.bits = (n*8)/2; + event.source = les->rsource->source; + memcpy(event.entropy, buf, n); + + /* Do the actual entropy insertion */ + entropy_processor(&event); - /* - * FIXME: Cannot harvest this stuff into the queue; - * the poor thing will choke to death! - */ - random_harvest(buf, n, 0, les->rsource->source); } } Modified: projects/random_number_generator/sys/dev/random/live_entropy_sources.h ============================================================================== --- projects/random_number_generator/sys/dev/random/live_entropy_sources.h Sun Oct 6 09:37:57 2013 (r256080) +++ projects/random_number_generator/sys/dev/random/live_entropy_sources.h Sun Oct 6 09:55:28 2013 (r256081) @@ -42,7 +42,7 @@ struct live_entropy_sources { void live_entropy_source_register(struct random_hardware_source *); void live_entropy_source_deregister(struct random_hardware_source *); -void live_entropy_sources_feed(int); +void live_entropy_sources_feed(int, event_proc_f); #define LIVE_ENTROPY_SRC_MODULE(name, modevent, ver) \ static moduledata_t name##_mod = { \ Modified: projects/random_number_generator/sys/dev/random/nehemiah.c ============================================================================== --- projects/random_number_generator/sys/dev/random/nehemiah.c Sun Oct 6 09:37:57 2013 (r256080) +++ projects/random_number_generator/sys/dev/random/nehemiah.c Sun Oct 6 09:55:28 2013 (r256081) @@ -31,6 +31,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -40,9 +41,11 @@ __FBSDID("$FreeBSD$"); #include #include +#include +#include +#include #include #include -#include static void random_nehemiah_init(void); static void random_nehemiah_deinit(void); Modified: projects/random_number_generator/sys/dev/random/random_adaptors.c ============================================================================== --- projects/random_number_generator/sys/dev/random/random_adaptors.c Sun Oct 6 09:37:57 2013 (r256080) +++ projects/random_number_generator/sys/dev/random/random_adaptors.c Sun Oct 6 09:55:28 2013 (r256081) @@ -55,8 +55,6 @@ static struct sysctl_ctx_list random_cli struct random_adaptor *random_adaptor; -MALLOC_DEFINE(M_RANDOM_ADAPTORS, "random_adaptors", "Random adaptors buffers"); - int random_adaptor_register(const char *name, struct random_adaptor *rsp) { @@ -64,8 +62,7 @@ random_adaptor_register(const char *name KASSERT(name != NULL && rsp != NULL, ("invalid input to %s", __func__)); - rpp = malloc(sizeof(struct random_adaptors), M_RANDOM_ADAPTORS, - M_WAITOK); + rpp = malloc(sizeof(struct random_adaptors), M_ENTROPY, M_WAITOK); rpp->name = name; rpp->rsp = rsp; Modified: projects/random_number_generator/sys/dev/random/random_harvestq.c ============================================================================== --- projects/random_number_generator/sys/dev/random/random_harvestq.c Sun Oct 6 09:37:57 2013 (r256080) +++ projects/random_number_generator/sys/dev/random/random_harvestq.c Sun Oct 6 09:55:28 2013 (r256081) @@ -39,17 +39,17 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include +#include #include - -#include "random_harvestq.h" +#include +#include #define RANDOM_FIFO_MAX 1024 /* How many events to queue up */ -MALLOC_DEFINE(M_ENTROPY, "entropy", "Entropy harvesting buffers"); - /* * The harvest mutex protects the consistency of the entropy fifos and * empty fifo. @@ -66,7 +66,7 @@ struct entropyfifo { static struct entropyfifo emptyfifo; /* Harvested entropy */ -static struct entropyfifo harvestfifo[ENTROPYSOURCE]; +static struct entropyfifo harvestfifo; /* <0 to end the kthread, 0 to let it run, 1 to flush the harvest queues */ int random_kthread_control = 0; @@ -79,8 +79,7 @@ random_kthread(void *arg) STAILQ_HEAD(, harvest) local_queue; struct harvest *event = NULL; int local_count; - enum esource source; - event_proc_f func = arg; + event_proc_f entropy_processor = arg; STAILQ_INIT(&local_queue); local_count = 0; @@ -89,16 +88,14 @@ random_kthread(void *arg) mtx_lock_spin(&harvest_mtx); for (; random_kthread_control >= 0;) { - /* Cycle through all the entropy sources */ - for (source = RANDOM_START; source < ENTROPYSOURCE; source++) { - /* - * Drain entropy source records into a thread-local - * queue for processing while not holding the mutex. - */ - STAILQ_CONCAT(&local_queue, &harvestfifo[source].head); - local_count += harvestfifo[source].count; - harvestfifo[source].count = 0; - } + /* + * Grab all the entropy events. + * Drain entropy source records into a thread-local + * queue for processing while not holding the mutex. + */ + STAILQ_CONCAT(&local_queue, &harvestfifo.head); + local_count += harvestfifo.count; + harvestfifo.count = 0; /* * Deal with events, if any. @@ -107,7 +104,7 @@ random_kthread(void *arg) if (!STAILQ_EMPTY(&local_queue)) { mtx_unlock_spin(&harvest_mtx); STAILQ_FOREACH(event, &local_queue, next) - func(event); + entropy_processor(event); mtx_lock_spin(&harvest_mtx); STAILQ_CONCAT(&emptyfifo.head, &local_queue); emptyfifo.count += local_count; @@ -118,16 +115,10 @@ random_kthread(void *arg) local_count)); /* - * Do Hardware/fast RNG source processing here. + * Do only one round of the hardware sources for now. + * Later we'll need to make it rate-adaptive. */ -#if 0 - while (hardware_source) { - event = hardware_source->read(); - func(event); - hardware_source++; - /* Throttle somehow? */ - } -#endif + live_entropy_sources_feed(1, entropy_processor); /* * If a queue flush was commanded, it has now happened, @@ -153,22 +144,22 @@ random_harvestq_init(event_proc_f cb) { int error, i; struct harvest *np; - enum esource e; /* Initialise the harvest fifos */ + + /* Contains the currently unused event structs. */ STAILQ_INIT(&emptyfifo.head); - emptyfifo.count = 0; for (i = 0; i < RANDOM_FIFO_MAX; i++) { np = malloc(sizeof(struct harvest), M_ENTROPY, M_WAITOK); STAILQ_INSERT_TAIL(&emptyfifo.head, np, next); } - for (e = RANDOM_START; e < ENTROPYSOURCE; e++) { - STAILQ_INIT(&harvestfifo[e].head); - harvestfifo[e].count = 0; - } + emptyfifo.count = RANDOM_FIFO_MAX; - mtx_init(&harvest_mtx, "entropy harvest mutex", NULL, MTX_SPIN); + /* Will contain the queued-up events. */ + STAILQ_INIT(&harvestfifo.head); + harvestfifo.count = 0; + mtx_init(&harvest_mtx, "entropy harvest mutex", NULL, MTX_SPIN); /* Start the hash/reseed thread */ error = kproc_create(random_kthread, cb, @@ -182,7 +173,6 @@ void random_harvestq_deinit(void) { struct harvest *np; - enum esource e; /* Destroy the harvest fifos */ while (!STAILQ_EMPTY(&emptyfifo.head)) { @@ -190,20 +180,26 @@ random_harvestq_deinit(void) STAILQ_REMOVE_HEAD(&emptyfifo.head, next); free(np, M_ENTROPY); } - for (e = RANDOM_START; e < ENTROPYSOURCE; e++) { - while (!STAILQ_EMPTY(&harvestfifo[e].head)) { - np = STAILQ_FIRST(&harvestfifo[e].head); - STAILQ_REMOVE_HEAD(&harvestfifo[e].head, next); - free(np, M_ENTROPY); - } + emptyfifo.count = 0; + while (!STAILQ_EMPTY(&harvestfifo.head)) { + np = STAILQ_FIRST(&harvestfifo.head); + STAILQ_REMOVE_HEAD(&harvestfifo.head, next); + free(np, M_ENTROPY); } + harvestfifo.count = 0; mtx_destroy(&harvest_mtx); } /* - * Entropy harvesting routine. This is supposed to be fast; do - * not do anything slow in here! + * Entropy harvesting routine. + * This is supposed to be fast; do not do anything slow in here! + * + * It is also illegal (and morally reprehensible) to insert any + * high-rate data here. "High-rate" is define as a data source + * that will usually cause lots of failures of the "Lockless read" + * check a few lines below. This includes the "always-on" sources + * like the Intel "rdrand" or the VIA Nehamiah "xstore" sources. */ void random_harvestq_internal(u_int64_t somecounter, const void *entropy, @@ -215,21 +211,21 @@ random_harvestq_internal(u_int64_t somec ("random_harvest_internal: origin %d invalid\n", origin)); /* Lockless read to avoid lock operations if fifo is full. */ - if (harvestfifo[origin].count >= RANDOM_FIFO_MAX) + if (harvestfifo.count >= RANDOM_FIFO_MAX) return; mtx_lock_spin(&harvest_mtx); /* - * Don't make the harvest queues too big - help to prevent low-grade - * entropy swamping + * On't overfill the harvest queue; this could steal all + * our memory. */ - if (harvestfifo[origin].count < RANDOM_FIFO_MAX) { + if (harvestfifo.count < RANDOM_FIFO_MAX) { event = STAILQ_FIRST(&emptyfifo.head); if (event != NULL) { /* Add the harvested data to the fifo */ STAILQ_REMOVE_HEAD(&emptyfifo.head, next); - harvestfifo[origin].count++; + emptyfifo.count--; event->somecounter = somecounter; event->size = count; event->bits = bits; @@ -239,21 +235,11 @@ random_harvestq_internal(u_int64_t somec count = MIN(count, HARVESTSIZE); memcpy(event->entropy, entropy, count); -#if 0 - { - int i; - printf("Harvest:%16jX ", event->somecounter); - for (i = 0; i < event->size; i++) - printf("%02X", event->entropy[i]); - for (; i < 16; i++) - printf(" "); - printf(" %2d %2d %02X\n", event->size, event->bits, event->source); - } -#endif - - STAILQ_INSERT_TAIL(&harvestfifo[origin].head, + STAILQ_INSERT_TAIL(&harvestfifo.head, event, next); + harvestfifo.count++; } } + mtx_unlock_spin(&harvest_mtx); } Modified: projects/random_number_generator/sys/dev/random/randomdev.c ============================================================================== --- projects/random_number_generator/sys/dev/random/randomdev.c Sun Oct 6 09:37:57 2013 (r256080) +++ projects/random_number_generator/sys/dev/random/randomdev.c Sun Oct 6 09:55:28 2013 (r256081) @@ -52,9 +52,11 @@ __FBSDID("$FreeBSD$"); #include #include +#include +#include #include +#include #include -#include #define RANDOM_MINOR 0 @@ -72,6 +74,8 @@ static struct cdevsw random_cdevsw = { .d_name = "random", }; +MALLOC_DEFINE(M_ENTROPY, "entropy", "Entropy harvesting buffers"); + /* For use with make_dev(9)/destroy_dev(9). */ static struct cdev *random_dev; @@ -82,10 +86,6 @@ random_read(struct cdev *dev __unused, s int c, error = 0; void *random_buf; - /* XXX: Harvest some entropy from live entropy sources, if available */ - live_entropy_sources_feed(65); /* 65 is meaningless -- - need to decide appropriate value */ - /* Blocking logic */ if (!random_adaptor->seeded) error = (*random_adaptor->block)(flag); @@ -93,7 +93,7 @@ random_read(struct cdev *dev __unused, s /* The actual read */ if (!error) { - random_buf = (void *)malloc(PAGE_SIZE, M_TEMP, M_WAITOK); + random_buf = (void *)malloc(PAGE_SIZE, M_ENTROPY, M_WAITOK); while (uio->uio_resid > 0 && !error) { c = MIN(uio->uio_resid, PAGE_SIZE); @@ -104,7 +104,7 @@ random_read(struct cdev *dev __unused, s * optional housekeeping */ (*random_adaptor->read)(NULL, 0); - free(random_buf, M_TEMP); + free(random_buf, M_ENTROPY); } Modified: projects/random_number_generator/sys/dev/random/randomdev.h ============================================================================== --- projects/random_number_generator/sys/dev/random/randomdev.h Sun Oct 6 09:37:57 2013 (r256080) +++ projects/random_number_generator/sys/dev/random/randomdev.h Sun Oct 6 09:55:28 2013 (r256081) @@ -30,6 +30,8 @@ * and non algorithm-specific for the entropy processor */ +MALLOC_DECLARE(M_ENTROPY); + typedef void random_init_func_t(void); typedef void random_deinit_func_t(void); typedef int random_block_func_t(int); Modified: projects/random_number_generator/sys/dev/random/randomdev_soft.c ============================================================================== --- projects/random_number_generator/sys/dev/random/randomdev_soft.c Sun Oct 6 09:37:57 2013 (r256080) +++ projects/random_number_generator/sys/dev/random/randomdev_soft.c Sun Oct 6 09:55:28 2013 (r256081) @@ -53,9 +53,10 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include +#include +#include #if defined(YARROW_RNG) #include #endif @@ -63,7 +64,6 @@ __FBSDID("$FreeBSD$"); #include #endif -#include "random_harvestq.h" static int randomdev_poll(int event, struct thread *td); static int randomdev_block(int flag); Modified: projects/random_number_generator/sys/dev/random/randomdev_soft.h ============================================================================== --- projects/random_number_generator/sys/dev/random/randomdev_soft.h Sun Oct 6 09:37:57 2013 (r256080) +++ projects/random_number_generator/sys/dev/random/randomdev_soft.h Sun Oct 6 09:55:28 2013 (r256081) @@ -41,8 +41,6 @@ #define HARVESTSIZE 16 /* max size of each harvested entropy unit */ -MALLOC_DECLARE(M_ENTROPY); - /* These are used to queue harvested packets of entropy. The entropy * buffer size is pretty arbitrary. */ Modified: projects/random_number_generator/sys/dev/random/yarrow.c ============================================================================== --- projects/random_number_generator/sys/dev/random/yarrow.c Sun Oct 6 09:37:57 2013 (r256080) +++ projects/random_number_generator/sys/dev/random/yarrow.c Sun Oct 6 09:55:28 2013 (r256081) @@ -97,6 +97,7 @@ clear_counter(void) /* 128-bit C = C + 1 */ /* Nothing to see here, folks, just an ugly mess. */ +/* TODO: Make a Galois counter instead? */ static void increment_counter(void) { @@ -113,13 +114,25 @@ random_process_event(struct harvest *eve struct source *source; enum esource src; - /* Unpack the event into the appropriate source accumulator */ +#if 1 + /* Do this better with DTrace */ + { + int i; + + printf("Harvest:%16jX ", event->somecounter); + for (i = 0; i < event->size; i++) + printf("%02X", event->entropy[i]); + for (; i < 16; i++) + printf(" "); + printf(" %2d %2d %02X\n", event->size, event->bits, event->source); + } +#endif + + /* Accumulate the event into the appropriate pool */ pl = random_state.which; source = &random_state.pool[pl].source[event->source]; - randomdev_hash_iterate(&random_state.pool[pl].hash, event->entropy, - sizeof(event->entropy)); - randomdev_hash_iterate(&random_state.pool[pl].hash, &event->somecounter, - sizeof(event->somecounter)); + randomdev_hash_iterate(&random_state.pool[pl].hash, event, + sizeof(*event)); source->bits += event->bits; /* Count the over-threshold sources in each pool */ From owner-svn-src-projects@FreeBSD.ORG Sun Oct 6 12:31:25 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 0456FC1F; Sun, 6 Oct 2013 12:31:25 +0000 (UTC) (envelope-from markm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E5CAB27DF; Sun, 6 Oct 2013 12:31:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r96CVOTl029838; Sun, 6 Oct 2013 12:31:24 GMT (envelope-from markm@svn.freebsd.org) Received: (from markm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r96CVO1T029837; Sun, 6 Oct 2013 12:31:24 GMT (envelope-from markm@svn.freebsd.org) Message-Id: <201310061231.r96CVO1T029837@svn.freebsd.org> From: Mark Murray Date: Sun, 6 Oct 2013 12:31:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256083 - projects/random_number_generator/contrib/libc++/include X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Oct 2013 12:31:25 -0000 Author: markm Date: Sun Oct 6 12:31:24 2013 New Revision: 256083 URL: http://svnweb.freebsd.org/changeset/base/256083 Log: MFC - tracking commit Modified: projects/random_number_generator/contrib/libc++/include/memory Directory Properties: projects/random_number_generator/ (props changed) projects/random_number_generator/contrib/libc++/ (props changed) Modified: projects/random_number_generator/contrib/libc++/include/memory ============================================================================== --- projects/random_number_generator/contrib/libc++/include/memory Sun Oct 6 10:12:11 2013 (r256082) +++ projects/random_number_generator/contrib/libc++/include/memory Sun Oct 6 12:31:24 2013 (r256083) @@ -965,13 +965,13 @@ public: namespace __has_pointer_type_imp { - template static __two test(...); - template static char test(typename _Up::pointer* = 0); + template static __two __test(...); + template static char __test(typename _Up::pointer* = 0); } template struct __has_pointer_type - : public integral_constant(0)) == 1> + : public integral_constant(0)) == 1> { }; From owner-svn-src-projects@FreeBSD.ORG Sun Oct 6 12:35:30 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 1B6B9FDE; Sun, 6 Oct 2013 12:35:30 +0000 (UTC) (envelope-from markm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 08EE127FF; Sun, 6 Oct 2013 12:35:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r96CZTdb031696; Sun, 6 Oct 2013 12:35:29 GMT (envelope-from markm@svn.freebsd.org) Received: (from markm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r96CZTIv031694; Sun, 6 Oct 2013 12:35:29 GMT (envelope-from markm@svn.freebsd.org) Message-Id: <201310061235.r96CZTIv031694@svn.freebsd.org> From: Mark Murray Date: Sun, 6 Oct 2013 12:35:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256084 - projects/random_number_generator/sys/dev/random X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Oct 2013 12:35:30 -0000 Author: markm Date: Sun Oct 6 12:35:29 2013 New Revision: 256084 URL: http://svnweb.freebsd.org/changeset/base/256084 Log: Don't use the "real" assembler mnemonics; older compilers may not understand them (like when building CURRENT on 9.x). Submitted by: Konstantin Belousov Modified: projects/random_number_generator/sys/dev/random/ivy.c projects/random_number_generator/sys/dev/random/nehemiah.c Modified: projects/random_number_generator/sys/dev/random/ivy.c ============================================================================== --- projects/random_number_generator/sys/dev/random/ivy.c Sun Oct 6 12:31:24 2013 (r256083) +++ projects/random_number_generator/sys/dev/random/ivy.c Sun Oct 6 12:35:29 2013 (r256084) @@ -65,12 +65,12 @@ ivy_rng_store(uint64_t *tmp) __asm __volatile( #ifdef __amd64__ - "rdrand\t%%rax\n\t" + ".byte\t0x48,0x0f,0xc7,0xf0\n\t" /* rdrand %rax */ "jnc\t1f\n\t" "movq\t%%rax,%1\n\t" "movl\t$8,%%eax\n" #else /* i386 */ - "rdrand\t%%eax\n\t" + ".byte\t0x0f,0xc7,0xf0\n\t" /* rdrand %eax */ "jnc\t1f\n\t" "movl\t%%eax,%1\n\t" "movl\t$4,%%eax\n" Modified: projects/random_number_generator/sys/dev/random/nehemiah.c ============================================================================== --- projects/random_number_generator/sys/dev/random/nehemiah.c Sun Oct 6 12:31:24 2013 (r256083) +++ projects/random_number_generator/sys/dev/random/nehemiah.c Sun Oct 6 12:35:29 2013 (r256084) @@ -71,7 +71,7 @@ VIA_RNG_store(void *buf) #ifdef __GNUCLIKE_ASM __asm __volatile( "movl $0,%%edx\n\t" - "xstore" + ".byte 0x0f, 0xa7, 0xc0" /* xstore */ : "=a" (retval), "+d" (rate), "+D" (buf) : : "memory" From owner-svn-src-projects@FreeBSD.ORG Sun Oct 6 12:40:34 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 3D536320; Sun, 6 Oct 2013 12:40:34 +0000 (UTC) (envelope-from markm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 289FA2844; Sun, 6 Oct 2013 12:40:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r96CeYld034891; Sun, 6 Oct 2013 12:40:34 GMT (envelope-from markm@svn.freebsd.org) Received: (from markm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r96CeW0F034884; Sun, 6 Oct 2013 12:40:32 GMT (envelope-from markm@svn.freebsd.org) Message-Id: <201310061240.r96CeW0F034884@svn.freebsd.org> From: Mark Murray Date: Sun, 6 Oct 2013 12:40:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256086 - in projects/random_number_generator/sys: dev/random net netgraph X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Oct 2013 12:40:34 -0000 Author: markm Date: Sun Oct 6 12:40:32 2013 New Revision: 256086 URL: http://svnweb.freebsd.org/changeset/base/256086 Log: Debug run. This now works, except that the "live" sources haven't been tested. With all sources turned on, this unlocks itself in a couple of seconds! That is no my box, and there is no guarantee that this will be the case everywhere. * Cut debug prints. * Use the same locks/mutexes all the way through. * Be a tad more conservative about entropy estimates. Modified: projects/random_number_generator/sys/dev/random/live_entropy_sources.c projects/random_number_generator/sys/dev/random/random_harvestq.c projects/random_number_generator/sys/dev/random/random_harvestq.h projects/random_number_generator/sys/dev/random/yarrow.c projects/random_number_generator/sys/net/if_ethersubr.c projects/random_number_generator/sys/net/if_tun.c projects/random_number_generator/sys/netgraph/ng_iface.c Modified: projects/random_number_generator/sys/dev/random/live_entropy_sources.c ============================================================================== --- projects/random_number_generator/sys/dev/random/live_entropy_sources.c Sun Oct 6 12:39:12 2013 (r256085) +++ projects/random_number_generator/sys/dev/random/live_entropy_sources.c Sun Oct 6 12:40:32 2013 (r256086) @@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$"); LIST_HEAD(les_head, live_entropy_sources); static struct les_head sources = LIST_HEAD_INITIALIZER(sources); -static struct sx les_lock; /* need a sleepable lock */ #define LES_THRESHOLD 10 @@ -65,9 +64,9 @@ live_entropy_source_register(struct rand les = malloc(sizeof(struct live_entropy_sources), M_ENTROPY, M_WAITOK); les->rsource = rsource; - sx_xlock(&les_lock); + mtx_lock_spin(&harvest_mtx); LIST_INSERT_HEAD(&sources, les, entries); - sx_xunlock(&les_lock); + mtx_unlock_spin(&harvest_mtx); } void @@ -77,7 +76,7 @@ live_entropy_source_deregister(struct ra KASSERT(rsource != NULL, ("invalid input to %s", __func__)); - sx_xlock(&les_lock); + mtx_lock_spin(&harvest_mtx); LIST_FOREACH(les, &sources, entries) { if (les->rsource == rsource) { LIST_REMOVE(les, entries); @@ -85,7 +84,7 @@ live_entropy_source_deregister(struct ra break; } } - sx_xunlock(&les_lock); + mtx_unlock_spin(&harvest_mtx); } static int @@ -96,7 +95,7 @@ live_entropy_source_handler(SYSCTL_HANDL count = error = 0; - sx_slock(&les_lock); + mtx_lock_spin(&harvest_mtx); if (LIST_EMPTY(&sources)) error = SYSCTL_OUT(req, "", 0); @@ -113,7 +112,7 @@ live_entropy_source_handler(SYSCTL_HANDL } } - sx_sunlock(&les_lock); + mtx_unlock_spin(&harvest_mtx); return (error); } @@ -126,8 +125,6 @@ live_entropy_sources_init(void *unused) CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, 0, live_entropy_source_handler, "", "List of Active Live Entropy Sources"); - - sx_init(&les_lock, "live_entropy_sources"); } /* @@ -138,6 +135,7 @@ live_entropy_sources_init(void *unused) * * BEWARE!!! * This function runs inside the RNG thread! Don't do anything silly! + * The harvest_mtx mutex is held; you may count on that. */ void live_entropy_sources_feed(int rounds, event_proc_f entropy_processor) @@ -147,8 +145,6 @@ live_entropy_sources_feed(int rounds, ev struct live_entropy_sources *les; int i, n; - sx_slock(&les_lock); - /* * Walk over all of live entropy sources, and feed their output * to the system-wide RNG. @@ -176,15 +172,11 @@ live_entropy_sources_feed(int rounds, ev } } - - sx_sunlock(&les_lock); } static void live_entropy_sources_deinit(void *unused) { - - sx_destroy(&les_lock); } SYSINIT(random_adaptors, SI_SUB_DRIVERS, SI_ORDER_FIRST, Modified: projects/random_number_generator/sys/dev/random/random_harvestq.c ============================================================================== --- projects/random_number_generator/sys/dev/random/random_harvestq.c Sun Oct 6 12:39:12 2013 (r256085) +++ projects/random_number_generator/sys/dev/random/random_harvestq.c Sun Oct 6 12:40:32 2013 (r256086) @@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$"); /* * The harvest mutex protects the consistency of the entropy fifos and - * empty fifo. + * empty fifo and other associated structures. */ struct mtx harvest_mtx; Modified: projects/random_number_generator/sys/dev/random/random_harvestq.h ============================================================================== --- projects/random_number_generator/sys/dev/random/random_harvestq.h Sun Oct 6 12:39:12 2013 (r256085) +++ projects/random_number_generator/sys/dev/random/random_harvestq.h Sun Oct 6 12:40:32 2013 (r256086) @@ -37,5 +37,6 @@ void random_harvestq_internal(u_int64_t, u_int, u_int, enum esource); extern int random_kthread_control; +extern struct mtx harvest_mtx; #endif /* __RANDOM_HARVEST_H__ */ Modified: projects/random_number_generator/sys/dev/random/yarrow.c ============================================================================== --- projects/random_number_generator/sys/dev/random/yarrow.c Sun Oct 6 12:39:12 2013 (r256085) +++ projects/random_number_generator/sys/dev/random/yarrow.c Sun Oct 6 12:40:32 2013 (r256086) @@ -114,7 +114,7 @@ random_process_event(struct harvest *eve struct source *source; enum esource src; -#if 1 +#if 0 /* Do this better with DTrace */ { int i; @@ -243,6 +243,10 @@ reseed(u_int fastslow) u_int i; enum esource j; +#if 0 + printf("Yarrow: %s reseed\n", fastslow == FAST ? "fast" : "slow"); +#endif + /* The reseed task must not be jumped on */ mtx_lock(&random_reseed_mtx); Modified: projects/random_number_generator/sys/net/if_ethersubr.c ============================================================================== --- projects/random_number_generator/sys/net/if_ethersubr.c Sun Oct 6 12:39:12 2013 (r256085) +++ projects/random_number_generator/sys/net/if_ethersubr.c Sun Oct 6 12:40:32 2013 (r256086) @@ -639,7 +639,7 @@ ether_input_internal(struct ifnet *ifp, } if (harvest.ethernet) - random_harvest(&(m->m_data), 12, 3, RANDOM_NET_ETHER); + random_harvest(&(m->m_data), 12, 2, RANDOM_NET_ETHER); ether_demux(ifp, m); CURVNET_RESTORE(); Modified: projects/random_number_generator/sys/net/if_tun.c ============================================================================== --- projects/random_number_generator/sys/net/if_tun.c Sun Oct 6 12:39:12 2013 (r256085) +++ projects/random_number_generator/sys/net/if_tun.c Sun Oct 6 12:40:32 2013 (r256086) @@ -918,7 +918,7 @@ tunwrite(struct cdev *dev, struct uio *u return (EAFNOSUPPORT); } if (harvest.point_to_point) - random_harvest(&(m->m_data), 12, 3, RANDOM_NET_TUN); + random_harvest(&(m->m_data), 12, 2, RANDOM_NET_TUN); ifp->if_ibytes += m->m_pkthdr.len; ifp->if_ipackets++; CURVNET_SET(ifp->if_vnet); Modified: projects/random_number_generator/sys/netgraph/ng_iface.c ============================================================================== --- projects/random_number_generator/sys/netgraph/ng_iface.c Sun Oct 6 12:39:12 2013 (r256085) +++ projects/random_number_generator/sys/netgraph/ng_iface.c Sun Oct 6 12:40:32 2013 (r256086) @@ -775,7 +775,7 @@ ng_iface_rcvdata(hook_p hook, item_p ite return (EAFNOSUPPORT); } if (harvest.point_to_point) - random_harvest(&(m->m_data), 12, 3, RANDOM_NET_NG); + random_harvest(&(m->m_data), 12, 2, RANDOM_NET_NG); M_SETFIB(m, ifp->if_fib); netisr_dispatch(isr, m); return (0); From owner-svn-src-projects@FreeBSD.ORG Sun Oct 6 12:43:43 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 0926440F; Sun, 6 Oct 2013 12:43:43 +0000 (UTC) (envelope-from markm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DC168284D; Sun, 6 Oct 2013 12:43:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r96ChgNt036114; Sun, 6 Oct 2013 12:43:42 GMT (envelope-from markm@svn.freebsd.org) Received: (from markm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r96Chgfv036100; Sun, 6 Oct 2013 12:43:42 GMT (envelope-from markm@svn.freebsd.org) Message-Id: <201310061243.r96Chgfv036100@svn.freebsd.org> From: Mark Murray Date: Sun, 6 Oct 2013 12:43:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256087 - in projects/random_number_generator/etc: defaults rc.d X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Oct 2013 12:43:43 -0000 Author: markm Date: Sun Oct 6 12:43:42 2013 New Revision: 256087 URL: http://svnweb.freebsd.org/changeset/base/256087 Log: As userland writing to /dev/random is no more, remove the "better than nothing" bootstrap mode. Add SWI harvesting to the mix. My box seeds Yarrow by itself in a few seconds! YMMV; more to follow. Modified: projects/random_number_generator/etc/defaults/rc.conf projects/random_number_generator/etc/rc.d/initrandom Modified: projects/random_number_generator/etc/defaults/rc.conf ============================================================================== --- projects/random_number_generator/etc/defaults/rc.conf Sun Oct 6 12:40:32 2013 (r256086) +++ projects/random_number_generator/etc/defaults/rc.conf Sun Oct 6 12:43:42 2013 (r256087) @@ -651,6 +651,7 @@ entropy_save_num="8" # Number of entropy harvest_interrupt="YES" # Entropy device harvests interrupt randomness harvest_ethernet="YES" # Entropy device harvests ethernet randomness harvest_p_to_p="YES" # Entropy device harvests point-to-point randomness +harvest_swi="YES" # Entropy device harvests internal SWI randomness dmesg_enable="YES" # Save dmesg(8) to /var/run/dmesg.boot watchdogd_enable="NO" # Start the software watchdog daemon watchdogd_flags="" # Flags to watchdogd (if enabled) Modified: projects/random_number_generator/etc/rc.d/initrandom ============================================================================== --- projects/random_number_generator/etc/rc.d/initrandom Sun Oct 6 12:40:32 2013 (r256086) +++ projects/random_number_generator/etc/rc.d/initrandom Sun Oct 6 12:43:42 2013 (r256087) @@ -14,26 +14,6 @@ name="initrandom" start_cmd="initrandom_start" stop_cmd=":" -feed_dev_random() -{ - if [ -f "${1}" -a -r "${1}" -a -s "${1}" ]; then - cat "${1}" | dd of=/dev/random bs=8k 2>/dev/null - fi -} - -better_than_nothing() -{ - # XXX temporary until we can improve the entropy - # harvesting rate. - # Entropy below is not great, but better than nothing. - # This unblocks the generator at startup - # Note: commands are ordered to cause the most variance across reboots. - ( kenv; dmesg; df -ib; ps -fauxww; date; sysctl -a ) \ - | dd of=/dev/random bs=8k 2>/dev/null - /sbin/sha256 -q `sysctl -n kern.bootfile` \ - | dd of=/dev/random bs=8k 2>/dev/null -} - initrandom_start() { soft_random_generator=`sysctl kern.random 2>/dev/null` @@ -63,23 +43,15 @@ initrandom_start() else ${SYSCTL} kern.random.sys.harvest.point_to_point=0 >/dev/null fi - fi - # First pass at reseeding /dev/random. - # - case ${entropy_file} in - [Nn][Oo] | '') - ;; - *) - if [ -w /dev/random ]; then - feed_dev_random "${entropy_file}" + if checkyesno harvest_swi; then + ${SYSCTL} kern.random.sys.harvest.swi=1 >/dev/null + echo -n ' swi' + else + ${SYSCTL} kern.random.sys.harvest.swi=0 >/dev/null fi - ;; - esac - - better_than_nothing + fi - echo -n ' kickstart' fi echo '.' From owner-svn-src-projects@FreeBSD.ORG Sun Oct 6 13:01:42 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D1D658EA; Sun, 6 Oct 2013 13:01:42 +0000 (UTC) (envelope-from markm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id ADA9E2911; Sun, 6 Oct 2013 13:01:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r96D1gXb045943; Sun, 6 Oct 2013 13:01:42 GMT (envelope-from markm@svn.freebsd.org) Received: (from markm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r96D1gtS045942; Sun, 6 Oct 2013 13:01:42 GMT (envelope-from markm@svn.freebsd.org) Message-Id: <201310061301.r96D1gtS045942@svn.freebsd.org> From: Mark Murray Date: Sun, 6 Oct 2013 13:01:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256088 - projects/random_number_generator/share/man/man4 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Oct 2013 13:01:42 -0000 Author: markm Date: Sun Oct 6 13:01:42 2013 New Revision: 256088 URL: http://svnweb.freebsd.org/changeset/base/256088 Log: Fix up the man page for random(4). This mainly removes no-longer-relevant details about HW RNGs, reseeding explicitly and user-supplied entropy. Modified: projects/random_number_generator/share/man/man4/random.4 Modified: projects/random_number_generator/share/man/man4/random.4 ============================================================================== --- projects/random_number_generator/share/man/man4/random.4 Sun Oct 6 12:43:42 2013 (r256087) +++ projects/random_number_generator/share/man/man4/random.4 Sun Oct 6 13:01:42 2013 (r256088) @@ -1,4 +1,4 @@ -.\" Copyright (c) 2001 Mark R V Murray. All rights reserved. +.\" Copyright (c) 2001-2013 Mark R V Murray. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -43,35 +43,48 @@ The device will probe for certain hardware entropy sources, and use these in preference to the fallback, which is a generator implemented in software. -If the kernel environment MIB's -.Va hw.nehemiah_rng_enable -or -.Va hw.ivy_rng_enable -are set to -.Dq Li 0 , -the associated hardware entropy source will be ignored. -.Pp -If the device is using -the software generator, -writing data to -.Nm -would perturb the internal state. -This perturbation of the internal state -is the only userland method of introducing -extra entropy into the device. -If the writer has superuser privilege, -then closing the device after writing -will make the software generator reseed itself. -This can be used for extra security, -as it immediately introduces any/all new entropy -into the PRNG. -The hardware generators will generate -sufficient quantities of entropy, -and will therefore ignore user-supplied input. -The software -.Nm -device may be controlled with -.Xr sysctl 8 . +.Pp +The software generator will start in an +.Em unseeded +state, and will block reads until +it is (re)seeded. +This may cause trouble at system boot +when keys and the like +are generated from +/dev/random +so steps should be taken to ensure a +reseed as soon as possible. +The +.Xr sysctl 8 +controlling the +.Em seeded +status (see below) may be used +if security is not an issue +or for convenience +during setup or development. +.Pp +This initial seeding +of random number generators +is a bootstrapping problem +that needs very careful attention. +In some cases, +it may be difficult +to find enough randomness +to seed a random number generator +until a system is fully operational, +but the system requires random numbers +to become fully operational. +It is (or more accurately should be) +critically important that the +.Nm +device is seeded +before the first time it is used. +In the case where a dummy or "blocking-only" +device is used, +it is the responsibility +of the system architect +to ensure that no blocking reads +hold up critical processes. .Pp To see the current settings of the software .Nm @@ -81,22 +94,20 @@ device, use the command line: .Pp which results in something like: .Bd -literal -offset indent -kern.random.adaptors: yarrow +kern.random.adaptors: yarrow,dummy +kern.random.active_adaptor: yarrow +kern.random.yarrow.gengateinterval: 10 +kern.random.yarrow.bins: 10 +kern.random.yarrow.fastthresh: 96 +kern.random.yarrow.slowthresh: 128 +kern.random.yarrow.slowoverthresh: 2 kern.random.sys.seeded: 1 kern.random.sys.harvest.ethernet: 1 kern.random.sys.harvest.point_to_point: 1 kern.random.sys.harvest.interrupt: 1 -kern.random.sys.harvest.swi: 0 -kern.random.yarrow.gengateinterval: 10 -kern.random.yarrow.bins: 10 -kern.random.yarrow.fastthresh: 192 -kern.random.yarrow.slowthresh: 256 -kern.random.yarrow.slowoverthresh: 2 +kern.random.sys.harvest.swi: 1 .Ed .Pp -(These would not be seen if a -hardware generator is present.) -.Pp Other than .Dl kern.random.adaptors all settings are read/write. @@ -107,9 +118,10 @@ variable indicates whether or not the .Nm device is in an acceptably secure state as a result of reseeding. -If set to 0, the device will block (on read) until the next reseed -(which can be from an explicit write, -or as a result of entropy harvesting). +If set to 0, +the device will block (on read) +until the next reseed +as a result of entropy harvesting. A reseed will set the value to 1 (non-blocking). .Pp The @@ -276,19 +288,6 @@ the generator produce independent sequen However, the guessability or reproducibility of the sequence is unimportant, unlike the previous cases. .Pp -One final consideration for the seeding of random number generators -is a bootstrapping problem. -In some cases, it may be difficult to find enough randomness to -seed a random number generator until a system is fully operational, -but the system requires random numbers to become fully operational. -There is no substitute for careful thought here, -but the -.Fx -.Nm -device, -which is based on the Yarrow system, -should be of some help in this area. -.Pp .Fx does also provide the traditional .Xr rand 3 @@ -325,17 +324,6 @@ and is an implementation of the .Em Yarrow algorithm by Bruce Schneier, .Em et al . -The only hardware implementations -currently are for the -.Tn VIA C3 Nehemiah -(stepping 3 or greater) -CPU -and the -.Tn Intel -.Dq Bull Mountain -.Em RdRand -instruction and underlying random number generator (RNG). -More will be added in the future. .Pp The author gratefully acknowledges significant assistance from VIA Technologies, Inc. From owner-svn-src-projects@FreeBSD.ORG Sun Oct 6 18:56:14 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 6516FF20; Sun, 6 Oct 2013 18:56:14 +0000 (UTC) (envelope-from markm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 38E2229E4; Sun, 6 Oct 2013 18:56:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r96IuELZ036096; Sun, 6 Oct 2013 18:56:14 GMT (envelope-from markm@svn.freebsd.org) Received: (from markm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r96IuDwK036094; Sun, 6 Oct 2013 18:56:13 GMT (envelope-from markm@svn.freebsd.org) Message-Id: <201310061856.r96IuDwK036094@svn.freebsd.org> From: Mark Murray Date: Sun, 6 Oct 2013 18:56:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256091 - in projects/random_number_generator: contrib/llvm/lib/Target/X86 share/man/man9 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Oct 2013 18:56:14 -0000 Author: markm Date: Sun Oct 6 18:56:13 2013 New Revision: 256091 URL: http://svnweb.freebsd.org/changeset/base/256091 Log: MFC - tracking commit. Modified: projects/random_number_generator/contrib/llvm/lib/Target/X86/X86InstrInfo.cpp projects/random_number_generator/share/man/man9/lock.9 Directory Properties: projects/random_number_generator/ (props changed) projects/random_number_generator/contrib/llvm/ (props changed) Modified: projects/random_number_generator/contrib/llvm/lib/Target/X86/X86InstrInfo.cpp ============================================================================== --- projects/random_number_generator/contrib/llvm/lib/Target/X86/X86InstrInfo.cpp Sun Oct 6 16:12:45 2013 (r256090) +++ projects/random_number_generator/contrib/llvm/lib/Target/X86/X86InstrInfo.cpp Sun Oct 6 18:56:13 2013 (r256091) @@ -3881,6 +3881,10 @@ MachineInstr* X86InstrInfo::foldMemoryOp const MachineFrameInfo *MFI = MF.getFrameInfo(); unsigned Size = MFI->getObjectSize(FrameIndex); unsigned Alignment = MFI->getObjectAlignment(FrameIndex); + // If the function stack isn't realigned we don't want to fold instructions + // that need increased alignment. + if (!RI.needsStackRealignment(MF)) + Alignment = std::min(Alignment, TM.getFrameLowering()->getStackAlignment()); if (Ops.size() == 2 && Ops[0] == 0 && Ops[1] == 1) { unsigned NewOpc = 0; unsigned RCSize = 0; Modified: projects/random_number_generator/share/man/man9/lock.9 ============================================================================== --- projects/random_number_generator/share/man/man9/lock.9 Sun Oct 6 16:12:45 2013 (r256090) +++ projects/random_number_generator/share/man/man9/lock.9 Sun Oct 6 18:56:13 2013 (r256091) @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 16, 2011 +.Dd October 6, 2013 .Dt LOCK 9 .Os .Sh NAME @@ -164,11 +164,17 @@ If an exclusive lock has been recursed, .Xr panic 9 . .It Dv LK_UPGRADE Upgrade a shared lock to an exclusive lock. -If this call fails, the shared lock is lost. +If this call fails, the shared lock is lost, even if the +.Dv LK_NOWAIT +flag is specified. During the upgrade, the shared lock could be temporarily dropped. Attempts to upgrade an exclusive lock will cause a .Xr panic 9 . +.It Dv LK_TRYUPGRADE +Try to upgrade a shared lock to an exclusive lock. +The failure to upgrade does not result in the dropping +of the shared lock ownership. .It Dv LK_RELEASE Release the lock. Releasing a lock that is not held can cause a @@ -333,7 +339,9 @@ fail if: was requested and another thread had already requested a lock upgrade. .It Bq Er EBUSY .Dv LK_NOWAIT -was set, and a sleep would have been required. +was set, and a sleep would have been required, or +.Dv LK_TRYUPGRADE +operation was not able to upgrade the lock. .It Bq Er ENOLCK .Dv LK_SLEEPFAIL was set and From owner-svn-src-projects@FreeBSD.ORG Sun Oct 6 22:45:06 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 225912FB; Sun, 6 Oct 2013 22:45:06 +0000 (UTC) (envelope-from markm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F328A235E; Sun, 6 Oct 2013 22:45:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r96Mj5Gs055648; Sun, 6 Oct 2013 22:45:05 GMT (envelope-from markm@svn.freebsd.org) Received: (from markm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r96Mj3mQ055614; Sun, 6 Oct 2013 22:45:03 GMT (envelope-from markm@svn.freebsd.org) Message-Id: <201310062245.r96Mj3mQ055614@svn.freebsd.org> From: Mark Murray Date: Sun, 6 Oct 2013 22:45:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256094 - in projects/random_number_generator/sys: boot/forth conf dev/random kern sys X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Oct 2013 22:45:06 -0000 Author: markm Date: Sun Oct 6 22:45:02 2013 New Revision: 256094 URL: http://svnweb.freebsd.org/changeset/base/256094 Log: Snapshot. Looking pretty good; this mostly works now. New code includes: * Read cached entropy at startup, both from files and from loader(8) preloaded entropy. Failures are soft, but announced. Untested. * Use EVENTHANDLER to do above just before we go multiuser. Untested. Added: projects/random_number_generator/sys/dev/random/rwfile.c (contents, props changed) projects/random_number_generator/sys/dev/random/rwfile.h (contents, props changed) Modified: projects/random_number_generator/sys/boot/forth/loader.conf projects/random_number_generator/sys/conf/files projects/random_number_generator/sys/conf/files.amd64 projects/random_number_generator/sys/conf/files.i386 projects/random_number_generator/sys/dev/random/ivy.c projects/random_number_generator/sys/dev/random/live_entropy_sources.c projects/random_number_generator/sys/dev/random/live_entropy_sources.h projects/random_number_generator/sys/dev/random/random_harvestq.c projects/random_number_generator/sys/dev/random/randomdev_soft.c projects/random_number_generator/sys/kern/init_main.c projects/random_number_generator/sys/sys/eventhandler.h projects/random_number_generator/sys/sys/random.h Modified: projects/random_number_generator/sys/boot/forth/loader.conf ============================================================================== --- projects/random_number_generator/sys/boot/forth/loader.conf Sun Oct 6 20:46:01 2013 (r256093) +++ projects/random_number_generator/sys/boot/forth/loader.conf Sun Oct 6 22:45:02 2013 (r256094) @@ -39,6 +39,17 @@ bitmap_type="splash_image_data" # and pl ############################################################## +### Random number generator configuration ################### +############################################################## + +entropy_cache_load="NO" # Set this to YES to load entropy at boot time +entropy_cache_name="/boot/entropy" # Set this to the name of the file +entropy_cache_type="/boot/entropy" +#kern.random.sys.seeded="0" # Set this to 1 to start /dev/random + # without waiting for a (re)seed. + + +############################################################## ### Loader settings ######################################## ############################################################## Modified: projects/random_number_generator/sys/conf/files ============================================================================== --- projects/random_number_generator/sys/conf/files Sun Oct 6 20:46:01 2013 (r256093) +++ projects/random_number_generator/sys/conf/files Sun Oct 6 22:45:02 2013 (r256094) @@ -2051,6 +2051,7 @@ dev/random/randomdev.c optional random dev/random/randomdev_soft.c optional random dev/random/yarrow.c optional random dev/random/hash.c optional random +dev/random/rwfile.c optional random dev/rc/rc.c optional rc dev/re/if_re.c optional re dev/rndtest/rndtest.c optional rndtest Modified: projects/random_number_generator/sys/conf/files.amd64 ============================================================================== --- projects/random_number_generator/sys/conf/files.amd64 Sun Oct 6 20:46:01 2013 (r256093) +++ projects/random_number_generator/sys/conf/files.amd64 Sun Oct 6 22:45:02 2013 (r256094) @@ -259,6 +259,8 @@ dev/nvme/nvme_sysctl.c optional nvme dev/nvme/nvme_test.c optional nvme dev/nvme/nvme_util.c optional nvme dev/nvram/nvram.c optional nvram isa +dev/random/ivy.c optional rdrand_rng +dev/random/nehemiah.c optional padlock_rng dev/qlxge/qls_dbg.c optional qlxge pci dev/qlxge/qls_dump.c optional qlxge pci dev/qlxge/qls_hw.c optional qlxge pci Modified: projects/random_number_generator/sys/conf/files.i386 ============================================================================== --- projects/random_number_generator/sys/conf/files.i386 Sun Oct 6 20:46:01 2013 (r256093) +++ projects/random_number_generator/sys/conf/files.i386 Sun Oct 6 22:45:02 2013 (r256094) @@ -257,6 +257,8 @@ dev/nvme/nvme_test.c optional nvme dev/nvme/nvme_util.c optional nvme dev/nvram/nvram.c optional nvram isa dev/pcf/pcf_isa.c optional pcf +dev/random/ivy.c optional rdrand_rng +dev/random/nehemiah.c optional padlock_rng dev/sbni/if_sbni.c optional sbni dev/sbni/if_sbni_isa.c optional sbni isa dev/sbni/if_sbni_pci.c optional sbni pci Modified: projects/random_number_generator/sys/dev/random/ivy.c ============================================================================== --- projects/random_number_generator/sys/dev/random/ivy.c Sun Oct 6 20:46:01 2013 (r256093) +++ projects/random_number_generator/sys/dev/random/ivy.c Sun Oct 6 22:45:02 2013 (r256094) @@ -57,6 +57,15 @@ struct random_hardware_source random_ivy .read = random_ivy_read }; +#if 1 +static inline int +ivy_rng_store(uint64_t *tmp) +{ + *tmp = 0xF001FACE; + + return (sizeof(uint64_t)); +} +#else static inline int ivy_rng_store(uint64_t *tmp) { @@ -82,6 +91,7 @@ ivy_rng_store(uint64_t *tmp) return (0); #endif } +#endif static int random_ivy_read(void *buf, int c) @@ -114,6 +124,10 @@ rdrand_modevent(module_t mod, int type, switch (type) { case MOD_LOAD: +#if 1 + live_entropy_source_register(&random_ivy); + printf("%s: CRAP RDRAND is present\n", random_ivy.ident); +#else if (cpu_feature2 & CPUID2_RDRAND) live_entropy_source_register(&random_ivy); else @@ -122,6 +136,7 @@ rdrand_modevent(module_t mod, int type, #endif printf("%s: RDRAND is not present\n", random_ivy.ident); +#endif break; case MOD_UNLOAD: Modified: projects/random_number_generator/sys/dev/random/live_entropy_sources.c ============================================================================== --- projects/random_number_generator/sys/dev/random/live_entropy_sources.c Sun Oct 6 20:46:01 2013 (r256093) +++ projects/random_number_generator/sys/dev/random/live_entropy_sources.c Sun Oct 6 22:45:02 2013 (r256094) @@ -52,7 +52,11 @@ __FBSDID("$FreeBSD$"); LIST_HEAD(les_head, live_entropy_sources); static struct les_head sources = LIST_HEAD_INITIALIZER(sources); -#define LES_THRESHOLD 10 +/* + * The harvest mutex protects the consistency of the entropy fifos and + * empty fifo and other associated structures. + */ +struct mtx live_mtx; void live_entropy_source_register(struct random_hardware_source *rsource) @@ -64,27 +68,27 @@ live_entropy_source_register(struct rand les = malloc(sizeof(struct live_entropy_sources), M_ENTROPY, M_WAITOK); les->rsource = rsource; - mtx_lock_spin(&harvest_mtx); + mtx_lock(&live_mtx); LIST_INSERT_HEAD(&sources, les, entries); - mtx_unlock_spin(&harvest_mtx); + mtx_unlock(&live_mtx); } void live_entropy_source_deregister(struct random_hardware_source *rsource) { - struct live_entropy_sources *les; + struct live_entropy_sources *les = NULL; KASSERT(rsource != NULL, ("invalid input to %s", __func__)); - mtx_lock_spin(&harvest_mtx); - LIST_FOREACH(les, &sources, entries) { + mtx_lock(&live_mtx); + LIST_FOREACH(les, &sources, entries) if (les->rsource == rsource) { LIST_REMOVE(les, entries); - free(les, M_ENTROPY); break; } - } - mtx_unlock_spin(&harvest_mtx); + mtx_unlock(&live_mtx); + if (les != NULL) + free(les, M_ENTROPY); } static int @@ -95,7 +99,7 @@ live_entropy_source_handler(SYSCTL_HANDL count = error = 0; - mtx_lock_spin(&harvest_mtx); + mtx_lock(&live_mtx); if (LIST_EMPTY(&sources)) error = SYSCTL_OUT(req, "", 0); @@ -112,7 +116,7 @@ live_entropy_source_handler(SYSCTL_HANDL } } - mtx_unlock_spin(&harvest_mtx); + mtx_unlock(&live_mtx); return (error); } @@ -125,6 +129,8 @@ live_entropy_sources_init(void *unused) CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, 0, live_entropy_source_handler, "", "List of Active Live Entropy Sources"); + + mtx_init(&live_mtx, "live entropy source mutex", NULL, MTX_DEF); } /* @@ -135,7 +141,7 @@ live_entropy_sources_init(void *unused) * * BEWARE!!! * This function runs inside the RNG thread! Don't do anything silly! - * The harvest_mtx mutex is held; you may count on that. + * Remember that we are NOT holding harvest_mtx on entry! */ void live_entropy_sources_feed(int rounds, event_proc_f entropy_processor) @@ -145,6 +151,8 @@ live_entropy_sources_feed(int rounds, ev struct live_entropy_sources *les; int i, n; + mtx_lock(&live_mtx); + /* * Walk over all of live entropy sources, and feed their output * to the system-wide RNG. @@ -168,15 +176,18 @@ live_entropy_sources_feed(int rounds, ev /* Do the actual entropy insertion */ entropy_processor(&event); - } } + + mtx_unlock(&live_mtx); } static void live_entropy_sources_deinit(void *unused) { + + mtx_destroy(&live_mtx); } SYSINIT(random_adaptors, SI_SUB_DRIVERS, SI_ORDER_FIRST, Modified: projects/random_number_generator/sys/dev/random/live_entropy_sources.h ============================================================================== --- projects/random_number_generator/sys/dev/random/live_entropy_sources.h Sun Oct 6 20:46:01 2013 (r256093) +++ projects/random_number_generator/sys/dev/random/live_entropy_sources.h Sun Oct 6 22:45:02 2013 (r256094) @@ -40,6 +40,8 @@ struct live_entropy_sources { struct random_hardware_source *rsource; /* associated random adaptor */ }; +extern struct mtx live_mtx; + void live_entropy_source_register(struct random_hardware_source *); void live_entropy_source_deregister(struct random_hardware_source *); void live_entropy_sources_feed(int, event_proc_f); Modified: projects/random_number_generator/sys/dev/random/random_harvestq.c ============================================================================== --- projects/random_number_generator/sys/dev/random/random_harvestq.c Sun Oct 6 20:46:01 2013 (r256093) +++ projects/random_number_generator/sys/dev/random/random_harvestq.c Sun Oct 6 22:45:02 2013 (r256094) @@ -33,8 +33,10 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include +#include #include #include #include @@ -43,10 +45,13 @@ __FBSDID("$FreeBSD$"); #include #include +#include + #include #include #include #include +#include #define RANDOM_FIFO_MAX 1024 /* How many events to queue up */ @@ -73,6 +78,56 @@ int random_kthread_control = 0; static struct proc *random_kthread_proc; +static const char *entropy_files[] = { + "/entropy", + "/var/db/entropy", + "/boot/entropy", /* Yeah, Yeah. I know this is loaded by + * loader(8), but not always, and it doesn't + * hurt to do this again. + */ + NULL +}; + +/* Deal with entropy cached externally if this is present. + */ +static void +random_harvestq_cache(void *arg __unused) +{ + const char **entropy_file; + uint8_t *keyfile, *data; + size_t size, i; + int error; + + /* Get stuff that may have been preloaded by loader(8) */ + keyfile = preload_search_by_type("/boot/entropy"); + if (keyfile != NULL) { + data = preload_fetch_addr(keyfile); + size = preload_fetch_size(keyfile); + if (data != NULL && size != 0) { + for (i = 0U; i < size; i += 16) + random_harvestq_internal(get_cyclecount(), data + i, 16, (16*8)/4, RANDOM_CACHED); + printf("random: read %zu bytes from preloaded cache\n", size); + bzero(data, size); + } + else + printf("random: no preloaded entropy cache available\n"); + } + data = malloc(PAGE_SIZE, M_ENTROPY, M_WAITOK); + for (entropy_file = entropy_files; *entropy_file; entropy_file++) { + error = randomdev_read_file(*entropy_file, data); + if (error == 0) { + for (i = 0U; i < PAGE_SIZE; i += 16) + random_harvestq_internal(get_cyclecount(), data + i, 16, (16*8)/4, RANDOM_CACHED); + printf("random: read %d bytes from '%s'\n", PAGE_SIZE, *entropy_file); + } + else + printf("random: entropy cache '%s' not present or unreadable; error = %d\n", *entropy_file, error); + } + bzero(data, PAGE_SIZE); + free(data, M_ENTROPY); +} +EVENTHANDLER_DEFINE(multiuser, random_harvestq_cache, NULL, 0); + static void random_kthread(void *arg) { @@ -118,7 +173,9 @@ random_kthread(void *arg) * Do only one round of the hardware sources for now. * Later we'll need to make it rate-adaptive. */ + mtx_unlock_spin(&harvest_mtx); live_entropy_sources_feed(1, entropy_processor); + mtx_lock_spin(&harvest_mtx); /* * If a queue flush was commanded, it has now happened, Modified: projects/random_number_generator/sys/dev/random/randomdev_soft.c ============================================================================== --- projects/random_number_generator/sys/dev/random/randomdev_soft.c Sun Oct 6 20:46:01 2013 (r256093) +++ projects/random_number_generator/sys/dev/random/randomdev_soft.c Sun Oct 6 22:45:02 2013 (r256094) @@ -99,6 +99,8 @@ static struct random_adaptor random_cont #define RANDOM_CSPRNG_NAME "fortuna" #endif +TUNABLE_INT("kern.random.sys.seeded", &random_context.seeded); + /* List for the dynamic sysctls */ static struct sysctl_ctx_list random_clist; Added: projects/random_number_generator/sys/dev/random/rwfile.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/random_number_generator/sys/dev/random/rwfile.c Sun Oct 6 22:45:02 2013 (r256094) @@ -0,0 +1,91 @@ +/*- + * Copyright (c) 2013 Mark R V Murray + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer + * in this position and unchanged. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include + +#include + +int +randomdev_read_file(const char *filename, void *buf) +{ + struct nameidata nd; + struct thread* td = curthread; + int error; + ssize_t resid; + int flags; + + NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, filename, td); + flags = FREAD; + error = vn_open(&nd, &flags, 0, NULL); + if (error == 0) { + NDFREE(&nd, NDF_ONLY_PNBUF); + if (nd.ni_vp->v_type != VREG) + error = ENOEXEC; + else + error = vn_rdwr(UIO_READ, nd.ni_vp, buf, PAGE_SIZE, 0, UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred, NOCRED, &resid, td); + + VOP_UNLOCK(nd.ni_vp, 0); + vn_close(nd.ni_vp, FREAD, td->td_ucred, td); + } + + return (error); +} + +int +randomdev_write_file(const char *filename, void *buf) +{ + struct nameidata nd; + struct thread* td = curthread; + int error; + ssize_t resid; + int flags; + + NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, filename, td); + flags = FWRITE | O_CREAT | O_TRUNC; + error = vn_open(&nd, &flags, 0, NULL); + if (error == 0) { + NDFREE(&nd, NDF_ONLY_PNBUF); + if (nd.ni_vp->v_type != VREG) + error = ENOEXEC; + else + error = vn_rdwr(UIO_WRITE, nd.ni_vp, buf, PAGE_SIZE, 0, UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred, NOCRED, &resid, td); + + VOP_UNLOCK(nd.ni_vp, 0); + vn_close(nd.ni_vp, FREAD, td->td_ucred, td); + } + + return (error); +} Added: projects/random_number_generator/sys/dev/random/rwfile.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/random_number_generator/sys/dev/random/rwfile.h Sun Oct 6 22:45:02 2013 (r256094) @@ -0,0 +1,30 @@ +/*- + * Copyright (c) 2013 Mark R V Murray + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer + * in this position and unchanged. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD$ + */ + +int randomdev_read_file(const char *filename, void *buf); +int randomdev_write_file(const char *filename, void *buf); Modified: projects/random_number_generator/sys/kern/init_main.c ============================================================================== --- projects/random_number_generator/sys/kern/init_main.c Sun Oct 6 20:46:01 2013 (r256093) +++ projects/random_number_generator/sys/kern/init_main.c Sun Oct 6 22:45:02 2013 (r256094) @@ -847,6 +847,8 @@ kick_init(const void *udata __unused) { struct thread *td; + EVENTHANDLER_INVOKE(multiuser); + td = FIRST_THREAD_IN_PROC(initproc); thread_lock(td); TD_SET_CAN_RUN(td); Modified: projects/random_number_generator/sys/sys/eventhandler.h ============================================================================== --- projects/random_number_generator/sys/sys/eventhandler.h Sun Oct 6 20:46:01 2013 (r256093) +++ projects/random_number_generator/sys/sys/eventhandler.h Sun Oct 6 22:45:02 2013 (r256094) @@ -192,6 +192,10 @@ EVENTHANDLER_DECLARE(vm_lowmem, vm_lowme typedef void (*mountroot_handler_t)(void *); EVENTHANDLER_DECLARE(mountroot, mountroot_handler_t); +/* Going multiuser (starting pid 1) event */ +typedef void (*multiuser_handler_t)(void *); +EVENTHANDLER_DECLARE(multiuser, multiuser_handler_t); + /* File system mount events */ struct mount; struct vnode; Modified: projects/random_number_generator/sys/sys/random.h ============================================================================== --- projects/random_number_generator/sys/sys/random.h Sun Oct 6 20:46:01 2013 (r256093) +++ projects/random_number_generator/sys/sys/random.h Sun Oct 6 22:45:02 2013 (r256094) @@ -39,7 +39,7 @@ int read_random(void *, int); */ enum esource { RANDOM_START = 0, - RANDOM_WRITE = 0, + RANDOM_CACHED = 0, RANDOM_KEYBOARD, RANDOM_MOUSE, RANDOM_NET_TUN, @@ -54,7 +54,6 @@ enum esource { RANDOM_PURE_HIFN, RANDOM_PURE_RDRAND, RANDOM_PURE_NEHEMIAH, - RANDOM_PURE, ENTROPYSOURCE }; void random_harvest(void *, u_int, u_int, enum esource); From owner-svn-src-projects@FreeBSD.ORG Mon Oct 7 07:36:24 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 338128E2; Mon, 7 Oct 2013 07:36:24 +0000 (UTC) (envelope-from markm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 12A652A5D; Mon, 7 Oct 2013 07:36:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r977aNx8034493; Mon, 7 Oct 2013 07:36:23 GMT (envelope-from markm@svn.freebsd.org) Received: (from markm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r977aMmS034482; Mon, 7 Oct 2013 07:36:22 GMT (envelope-from markm@svn.freebsd.org) Message-Id: <201310070736.r977aMmS034482@svn.freebsd.org> From: Mark Murray Date: Mon, 7 Oct 2013 07:36:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256098 - in projects/random_number_generator: . etc gnu/usr.bin gnu/usr.bin/rcs share/doc/psd share/doc/psd/13.rcs share/man/man4 share/mk sys/conf tools/build/mk tools/build/options X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Oct 2013 07:36:24 -0000 Author: markm Date: Mon Oct 7 07:36:21 2013 New Revision: 256098 URL: http://svnweb.freebsd.org/changeset/base/256098 Log: MFC - tracking commit Deleted: projects/random_number_generator/gnu/usr.bin/rcs/ projects/random_number_generator/share/doc/psd/13.rcs/ projects/random_number_generator/tools/build/options/WITHOUT_RCS Modified: projects/random_number_generator/ObsoleteFiles.inc projects/random_number_generator/etc/ftpusers projects/random_number_generator/gnu/usr.bin/Makefile projects/random_number_generator/share/doc/psd/Makefile projects/random_number_generator/share/man/man4/urtwn.4 projects/random_number_generator/share/mk/bsd.own.mk projects/random_number_generator/sys/conf/newvers.sh projects/random_number_generator/tools/build/mk/OptionalObsoleteFiles.inc Directory Properties: projects/random_number_generator/ (props changed) projects/random_number_generator/share/man/man4/ (props changed) projects/random_number_generator/sys/ (props changed) projects/random_number_generator/sys/conf/ (props changed) Modified: projects/random_number_generator/ObsoleteFiles.inc ============================================================================== --- projects/random_number_generator/ObsoleteFiles.inc Mon Oct 7 07:32:16 2013 (r256097) +++ projects/random_number_generator/ObsoleteFiles.inc Mon Oct 7 07:36:21 2013 (r256098) @@ -38,6 +38,29 @@ # xargs -n1 | sort | uniq -d; # done +# 20131015: removal of RCS from base +OLD_FILES+=usr/bin/ci +OLD_FILES+=usr/bin/co +OLD_FILES+=usr/bin/ident +OLD_FILES+=usr/bin/merge +OLD_FILES+=usr/bin/rcs +OLD_FILES+=usr/bin/rcsclean +OLD_FILES+=usr/bin/rcsdiff +OLD_FILES+=usr/bin/rcsfreeze +OLD_FILES+=usr/bin/rcsmerge +OLD_FILES+=usr/bin/rlog +OLD_FILES+=usr/share/man/man1/ci.1.gz +OLD_FILES+=usr/share/man/man1/co.1.gz +OLD_FILES+=usr/share/man/man1/ident.1.gz +OLD_FILES+=usr/share/man/man1/merge.1.gz +OLD_FILES+=usr/share/man/man1/rcs.1.gz +OLD_FILES+=usr/share/man/man1/rcsclean.1.gz +OLD_FILES+=usr/share/man/man1/rcsdiff.1.gz +OLD_FILES+=usr/share/man/man1/rcsfreeze.1.gz +OLD_FILES+=usr/share/man/man1/rcsintro.1.gz +OLD_FILES+=usr/share/man/man1/rcsmerge.1.gz +OLD_FILES+=usr/share/man/man1/rlog.1.gz +OLD_FILES+=usr/share/man/man5/rcsfile.5.gz # 20131001: ar and ranlib from binutils not used OLD_FILES+=usr/bin/gnu-ar OLD_FILES+=usr/bin/gnu-ranlib Modified: projects/random_number_generator/etc/ftpusers ============================================================================== --- projects/random_number_generator/etc/ftpusers Mon Oct 7 07:32:16 2013 (r256097) +++ projects/random_number_generator/etc/ftpusers Mon Oct 7 07:36:21 2013 (r256098) @@ -13,7 +13,11 @@ games news man sshd +smmsp +mailnull +_atf bind +unbound proxy _pflogd _dhcp @@ -23,5 +27,3 @@ auditdistd www hast nobody -mailnull -smmsp Modified: projects/random_number_generator/gnu/usr.bin/Makefile ============================================================================== --- projects/random_number_generator/gnu/usr.bin/Makefile Mon Oct 7 07:32:16 2013 (r256097) +++ projects/random_number_generator/gnu/usr.bin/Makefile Mon Oct 7 07:36:21 2013 (r256098) @@ -12,7 +12,6 @@ SUBDIR= ${_binutils} \ ${_gperf} \ grep \ ${_groff} \ - ${_rcs} \ sdiff \ send-pr \ ${_texinfo} @@ -32,10 +31,6 @@ _dtc= dtc _texinfo= texinfo .endif -.if ${MK_RCS} != "no" -_rcs= rcs -.endif - .if ${MK_BINUTILS} != "no" _binutils= binutils .endif Modified: projects/random_number_generator/share/doc/psd/Makefile ============================================================================== --- projects/random_number_generator/share/doc/psd/Makefile Mon Oct 7 07:32:16 2013 (r256097) +++ projects/random_number_generator/share/doc/psd/Makefile Mon Oct 7 07:36:21 2013 (r256098) @@ -20,7 +20,6 @@ SUBDIR= title \ 05.sysman \ 06.Clang \ 12.make \ - 13.rcs \ 15.yacc \ 16.lex \ 17.m4 \ Modified: projects/random_number_generator/share/man/man4/urtwn.4 ============================================================================== --- projects/random_number_generator/share/man/man4/urtwn.4 Mon Oct 7 07:32:16 2013 (r256097) +++ projects/random_number_generator/share/man/man4/urtwn.4 Mon Oct 7 07:36:21 2013 (r256098) @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd July 7, 2013 +.Dd October 6, 2013 .Dt URTWN 4 .Os .Sh NAME @@ -57,18 +57,6 @@ The RTL8192CU is a highly integrated mul 802.11n adapter that combines a MAC, a 2T2R capable baseband and an RF in a single chip. It operates in the 2GHz spectrum only. -.Pp -The driver needs at least version 1.1p0 of the following firmware files, -which are loaded when an interface is attached: -.Pp -.Bl -tag -width Ds -offset indent -compact -.It urtwn-rtl8192cfwT -.It urtwn-rtl8192cfwU -.It urtwn-rtl8723fw -.El -.Pp -The firmware is available as part of the FreeBSD Ports collection in -net/urtwn-firmware-kmod. .Sh HARDWARE The following adapters should work: .Pp Modified: projects/random_number_generator/share/mk/bsd.own.mk ============================================================================== --- projects/random_number_generator/share/mk/bsd.own.mk Mon Oct 7 07:32:16 2013 (r256097) +++ projects/random_number_generator/share/mk/bsd.own.mk Mon Oct 7 07:36:21 2013 (r256098) @@ -334,7 +334,6 @@ __DEFAULT_YES_OPTIONS = \ PROFILE \ QUOTAS \ RCMDS \ - RCS \ RESCUE \ ROUTED \ SENDMAIL \ Modified: projects/random_number_generator/sys/conf/newvers.sh ============================================================================== --- projects/random_number_generator/sys/conf/newvers.sh Mon Oct 7 07:32:16 2013 (r256097) +++ projects/random_number_generator/sys/conf/newvers.sh Mon Oct 7 07:36:21 2013 (r256098) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="10.0" -BRANCH="ALPHA4" +BRANCH="ALPHA5" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: projects/random_number_generator/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/random_number_generator/tools/build/mk/OptionalObsoleteFiles.inc Mon Oct 7 07:32:16 2013 (r256097) +++ projects/random_number_generator/tools/build/mk/OptionalObsoleteFiles.inc Mon Oct 7 07:36:21 2013 (r256098) @@ -3859,31 +3859,6 @@ OLD_FILES+=usr/share/man/man8/rshd.8.gz OLD_FILES+=usr/share/man/man8/rwhod.8.gz .endif -.if ${MK_RCS} == no -OLD_FILES+=usr/bin/ci -OLD_FILES+=usr/bin/co -OLD_FILES+=usr/bin/ident -OLD_FILES+=usr/bin/merge -OLD_FILES+=usr/bin/rcs -OLD_FILES+=usr/bin/rcsclean -OLD_FILES+=usr/bin/rcsdiff -OLD_FILES+=usr/bin/rcsfreeze -OLD_FILES+=usr/bin/rcsmerge -OLD_FILES+=usr/bin/rlog -OLD_FILES+=usr/share/man/man1/ci.1.gz -OLD_FILES+=usr/share/man/man1/co.1.gz -OLD_FILES+=usr/share/man/man1/ident.1.gz -OLD_FILES+=usr/share/man/man1/merge.1.gz -OLD_FILES+=usr/share/man/man1/rcs.1.gz -OLD_FILES+=usr/share/man/man1/rcsclean.1.gz -OLD_FILES+=usr/share/man/man1/rcsdiff.1.gz -OLD_FILES+=usr/share/man/man1/rcsfreeze.1.gz -OLD_FILES+=usr/share/man/man1/rcsintro.1.gz -OLD_FILES+=usr/share/man/man1/rcsmerge.1.gz -OLD_FILES+=usr/share/man/man1/rlog.1.gz -OLD_FILES+=usr/share/man/man5/rcsfile.5.gz -.endif - #.if ${MK_RESCUE} == no # to be filled in or replaced with a special target #.endif From owner-svn-src-projects@FreeBSD.ORG Mon Oct 7 15:28:13 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 57084DAB; Mon, 7 Oct 2013 15:28:13 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4095F2B47; Mon, 7 Oct 2013 15:28:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r97FSDB9083202; Mon, 7 Oct 2013 15:28:13 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r97FSACB083179; Mon, 7 Oct 2013 15:28:10 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201310071528.r97FSACB083179@svn.freebsd.org> From: Alexander Motin Date: Mon, 7 Oct 2013 15:28:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256111 - in projects/camlock: . bin/dd bin/pkill cddl/contrib/opensolaris/cmd/zfs cddl/lib/libdtrace contrib/bind9 contrib/binutils/bfd contrib/binutils/binutils contrib/binutils/inclu... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Oct 2013 15:28:13 -0000 Author: mav Date: Mon Oct 7 15:28:08 2013 New Revision: 256111 URL: http://svnweb.freebsd.org/changeset/base/256111 Log: MFC @ r256110 Added: projects/camlock/contrib/dialog/package/freebsd/ - copied from r256110, head/contrib/dialog/package/freebsd/ projects/camlock/contrib/dialog/po/fa.po - copied unchanged from r256110, head/contrib/dialog/po/fa.po projects/camlock/libexec/freebsd-version/ - copied from r256110, head/libexec/freebsd-version/ projects/camlock/sys/modules/ibcore/ - copied from r256110, head/sys/modules/ibcore/ projects/camlock/sys/modules/ipoib/ - copied from r256110, head/sys/modules/ipoib/ projects/camlock/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c - copied unchanged from r256110, head/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c projects/camlock/sys/ofed/drivers/infiniband/hw/mlx4/cm.c - copied unchanged from r256110, head/sys/ofed/drivers/infiniband/hw/mlx4/cm.c projects/camlock/sys/ofed/drivers/infiniband/hw/mlx4/mcg.c - copied unchanged from r256110, head/sys/ofed/drivers/infiniband/hw/mlx4/mcg.c projects/camlock/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c - copied unchanged from r256110, head/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c projects/camlock/sys/ofed/drivers/net/mlx4/resource_tracker.c - copied unchanged from r256110, head/sys/ofed/drivers/net/mlx4/resource_tracker.c projects/camlock/sys/ofed/drivers/net/mlx4/sys_tune.c - copied unchanged from r256110, head/sys/ofed/drivers/net/mlx4/sys_tune.c projects/camlock/sys/ofed/include/linux/atomic.h - copied unchanged from r256110, head/sys/ofed/include/linux/atomic.h projects/camlock/sys/ofed/include/linux/clocksource.h - copied unchanged from r256110, head/sys/ofed/include/linux/clocksource.h projects/camlock/sys/ofed/include/rdma/ib_pma.h - copied unchanged from r256110, head/sys/ofed/include/rdma/ib_pma.h projects/camlock/sys/powerpc/pseries/phyp_vscsi.c - copied unchanged from r256110, head/sys/powerpc/pseries/phyp_vscsi.c projects/camlock/tools/build/options/WITHOUT_LDNS_UTILS - copied unchanged from r256110, head/tools/build/options/WITHOUT_LDNS_UTILS projects/camlock/usr.sbin/bhyve/ahci.h - copied unchanged from r256110, head/usr.sbin/bhyve/ahci.h projects/camlock/usr.sbin/bhyve/block_if.c - copied unchanged from r256110, head/usr.sbin/bhyve/block_if.c projects/camlock/usr.sbin/bhyve/block_if.h - copied unchanged from r256110, head/usr.sbin/bhyve/block_if.h projects/camlock/usr.sbin/bhyve/pci_ahci.c - copied unchanged from r256110, head/usr.sbin/bhyve/pci_ahci.c Deleted: projects/camlock/contrib/bind9/ projects/camlock/contrib/dialog/samples/copifuncs/ projects/camlock/contrib/dialog/samples/install/ projects/camlock/etc/mtree/BIND.chroot.dist projects/camlock/etc/mtree/BIND.include.dist projects/camlock/gnu/usr.bin/binutils/ar/Makefile projects/camlock/gnu/usr.bin/binutils/ar/ar.1 projects/camlock/gnu/usr.bin/binutils/ranlib/Makefile projects/camlock/gnu/usr.bin/binutils/ranlib/ranlib.1 projects/camlock/gnu/usr.bin/rcs/ projects/camlock/lib/bind/ projects/camlock/share/doc/bind9/ projects/camlock/share/doc/psd/13.rcs/ projects/camlock/sys/kern/uipc_cow.c projects/camlock/tools/build/options/WITHOUT_BIND projects/camlock/tools/build/options/WITHOUT_BIND_DNSSEC projects/camlock/tools/build/options/WITHOUT_BIND_ETC projects/camlock/tools/build/options/WITHOUT_BIND_LIBS_LWRES projects/camlock/tools/build/options/WITHOUT_BIND_MTREE projects/camlock/tools/build/options/WITHOUT_BIND_NAMED projects/camlock/tools/build/options/WITHOUT_BIND_UTILS projects/camlock/tools/build/options/WITHOUT_RCS projects/camlock/tools/build/options/WITH_BIND_IDN projects/camlock/tools/build/options/WITH_BIND_LARGE_FILE projects/camlock/tools/build/options/WITH_BIND_LIBS projects/camlock/tools/build/options/WITH_BIND_SIGCHASE projects/camlock/tools/build/options/WITH_BIND_XML projects/camlock/tools/build/options/WITH_LDNS_UTILS projects/camlock/usr.bin/dig/ projects/camlock/usr.bin/nslookup/ projects/camlock/usr.bin/nsupdate/ projects/camlock/usr.sbin/arpaname/ projects/camlock/usr.sbin/ddns-confgen/ projects/camlock/usr.sbin/dnssec-dsfromkey/ projects/camlock/usr.sbin/dnssec-keyfromlabel/ projects/camlock/usr.sbin/dnssec-keygen/ projects/camlock/usr.sbin/dnssec-revoke/ projects/camlock/usr.sbin/dnssec-settime/ projects/camlock/usr.sbin/dnssec-signzone/ projects/camlock/usr.sbin/dnssec-verify/ projects/camlock/usr.sbin/genrandom/ projects/camlock/usr.sbin/isc-hmac-fixup/ projects/camlock/usr.sbin/named/ projects/camlock/usr.sbin/named-checkconf/ projects/camlock/usr.sbin/named-checkzone/ projects/camlock/usr.sbin/named-journalprint/ projects/camlock/usr.sbin/nsec3hash/ projects/camlock/usr.sbin/rndc/ projects/camlock/usr.sbin/rndc-confgen/ Modified: projects/camlock/Makefile.inc1 projects/camlock/ObsoleteFiles.inc projects/camlock/UPDATING projects/camlock/bin/dd/dd.1 projects/camlock/bin/pkill/pkill.c projects/camlock/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c projects/camlock/cddl/lib/libdtrace/tcp.d projects/camlock/contrib/binutils/bfd/elflink.c projects/camlock/contrib/binutils/bfd/elfxx-mips.c projects/camlock/contrib/binutils/binutils/readelf.c projects/camlock/contrib/binutils/include/elf/common.h projects/camlock/contrib/bmake/make.1 projects/camlock/contrib/dialog/CHANGES projects/camlock/contrib/dialog/VERSION projects/camlock/contrib/dialog/aclocal.m4 projects/camlock/contrib/dialog/arrows.c projects/camlock/contrib/dialog/buildlist.c projects/camlock/contrib/dialog/checklist.c projects/camlock/contrib/dialog/config.guess projects/camlock/contrib/dialog/config.sub projects/camlock/contrib/dialog/configure projects/camlock/contrib/dialog/configure.in projects/camlock/contrib/dialog/dialog.1 projects/camlock/contrib/dialog/dialog.3 projects/camlock/contrib/dialog/dialog.c projects/camlock/contrib/dialog/dialog.h projects/camlock/contrib/dialog/formbox.c projects/camlock/contrib/dialog/guage.c projects/camlock/contrib/dialog/inputstr.c projects/camlock/contrib/dialog/makefile.in projects/camlock/contrib/dialog/menubox.c projects/camlock/contrib/dialog/mixedform.c projects/camlock/contrib/dialog/package/debian/changelog projects/camlock/contrib/dialog/package/debian/copyright projects/camlock/contrib/dialog/package/dialog.spec projects/camlock/contrib/dialog/po/lt.po projects/camlock/contrib/dialog/samples/inputbox6-utf8 projects/camlock/contrib/dialog/samples/report-tempfile projects/camlock/contrib/dialog/treeview.c projects/camlock/contrib/dialog/util.c projects/camlock/contrib/libc++/include/memory projects/camlock/contrib/llvm/include/llvm/IR/CallingConv.h projects/camlock/contrib/llvm/lib/AsmParser/LLLexer.cpp projects/camlock/contrib/llvm/lib/AsmParser/LLParser.cpp projects/camlock/contrib/llvm/lib/AsmParser/LLToken.h projects/camlock/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp projects/camlock/contrib/llvm/lib/IR/AsmWriter.cpp projects/camlock/contrib/llvm/lib/Target/X86/X86CallingConv.td projects/camlock/contrib/llvm/lib/Target/X86/X86FastISel.cpp projects/camlock/contrib/llvm/lib/Target/X86/X86FixupLEAs.cpp projects/camlock/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp projects/camlock/contrib/llvm/lib/Target/X86/X86InstrInfo.cpp projects/camlock/contrib/llvm/lib/Target/X86/X86Subtarget.h projects/camlock/contrib/llvm/tools/clang/include/clang-c/Index.h projects/camlock/contrib/llvm/tools/clang/include/clang/AST/Type.h projects/camlock/contrib/llvm/tools/clang/include/clang/Basic/Attr.td projects/camlock/contrib/llvm/tools/clang/include/clang/Basic/Specifiers.h projects/camlock/contrib/llvm/tools/clang/lib/AST/DumpXML.cpp projects/camlock/contrib/llvm/tools/clang/lib/AST/MicrosoftMangle.cpp projects/camlock/contrib/llvm/tools/clang/lib/AST/Type.cpp projects/camlock/contrib/llvm/tools/clang/lib/AST/TypePrinter.cpp projects/camlock/contrib/llvm/tools/clang/lib/Basic/Targets.cpp projects/camlock/contrib/llvm/tools/clang/lib/CodeGen/CGCall.cpp projects/camlock/contrib/llvm/tools/clang/lib/Sema/SemaDeclAttr.cpp projects/camlock/contrib/llvm/tools/clang/lib/Sema/SemaType.cpp projects/camlock/contrib/unbound/config.h projects/camlock/contrib/unbound/config.h.in projects/camlock/contrib/unbound/configure projects/camlock/contrib/unbound/configure.ac projects/camlock/contrib/unbound/daemon/unbound.c projects/camlock/contrib/unbound/doc/unbound-checkconf.8 projects/camlock/contrib/unbound/doc/unbound-control.8 projects/camlock/contrib/unbound/doc/unbound.8 projects/camlock/contrib/unbound/doc/unbound.conf.5 projects/camlock/contrib/unbound/freebsd-configure.sh projects/camlock/etc/Makefile projects/camlock/etc/ftpusers projects/camlock/etc/mtree/BSD.include.dist projects/camlock/etc/mtree/BSD.root.dist projects/camlock/etc/mtree/BSD.var.dist projects/camlock/etc/mtree/Makefile projects/camlock/etc/network.subr projects/camlock/etc/periodic/daily/Makefile projects/camlock/etc/portsnap.conf projects/camlock/etc/rc.d/Makefile projects/camlock/etc/rc.d/NETWORKING projects/camlock/etc/rc.d/netif projects/camlock/games/fortune/datfiles/freebsd-tips projects/camlock/gnu/lib/libdialog/dlg_config.h projects/camlock/gnu/usr.bin/Makefile projects/camlock/gnu/usr.bin/binutils/Makefile projects/camlock/include/Makefile projects/camlock/include/mk-osreldate.sh projects/camlock/lib/Makefile projects/camlock/lib/csu/arm/crt1.c projects/camlock/lib/csu/common/notes.h projects/camlock/lib/libarchive/Makefile projects/camlock/lib/libc/sys/accept.2 projects/camlock/lib/libedit/readline.c projects/camlock/lib/libvmmapi/vmmapi.c projects/camlock/lib/libvmmapi/vmmapi.h projects/camlock/libexec/Makefile projects/camlock/libexec/rtld-elf/rtld.c projects/camlock/libexec/rtld-elf/rtld.h projects/camlock/release/Makefile projects/camlock/sbin/bsdlabel/bsdlabel.8 projects/camlock/sbin/ccdconfig/ccdconfig.8 projects/camlock/sbin/fdisk/fdisk.8 projects/camlock/sbin/gbde/gbde.8 projects/camlock/sbin/geom/class/eli/geli.8 projects/camlock/sbin/geom/class/shsec/gshsec.8 projects/camlock/sbin/geom/class/virstor/gvirstor.8 projects/camlock/sbin/gvinum/gvinum.8 projects/camlock/sbin/mount_msdosfs/mount_msdosfs.8 projects/camlock/sbin/newfs/newfs.8 projects/camlock/sbin/newfs_msdos/newfs_msdos.8 projects/camlock/sbin/newfs_nandfs/newfs_nandfs.8 projects/camlock/sbin/recoverdisk/recoverdisk.1 projects/camlock/share/doc/Makefile projects/camlock/share/doc/psd/Makefile projects/camlock/share/man/man4/bxe.4 projects/camlock/share/man/man4/ddb.4 projects/camlock/share/man/man4/geom_linux_lvm.4 projects/camlock/share/man/man4/urtwn.4 projects/camlock/share/man/man5/ext2fs.5 projects/camlock/share/man/man5/msdosfs.5 projects/camlock/share/man/man5/reiserfs.5 projects/camlock/share/man/man5/src.conf.5 projects/camlock/share/man/man8/picobsd.8 projects/camlock/share/man/man9/lock.9 projects/camlock/share/misc/bsd-family-tree projects/camlock/share/mk/bsd.libnames.mk projects/camlock/share/mk/bsd.own.mk projects/camlock/sys/amd64/amd64/machdep.c projects/camlock/sys/amd64/amd64/pmap.c projects/camlock/sys/amd64/amd64/trap.c projects/camlock/sys/amd64/amd64/vm_machdep.c projects/camlock/sys/amd64/conf/NOTES projects/camlock/sys/amd64/include/pcpu.h projects/camlock/sys/amd64/include/pmap.h projects/camlock/sys/amd64/include/vmm.h (contents, props changed) projects/camlock/sys/amd64/include/vmm_dev.h (contents, props changed) projects/camlock/sys/amd64/include/vmm_instruction_emul.h (contents, props changed) projects/camlock/sys/amd64/vmm/amd/amdv.c projects/camlock/sys/amd64/vmm/intel/ept.c projects/camlock/sys/amd64/vmm/intel/ept.h projects/camlock/sys/amd64/vmm/intel/vmcs.c projects/camlock/sys/amd64/vmm/intel/vmcs.h projects/camlock/sys/amd64/vmm/intel/vmx.c projects/camlock/sys/amd64/vmm/intel/vmx.h projects/camlock/sys/amd64/vmm/intel/vmx_genassym.c projects/camlock/sys/amd64/vmm/intel/vmx_support.S projects/camlock/sys/amd64/vmm/io/ppt.c projects/camlock/sys/amd64/vmm/io/ppt.h projects/camlock/sys/amd64/vmm/vmm.c projects/camlock/sys/amd64/vmm/vmm_dev.c projects/camlock/sys/amd64/vmm/vmm_instruction_emul.c projects/camlock/sys/amd64/vmm/vmm_mem.c projects/camlock/sys/amd64/vmm/vmm_mem.h projects/camlock/sys/amd64/vmm/vmm_msr.c projects/camlock/sys/arm/samsung/exynos/exynos5_machdep.c projects/camlock/sys/boot/arm/ixp425/boot2/Makefile projects/camlock/sys/boot/common/loader.8 projects/camlock/sys/boot/i386/efi/Makefile projects/camlock/sys/boot/powerpc/boot1.chrp/Makefile projects/camlock/sys/boot/userboot/libstand/Makefile projects/camlock/sys/boot/userboot/test/Makefile projects/camlock/sys/boot/userboot/userboot/Makefile projects/camlock/sys/cam/cam.h projects/camlock/sys/cam/cam_ccb.h projects/camlock/sys/cam/cam_compat.c projects/camlock/sys/cam/cam_compat.h projects/camlock/sys/cam/cam_xpt.c projects/camlock/sys/cam/ctl/ctl_frontend_iscsi.c projects/camlock/sys/cam/scsi/scsi_pass.c projects/camlock/sys/compat/freebsd32/freebsd32.h projects/camlock/sys/compat/linux/linux_futex.c projects/camlock/sys/compat/linux/linux_uid16.c projects/camlock/sys/conf/files projects/camlock/sys/conf/files.powerpc projects/camlock/sys/conf/newvers.sh projects/camlock/sys/contrib/rdma/ib_umem.h projects/camlock/sys/dev/adb/adb_mouse.c projects/camlock/sys/dev/asr/asr.c projects/camlock/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c projects/camlock/sys/dev/e1000/if_igb.c projects/camlock/sys/dev/firewire/sbp.c projects/camlock/sys/dev/hpt27xx/hpt27xx_osm_bsd.c projects/camlock/sys/dev/hpt27xx/os_bsd.h projects/camlock/sys/dev/hptiop/hptiop.c projects/camlock/sys/dev/hptiop/hptiop.h projects/camlock/sys/dev/hptmv/entry.c projects/camlock/sys/dev/hptmv/osbsd.h projects/camlock/sys/dev/hptnr/hptnr_osm_bsd.c projects/camlock/sys/dev/hptnr/os_bsd.h projects/camlock/sys/dev/hptrr/hptrr_osm_bsd.c projects/camlock/sys/dev/hptrr/os_bsd.h projects/camlock/sys/dev/hyperv/vmbus/hv_hv.c projects/camlock/sys/dev/iir/iir.c projects/camlock/sys/dev/iir/iir.h projects/camlock/sys/dev/iscsi/icl.c projects/camlock/sys/dev/iscsi/iscsi.c projects/camlock/sys/dev/iscsi_initiator/iscsi.c projects/camlock/sys/dev/ixgbe/ixgbe.c projects/camlock/sys/dev/mfi/mfi_pci.c projects/camlock/sys/dev/nfe/if_nfe.c projects/camlock/sys/dev/tws/tws.c projects/camlock/sys/dev/tws/tws_cam.c projects/camlock/sys/dev/virtio/network/if_vtnet.c projects/camlock/sys/dev/xen/timer/timer.c projects/camlock/sys/fs/cd9660/cd9660_vfsops.c projects/camlock/sys/geom/geom_int.h projects/camlock/sys/geom/geom_kern.c projects/camlock/sys/geom/geom_subr.c projects/camlock/sys/i386/conf/NOTES projects/camlock/sys/i386/include/pcpu.h projects/camlock/sys/i386/xen/mp_machdep.c projects/camlock/sys/i386/xen/mptable.c projects/camlock/sys/kern/kern_descrip.c projects/camlock/sys/kern/kern_event.c projects/camlock/sys/kern/kern_lock.c projects/camlock/sys/kern/kern_malloc.c projects/camlock/sys/kern/kern_timeout.c projects/camlock/sys/kern/vfs_bio.c projects/camlock/sys/kern/vfs_mount.c projects/camlock/sys/kern/vfs_subr.c projects/camlock/sys/libkern/arm/aeabi_unwind.c projects/camlock/sys/libkern/ashldi3.c projects/camlock/sys/mips/conf/MALTA projects/camlock/sys/mips/mips/tlb.c projects/camlock/sys/mips/nlm/dev/sec/nlmrsa.c projects/camlock/sys/mips/nlm/dev/sec/nlmrsalib.h projects/camlock/sys/modules/Makefile projects/camlock/sys/modules/hyperv/netvsc/Makefile projects/camlock/sys/modules/hyperv/stordisengage/Makefile projects/camlock/sys/modules/hyperv/storvsc/Makefile projects/camlock/sys/modules/hyperv/utilities/Makefile projects/camlock/sys/modules/hyperv/vmbus/Makefile projects/camlock/sys/modules/mlx4/Makefile projects/camlock/sys/modules/mlx4ib/Makefile projects/camlock/sys/modules/sfxge/Makefile projects/camlock/sys/net/if_enc.c projects/camlock/sys/net/if_tap.c projects/camlock/sys/net/if_tun.c projects/camlock/sys/netinet/in_kdtrace.c projects/camlock/sys/netinet6/ip6_mroute.c projects/camlock/sys/netpfil/ipfw/ip_fw_log.c projects/camlock/sys/ofed/drivers/infiniband/core/addr.c projects/camlock/sys/ofed/drivers/infiniband/core/cma.c projects/camlock/sys/ofed/drivers/infiniband/core/core_priv.h projects/camlock/sys/ofed/drivers/infiniband/core/device.c projects/camlock/sys/ofed/drivers/infiniband/core/sa_query.c projects/camlock/sys/ofed/drivers/infiniband/core/sysfs.c projects/camlock/sys/ofed/drivers/infiniband/core/umem.c projects/camlock/sys/ofed/drivers/infiniband/core/uverbs_cmd.c projects/camlock/sys/ofed/drivers/infiniband/core/uverbs_main.c projects/camlock/sys/ofed/drivers/infiniband/core/verbs.c projects/camlock/sys/ofed/drivers/infiniband/hw/mlx4/Kconfig projects/camlock/sys/ofed/drivers/infiniband/hw/mlx4/Makefile projects/camlock/sys/ofed/drivers/infiniband/hw/mlx4/ah.c projects/camlock/sys/ofed/drivers/infiniband/hw/mlx4/cq.c projects/camlock/sys/ofed/drivers/infiniband/hw/mlx4/mad.c projects/camlock/sys/ofed/drivers/infiniband/hw/mlx4/main.c projects/camlock/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_ib.h projects/camlock/sys/ofed/drivers/infiniband/hw/mlx4/mr.c projects/camlock/sys/ofed/drivers/infiniband/hw/mlx4/qp.c projects/camlock/sys/ofed/drivers/infiniband/hw/mlx4/srq.c projects/camlock/sys/ofed/drivers/infiniband/hw/mlx4/user.h projects/camlock/sys/ofed/drivers/infiniband/hw/mlx4/wc.c projects/camlock/sys/ofed/drivers/infiniband/hw/mthca/mthca_cmd.c projects/camlock/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c projects/camlock/sys/ofed/drivers/infiniband/hw/mthca/mthca_memfree.c projects/camlock/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c projects/camlock/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h projects/camlock/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c projects/camlock/sys/ofed/drivers/net/mlx4/Makefile projects/camlock/sys/ofed/drivers/net/mlx4/alloc.c projects/camlock/sys/ofed/drivers/net/mlx4/catas.c projects/camlock/sys/ofed/drivers/net/mlx4/cmd.c projects/camlock/sys/ofed/drivers/net/mlx4/cq.c projects/camlock/sys/ofed/drivers/net/mlx4/en_cq.c projects/camlock/sys/ofed/drivers/net/mlx4/en_main.c projects/camlock/sys/ofed/drivers/net/mlx4/en_netdev.c projects/camlock/sys/ofed/drivers/net/mlx4/en_port.c projects/camlock/sys/ofed/drivers/net/mlx4/en_port.h projects/camlock/sys/ofed/drivers/net/mlx4/en_rx.c projects/camlock/sys/ofed/drivers/net/mlx4/en_tx.c projects/camlock/sys/ofed/drivers/net/mlx4/eq.c projects/camlock/sys/ofed/drivers/net/mlx4/fw.c projects/camlock/sys/ofed/drivers/net/mlx4/fw.h projects/camlock/sys/ofed/drivers/net/mlx4/icm.c projects/camlock/sys/ofed/drivers/net/mlx4/icm.h projects/camlock/sys/ofed/drivers/net/mlx4/intf.c projects/camlock/sys/ofed/drivers/net/mlx4/main.c projects/camlock/sys/ofed/drivers/net/mlx4/mcg.c projects/camlock/sys/ofed/drivers/net/mlx4/mlx4.h projects/camlock/sys/ofed/drivers/net/mlx4/mlx4_en.h projects/camlock/sys/ofed/drivers/net/mlx4/mr.c projects/camlock/sys/ofed/drivers/net/mlx4/pd.c projects/camlock/sys/ofed/drivers/net/mlx4/port.c projects/camlock/sys/ofed/drivers/net/mlx4/profile.c projects/camlock/sys/ofed/drivers/net/mlx4/qp.c projects/camlock/sys/ofed/drivers/net/mlx4/reset.c projects/camlock/sys/ofed/drivers/net/mlx4/sense.c projects/camlock/sys/ofed/drivers/net/mlx4/srq.c projects/camlock/sys/ofed/include/asm/atomic.h projects/camlock/sys/ofed/include/asm/byteorder.h projects/camlock/sys/ofed/include/linux/bitops.h projects/camlock/sys/ofed/include/linux/compat.h projects/camlock/sys/ofed/include/linux/device.h projects/camlock/sys/ofed/include/linux/dma-mapping.h projects/camlock/sys/ofed/include/linux/gfp.h projects/camlock/sys/ofed/include/linux/idr.h projects/camlock/sys/ofed/include/linux/if_ether.h projects/camlock/sys/ofed/include/linux/in6.h projects/camlock/sys/ofed/include/linux/kernel.h projects/camlock/sys/ofed/include/linux/linux_compat.c projects/camlock/sys/ofed/include/linux/list.h projects/camlock/sys/ofed/include/linux/log2.h projects/camlock/sys/ofed/include/linux/mlx4/cmd.h projects/camlock/sys/ofed/include/linux/mlx4/cq.h projects/camlock/sys/ofed/include/linux/mlx4/device.h projects/camlock/sys/ofed/include/linux/mlx4/driver.h projects/camlock/sys/ofed/include/linux/mlx4/qp.h projects/camlock/sys/ofed/include/linux/mlx4/srq.h projects/camlock/sys/ofed/include/linux/moduleparam.h projects/camlock/sys/ofed/include/linux/pci.h projects/camlock/sys/ofed/include/linux/sysfs.h projects/camlock/sys/ofed/include/linux/types.h projects/camlock/sys/ofed/include/linux/workqueue.h projects/camlock/sys/ofed/include/rdma/ib_cm.h projects/camlock/sys/ofed/include/rdma/ib_mad.h projects/camlock/sys/ofed/include/rdma/ib_sa.h projects/camlock/sys/ofed/include/rdma/ib_umem.h projects/camlock/sys/ofed/include/rdma/ib_user_verbs.h projects/camlock/sys/ofed/include/rdma/ib_verbs.h projects/camlock/sys/powerpc/include/ofw_machdep.h projects/camlock/sys/powerpc/include/proc.h projects/camlock/sys/powerpc/ofw/ofw_machdep.c projects/camlock/sys/powerpc/ofw/ofw_syscons.c projects/camlock/sys/powerpc/ofw/ofw_syscons.h projects/camlock/sys/powerpc/powermac/platform_powermac.c projects/camlock/sys/powerpc/powerpc/mmu_if.m projects/camlock/sys/powerpc/ps3/ps3cdrom.c projects/camlock/sys/powerpc/pseries/mmu_phyp.c projects/camlock/sys/powerpc/pseries/phyp_console.c projects/camlock/sys/powerpc/pseries/platform_chrp.c projects/camlock/sys/powerpc/pseries/vdevice.c projects/camlock/sys/security/mac/mac_framework.c projects/camlock/sys/security/mac/mac_internal.h projects/camlock/sys/security/mac/mac_posix_shm.c projects/camlock/sys/security/mac/mac_vfs.c projects/camlock/sys/sparc64/include/proc.h projects/camlock/sys/sys/elf_common.h projects/camlock/sys/sys/lockmgr.h projects/camlock/sys/x86/acpica/madt.c projects/camlock/sys/x86/include/stdarg.h projects/camlock/sys/x86/xen/hvm.c projects/camlock/sys/x86/xen/xen_intr.c projects/camlock/tools/build/mk/OptionalObsoleteFiles.inc projects/camlock/tools/build/options/WITHOUT_BINUTILS projects/camlock/tools/build/options/makeman projects/camlock/usr.bin/Makefile projects/camlock/usr.bin/calendar/calendar.1 projects/camlock/usr.bin/calendar/calendars/calendar.dutch projects/camlock/usr.bin/host/Makefile projects/camlock/usr.bin/kdump/kdump.c projects/camlock/usr.bin/patch/patch.c projects/camlock/usr.bin/patch/util.c projects/camlock/usr.bin/svn/lib/libapr/apr_private.h projects/camlock/usr.bin/svn/svn_private_config.h projects/camlock/usr.sbin/Makefile projects/camlock/usr.sbin/bhyve/Makefile projects/camlock/usr.sbin/bhyve/bhyverun.c projects/camlock/usr.sbin/bhyve/bhyverun.h projects/camlock/usr.sbin/bhyve/pci_emul.c projects/camlock/usr.sbin/bhyve/pci_virtio_block.c projects/camlock/usr.sbin/bhyve/pit_8254.c projects/camlock/usr.sbin/bhyve/rtc.c projects/camlock/usr.sbin/bhyvectl/bhyvectl.c projects/camlock/usr.sbin/bhyveload/bhyveload.c projects/camlock/usr.sbin/boot0cfg/boot0cfg.8 projects/camlock/usr.sbin/bsdconfig/share/media/ftp.subr projects/camlock/usr.sbin/bsdinstall/scripts/mirrorselect projects/camlock/usr.sbin/kldxref/kldxref.c projects/camlock/usr.sbin/ntp/config.h projects/camlock/usr.sbin/ntp/libparse/Makefile Directory Properties: projects/camlock/ (props changed) projects/camlock/cddl/ (props changed) projects/camlock/cddl/contrib/opensolaris/ (props changed) projects/camlock/cddl/contrib/opensolaris/cmd/zfs/ (props changed) projects/camlock/contrib/binutils/ (props changed) projects/camlock/contrib/bmake/ (props changed) projects/camlock/contrib/dialog/ (props changed) projects/camlock/contrib/libc++/ (props changed) projects/camlock/contrib/llvm/ (props changed) projects/camlock/contrib/llvm/tools/clang/ (props changed) projects/camlock/contrib/unbound/ (props changed) projects/camlock/gnu/lib/ (props changed) projects/camlock/gnu/usr.bin/binutils/ (props changed) projects/camlock/lib/libc/ (props changed) projects/camlock/lib/libvmmapi/ (props changed) projects/camlock/sbin/ (props changed) projects/camlock/share/man/man4/ (props changed) projects/camlock/sys/ (props changed) projects/camlock/sys/amd64/vmm/ (props changed) projects/camlock/sys/boot/ (props changed) projects/camlock/sys/boot/i386/efi/ (props changed) projects/camlock/sys/boot/powerpc/boot1.chrp/ (props changed) projects/camlock/sys/conf/ (props changed) projects/camlock/sys/dev/hyperv/ (props changed) projects/camlock/sys/modules/hyperv/ (props changed) projects/camlock/usr.bin/calendar/ (props changed) projects/camlock/usr.sbin/bhyve/ (props changed) projects/camlock/usr.sbin/bhyvectl/ (props changed) projects/camlock/usr.sbin/bhyveload/ (props changed) Modified: projects/camlock/Makefile.inc1 ============================================================================== --- projects/camlock/Makefile.inc1 Mon Oct 7 14:22:19 2013 (r256110) +++ projects/camlock/Makefile.inc1 Mon Oct 7 15:28:08 2013 (r256111) @@ -395,7 +395,7 @@ LIB32WMAKEFLAGS+= \ -DNO_LINT LIB32WMAKE= ${LIB32WMAKEENV} ${MAKE} ${LIB32WMAKEFLAGS} \ - -DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_INFO -DWITHOUT_HTML + -DWITHOUT_MAN -DWITHOUT_INFO -DWITHOUT_HTML LIB32IMAKE= ${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} -DNO_INCS \ ${IMAKE_INSTALL} .endif @@ -485,10 +485,6 @@ _worldtmp: mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \ -p ${WORLDTMP}/usr/lib >/dev/null .endif -.if ${MK_BIND_LIBS} != "no" - mtree -deU -f ${.CURDIR}/etc/mtree/BIND.include.dist \ - -p ${WORLDTMP}/usr/include >/dev/null -.endif .for _mtree in ${LOCAL_MTREE} mtree -deU -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null .endfor @@ -1089,9 +1085,11 @@ distributekernel distributekernel.debug: KERNEL=${INSTKERNNAME}.${_kernel} \ DESTDIR=${INSTALL_DDIR}/kernel.${_kernel} \ ${.TARGET:S/distributekernel/install/} +.if defined(NO_ROOT) sed -e 's|^./kernel|.|' \ ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta > \ ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta +.endif .endfor packagekernel: @@ -1740,7 +1738,7 @@ check-old-libs: delete-old-dirs: @echo ">>> Removing old directories" @${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ - -V OLD_DIRS | xargs -n1 | \ + -V OLD_DIRS | xargs -n1 | sort -r | \ while read dir; do \ if [ -d "${DESTDIR}/$${dir}" ]; then \ rmdir -v "${DESTDIR}/$${dir}" || true; \ Modified: projects/camlock/ObsoleteFiles.inc ============================================================================== --- projects/camlock/ObsoleteFiles.inc Mon Oct 7 14:22:19 2013 (r256110) +++ projects/camlock/ObsoleteFiles.inc Mon Oct 7 15:28:08 2013 (r256111) @@ -38,6 +38,263 @@ # xargs -n1 | sort | uniq -d; # done +# 20131015: removal of RCS from base +OLD_FILES+=usr/bin/ci +OLD_FILES+=usr/bin/co +OLD_FILES+=usr/bin/ident +OLD_FILES+=usr/bin/merge +OLD_FILES+=usr/bin/rcs +OLD_FILES+=usr/bin/rcsclean +OLD_FILES+=usr/bin/rcsdiff +OLD_FILES+=usr/bin/rcsfreeze +OLD_FILES+=usr/bin/rcsmerge +OLD_FILES+=usr/bin/rlog +OLD_FILES+=usr/share/man/man1/ci.1.gz +OLD_FILES+=usr/share/man/man1/co.1.gz +OLD_FILES+=usr/share/man/man1/ident.1.gz +OLD_FILES+=usr/share/man/man1/merge.1.gz +OLD_FILES+=usr/share/man/man1/rcs.1.gz +OLD_FILES+=usr/share/man/man1/rcsclean.1.gz +OLD_FILES+=usr/share/man/man1/rcsdiff.1.gz +OLD_FILES+=usr/share/man/man1/rcsfreeze.1.gz +OLD_FILES+=usr/share/man/man1/rcsintro.1.gz +OLD_FILES+=usr/share/man/man1/rcsmerge.1.gz +OLD_FILES+=usr/share/man/man1/rlog.1.gz +OLD_FILES+=usr/share/man/man5/rcsfile.5.gz +# 20131001: ar and ranlib from binutils not used +OLD_FILES+=usr/bin/gnu-ar +OLD_FILES+=usr/bin/gnu-ranlib +OLD_FILES+=usr/share/man/man1/gnu-ar.1.gz +OLD_FILES+=usr/share/man/man1/gnu-ranlib.1.gz +# 20130930: BIND removed from base +OLD_FILES+=etc/namedb +OLD_FILES+=etc/periodic/daily/470.status-named +OLD_FILES+=usr/bin/dig +OLD_FILES+=usr/bin/nslookup +OLD_FILES+=usr/bin/nsupdate +OLD_DIRS+=usr/include/lwres +OLD_FILES+=usr/include/lwres/context.h +OLD_FILES+=usr/include/lwres/int.h +OLD_FILES+=usr/include/lwres/ipv6.h +OLD_FILES+=usr/include/lwres/lang.h +OLD_FILES+=usr/include/lwres/list.h +OLD_FILES+=usr/include/lwres/lwbuffer.h +OLD_FILES+=usr/include/lwres/lwpacket.h +OLD_FILES+=usr/include/lwres/lwres.h +OLD_FILES+=usr/include/lwres/net.h +OLD_FILES+=usr/include/lwres/netdb.h +OLD_FILES+=usr/include/lwres/platform.h +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_FILES+=usr/lib/liblwres_p.a +OLD_FILES+=usr/sbin/arpaname +OLD_FILES+=usr/sbin/ddns-confgen +OLD_FILES+=usr/sbin/dnssec-dsfromkey +OLD_FILES+=usr/sbin/dnssec-keyfromlabel +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/genrandom +OLD_FILES+=usr/sbin/isc-hmac-fixup +OLD_FILES+=usr/sbin/lwresd +OLD_FILES+=usr/sbin/named +OLD_FILES+=usr/sbin/named-checkconf +OLD_FILES+=usr/sbin/named-checkzone +OLD_FILES+=usr/sbin/named-compilezone +OLD_FILES+=usr/sbin/named-journalprint +OLD_FILES+=usr/sbin/named.reconfig +OLD_FILES+=usr/sbin/named.reload +OLD_FILES+=usr/sbin/nsec3hash +OLD_FILES+=usr/sbin/rndc +OLD_FILES+=usr/sbin/rndc-confgen +OLD_DIRS+=usr/share/doc/bind9 +OLD_FILES+=usr/share/doc/bind9/CHANGES +OLD_FILES+=usr/share/doc/bind9/COPYRIGHT +OLD_FILES+=usr/share/doc/bind9/FAQ +OLD_FILES+=usr/share/doc/bind9/HISTORY +OLD_FILES+=usr/share/doc/bind9/README +OLD_DIRS+=usr/share/doc/bind9/arm +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch01.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch02.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch03.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch04.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch05.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch06.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch07.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch08.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch09.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch10.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.pdf +OLD_FILES+=usr/share/doc/bind9/arm/man.arpaname.html +OLD_FILES+=usr/share/doc/bind9/arm/man.ddns-confgen.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dig.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-dsfromkey.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-keyfromlabel.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-keygen.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-revoke.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-settime.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-signzone.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-verify.html +OLD_FILES+=usr/share/doc/bind9/arm/man.genrandom.html +OLD_FILES+=usr/share/doc/bind9/arm/man.host.html +OLD_FILES+=usr/share/doc/bind9/arm/man.isc-hmac-fixup.html +OLD_FILES+=usr/share/doc/bind9/arm/man.named-checkconf.html +OLD_FILES+=usr/share/doc/bind9/arm/man.named-checkzone.html +OLD_FILES+=usr/share/doc/bind9/arm/man.named-journalprint.html +OLD_FILES+=usr/share/doc/bind9/arm/man.named.html +OLD_FILES+=usr/share/doc/bind9/arm/man.nsec3hash.html +OLD_FILES+=usr/share/doc/bind9/arm/man.nsupdate.html +OLD_FILES+=usr/share/doc/bind9/arm/man.rndc-confgen.html +OLD_FILES+=usr/share/doc/bind9/arm/man.rndc.conf.html +OLD_FILES+=usr/share/doc/bind9/arm/man.rndc.html +OLD_DIRS+=usr/share/doc/bind9/misc +OLD_FILES+=usr/share/doc/bind9/misc/dnssec +OLD_FILES+=usr/share/doc/bind9/misc/format-options.pl +OLD_FILES+=usr/share/doc/bind9/misc/ipv6 +OLD_FILES+=usr/share/doc/bind9/misc/migration +OLD_FILES+=usr/share/doc/bind9/misc/migration-4to9 +OLD_FILES+=usr/share/doc/bind9/misc/options +OLD_FILES+=usr/share/doc/bind9/misc/rfc-compliance +OLD_FILES+=usr/share/doc/bind9/misc/roadmap +OLD_FILES+=usr/share/doc/bind9/misc/sdb +OLD_FILES+=usr/share/doc/bind9/misc/sort-options.pl +OLD_FILES+=usr/share/man/man1/arpaname.1.gz +OLD_FILES+=usr/share/man/man1/dig.1.gz +OLD_FILES+=usr/share/man/man1/nslookup.1.gz +OLD_FILES+=usr/share/man/man1/nsupdate.1.gz +OLD_FILES+=usr/share/man/man3/lwres.3.gz +OLD_FILES+=usr/share/man/man3/lwres_addr_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_add.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_back.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_clear.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_first.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_forward.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_getmem.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint16.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint32.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint8.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_init.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_invalidate.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_putmem.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint16.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint32.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint8.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_subtract.3.gz +OLD_FILES+=usr/share/man/man3/lwres_conf_clear.3.gz +OLD_FILES+=usr/share/man/man3/lwres_conf_get.3.gz +OLD_FILES+=usr/share/man/man3/lwres_conf_init.3.gz +OLD_FILES+=usr/share/man/man3/lwres_conf_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_conf_print.3.gz +OLD_FILES+=usr/share/man/man3/lwres_config.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_allocmem.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_create.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_destroy.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_freemem.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_initserial.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_nextserial.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_sendrecv.3.gz +OLD_FILES+=usr/share/man/man3/lwres_endhostent.3.gz +OLD_FILES+=usr/share/man/man3/lwres_endhostent_r.3.gz +OLD_FILES+=usr/share/man/man3/lwres_freeaddrinfo.3.gz +OLD_FILES+=usr/share/man/man3/lwres_freehostent.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabn.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gai_strerror.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getaddrinfo.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getaddrsbyname.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostbyaddr.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostbyaddr_r.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostbyname.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostbyname2.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostbyname_r.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostent.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostent_r.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getipnode.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getipnodebyaddr.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getipnodebyname.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getnamebyaddr.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getnameinfo.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getrrsetbyname.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnba.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_herror.3.gz +OLD_FILES+=usr/share/man/man3/lwres_hstrerror.3.gz +OLD_FILES+=usr/share/man/man3/lwres_inetntop.3.gz +OLD_FILES+=usr/share/man/man3/lwres_lwpacket_parseheader.3.gz +OLD_FILES+=usr/share/man/man3/lwres_lwpacket_renderheader.3.gz +OLD_FILES+=usr/share/man/man3/lwres_net_ntop.3.gz +OLD_FILES+=usr/share/man/man3/lwres_noop.3.gz +OLD_FILES+=usr/share/man/man3/lwres_nooprequest_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_nooprequest_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_nooprequest_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_noopresponse_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_noopresponse_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_noopresponse_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_packet.3.gz +OLD_FILES+=usr/share/man/man3/lwres_resutil.3.gz +OLD_FILES+=usr/share/man/man3/lwres_sethostent.3.gz +OLD_FILES+=usr/share/man/man3/lwres_sethostent_r.3.gz +OLD_FILES+=usr/share/man/man3/lwres_string_parse.3.gz +OLD_FILES+=usr/share/man/man5/named.conf.5.gz +OLD_FILES+=usr/share/man/man5/rndc.conf.5.gz +OLD_FILES+=usr/share/man/man8/ddns-confgen.8.gz +OLD_FILES+=usr/share/man/man8/dnssec-dsfromkey.8.gz +OLD_FILES+=usr/share/man/man8/dnssec-keyfromlabel.8.gz +OLD_FILES+=usr/share/man/man8/dnssec-keygen.8.gz +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/genrandom.8.gz +OLD_FILES+=usr/share/man/man8/isc-hmac-fixup.8.gz +OLD_FILES+=usr/share/man/man8/lwresd.8.gz +OLD_FILES+=usr/share/man/man8/named-checkconf.8.gz +OLD_FILES+=usr/share/man/man8/named-checkzone.8.gz +OLD_FILES+=usr/share/man/man8/named-compilezone.8.gz +OLD_FILES+=usr/share/man/man8/named-journalprint.8.gz +OLD_FILES+=usr/share/man/man8/named.8.gz +OLD_FILES+=usr/share/man/man8/named.reconfig.8.gz +OLD_FILES+=usr/share/man/man8/named.reload.8.gz +OLD_FILES+=usr/share/man/man8/nsec3hash.8.gz +OLD_FILES+=usr/share/man/man8/rndc-confgen.8.gz +OLD_FILES+=usr/share/man/man8/rndc.8.gz +OLD_DIRS+=var/named/dev +OLD_DIRS+=var/named/etc +OLD_DIRS+=var/named/etc/namedb +OLD_FILES+=var/named/etc/namedb/PROTO.localhost-v6.rev +OLD_FILES+=var/named/etc/namedb/PROTO.localhost.rev +OLD_DIRS+=var/named/etc/namedb/dynamic +OLD_FILES+=var/named/etc/namedb/make-localhost +OLD_DIRS+=var/named/etc/namedb/master +OLD_FILES+=var/named/etc/namedb/master/empty.db +OLD_FILES+=var/named/etc/namedb/master/localhost-forward.db +OLD_FILES+=var/named/etc/namedb/master/localhost-reverse.db +#OLD_FILES+=var/named/etc/namedb/named.conf # intentionally left out +OLD_FILES+=var/named/etc/namedb/named.root +OLD_DIRS+=var/named/etc/namedb/slave +OLD_DIRS+=var/named/var +OLD_DIRS+=var/named/var/dump +OLD_DIRS+=var/named/var/log +OLD_DIRS+=var/named/var/run +OLD_DIRS+=var/named/var/run/named +OLD_DIRS+=var/named/var/stats +OLD_DIRS+=var/run/named # 20130908: libssh becomes private OLD_FILES+=usr/lib/libssh.a OLD_FILES+=usr/lib/libssh.so Modified: projects/camlock/UPDATING ============================================================================== --- projects/camlock/UPDATING Mon Oct 7 14:22:19 2013 (r256110) +++ projects/camlock/UPDATING Mon Oct 7 15:28:08 2013 (r256111) @@ -31,6 +31,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20130930: + BIND has been removed from the base system. If all you need + is a local resolver, simply enable and start the local_unbound + service instead. Otherwise, several versions of BIND are + available in the ports tree. + 20130916: With the addition of unbound(8), a new unbound user is now required during installworld. "mergemaster -p" can be used to Modified: projects/camlock/bin/dd/dd.1 ============================================================================== --- projects/camlock/bin/dd/dd.1 Mon Oct 7 14:22:19 2013 (r256110) +++ projects/camlock/bin/dd/dd.1 Mon Oct 7 15:28:08 2013 (r256111) @@ -32,7 +32,7 @@ .\" @(#)dd.1 8.2 (Berkeley) 1/13/94 .\" $FreeBSD$ .\" -.Dd January 23, 2009 +.Dd October 1, 2013 .Dt DD 1 .Os .Sh NAME @@ -378,12 +378,12 @@ will exit. .Sh EXAMPLES Check that a disk drive contains no bad blocks: .Pp -.Dl "dd if=/dev/ad0 of=/dev/null bs=1m" +.Dl "dd if=/dev/ada0 of=/dev/null bs=1m" .Pp Do a refresh of a disk drive, in order to prevent presently recoverable read errors from progressing into unrecoverable read errors: .Pp -.Dl "dd if=/dev/ad0 of=/dev/ad0 bs=1m" +.Dl "dd if=/dev/ada0 of=/dev/ada0 bs=1m" .Pp Remove parity bit from a file: .Pp Modified: projects/camlock/bin/pkill/pkill.c ============================================================================== --- projects/camlock/bin/pkill/pkill.c Mon Oct 7 14:22:19 2013 (r256110) +++ projects/camlock/bin/pkill/pkill.c Mon Oct 7 15:28:08 2013 (r256111) @@ -481,7 +481,6 @@ main(int argc, char **argv) * We skip P_SYSTEM processes to match ps(1) output. */ if ((kp->ki_flag & P_SYSTEM) == 0 && - kp->ki_loginclass != NULL && strcmp(kp->ki_loginclass, li->li_name) == 0) break; } Modified: projects/camlock/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c ============================================================================== --- projects/camlock/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Mon Oct 7 14:22:19 2013 (r256110) +++ projects/camlock/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Mon Oct 7 15:28:08 2013 (r256111) @@ -58,6 +58,7 @@ #include #include #include +#include #include #include Modified: projects/camlock/cddl/lib/libdtrace/tcp.d ============================================================================== --- projects/camlock/cddl/lib/libdtrace/tcp.d Mon Oct 7 14:22:19 2013 (r256110) +++ projects/camlock/cddl/lib/libdtrace/tcp.d Mon Oct 7 15:28:08 2013 (r256111) @@ -141,6 +141,25 @@ typedef struct tcpinfo { struct tcphdr *tcp_hdr; /* raw TCP header */ } tcpinfo_t; +/* + * A clone of tcpinfo_t used to handle the fact that the TCP input path + * overwrites some fields of the TCP header with their host-order equivalents. + * Unfortunately, DTrace doesn't let us simply typedef a new name for struct + * tcpinfo and define a separate translator for it. + */ +typedef struct tcpinfoh { + uint16_t tcp_sport; /* source port */ + uint16_t tcp_dport; /* destination port */ + uint32_t tcp_seq; /* sequence number */ + uint32_t tcp_ack; /* acknowledgment number */ + uint8_t tcp_offset; /* data offset, in bytes */ + uint8_t tcp_flags; /* flags */ + uint16_t tcp_window; /* window size */ + uint16_t tcp_checksum; /* checksum */ + uint16_t tcp_urgent; /* urgent data pointer */ + struct tcphdr *tcp_hdr; /* raw TCP header */ +} tcpinfoh_t; + #pragma D binding "1.0" translator translator csinfo_t < struct tcpcb *p > { cs_addr = NULL; @@ -180,7 +199,7 @@ translator tcpsinfo_t < struct tcpcb *p tcps_sack_snxt = p == NULL ? 0 : p->sack_newdata; tcps_rto = p == NULL ? -1 : p->t_rxtcur / 1000; /* XXX */ tcps_mss = p == NULL ? -1 : p->t_maxseg; - tcps_retransmit = -1; /* XXX */ + tcps_retransmit = p == NULL ? -1 : p->t_rxtshift > 0 ? 1 : 0; }; #pragma D binding "1.0" translator @@ -197,6 +216,25 @@ translator tcpinfo_t < struct tcphdr *p tcp_hdr = (struct tcphdr *)p; }; +/* + * This translator differs from the one for tcpinfo_t in that the sequence + * number, acknowledgement number, window size and urgent pointer are already + * in host order and thus don't need to be converted. + */ +#pragma D binding "1.0" translator +translator tcpinfoh_t < struct tcphdr *p > { + tcp_sport = p == NULL ? 0 : ntohs(p->th_sport); + tcp_dport = p == NULL ? 0 : ntohs(p->th_dport); + tcp_seq = p == NULL ? -1 : p->th_seq; + tcp_ack = p == NULL ? -1 : p->th_ack; + tcp_offset = p == NULL ? -1 : (p->th_off >> 2); + tcp_flags = p == NULL ? 0 : p->th_flags; + tcp_window = p == NULL ? 0 : (p->th_win); + tcp_checksum = p == NULL ? 0 : ntohs(p->th_sum); + tcp_urgent = p == NULL ? 0 : p->th_urp; + tcp_hdr = (struct tcphdr *)p; +}; + #pragma D binding "1.0" translator translator tcplsinfo_t < int s > { tcps_state = s; Modified: projects/camlock/contrib/binutils/bfd/elflink.c ============================================================================== --- projects/camlock/contrib/binutils/bfd/elflink.c Mon Oct 7 14:22:19 2013 (r256110) +++ projects/camlock/contrib/binutils/bfd/elflink.c Mon Oct 7 15:28:08 2013 (r256111) @@ -488,12 +488,28 @@ bfd_elf_record_link_assignment (bfd *out if (h->root.u.undef.next != NULL || htab->root.undefs_tail == &h->root) bfd_link_repair_undef_list (&htab->root); } - - if (h->root.type == bfd_link_hash_new) + else if (h->root.type == bfd_link_hash_new) { bfd_elf_link_mark_dynamic_symbol (info, h, NULL); h->non_elf = 0; } + else if (h->root.type == bfd_link_hash_indirect) + { + const struct elf_backend_data *bed = get_elf_backend_data (output_bfd); + struct elf_link_hash_entry *hv = h; + do + hv = (struct elf_link_hash_entry *) hv->root.u.i.link; + while (hv->root.type == bfd_link_hash_indirect + || hv->root.type == bfd_link_hash_warning); + h->root.type = bfd_link_hash_undefined; + hv->root.type = bfd_link_hash_indirect; + hv->root.u.i.link = (struct bfd_link_hash_entry *) h; + (*bed->elf_backend_copy_indirect_symbol) (info, h, hv); + } + else if (h->root.type == bfd_link_hash_warning) + { + abort (); + } /* If this symbol is being provided by the linker script, and it is currently defined by a dynamic object, but not by a regular @@ -1417,10 +1433,10 @@ _bfd_elf_merge_symbol (bfd *abfd, case, we make the versioned symbol point to the normal one. */ const struct elf_backend_data *bed = get_elf_backend_data (abfd); flip->root.type = h->root.type; + flip->root.u.undef.abfd = h->root.u.undef.abfd; h->root.type = bfd_link_hash_indirect; h->root.u.i.link = (struct bfd_link_hash_entry *) flip; (*bed->elf_backend_copy_indirect_symbol) (info, flip, h); - flip->root.u.undef.abfd = h->root.u.undef.abfd; if (h->def_dynamic) { h->def_dynamic = 0; Modified: projects/camlock/contrib/binutils/bfd/elfxx-mips.c ============================================================================== --- projects/camlock/contrib/binutils/bfd/elfxx-mips.c Mon Oct 7 14:22:19 2013 (r256110) +++ projects/camlock/contrib/binutils/bfd/elfxx-mips.c Mon Oct 7 15:28:08 2013 (r256111) @@ -557,6 +557,10 @@ static bfd *reldyn_sorting_bfd; #define MIPS_ELF_DYN_SIZE(abfd) \ (get_elf_backend_data (abfd)->s->sizeof_dyn) +/* The size of the rld_map pointer. */ +#define MIPS_ELF_RLD_MAP_SIZE(abfd) \ + (get_elf_backend_data (abfd)->s->arch_size / 8) + /* The size of a GOT entry. */ #define MIPS_ELF_GOT_SIZE(abfd) \ (get_elf_backend_data (abfd)->s->arch_size / 8) @@ -7492,7 +7496,7 @@ _bfd_mips_elf_size_dynamic_sections (bfd { /* We add a room for __rld_map. It will be filled in by the rtld to contain a pointer to the _r_debug structure. */ - s->size += 4; + s->size += MIPS_ELF_RLD_MAP_SIZE (output_bfd); } else if (SGI_COMPAT (output_bfd) && CONST_STRNEQ (name, ".compact_rel")) Modified: projects/camlock/contrib/binutils/binutils/readelf.c ============================================================================== --- projects/camlock/contrib/binutils/binutils/readelf.c Mon Oct 7 14:22:19 2013 (r256110) +++ projects/camlock/contrib/binutils/binutils/readelf.c Mon Oct 7 15:28:08 2013 (r256111) @@ -9169,6 +9169,8 @@ get_freebsd_note_type (unsigned e_type) return _("NT_FREEBSD_ABI_TAG"); case NT_FREEBSD_NOINIT_TAG: return _("NT_FREEBSD_NOINIT_TAG"); + case NT_FREEBSD_ARCH_TAG: + return _("NT_FREEBSD_ARCH_TAG"); default: break; } Modified: projects/camlock/contrib/binutils/include/elf/common.h ============================================================================== --- projects/camlock/contrib/binutils/include/elf/common.h Mon Oct 7 14:22:19 2013 (r256110) +++ projects/camlock/contrib/binutils/include/elf/common.h Mon Oct 7 15:28:08 2013 (r256111) @@ -456,6 +456,7 @@ #define NT_FREEBSD_TAG 1 #define NT_FREEBSD_NOINIT_TAG 2 +#define NT_FREEBSD_ARCH_TAG 3 /* These three macros disassemble and assemble a symbol table st_info field, which contains the symbol binding and symbol type. The STB_ and STT_ Modified: projects/camlock/contrib/bmake/make.1 ============================================================================== --- projects/camlock/contrib/bmake/make.1 Mon Oct 7 14:22:19 2013 (r256110) +++ projects/camlock/contrib/bmake/make.1 Mon Oct 7 15:28:08 2013 (r256111) @@ -730,7 +730,7 @@ even if the target is not tagged with The default is .Ql Pa yes for backwards compatability with -.Fx 9 +.Fx 9.0 and earlier. .It Va .MAKE.DEPENDFILE Names the makefile (default Modified: projects/camlock/contrib/dialog/CHANGES ============================================================================== --- projects/camlock/contrib/dialog/CHANGES Mon Oct 7 14:22:19 2013 (r256110) +++ projects/camlock/contrib/dialog/CHANGES Mon Oct 7 15:28:08 2013 (r256111) @@ -1,9 +1,38 @@ --- $Id: CHANGES,v 1.458 2013/05/24 00:23:22 tom Exp $ +-- $Id: CHANGES,v 1.476 2013/09/24 00:06:47 tom Exp $ -- Thomas E. Dickey This version of dialog was originally from a Debian snapshot. I've done this to it: +2013/09/23 + + fix samples/inputbox6-utf8, which had depended unnecessarily on bash. + + improve memory caching for wide-character manipulation in gauge + widget (report by Devin Teske). + + add dlg_reallocate_gauge (discussion with Devin Teske). + + updated configure macros to use msys changes from ncurses. + + update config.guess, config.sub + +2013/09/02 + + modify makefile rule to make the ".png" filenames created by groff + predictable. + + add option --help-tags to allow scripts to get the item's tag field + consistently from help- and help-item button results rather than + getting the item's text for the latter (discussion with Florent + Rougon). + + correct manpage discussion of DIALOG_ITEM_HELP versus --item-help, + as well as --help-button return status (report by Florent Rougon). + + correct limit used for --hline option (report by Devin Teske, + cf: 2011/06/30). + + do not print empty "[]" if a --hline option was given with an empty + value (report by Devin Teske). + + miscellaneous configure script fixes/updates. In particular, add + option --with-shared which builds shared libraries without a libtool + dependency. + + add FreeBSD port-files for test-builds. + + update lt.po, add fa.po from + http://translationproject.org/latest/dialog/ + + update config.guess, config.sub + 2013/05/23 + modify ifdef in arrows.c to work around packages which use the wide-character ncursesw headers with the ncurses library (report @@ -298,7 +327,7 @@ to it: separate ncurses' header files. + CF_DISABLE_RPATH_HACK, fix garbled message + CF_LD_RPATH_OPT, add mirbsd - + CF_MAKEFLAGS, filter out GNU make's entering/leaving messages. + + CF_MAKEFLAGS, filter out GNU make's entering/leaving messages. This only appeared when using the macro in a dpkg script, though it should have in other cases. + CF_RPATH_HACK, add a check for libraries not found, e.g., from Modified: projects/camlock/contrib/dialog/VERSION ============================================================================== --- projects/camlock/contrib/dialog/VERSION Mon Oct 7 14:22:19 2013 (r256110) +++ projects/camlock/contrib/dialog/VERSION Mon Oct 7 15:28:08 2013 (r256111) @@ -1 +1 @@ -11:1:0 1.2 20130523 +11:1:0 1.2 20130923 Modified: projects/camlock/contrib/dialog/aclocal.m4 ============================================================================== --- projects/camlock/contrib/dialog/aclocal.m4 Mon Oct 7 14:22:19 2013 (r256110) +++ projects/camlock/contrib/dialog/aclocal.m4 Mon Oct 7 15:28:08 2013 (r256111) @@ -1,7 +1,7 @@ dnl macros used for DIALOG configure script -dnl $Id: aclocal.m4,v 1.90 2012/12/02 20:07:30 tom Exp $ +dnl $Id: aclocal.m4,v 1.94 2013/09/22 14:26:24 tom Exp $ dnl --------------------------------------------------------------------------- -dnl Copyright 1999-2011,2012 -- Thomas E. Dickey +dnl Copyright 1999-2012,2013 -- Thomas E. Dickey dnl dnl Permission is hereby granted, free of charge, to any person obtaining a dnl copy of this software and associated documentation files (the @@ -590,7 +590,7 @@ changequote([,])dnl AC_SUBST(GENCAT) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ACVERSION_CHECK version: 3 updated: 2012/10/03 18:39:53 +dnl CF_ACVERSION_CHECK version: 4 updated: 2013/03/04 19:52:56 dnl ------------------ dnl Conditionally generate script according to whether we're using a given autoconf. dnl @@ -599,6 +599,7 @@ dnl $2 = code to use if AC_ACVERSION is dnl $3 = code to use if AC_ACVERSION is older than $1. define([CF_ACVERSION_CHECK], [ +ifdef([AC_ACVERSION], ,[m4_copy([m4_PACKAGE_VERSION],[AC_ACVERSION])])dnl ifdef([m4_version_compare], [m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])], [CF_ACVERSION_COMPARE( @@ -1125,6 +1126,27 @@ if test ".$system_name" != ".$cf_cv_syst fi ])dnl dnl --------------------------------------------------------------------------- +dnl CF_CHECK_LIBTOOL_VERSION version: 1 updated: 2013/04/06 18:03:09 +dnl ------------------------ +dnl Show the version of libtool +dnl +dnl Save the version in a cache variable - this is not entirely a good thing, +dnl but the version string from libtool is very ugly, and for bug reports it +dnl might be useful to have the original string. +AC_DEFUN([CF_CHECK_LIBTOOL_VERSION],[ +if test -n "$LIBTOOL" && test "$LIBTOOL" != none +then + AC_MSG_CHECKING(version of $LIBTOOL) + CF_LIBTOOL_VERSION + AC_MSG_RESULT($cf_cv_libtool_version) + if test -z "$cf_cv_libtool_version" ; then + AC_MSG_ERROR(This is not GNU libtool) + fi +else + AC_MSG_ERROR(GNU libtool has not been found) +fi +])dnl +dnl --------------------------------------------------------------------------- dnl CF_CLANG_COMPILER version: 1 updated: 2012/06/16 14:55:39 dnl ----------------- dnl Check if the given compiler is really clang. clang's C driver defines @@ -1293,7 +1315,7 @@ fi AC_CHECK_HEADERS($cf_cv_ncurses_header) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_LIBS version: 36 updated: 2012/07/07 21:02:48 +dnl CF_CURSES_LIBS version: 37 updated: 2013/02/09 17:33:50 dnl -------------- dnl Look for the curses libraries. Older curses implementations may require dnl termcap/termlib to be linked as well. Call CF_CURSES_CPPFLAGS first. @@ -1330,7 +1352,7 @@ hpux10.*) #(vi ac_cv_func_initscr=yes ])]) fi - ;; + ;; linux*) case `arch 2>/dev/null` in x86_64) @@ -1345,7 +1367,7 @@ linux*) CF_ADD_LIBDIR(/lib) ;; esac - ;; + ;; sunos3*|sunos4*) if test "x$cf_cv_screen" = "xcurses_5lib" then @@ -1359,59 +1381,63 @@ sunos3*|sunos4*) esac if test ".$ac_cv_func_initscr" != .yes ; then - cf_save_LIBS="$LIBS" - cf_term_lib="" - cf_curs_lib="" + cf_save_LIBS="$LIBS" - if test ".${cf_cv_ncurses_version:-no}" != .no - then - cf_check_list="ncurses curses cursesX" - else - cf_check_list="cursesX curses ncurses" - fi + if test ".${cf_cv_ncurses_version:-no}" != .no + then + cf_check_list="ncurses curses cursesX" + else + cf_check_list="cursesX curses ncurses" + fi - # Check for library containing tgoto. Do this before curses library - # because it may be needed to link the test-case for initscr. - AC_CHECK_FUNC(tgoto,[cf_term_lib=predefined],[ - for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown - do - AC_CHECK_LIB($cf_term_lib,tgoto,[break]) - done - ]) + # Check for library containing tgoto. Do this before curses library + # because it may be needed to link the test-case for initscr. + if test "x$cf_term_lib" = x + then + AC_CHECK_FUNC(tgoto,[cf_term_lib=predefined],[ + for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown + do + AC_CHECK_LIB($cf_term_lib,tgoto,[break]) + done + ]) + fi - # Check for library containing initscr - test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS" - for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown - do - AC_CHECK_LIB($cf_curs_lib,initscr,[break]) - done - test $cf_curs_lib = unknown && AC_MSG_ERROR(no curses library found) + # Check for library containing initscr + test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS" + if test "x$cf_curs_lib" = x + then + for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown + do + AC_CHECK_LIB($cf_curs_lib,initscr,[break]) + done + fi + test $cf_curs_lib = unknown && AC_MSG_ERROR(no curses library found) - LIBS="-l$cf_curs_lib $cf_save_LIBS" - if test "$cf_term_lib" = unknown ; then - AC_MSG_CHECKING(if we can link with $cf_curs_lib library) - AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], - [initscr()], - [cf_result=yes], - [cf_result=no]) - AC_MSG_RESULT($cf_result) - test $cf_result = no && AC_MSG_ERROR(Cannot link curses library) - elif test "$cf_curs_lib" = "$cf_term_lib" ; then - : - elif test "$cf_term_lib" != predefined ; then - AC_MSG_CHECKING(if we need both $cf_curs_lib and $cf_term_lib libraries) - AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], - [initscr(); tgoto((char *)0, 0, 0);], - [cf_result=no], - [ - LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" - AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], - [initscr()], - [cf_result=yes], - [cf_result=error]) - ]) - AC_MSG_RESULT($cf_result) - fi + LIBS="-l$cf_curs_lib $cf_save_LIBS" + if test "$cf_term_lib" = unknown ; then + AC_MSG_CHECKING(if we can link with $cf_curs_lib library) + AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], + [initscr()], + [cf_result=yes], + [cf_result=no]) + AC_MSG_RESULT($cf_result) + test $cf_result = no && AC_MSG_ERROR(Cannot link curses library) + elif test "$cf_curs_lib" = "$cf_term_lib" ; then + : + elif test "$cf_term_lib" != predefined ; then + AC_MSG_CHECKING(if we need both $cf_curs_lib and $cf_term_lib libraries) + AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], + [initscr(); tgoto((char *)0, 0, 0);], + [cf_result=no], + [ + LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" + AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], + [initscr()], + [cf_result=yes], + [cf_result=error]) + ]) + AC_MSG_RESULT($cf_result) + fi fi fi @@ -1708,6 +1734,20 @@ if test "$cf_disable_rpath_hack" = no ; fi ]) dnl --------------------------------------------------------------------------- +dnl CF_ENABLE_RPATH version: 2 updated: 2010/03/27 18:39:42 +dnl --------------- +dnl Check if the rpath option should be used, setting cache variable +dnl cf_cv_enable_rpath if so. +AC_DEFUN([CF_ENABLE_RPATH], +[ +AC_MSG_CHECKING(if rpath option should be used) +AC_ARG_ENABLE(rpath, +[ --enable-rpath use rpath option when generating shared libraries], +[cf_cv_enable_rpath=$enableval], +[cf_cv_enable_rpath=no]) +AC_MSG_RESULT($cf_cv_enable_rpath) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_FIND_LIBRARY version: 9 updated: 2008/03/23 14:48:54 dnl --------------- dnl Look for a non-standard library, given parameters for AC_TRY_LINK. We @@ -1888,6 +1928,15 @@ ifelse([$5],,AC_MSG_WARN(Cannot find $3 fi ])dnl dnl --------------------------------------------------------------------------- +dnl CF_FORGET_TOOL version: 1 updated: 2013/04/06 18:03:09 +dnl -------------- +dnl Forget that we saw the given tool. +AC_DEFUN([CF_FORGET_TOOL],[ +unset ac_cv_prog_ac_ct_$1 +unset ac_ct_$1 +unset $1 +])dnl +dnl --------------------------------------------------------------------------- dnl CF_FUNC_WAIT version: 3 updated: 2012/10/06 08:57:51 dnl ------------ dnl Test for the presence of , 'union wait', arg-type of 'wait()' @@ -2256,7 +2305,7 @@ test -d "$oldincludedir" && { $1="[$]$1 $cf_header_path_list" ])dnl dnl --------------------------------------------------------------------------- -dnl CF_INTEL_COMPILER version: 4 updated: 2010/05/26 05:38:42 +dnl CF_INTEL_COMPILER version: 5 updated: 2013/02/10 10:41:05 dnl ----------------- dnl Check if the given compiler is really the Intel compiler for Linux. It dnl tries to imitate gcc, but does not return an error when it finds a mismatch @@ -2270,6 +2319,7 @@ dnl $1 = GCC (default) or GXX dnl $2 = INTEL_COMPILER (default) or INTEL_CPLUSPLUS dnl $3 = CFLAGS (default) or CXXFLAGS AC_DEFUN([CF_INTEL_COMPILER],[ +AC_REQUIRE([AC_CANONICAL_HOST]) ifelse([$2],,INTEL_COMPILER,[$2])=no if test "$ifelse([$1],,[$1],GCC)" = yes ; then @@ -2415,6 +2465,18 @@ CF_SUBDIR_PATH($1,$2,lib) $1="$cf_library_path_list [$]$1" ])dnl dnl --------------------------------------------------------------------------- +dnl CF_LIBTOOL_VERSION version: 1 updated: 2013/04/06 18:03:09 +dnl ------------------ +AC_DEFUN([CF_LIBTOOL_VERSION],[ +if test -n "$LIBTOOL" && test "$LIBTOOL" != none +then + cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([[^)]]*)//g' -e 's/^[[^1-9]]*//' -e 's/[[^0-9.]].*//'` +else + cf_cv_libtool_version= +fi +test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version +])dnl +dnl --------------------------------------------------------------------------- dnl CF_LIB_PREFIX version: 9 updated: 2012/01/21 19:28:10 dnl ------------- dnl Compute the library-prefix for the given host system @@ -2432,6 +2494,69 @@ ifelse($1,,,[$1=$LIB_PREFIX]) AC_SUBST(LIB_PREFIX) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_LIB_SUFFIX version: 22 updated: 2013/09/07 13:54:05 +dnl ------------- +dnl Compute the library file-suffix from the given model name +dnl $1 = model name +dnl $2 = variable to set (the nominal library suffix) +dnl $3 = dependency variable to set (actual filename) +dnl The variable $LIB_SUFFIX, if set, prepends the variable to set. +AC_DEFUN([CF_LIB_SUFFIX], +[ + case X$1 in #(vi + Xlibtool) #(vi + $2='.la' + $3=[$]$2 + ;; + Xdebug) #(vi + $2='_g.a' + $3=[$]$2 + ;; + Xprofile) #(vi + $2='_p.a' + $3=[$]$2 + ;; + Xshared) #(vi + case $cf_cv_system_name in + aix[[5-7]]*) #(vi + $2='.a' + $3=[$]$2 + ;; + cygwin*|msys*|mingw*) #(vi + $2='.dll' + $3='.dll.a' + ;; + darwin*) #(vi + $2='.dylib' + $3=[$]$2 + ;; + hpux*) #(vi + case $target in + ia64*) #(vi + $2='.so' + $3=[$]$2 + ;; + *) #(vi + $2='.sl' + $3=[$]$2 + ;; + esac + ;; + *) #(vi + $2='.so' + $3=[$]$2 + ;; + esac + ;; + *) + $2='.a' + $3=[$]$2 + ;; + esac + test -n "$LIB_SUFFIX" && $2="${LIB_SUFFIX}[$]{$2}" + test -n "$LIB_SUFFIX" && $3="${LIB_SUFFIX}[$]{$3}" +])dnl +dnl --------------------------------------------------------------------------- dnl CF_MAKEFLAGS version: 14 updated: 2011/03/31 19:29:46 dnl ------------ dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass 'make' @@ -2569,7 +2694,7 @@ if test "$cf_cv_mbstate_t" != unknown ; fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_MIXEDCASE_FILENAMES version: 4 updated: 2012/10/02 20:55:03 +dnl CF_MIXEDCASE_FILENAMES version: 5 updated: 2013/09/07 13:54:05 dnl ---------------------- dnl Check if the file-system supports mixed-case filenames. If we're able to dnl create a lowercase name and see it as uppercase, it doesn't support that. @@ -2578,7 +2703,7 @@ AC_DEFUN([CF_MIXEDCASE_FILENAMES], AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[ if test "$cross_compiling" = yes ; then case $target_alias in #(vi - *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-mingw32*|*-uwin*) #(vi + *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw32*|*-uwin*) #(vi cf_cv_mixedcase=no ;; *) @@ -2959,6 +3084,25 @@ case .$with_cflags in #(vi esac ])dnl dnl --------------------------------------------------------------------------- +dnl CF_NUMBER_SYNTAX version: 1 updated: 2003/09/20 18:12:49 +dnl ---------------- +dnl Check if the given variable is a number. If not, report an error. +dnl $1 is the variable +dnl $2 is the message +AC_DEFUN([CF_NUMBER_SYNTAX],[ +if test -n "$1" ; then + case $1 in #(vi + [[0-9]]*) #(vi + ;; + *) + AC_MSG_ERROR($2 is not a number: $1) + ;; + esac +else + AC_MSG_ERROR($2 value is empty) +fi +])dnl +dnl --------------------------------------------------------------------------- dnl CF_OUR_MESSAGES version: 7 updated: 2004/09/12 19:45:55 dnl --------------- dnl Check if we use the messages included with this program @@ -3049,6 +3193,40 @@ case ".[$]$1" in #(vi esac ])dnl dnl --------------------------------------------------------------------------- +dnl CF_PKG_CONFIG version: 7 updated: 2011/04/29 04:53:22 +dnl ------------- +dnl Check for the package-config program, unless disabled by command-line. +AC_DEFUN([CF_PKG_CONFIG], +[ +AC_MSG_CHECKING(if you want to use pkg-config) +AC_ARG_WITH(pkg-config, + [ --with-pkg-config{=path} enable/disable use of pkg-config], + [cf_pkg_config=$withval], + [cf_pkg_config=yes]) +AC_MSG_RESULT($cf_pkg_config) + +case $cf_pkg_config in #(vi +no) #(vi + PKG_CONFIG=none + ;; +yes) #(vi + CF_ACVERSION_CHECK(2.52, + [AC_PATH_TOOL(PKG_CONFIG, pkg-config, none)], + [AC_PATH_PROG(PKG_CONFIG, pkg-config, none)]) + ;; +*) + PKG_CONFIG=$withval + ;; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Mon Oct 7 16:57:57 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 0E4AA9D7; Mon, 7 Oct 2013 16:57:56 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BFDF821CA; Mon, 7 Oct 2013 16:57:56 +0000 (UTC) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id E2CFFB95B; Mon, 7 Oct 2013 12:57:55 -0400 (EDT) From: John Baldwin To: Konstantin Belousov Subject: Re: svn commit: r256042 - in projects/random_number_generator: share/examples/kld/random_adaptor sys/conf sys/dev/glxsb sys/dev/hifn sys/dev/random sys/dev/rndtest sys/dev/safe sys/dev/syscons sys/dev/... Date: Mon, 7 Oct 2013 12:57:20 -0400 User-Agent: KMail/1.13.5 (FreeBSD/8.4-CBSD-20130906; KDE/4.5.5; amd64; ; ) References: <201310040655.r946t6ZR038091@svn.freebsd.org> <20131004070521.GQ41229@kib.kiev.ua> In-Reply-To: <20131004070521.GQ41229@kib.kiev.ua> MIME-Version: 1.0 Message-Id: <201310071257.20224.jhb@freebsd.org> Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Mon, 07 Oct 2013 12:57:56 -0400 (EDT) Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org, Mark Murray X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Oct 2013 16:57:57 -0000 On Friday, October 04, 2013 3:05:21 am Konstantin Belousov wrote: > On Fri, Oct 04, 2013 at 06:55:06AM +0000, Mark Murray wrote: > > #ifdef __amd64__ > > - ".byte\t0x48,0x0f,0xc7,0xf0\n\t" /* rdrand %rax */ > > + "rdrand\t%%rax\n\t" > > "jnc\t1f\n\t" > > "movq\t%%rax,%1\n\t" > > "movl\t$8,%%eax\n" > > #else /* i386 */ > > - ".byte\t0x0f,0xc7,0xf0\n\t" /* rdrand %eax */ > > + "rdrand\t%%eax\n\t" > > "jnc\t1f\n\t" > > "movl\t%%eax,%1\n\t" > > "movl\t$4,%%eax\n" > This should break the build with the in-tree binutils, i.e. when gcc > is used. The same for the chunks of the VIA asm. How hard would it be to just add rdrand to binutils? Ah, looks like dim@ just added it. I have a patch for amd64's DDB that I'll test locally. -- John Baldwin From owner-svn-src-projects@FreeBSD.ORG Mon Oct 7 18:56:56 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 68CB4342; Mon, 7 Oct 2013 18:56:56 +0000 (UTC) (envelope-from pawel@dawidek.net) Received: from mail.dawidek.net (garage.dawidek.net [91.121.88.72]) by mx1.freebsd.org (Postfix) with ESMTP id 2DB2F2995; Mon, 7 Oct 2013 18:56:55 +0000 (UTC) Received: from localhost (89-73-195-149.dynamic.chello.pl [89.73.195.149]) by mail.dawidek.net (Postfix) with ESMTPSA id EFBB6AE5; Mon, 7 Oct 2013 20:51:02 +0200 (CEST) Date: Mon, 7 Oct 2013 20:56:55 +0200 From: Pawel Jakub Dawidek To: Mark Murray Subject: Re: svn commit: r256094 - in projects/random_number_generator/sys: boot/forth conf dev/random kern sys Message-ID: <20131007185654.GB1430@garage.freebsd.pl> References: <201310062245.r96Mj3mQ055614@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="zx4FCpZtqtKETZ7O" Content-Disposition: inline In-Reply-To: <201310062245.r96Mj3mQ055614@svn.freebsd.org> X-OS: FreeBSD 10.0-CURRENT amd64 User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Oct 2013 18:56:56 -0000 --zx4FCpZtqtKETZ7O Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Oct 06, 2013 at 10:45:03PM +0000, Mark Murray wrote: > Author: markm > Date: Sun Oct 6 22:45:02 2013 > New Revision: 256094 > URL: http://svnweb.freebsd.org/changeset/base/256094 >=20 > Log: > Snapshot. > =20 > Looking pretty good; this mostly works now. New code includes: > =20 > * Read cached entropy at startup, both from files and from loader(8) pr= eloaded entropy. Failures are soft, but announced. Untested. > =20 > * Use EVENTHANDLER to do above just before we go multiuser. Untested. [...] > +int randomdev_read_file(const char *filename, void *buf); > +int randomdev_write_file(const char *filename, void *buf); Can we pass buffer sizes explicitely and not just assume it is PAGE_SIZE? --=20 Pawel Jakub Dawidek http://www.wheelsystems.com FreeBSD committer http://www.FreeBSD.org Am I Evil? Yes, I Am! http://mobter.com --zx4FCpZtqtKETZ7O Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (FreeBSD) iEYEARECAAYFAlJTA/YACgkQForvXbEpPzQnqwCgvmtsBursV1Pbdz8vtfdrqvUx m90AoLjp5jGoFM+V1v6xjczlnSkU4Ja0 =T7YM -----END PGP SIGNATURE----- --zx4FCpZtqtKETZ7O-- From owner-svn-src-projects@FreeBSD.ORG Mon Oct 7 18:59:30 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 2FC22460; Mon, 7 Oct 2013 18:59:30 +0000 (UTC) (envelope-from mark@grondar.org) Received: from gromit.grondar.org (grandfather.grondar.org [IPv6:2a01:348:0:15:5d59:5c20:0:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E7DB429AF; Mon, 7 Oct 2013 18:59:29 +0000 (UTC) Received: from [2001:470:9174:1:50fc:a600:2b5c:1c87] by gromit.grondar.org with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.80.1 (FreeBSD)) (envelope-from ) id 1VTG1f-0006Iz-52; Mon, 07 Oct 2013 19:59:28 +0100 Subject: Re: svn commit: r256094 - in projects/random_number_generator/sys: boot/forth conf dev/random kern sys Mime-Version: 1.0 (Mac OS X Mail 6.6 \(1510\)) Content-Type: multipart/signed; boundary="Apple-Mail=_C95DCFAA-52C5-4091-BE54-065E4614A4C7"; protocol="application/pgp-signature"; micalg=pgp-sha512 From: Mark R V Murray In-Reply-To: <20131007185654.GB1430@garage.freebsd.pl> Date: Mon, 7 Oct 2013 19:59:26 +0100 Message-Id: <18A91E54-3B25-4E54-90F3-4E2F6B05DE90@grondar.org> References: <201310062245.r96Mj3mQ055614@svn.freebsd.org> <20131007185654.GB1430@garage.freebsd.pl> To: Pawel Jakub Dawidek X-Mailer: Apple Mail (2.1510) X-SA-Score: -1.0 Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org, Mark Murray X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Oct 2013 18:59:30 -0000 --Apple-Mail=_C95DCFAA-52C5-4091-BE54-065E4614A4C7 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii On 7 Oct 2013, at 19:56, Pawel Jakub Dawidek wrote: > On Sun, Oct 06, 2013 at 10:45:03PM +0000, Mark Murray wrote: >> +int randomdev_read_file(const char *filename, void *buf); >> +int randomdev_write_file(const char *filename, void *buf); > > Can we pass buffer sizes explicitely and not just assume it is PAGE_SIZE? I don't see why not. Right now, I need to find out why the read function (not yet got to write) is panicking with "page not present". M -- Mark R V Murray --Apple-Mail=_C95DCFAA-52C5-4091-BE54-065E4614A4C7 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.20 (Darwin) Comment: GPGTools - http://gpgtools.org iQCVAwUBUlMEjt58vKOKE6LNAQpf3gQAkAvWMQGBsAHvGWSs3gqcf2sEC2nAT0BT m5DK3pyM4M4b6Xa5xh87tWzfg1cRPJrHh3Qt5avYtmqAWSpzN/T2Od0Y7TEDUY4x NzpOqSZXFlxP1xQj/jkaCVZERLPqpb2C0GwfgcV5HpcIH5Zzt8EwxTmLBsSLp34+ UhU43pYzQ+M= =CVUd -----END PGP SIGNATURE----- --Apple-Mail=_C95DCFAA-52C5-4091-BE54-065E4614A4C7-- From owner-svn-src-projects@FreeBSD.ORG Tue Oct 8 06:54:53 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id E8EF1529; Tue, 8 Oct 2013 06:54:53 +0000 (UTC) (envelope-from markm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C74FD282B; Tue, 8 Oct 2013 06:54:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r986sr3Q018897; Tue, 8 Oct 2013 06:54:53 GMT (envelope-from markm@svn.freebsd.org) Received: (from markm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r986sqBx018892; Tue, 8 Oct 2013 06:54:52 GMT (envelope-from markm@svn.freebsd.org) Message-Id: <201310080654.r986sqBx018892@svn.freebsd.org> From: Mark Murray Date: Tue, 8 Oct 2013 06:54:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256135 - in projects/random_number_generator/sys: dev/random kern sys X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Oct 2013 06:54:54 -0000 Author: markm Date: Tue Oct 8 06:54:52 2013 New Revision: 256135 URL: http://svnweb.freebsd.org/changeset/base/256135 Log: Debugging. My attempt at EVENTHANDLER(multiuser) was a failure; use EVENTHANDLER(mountroot) instead. This means we can't count on /var being present, so something will need to be done about harvesting /var/db/entropy/... . Some policy now needs to be sorted out, and a pre-sync cache needs to be written, but apart from that we are now ready to go. Over to review. Modified: projects/random_number_generator/sys/dev/random/random_harvestq.c projects/random_number_generator/sys/dev/random/rwfile.c projects/random_number_generator/sys/dev/random/rwfile.h projects/random_number_generator/sys/kern/init_main.c projects/random_number_generator/sys/sys/eventhandler.h Modified: projects/random_number_generator/sys/dev/random/random_harvestq.c ============================================================================== --- projects/random_number_generator/sys/dev/random/random_harvestq.c Tue Oct 8 04:52:40 2013 (r256134) +++ projects/random_number_generator/sys/dev/random/random_harvestq.c Tue Oct 8 06:54:52 2013 (r256135) @@ -25,7 +25,6 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD$ */ #include @@ -46,6 +45,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include @@ -80,21 +80,18 @@ static struct proc *random_kthread_proc; static const char *entropy_files[] = { "/entropy", - "/var/db/entropy", - "/boot/entropy", /* Yeah, Yeah. I know this is loaded by - * loader(8), but not always, and it doesn't - * hurt to do this again. - */ NULL }; /* Deal with entropy cached externally if this is present. + * Lots of policy may eventually arrive in this function. + * Called after / is mounted. */ static void random_harvestq_cache(void *arg __unused) { const char **entropy_file; - uint8_t *keyfile, *data; + uint8_t *keyfile, *data, *zbuf; size_t size, i; int error; @@ -104,21 +101,34 @@ random_harvestq_cache(void *arg __unused data = preload_fetch_addr(keyfile); size = preload_fetch_size(keyfile); if (data != NULL && size != 0) { - for (i = 0U; i < size; i += 16) - random_harvestq_internal(get_cyclecount(), data + i, 16, (16*8)/4, RANDOM_CACHED); + for (i = 0; i < size; i += 16) + random_harvestq_internal(get_cyclecount(), data + i, 16, 16, RANDOM_CACHED); printf("random: read %zu bytes from preloaded cache\n", size); bzero(data, size); } else printf("random: no preloaded entropy cache available\n"); } + + /* Read and attempt to overwrite the entropy cache files. + * If the file exists, can be read and then overwritten,i + * then use it. Ignore it otherwise, but print out what is + * going on. + */ data = malloc(PAGE_SIZE, M_ENTROPY, M_WAITOK); + zbuf = __DECONST(void *, zero_region); for (entropy_file = entropy_files; *entropy_file; entropy_file++) { - error = randomdev_read_file(*entropy_file, data); + error = randomdev_read_file(*entropy_file, data, PAGE_SIZE); if (error == 0) { - for (i = 0U; i < PAGE_SIZE; i += 16) - random_harvestq_internal(get_cyclecount(), data + i, 16, (16*8)/4, RANDOM_CACHED); - printf("random: read %d bytes from '%s'\n", PAGE_SIZE, *entropy_file); + printf("random: entropy cache '%s' provides %d bytes\n", *entropy_file, PAGE_SIZE); + error = randomdev_write_file(*entropy_file, zbuf, PAGE_SIZE); + if (error == 0) { + printf("random: entropy cache '%s' contents used and successfully overwritten\n", *entropy_file); + for (i = 0; i < PAGE_SIZE; i += 16) + random_harvestq_internal(get_cyclecount(), data + i, 16, 16, RANDOM_CACHED); + } + else + printf("random: entropy cache '%s' not overwritten and therefore not used; error = %d\n", *entropy_file, error); } else printf("random: entropy cache '%s' not present or unreadable; error = %d\n", *entropy_file, error); @@ -126,7 +136,7 @@ random_harvestq_cache(void *arg __unused bzero(data, PAGE_SIZE); free(data, M_ENTROPY); } -EVENTHANDLER_DEFINE(multiuser, random_harvestq_cache, NULL, 0); +EVENTHANDLER_DEFINE(mountroot, random_harvestq_cache, NULL, 0); static void random_kthread(void *arg) Modified: projects/random_number_generator/sys/dev/random/rwfile.c ============================================================================== --- projects/random_number_generator/sys/dev/random/rwfile.c Tue Oct 8 04:52:40 2013 (r256134) +++ projects/random_number_generator/sys/dev/random/rwfile.c Tue Oct 8 06:54:52 2013 (r256135) @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$"); #include int -randomdev_read_file(const char *filename, void *buf) +randomdev_read_file(const char *filename, void *buf, size_t length) { struct nameidata nd; struct thread* td = curthread; @@ -55,8 +55,7 @@ randomdev_read_file(const char *filename if (nd.ni_vp->v_type != VREG) error = ENOEXEC; else - error = vn_rdwr(UIO_READ, nd.ni_vp, buf, PAGE_SIZE, 0, UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred, NOCRED, &resid, td); - + error = vn_rdwr(UIO_READ, nd.ni_vp, buf, length, 0, UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred, NOCRED, &resid, td); VOP_UNLOCK(nd.ni_vp, 0); vn_close(nd.ni_vp, FREAD, td->td_ucred, td); } @@ -65,7 +64,7 @@ randomdev_read_file(const char *filename } int -randomdev_write_file(const char *filename, void *buf) +randomdev_write_file(const char *filename, void *buf, size_t length) { struct nameidata nd; struct thread* td = curthread; @@ -81,7 +80,7 @@ randomdev_write_file(const char *filenam if (nd.ni_vp->v_type != VREG) error = ENOEXEC; else - error = vn_rdwr(UIO_WRITE, nd.ni_vp, buf, PAGE_SIZE, 0, UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred, NOCRED, &resid, td); + error = vn_rdwr(UIO_WRITE, nd.ni_vp, buf, length, 0, UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred, NOCRED, &resid, td); VOP_UNLOCK(nd.ni_vp, 0); vn_close(nd.ni_vp, FREAD, td->td_ucred, td); Modified: projects/random_number_generator/sys/dev/random/rwfile.h ============================================================================== --- projects/random_number_generator/sys/dev/random/rwfile.h Tue Oct 8 04:52:40 2013 (r256134) +++ projects/random_number_generator/sys/dev/random/rwfile.h Tue Oct 8 06:54:52 2013 (r256135) @@ -26,5 +26,5 @@ * $FreeBSD$ */ -int randomdev_read_file(const char *filename, void *buf); -int randomdev_write_file(const char *filename, void *buf); +int randomdev_read_file(const char *filename, void *buf, size_t); +int randomdev_write_file(const char *filename, void *buf, size_t); Modified: projects/random_number_generator/sys/kern/init_main.c ============================================================================== --- projects/random_number_generator/sys/kern/init_main.c Tue Oct 8 04:52:40 2013 (r256134) +++ projects/random_number_generator/sys/kern/init_main.c Tue Oct 8 06:54:52 2013 (r256135) @@ -847,8 +847,6 @@ kick_init(const void *udata __unused) { struct thread *td; - EVENTHANDLER_INVOKE(multiuser); - td = FIRST_THREAD_IN_PROC(initproc); thread_lock(td); TD_SET_CAN_RUN(td); Modified: projects/random_number_generator/sys/sys/eventhandler.h ============================================================================== --- projects/random_number_generator/sys/sys/eventhandler.h Tue Oct 8 04:52:40 2013 (r256134) +++ projects/random_number_generator/sys/sys/eventhandler.h Tue Oct 8 06:54:52 2013 (r256135) @@ -192,10 +192,6 @@ EVENTHANDLER_DECLARE(vm_lowmem, vm_lowme typedef void (*mountroot_handler_t)(void *); EVENTHANDLER_DECLARE(mountroot, mountroot_handler_t); -/* Going multiuser (starting pid 1) event */ -typedef void (*multiuser_handler_t)(void *); -EVENTHANDLER_DECLARE(multiuser, multiuser_handler_t); - /* File system mount events */ struct mount; struct vnode; From owner-svn-src-projects@FreeBSD.ORG Tue Oct 8 07:02:32 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 0581A76E; Tue, 8 Oct 2013 07:02:32 +0000 (UTC) (envelope-from markm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E46C12888; Tue, 8 Oct 2013 07:02:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9872Vwn024235; Tue, 8 Oct 2013 07:02:31 GMT (envelope-from markm@svn.freebsd.org) Received: (from markm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9872Ok8024177; Tue, 8 Oct 2013 07:02:24 GMT (envelope-from markm@svn.freebsd.org) Message-Id: <201310080702.r9872Ok8024177@svn.freebsd.org> From: Mark Murray Date: Tue, 8 Oct 2013 07:02:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256136 - in projects/random_number_generator: . cddl/contrib/opensolaris/cmd/zfs contrib/binutils/opcodes etc/rc.d lib/libutil libexec libexec/freebsd-version libexec/rtld-elf sbin/cam... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Oct 2013 07:02:32 -0000 Author: markm Date: Tue Oct 8 07:02:23 2013 New Revision: 256136 URL: http://svnweb.freebsd.org/changeset/base/256136 Log: MFC - tracking commit. Added: projects/random_number_generator/libexec/freebsd-version/ - copied from r256135, head/libexec/freebsd-version/ projects/random_number_generator/share/man/man9/VOP_ADVISE.9 - copied unchanged from r256135, head/share/man/man9/VOP_ADVISE.9 projects/random_number_generator/share/man/man9/VOP_ALLOCATE.9 - copied unchanged from r256135, head/share/man/man9/VOP_ALLOCATE.9 projects/random_number_generator/tools/regression/lib/libutil/test-humanize_number.c - copied unchanged from r256135, head/tools/regression/lib/libutil/test-humanize_number.c projects/random_number_generator/tools/regression/lib/libutil/test-humanize_number.t - copied unchanged from r256135, head/tools/regression/lib/libutil/test-humanize_number.t Modified: projects/random_number_generator/UPDATING projects/random_number_generator/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c projects/random_number_generator/contrib/binutils/opcodes/i386-dis.c projects/random_number_generator/contrib/binutils/opcodes/i386-opc.h projects/random_number_generator/contrib/binutils/opcodes/i386-opc.tbl projects/random_number_generator/contrib/binutils/opcodes/i386-tbl.h projects/random_number_generator/etc/rc.d/sshd projects/random_number_generator/lib/libutil/humanize_number.3 projects/random_number_generator/lib/libutil/humanize_number.c projects/random_number_generator/libexec/Makefile projects/random_number_generator/libexec/rtld-elf/rtld.c projects/random_number_generator/libexec/rtld-elf/rtld.h projects/random_number_generator/sbin/camcontrol/camcontrol.c projects/random_number_generator/sbin/camcontrol/fwdownload.c projects/random_number_generator/share/man/man4/altera_avgen.4 projects/random_number_generator/share/man/man4/rsu.4 projects/random_number_generator/share/man/man5/src.conf.5 projects/random_number_generator/share/man/man8/picobsd.8 projects/random_number_generator/share/man/man9/Makefile projects/random_number_generator/share/man/man9/VOP_FSYNC.9 projects/random_number_generator/share/man/man9/firmware.9 projects/random_number_generator/share/man/man9/vm_page_grab.9 projects/random_number_generator/share/man/man9/vnode.9 projects/random_number_generator/share/misc/bsd-family-tree projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c projects/random_number_generator/sys/dev/cxgbe/t4_sge.c projects/random_number_generator/sys/dev/isci/isci.c projects/random_number_generator/sys/dev/xen/control/control.c projects/random_number_generator/sys/i386/ibcs2/ibcs2_sysvec.c projects/random_number_generator/sys/i386/include/xen/xen-os.h projects/random_number_generator/sys/netinet6/ip6_mroute.c projects/random_number_generator/sys/ofed/include/rdma/ib_verbs.h projects/random_number_generator/sys/sys/elf_common.h projects/random_number_generator/sys/x86/include/stdarg.h projects/random_number_generator/tools/regression/lib/libutil/Makefile projects/random_number_generator/usr.bin/kdump/kdump.c Directory Properties: projects/random_number_generator/ (props changed) projects/random_number_generator/cddl/ (props changed) projects/random_number_generator/cddl/contrib/opensolaris/ (props changed) projects/random_number_generator/cddl/contrib/opensolaris/cmd/zfs/ (props changed) projects/random_number_generator/contrib/binutils/ (props changed) projects/random_number_generator/lib/libutil/ (props changed) projects/random_number_generator/sbin/ (props changed) projects/random_number_generator/share/man/man4/ (props changed) projects/random_number_generator/sys/ (props changed) projects/random_number_generator/sys/cddl/contrib/opensolaris/ (props changed) Modified: projects/random_number_generator/UPDATING ============================================================================== --- projects/random_number_generator/UPDATING Tue Oct 8 06:54:52 2013 (r256135) +++ projects/random_number_generator/UPDATING Tue Oct 8 07:02:23 2013 (r256136) @@ -31,6 +31,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20131006: + RCS has been removed from the base system. If you need RCS + install either devel/rcs or devel/rcs57. + 20130930: BIND has been removed from the base system. If all you need is a local resolver, simply enable and start the local_unbound Modified: projects/random_number_generator/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c ============================================================================== --- projects/random_number_generator/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Tue Oct 8 06:54:52 2013 (r256135) +++ projects/random_number_generator/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Tue Oct 8 07:02:23 2013 (r256136) @@ -58,6 +58,7 @@ #include #include #include +#include #include #include Modified: projects/random_number_generator/contrib/binutils/opcodes/i386-dis.c ============================================================================== --- projects/random_number_generator/contrib/binutils/opcodes/i386-dis.c Tue Oct 8 06:54:52 2013 (r256135) +++ projects/random_number_generator/contrib/binutils/opcodes/i386-dis.c Tue Oct 8 07:02:23 2013 (r256136) @@ -6438,14 +6438,22 @@ VMX_Fixup (int extrachar ATTRIBUTE_UNUSE static void OP_VMX (int bytemode, int sizeflag) { - used_prefixes |= (prefixes & (PREFIX_DATA | PREFIX_REPZ)); - if (prefixes & PREFIX_DATA) - strcpy (obuf, "vmclear"); - else if (prefixes & PREFIX_REPZ) - strcpy (obuf, "vmxon"); + if (modrm.mod == 3) + { + strcpy (obuf, "rdrand"); + OP_E (v_mode, sizeflag); + } else - strcpy (obuf, "vmptrld"); - OP_E (bytemode, sizeflag); + { + used_prefixes |= (prefixes & (PREFIX_DATA | PREFIX_REPZ)); + if (prefixes & PREFIX_DATA) + strcpy (obuf, "vmclear"); + else if (prefixes & PREFIX_REPZ) + strcpy (obuf, "vmxon"); + else + strcpy (obuf, "vmptrld"); + OP_E (bytemode, sizeflag); + } } static void Modified: projects/random_number_generator/contrib/binutils/opcodes/i386-opc.h ============================================================================== --- projects/random_number_generator/contrib/binutils/opcodes/i386-opc.h Tue Oct 8 06:54:52 2013 (r256135) +++ projects/random_number_generator/contrib/binutils/opcodes/i386-opc.h Tue Oct 8 07:02:23 2013 (r256136) @@ -79,6 +79,7 @@ typedef struct template #define CpuNo64 0x8000000 /* Not supported in the 64bit mode */ #define CpuPCLMUL 0x10000000 /* Carry-less Multiplication extensions */ +#define CpuRdRnd 0x20000000 /* Intel Random Number Generator extensions */ /* SSE4.1/4.2 Instructions required */ #define CpuSSE4 (CpuSSE4_1|CpuSSE4_2) @@ -87,7 +88,7 @@ typedef struct template #define CpuUnknownFlags (Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686 \ |CpuP4|CpuSledgehammer|CpuMMX|CpuMMX2|CpuSSE|CpuSSE2|CpuSSE3|CpuVMX \ |Cpu3dnow|Cpu3dnowA|CpuK6|CpuPadLock|CpuSVME|CpuSSSE3|CpuSSE4_1 \ - |CpuSSE4_2|CpuABM|CpuSSE4a|CpuXSAVE|CpuAES|CpuPCLMUL) + |CpuSSE4_2|CpuABM|CpuSSE4a|CpuXSAVE|CpuAES|CpuPCLMUL|CpuRdRnd) /* the bits in opcode_modifier are used to generate the final opcode from the base_opcode. These bits also are used to detect alternate forms of Modified: projects/random_number_generator/contrib/binutils/opcodes/i386-opc.tbl ============================================================================== --- projects/random_number_generator/contrib/binutils/opcodes/i386-opc.tbl Tue Oct 8 06:54:52 2013 (r256135) +++ projects/random_number_generator/contrib/binutils/opcodes/i386-opc.tbl Tue Oct 8 07:02:23 2013 (r256136) @@ -1502,3 +1502,21 @@ xrstor, 1, 0xfae, 0x5, CpuXSAVE, Modrm|N // INVPCID invpcid, 2, 0x660f3882, None, CpuNo64, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_sSuf|No_qSuf|No_xSuf|NoRex64, { BaseIndex|Disp8|Disp16|Disp32|Disp32S, Reg32 } invpcid, 2, 0x660f3882, None, Cpu64, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_sSuf|No_qSuf|No_xSuf|NoRex64, { BaseIndex|Disp8|Disp16|Disp32|Disp32S, Reg64 } + +// Intel AES extensions +aesdec, 2, 0x660f38de, None, CpuAES, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf, { RegXMM|LLongMem, RegXMM } +aesdeclast, 2, 0x660f38df, None, CpuAES, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf, { RegXMM|LLongMem, RegXMM } +aesenc, 2, 0x660f38dc, None, CpuAES, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf, { RegXMM|LLongMem, RegXMM } +aesenclast, 2, 0x660f38dd, None, CpuAES, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf, { RegXMM|LLongMem, RegXMM } +aesimc, 2, 0x660f38db, None, CpuAES, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf, { RegXMM|LLongMem, RegXMM } +aeskeygenassist, 3, 0x660f3adf, None, CpuAES, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf, { Imm8, RegXMM|LLongMem, RegXMM } + +// Intel Carry-less Multiplication extensions +pclmulqdq, 3, 0x660f3a44, None, CpuPCLMUL, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf, { Imm8, RegXMM|LLongMem, RegXMM } +pclmullqlqdq, 2, 0x660f3a44, 0x0, CpuPCLMUL, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf|ImmExt, { RegXMM|LLongMem, RegXMM } +pclmulhqlqdq, 2, 0x660f3a44, 0x1, CpuPCLMUL, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf|ImmExt, { RegXMM|LLongMem, RegXMM } +pclmullqhqdq, 2, 0x660f3a44, 0x10, CpuPCLMUL, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf|ImmExt, { RegXMM|LLongMem, RegXMM } +pclmulhqhqdq, 2, 0x660f3a44, 0x11, CpuPCLMUL, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf|ImmExt, { RegXMM|LLongMem, RegXMM } + +// Intel Random Number Generator extensions +rdrand, 1, 0x0fc7, 0x6, CpuRdRnd, Modrm|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf, { Reg16|Reg32|Reg64 } Modified: projects/random_number_generator/contrib/binutils/opcodes/i386-tbl.h ============================================================================== --- projects/random_number_generator/contrib/binutils/opcodes/i386-tbl.h Tue Oct 8 06:54:52 2013 (r256135) +++ projects/random_number_generator/contrib/binutils/opcodes/i386-tbl.h Tue Oct 8 07:02:23 2013 (r256136) @@ -4374,6 +4374,11 @@ const template i386_optab[] = Modrm|IgnoreSize|NoSuf|ImmExt, { RegXMM|LLongMem, RegXMM } }, + + /* Intel Random Number Generator extensions */ + {"rdrand", 1, 0x0fc7, 0x6, CpuRdRnd, + Modrm|NoSuf, + { Reg16|Reg32|Reg64 } }, { NULL, 0, 0, 0, 0, 0, { 0 } } }; Modified: projects/random_number_generator/etc/rc.d/sshd ============================================================================== --- projects/random_number_generator/etc/rc.d/sshd Tue Oct 8 06:54:52 2013 (r256135) +++ projects/random_number_generator/etc/rc.d/sshd Tue Oct 8 07:02:23 2013 (r256136) @@ -53,7 +53,7 @@ sshd_keygen_alg() fi if [ -f "${keyfile}" ] ; then - echo "$ALG host key exists." + info "$ALG host key exists." else echo "Generating $ALG host key." /usr/bin/ssh-keygen -q -t $alg -f "$keyfile" -N "" Modified: projects/random_number_generator/lib/libutil/humanize_number.3 ============================================================================== --- projects/random_number_generator/lib/libutil/humanize_number.3 Tue Oct 8 06:54:52 2013 (r256135) +++ projects/random_number_generator/lib/libutil/humanize_number.3 Tue Oct 8 07:02:23 2013 (r256136) @@ -28,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd Apr 12, 2011 +.Dd October 7, 2013 .Dt HUMANIZE_NUMBER 3 .Os .Sh NAME @@ -140,7 +140,7 @@ The following flags may be passed in .Fa flags : .Bl -tag -width ".Dv HN_DIVISOR_1000" -offset indent .It Dv HN_DECIMAL -If the final result is less than 10, display it using one digit. +If the final result is less than 10, display it using one decimal place. .It Dv HN_NOSPACE Do not put a space between .Fa number @@ -160,13 +160,18 @@ This flag has no effect when is also specified. .El .Sh RETURN VALUES -The -.Fn humanize_number -function returns the number of characters stored in +Upon success, the +.Nm +function returns the number of characters that would have been stored in .Fa buf (excluding the terminating .Dv NUL ) -upon success, or \-1 upon failure. +if +.Fa buf +was large enough, or \-1 upon failure. +Even upon failure, the contents of +.Fa buf +may be modified. If .Dv HN_GETSCALE is specified, the prefix index number will be returned instead. Modified: projects/random_number_generator/lib/libutil/humanize_number.c ============================================================================== --- projects/random_number_generator/lib/libutil/humanize_number.c Tue Oct 8 06:54:52 2013 (r256135) +++ projects/random_number_generator/lib/libutil/humanize_number.c Tue Oct 8 07:02:23 2013 (r256136) @@ -2,6 +2,7 @@ /* * Copyright (c) 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc. + * Copyright 2013 John-Mark Gurney * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation @@ -50,15 +51,26 @@ humanize_number(char *buf, size_t len, i { const char *prefixes, *sep; int i, r, remainder, s1, s2, sign; + int divisordeccut; int64_t divisor, max; size_t baselen; - assert(buf != NULL); - assert(suffix != NULL); - assert(scale >= 0); - assert(scale < maxscale || (((scale & (HN_AUTOSCALE | HN_GETSCALE)) != 0))); - assert(!((flags & HN_DIVISOR_1000) && (flags & HN_IEC_PREFIXES))); + /* Since so many callers don't check -1, NUL terminate the buffer */ + if (len > 0) + buf[0] = '\0'; + /* validate args */ + if (buf == NULL || suffix == NULL) + return (-1); + if (scale < 0) + return (-1); + else if (scale >= maxscale && + ((scale & ~(HN_AUTOSCALE|HN_GETSCALE)) != 0)) + return (-1); + if ((flags & HN_DIVISOR_1000) && (flags & HN_IEC_PREFIXES)) + return (-1); + + /* setup parameters */ remainder = 0; if (flags & HN_IEC_PREFIXES) { @@ -73,34 +85,32 @@ humanize_number(char *buf, size_t len, i * an assertion earlier). */ divisor = 1024; + divisordeccut = 973; /* ceil(.95 * 1024) */ if (flags & HN_B) prefixes = "B\0\0Ki\0Mi\0Gi\0Ti\0Pi\0Ei"; else prefixes = "\0\0\0Ki\0Mi\0Gi\0Ti\0Pi\0Ei"; } else { baselen = 1; - if (flags & HN_DIVISOR_1000) + if (flags & HN_DIVISOR_1000) { divisor = 1000; - else + divisordeccut = 950; + if (flags & HN_B) + prefixes = "B\0\0k\0\0M\0\0G\0\0T\0\0P\0\0E"; + else + prefixes = "\0\0\0k\0\0M\0\0G\0\0T\0\0P\0\0E"; + } else { divisor = 1024; - - if (flags & HN_B) - prefixes = "B\0\0k\0\0M\0\0G\0\0T\0\0P\0\0E"; - else - prefixes = "\0\0\0k\0\0M\0\0G\0\0T\0\0P\0\0E"; + divisordeccut = 973; /* ceil(.95 * 1024) */ + if (flags & HN_B) + prefixes = "B\0\0K\0\0M\0\0G\0\0T\0\0P\0\0E"; + else + prefixes = "\0\0\0K\0\0M\0\0G\0\0T\0\0P\0\0E"; + } } #define SCALE2PREFIX(scale) (&prefixes[(scale) * 3]) - if (scale < 0 || (scale >= maxscale && - (scale & (HN_AUTOSCALE | HN_GETSCALE)) == 0)) - return (-1); - - if (buf == NULL || suffix == NULL) - return (-1); - - if (len > 0) - buf[0] = '\0'; if (quotient < 0) { sign = -1; quotient = -quotient; @@ -132,8 +142,8 @@ humanize_number(char *buf, size_t len, i * divide once more. */ for (i = 0; - (quotient >= max || (quotient == max - 1 && remainder >= 950)) && - i < maxscale; i++) { + (quotient >= max || (quotient == max - 1 && + remainder >= divisordeccut)) && i < maxscale; i++) { remainder = quotient % divisor; quotient /= divisor; } @@ -148,20 +158,22 @@ humanize_number(char *buf, size_t len, i } /* If a value <= 9.9 after rounding and ... */ - if (quotient <= 9 && remainder < 950 && i > 0 && flags & HN_DECIMAL) { - /* baselen + \0 + .N */ - if (len < baselen + 1 + 2) - return (-1); - s1 = (int)quotient + ((remainder + 50) / 1000); - s2 = ((remainder + 50) / 100) % 10; + /* + * XXX - should we make sure there is enough space for the decimal + * place and if not, don't do HN_DECIMAL? + */ + if (((quotient == 9 && remainder < divisordeccut) || quotient < 9) && + i > 0 && flags & HN_DECIMAL) { + s1 = (int)quotient + ((remainder * 10 + divisor / 2) / + divisor / 10); + s2 = ((remainder * 10 + divisor / 2) / divisor) % 10; r = snprintf(buf, len, "%d%s%d%s%s%s", sign * s1, localeconv()->decimal_point, s2, sep, SCALE2PREFIX(i), suffix); } else r = snprintf(buf, len, "%" PRId64 "%s%s%s", - sign * (quotient + (remainder + 50) / 1000), + sign * (quotient + (remainder + divisor / 2) / divisor), sep, SCALE2PREFIX(i), suffix); return (r); } - Modified: projects/random_number_generator/libexec/Makefile ============================================================================== --- projects/random_number_generator/libexec/Makefile Tue Oct 8 06:54:52 2013 (r256135) +++ projects/random_number_generator/libexec/Makefile Tue Oct 8 07:02:23 2013 (r256136) @@ -8,6 +8,7 @@ SUBDIR= ${_atf} \ bootpd \ ${_comsat} \ fingerd \ + freebsd-version \ ftpd \ getty \ ${_mail.local} \ Modified: projects/random_number_generator/libexec/rtld-elf/rtld.c ============================================================================== --- projects/random_number_generator/libexec/rtld-elf/rtld.c Tue Oct 8 06:54:52 2013 (r256135) +++ projects/random_number_generator/libexec/rtld-elf/rtld.c Tue Oct 8 07:02:23 2013 (r256136) @@ -116,6 +116,7 @@ static Objlist_Entry *objlist_find(Objli static void objlist_init(Objlist *); static void objlist_push_head(Objlist *, Obj_Entry *); static void objlist_push_tail(Objlist *, Obj_Entry *); +static void objlist_put_after(Objlist *, Obj_Entry *, Obj_Entry *); static void objlist_remove(Objlist *, Obj_Entry *); static void *path_enumerate(const char *, path_enum_proc, void *); static int relocate_object_dag(Obj_Entry *root, bool bind_now, @@ -323,6 +324,7 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_ Objlist_Entry *entry; Obj_Entry *obj; Obj_Entry **preload_tail; + Obj_Entry *last_interposer; Objlist initlist; RtldLockState lockstate; char *library_path_rpath; @@ -537,8 +539,14 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_ die(); /* Make a list of all objects loaded at startup. */ + last_interposer = obj_main; for (obj = obj_list; obj != NULL; obj = obj->next) { - objlist_push_tail(&list_main, obj); + if (obj->z_interpose && obj != obj_main) { + objlist_put_after(&list_main, last_interposer, obj); + last_interposer = obj; + } else { + objlist_push_tail(&list_main, obj); + } obj->refcount++; } @@ -1128,6 +1136,8 @@ digest_dynamic1(Obj_Entry *obj, int earl obj->z_nodelete = true; if (dynp->d_un.d_val & DF_1_LOADFLTR) obj->z_loadfltr = true; + if (dynp->d_un.d_val & DF_1_INTERPOSE) + obj->z_interpose = true; if (dynp->d_un.d_val & DF_1_NODEFLIB) obj->z_nodeflib = true; break; @@ -1976,6 +1986,7 @@ static int load_preload_objects(void) { char *p = ld_preload; + Obj_Entry *obj; static const char delim[] = " \t:;"; if (p == NULL) @@ -1988,8 +1999,10 @@ load_preload_objects(void) savech = p[len]; p[len] = '\0'; - if (load_object(p, -1, NULL, 0) == NULL) + obj = load_object(p, -1, NULL, 0); + if (obj == NULL) return -1; /* XXX - cleanup */ + obj->z_interpose = true; p[len] = savech; p += len; p += strspn(p, delim); @@ -2378,6 +2391,23 @@ objlist_push_tail(Objlist *list, Obj_Ent } static void +objlist_put_after(Objlist *list, Obj_Entry *listobj, Obj_Entry *obj) +{ + Objlist_Entry *elm, *listelm; + + STAILQ_FOREACH(listelm, list, link) { + if (listelm->obj == listobj) + break; + } + elm = NEW(Objlist_Entry); + elm->obj = obj; + if (listelm != NULL) + STAILQ_INSERT_AFTER(list, listelm, elm, link); + else + STAILQ_INSERT_TAIL(list, elm, link); +} + +static void objlist_remove(Objlist *list, Obj_Entry *obj) { Objlist_Entry *elm; Modified: projects/random_number_generator/libexec/rtld-elf/rtld.h ============================================================================== --- projects/random_number_generator/libexec/rtld-elf/rtld.h Tue Oct 8 06:54:52 2013 (r256135) +++ projects/random_number_generator/libexec/rtld-elf/rtld.h Tue Oct 8 07:02:23 2013 (r256136) @@ -259,6 +259,7 @@ typedef struct Struct_Obj_Entry { bool z_nodelete : 1; /* Do not unload the object and dependencies */ bool z_noopen : 1; /* Do not load on dlopen */ bool z_loadfltr : 1; /* Immediately load filtees */ + bool z_interpose : 1; /* Interpose all objects but main */ bool z_nodeflib : 1; /* Don't search default library path */ bool ref_nodel : 1; /* Refcount increased to prevent dlclose */ bool init_scanned: 1; /* Object is already on init list. */ Modified: projects/random_number_generator/sbin/camcontrol/camcontrol.c ============================================================================== --- projects/random_number_generator/sbin/camcontrol/camcontrol.c Tue Oct 8 06:54:52 2013 (r256135) +++ projects/random_number_generator/sbin/camcontrol/camcontrol.c Tue Oct 8 07:02:23 2013 (r256136) @@ -2748,7 +2748,7 @@ atasecurity(struct cam_device *device, i if (strcasecmp(optarg, "user") == 0) { pwd.ctrl |= ATA_SECURITY_PASSWORD_USER; pwd.ctrl &= ~ATA_SECURITY_PASSWORD_MASTER; - } else if (strcasecmp(optarg, "master") != 0) { + } else if (strcasecmp(optarg, "master") == 0) { pwd.ctrl |= ATA_SECURITY_PASSWORD_MASTER; pwd.ctrl &= ~ATA_SECURITY_PASSWORD_USER; } else { Modified: projects/random_number_generator/sbin/camcontrol/fwdownload.c ============================================================================== --- projects/random_number_generator/sbin/camcontrol/fwdownload.c Tue Oct 8 06:54:52 2013 (r256135) +++ projects/random_number_generator/sbin/camcontrol/fwdownload.c Tue Oct 8 07:02:23 2013 (r256136) @@ -224,6 +224,7 @@ fw_read_img(const char *fw_img_path, con goto bailout; } *num_bytes = img_size; + close(fd); return (buf); bailout: free(buf); @@ -286,6 +287,7 @@ fw_download_img(struct cam_device *cam_d ata_28bit_cmd(&ccb->ataio, ATA_ATA_IDENTIFY, 0, 0, 0); } else { warnx("weird disk type '%s'", type); + cam_freeccb(ccb); return 1; } /* Disable freezing the device queue. */ Modified: projects/random_number_generator/share/man/man4/altera_avgen.4 ============================================================================== --- projects/random_number_generator/share/man/man4/altera_avgen.4 Tue Oct 8 06:54:52 2013 (r256135) +++ projects/random_number_generator/share/man/man4/altera_avgen.4 Tue Oct 8 07:02:23 2013 (r256136) @@ -56,11 +56,11 @@ entries configure the address, size, I/O .Pa /dev device node name that will be used. The -.Xr open , -.Xr read , -.Xr write , +.Xr open 2 , +.Xr read 2 , +.Xr write 2 , and -.Xr mmap +.Xr mmap 2 system calls (and variations) may be used on .Nm device nodes, subject to constraints imposed using Modified: projects/random_number_generator/share/man/man4/rsu.4 ============================================================================== --- projects/random_number_generator/share/man/man4/rsu.4 Tue Oct 8 06:54:52 2013 (r256135) +++ projects/random_number_generator/share/man/man4/rsu.4 Tue Oct 8 07:02:23 2013 (r256136) @@ -35,9 +35,9 @@ place the following lines in your kernel .Pp Alternatively, to load the driver as a module at boot time, place the following line in -.Xr loader.conf 5: +.Xr loader.conf 5 : .Bd -literal -offset indent -.Xr if_rsu_load="YES" +if_rsu_load="YES" .Ed .Pp After you have read the license in /usr/share/doc/legal/realtek Modified: projects/random_number_generator/share/man/man5/src.conf.5 ============================================================================== --- projects/random_number_generator/share/man/man5/src.conf.5 Tue Oct 8 06:54:52 2013 (r256135) +++ projects/random_number_generator/share/man/man5/src.conf.5 Tue Oct 8 07:02:23 2013 (r256136) @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. -.\" from FreeBSD: head/tools/build/options/makeman 253304 2013-07-12 23:08:44Z bapt +.\" from FreeBSD: head/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des .\" $FreeBSD$ -.Dd September 30, 2013 +.Dd October 6, 2013 .Dt SRC.CONF 5 .Os .Sh NAME @@ -200,7 +200,7 @@ When set, it also enforces the following Set to not build the Clang C/C++ compiler. .Pp It is a default setting on -arm/armeb, arm/armv6eb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32 and sparc64/sparc64. +arm/armeb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32 and sparc64/sparc64. When set, it also enforces the following options: .Pp .Bl -item -compact @@ -228,7 +228,7 @@ Set to avoid building the ARCMigrate, Re the Clang C/C++ compiler. .Pp It is a default setting on -arm/arm, arm/armeb, arm/armv6, arm/armv6eb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32 and sparc64/sparc64. +arm/arm, arm/armeb, arm/armv6, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32 and sparc64/sparc64. .It Va WITH_CLANG_FULL .\" from FreeBSD: head/tools/build/options/WITH_CLANG_FULL 246259 2013-02-02 22:28:29Z dim Set to build the ARCMigrate, Rewriter and StaticAnalyzer components of the @@ -245,7 +245,7 @@ and .Pa /usr/bin/cpp . .Pp It is a default setting on -arm/armeb, arm/armv6eb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64. +arm/armeb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64. When set, it also enforces the following options: .Pp .Bl -item -compact @@ -369,7 +369,7 @@ Set to build Flattened Device Tree suppo This includes the device tree compiler (dtc) and libfdt support library. .Pp It is a default setting on -arm/arm, arm/armeb, arm/armv6, arm/armv6eb, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc and powerpc/powerpc64. +arm/arm, arm/armeb, arm/armv6, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc and powerpc/powerpc64. .It Va WITHOUT_FLOPPY .\" from FreeBSD: head/tools/build/options/WITHOUT_FLOPPY 221540 2011-05-06 19:13:03Z ru Set to not build or install programs @@ -406,7 +406,7 @@ amd64/amd64, arm/arm, arm/armv6 and i386 Set to build and install gcc and g++. .Pp It is a default setting on -arm/armeb, arm/armv6eb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, pc98/i386, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64. +arm/armeb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, pc98/i386, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64. .It Va WITHOUT_GCOV .\" from FreeBSD: head/tools/build/options/WITHOUT_GCOV 156932 2006-03-21 07:50:50Z ru Set to not build the @@ -443,7 +443,7 @@ Build the GNU C++ stack (g++, libstdc++) This is the default on platforms where gcc is the system compiler. .Pp It is a default setting on -arm/armeb, arm/armv6eb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64. +arm/armeb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64. .It Va WITHOUT_GNU_SUPPORT .\" from FreeBSD: head/tools/build/options/WITHOUT_GNU_SUPPORT 156932 2006-03-21 07:50:50Z ru Set to build some programs without optional GNU support. @@ -909,11 +909,6 @@ This includes .Xr rlogin 1 , .Xr rsh 1 , etc. -.It Va WITHOUT_RCS -.\" from FreeBSD: head/tools/build/options/WITHOUT_RCS 156932 2006-03-21 07:50:50Z ru -Set to not build -.Xr rcs 1 -and related utilities. .It Va WITHOUT_RESCUE .\" from FreeBSD: head/tools/build/options/WITHOUT_RESCUE 156932 2006-03-21 07:50:50Z ru Set to not build Modified: projects/random_number_generator/share/man/man8/picobsd.8 ============================================================================== --- projects/random_number_generator/share/man/man8/picobsd.8 Tue Oct 8 06:54:52 2013 (r256135) +++ projects/random_number_generator/share/man/man8/picobsd.8 Tue Oct 8 07:02:23 2013 (r256136) @@ -20,7 +20,7 @@ utility is a script which produces a min which typically fits on a small media such as a floppy disk, or can be downloaded as a single image file from some media such as CDROM, flash memory, or through -.Xr etherboot . +etherboot. .Pp The .Nm @@ -64,7 +64,7 @@ kernel. This is the default behaviour, and is extremely useful as the kernel itself can be loaded, using -.Xr etherboot +etherboot or .Xr pxeboot 8 , .\" @@ -378,9 +378,7 @@ If the build is successful, the director .Pa build_dir-bridge/ will contain a .Pa kernel -that can be downloaded with -.Xr etherboot , -a floppy image called +that can be downloaded with etherboot, a floppy image called .Pa picobsd.bin , plus the products of the compilation in other directories. If you want to modify the source tree in @@ -480,9 +478,7 @@ Booting from a floppy is normally rather minutes), things are much faster if you store your image on a hard disk, Compact Flash, or CDROM. .Pp -You can also use -.Xr etherboot -to load the preloaded, uncompressed kernel image +You can also use etherboot to load the preloaded, uncompressed kernel image which is a byproduct of the .Nm build. Modified: projects/random_number_generator/share/man/man9/Makefile ============================================================================== --- projects/random_number_generator/share/man/man9/Makefile Tue Oct 8 06:54:52 2013 (r256135) +++ projects/random_number_generator/share/man/man9/Makefile Tue Oct 8 07:02:23 2013 (r256136) @@ -343,7 +343,9 @@ MAN= accept_filter.9 \ vnode.9 \ VOP_ACCESS.9 \ VOP_ACLCHECK.9 \ + VOP_ADVISE.9 \ VOP_ADVLOCK.9 \ + VOP_ALLOCATE.9 \ VOP_ATTRIB.9 \ VOP_BWRITE.9 \ VOP_CREATE.9 \ Copied: projects/random_number_generator/share/man/man9/VOP_ADVISE.9 (from r256135, head/share/man/man9/VOP_ADVISE.9) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/random_number_generator/share/man/man9/VOP_ADVISE.9 Tue Oct 8 07:02:23 2013 (r256136, copy of r256135, head/share/man/man9/VOP_ADVISE.9) @@ -0,0 +1,88 @@ +.\" -*- nroff -*- +.\" +.\" Copyright (c) 2013 Advanced Computing Technologies LLC +.\" Written by: John H. Baldwin +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd October 3, 2013 +.Dt VOP_ADVISE 9 +.Os +.Sh NAME +.Nm VOP_ADVISE +.Nd apply advice about use of file data +.Sh SYNOPSIS +.In sys/param.h +.In sys/vnode.h +.Ft int +.Fn VOP_ADVISE "struct vnode *vp" "off_t start" "off_t end" "int advice" +.Sh DESCRIPTION +This call applies advice for a range of a file's data. +It is used to implement the +.Xr posix_fadvise +system call. +.Pp +Its arguments are: +.Bl -tag -width offset +.It Fa vp +The vnode of the file. +.It Fa start +The start of the range of file data. +.It Fa end +The end of the range of file data. +.It Fa advice +The type of operation to apply to the file data. +Possible values are: +.Bl -tag -width POSIX_FADV_WILLNEED +.It Dv POSIX_FADV_WILLNEED +Initiate an asynchronous read of the file data if it is not already resident. +.It Dv POSIX_FADV_DONTNEED +Decrease the in-memory priority of clean file data or discard clean file data. +.El +.El +.Pp +If the +.Fa start +and +.Fa end +offsets are both zero, +then the operation should be applied to the entire file. +Note that this call is advisory only and may perform the requested +operation on a subset of the requested range +.Pq including not performing it at all +and still return success. +.Sh LOCKS +The file should be unlocked on entry. +.Sh RETURN VALUES +Zero is returned if the call is successful, otherwise an appropriate +error code is returned. +.Sh ERRORS +.Bl -tag -width Er +.It Bq Er EINVAL +An invalid value was given for +.Fa advice . +.El +.Sh SEE ALSO +.Xr vnode 9 Copied: projects/random_number_generator/share/man/man9/VOP_ALLOCATE.9 (from r256135, head/share/man/man9/VOP_ALLOCATE.9) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/random_number_generator/share/man/man9/VOP_ALLOCATE.9 Tue Oct 8 07:02:23 2013 (r256136, copy of r256135, head/share/man/man9/VOP_ALLOCATE.9) @@ -0,0 +1,84 @@ +.\" -*- nroff -*- +.\" +.\" Copyright (c) 2013 Advanced Computing Technologies LLC +.\" Written by: John H. Baldwin +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd October 3, 2013 +.Dt VOP_ALLOCATE 9 +.Os +.Sh NAME +.Nm VOP_ALLOCATE +.Nd allocate storage for a file +.Sh SYNOPSIS +.In sys/param.h +.In sys/vnode.h +.Ft int +.Fn VOP_ALLOCATE "struct vnode *vp" "off_t *offset" "off_t *len" +.Sh DESCRIPTION +This call allocates storage for a range of offsets in a file. +It is used to implement the +.Xr posix_fallocate +system call. +.Pp +Its arguments are: +.Bl -tag -width offset +.It Fa vp +The vnode of the file. +.It Fa offset +The start of the range to allocate storage for in the file. +.It Fa len +The length of the range to allocate storage for in the file. +.El +.Pp +The +.Fa offset +and +.Fa len +arguments are updated to reflect the portion of the range that +still needs to be allocated on return. +A partial allocation is considered a successful operation. +The file's contents are not changed. +.Sh LOCKS +The file should be exclusively locked on entry and will still be locked on exit. +.Sh RETURN VALUES +Zero is returned if the call is successful, otherwise an appropriate +error code is returned. +.Sh ERRORS +.Bl -tag -width Er +.It Bq Er EFBIG +An attempt was made to write a file that exceeds the process's file size +limit or the maximum file size. +.It Bq Er ENOSPC +The file system is full. +.It Bq Er EPERM +An append-only flag is set on the file, but the caller is attempting to +write before the current end of file. +.El +.Sh SEE ALSO +.Xr vnode 9 , +.Xr VOP_READ 9 , +.Xr VOP_WRITE 9 Modified: projects/random_number_generator/share/man/man9/VOP_FSYNC.9 ============================================================================== --- projects/random_number_generator/share/man/man9/VOP_FSYNC.9 Tue Oct 8 06:54:52 2013 (r256135) +++ projects/random_number_generator/share/man/man9/VOP_FSYNC.9 Tue Oct 8 07:02:23 2013 (r256136) @@ -65,15 +65,6 @@ Push data not written by file system syn .It Fa td The calling thread. .El -.Pp -The argument -.Fa waitfor -is either -.Dv MNT_WAIT -or -.Dv MNT_NOWAIT -and specifies whether or not the function should wait for the writes -to finish before returning. .Sh LOCKS The file should be locked on entry. .Sh RETURN VALUES Modified: projects/random_number_generator/share/man/man9/firmware.9 ============================================================================== --- projects/random_number_generator/share/man/man9/firmware.9 Tue Oct 8 06:54:52 2013 (r256135) +++ projects/random_number_generator/share/man/man9/firmware.9 Tue Oct 8 07:02:23 2013 (r256136) @@ -254,8 +254,8 @@ IxNpeMicrocode.dat .Pp Note that generating the firmware modules in this way requires the availability of the following tools: -.Xr awk , -.Xr make , +.Xr awk 1 , +.Xr make 1 , the compiler and the linker. .Sh SEE ALSO .Xr kld 4 , Modified: projects/random_number_generator/share/man/man9/vm_page_grab.9 ============================================================================== --- projects/random_number_generator/share/man/man9/vm_page_grab.9 Tue Oct 8 06:54:52 2013 (r256135) +++ projects/random_number_generator/share/man/man9/vm_page_grab.9 Tue Oct 8 07:02:23 2013 (r256136) @@ -64,7 +64,7 @@ function sleeps for any reason, the obje The .Fn vm_page_grab supports all of the flags supported by -.Xr vm_page_alloc . +.Xr vm_page_alloc 9 . In addition, .Fn vm_page_grab supports the following flags: Modified: projects/random_number_generator/share/man/man9/vnode.9 ============================================================================== --- projects/random_number_generator/share/man/man9/vnode.9 Tue Oct 8 06:54:52 2013 (r256135) +++ projects/random_number_generator/share/man/man9/vnode.9 Tue Oct 8 07:02:23 2013 (r256136) @@ -163,7 +163,9 @@ intertwining of VM Objects and Vnodes. .Xr malloc 9 , .Xr VOP_ACCESS 9 , .Xr VOP_ACLCHECK 9 , +.Xr VOP_ADVISE 9 , .Xr VOP_ADVLOCK 9 , +.Xr VOP_ALLOCATE 9 , .Xr VOP_ATTRIB 9 , .Xr VOP_BWRITE 9 , .Xr VOP_CREATE 9 , Modified: projects/random_number_generator/share/misc/bsd-family-tree ============================================================================== --- projects/random_number_generator/share/misc/bsd-family-tree Tue Oct 8 06:54:52 2013 (r256135) +++ projects/random_number_generator/share/misc/bsd-family-tree Tue Oct 8 07:02:23 2013 (r256136) @@ -270,17 +270,23 @@ FreeBSD 5.2 | | | | | | | | \ | | | | | | | | NetBSD | | | | | | | | 6.0.1 | | + | | | | | | | | | + | | | | | | NetBSD | | + | | | | | | 6.0.2 | | | | | | | | | OpenBSD 5.3 DragonFly 3.4.1 | | | | | | NetBSD | | | | | | | | 6.0.2 | | | | | | | | | | - | | | | | `-NetBSD 6.1 | | - | | FreeBSD | | | | - | | 8.4 | | | | - | | | | | | - | FreeBSD | | | | + | | | | | |`-NetBSD 6.1 | | + | | FreeBSD | | | | | + | | 8.4 | | NetBSD 6.1.1 | | + | | | | | | | + | FreeBSD | | NetBSD 6.1.2 | | | 9.2 | | | | | | | | | + | | | | | + | | | | | + | | | | | FreeBSD 10 -current | NetBSD -current OpenBSD -current | | | | | | v v v v v @@ -588,9 +594,12 @@ OpenBSD 5.3 2013-05-01 [OBD] NetBSD 6.0.2 2013-05-18 [NBD] (security/critical release) NetBSD 6.1 2013-05-18 [NBD] FreeBSD 8.4 2013-06-07 [FBD] +NetBSD 6.1.1 2013-08-22 [NBD] NetBSD 5.1.3 2013-09-29 [NBD] NetBSD 5.2.1 2013-09-29 [NBD] FreeBSD 9.2 2013-09-30 [FBD] +NetBSD 6.0.3 2013-09-30 [NBD] +NetBSD 6.1.2 2013-09-30 [NBD] Bibliography ------------------------ Modified: projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c ============================================================================== --- projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c Tue Oct 8 06:54:52 2013 (r256135) +++ projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c Tue Oct 8 07:02:23 2013 (r256136) @@ -117,7 +117,9 @@ lzjb_decompress(void *s_start, void *d_s src += 2; if ((cpy = dst - offset) < (uchar_t *)d_start) return (-1); - while (--mlen >= 0 && dst < d_end) + if (mlen > (d_end - dst)) + mlen = d_end - dst; + while (--mlen >= 0) *dst++ = *cpy++; } else { *dst++ = *src++; Modified: projects/random_number_generator/sys/dev/cxgbe/t4_sge.c ============================================================================== --- projects/random_number_generator/sys/dev/cxgbe/t4_sge.c Tue Oct 8 06:54:52 2013 (r256135) +++ projects/random_number_generator/sys/dev/cxgbe/t4_sge.c Tue Oct 8 07:02:23 2013 (r256136) @@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include "common/common.h" #include "common/t4_regs.h" @@ -215,10 +216,6 @@ static int handle_fw_msg(struct sge_iq * static int sysctl_uint16(SYSCTL_HANDLER_ARGS); -#if defined(__i386__) || defined(__amd64__) -extern u_int cpu_clflush_line_size; -#endif - /* * Called on MOD_LOAD. Validates and calculates the SGE tunables. */ Modified: projects/random_number_generator/sys/dev/isci/isci.c ============================================================================== --- projects/random_number_generator/sys/dev/isci/isci.c Tue Oct 8 06:54:52 2013 (r256135) +++ projects/random_number_generator/sys/dev/isci/isci.c Tue Oct 8 07:02:23 2013 (r256136) @@ -84,6 +84,7 @@ static driver_t isci_pci_driver = { }; DRIVER_MODULE(isci, pci, isci_pci_driver, isci_devclass, 0, 0); +MODULE_DEPEND(isci, cam, 1, 1, 1); static struct _pcsid { Modified: projects/random_number_generator/sys/dev/xen/control/control.c ============================================================================== --- projects/random_number_generator/sys/dev/xen/control/control.c Tue Oct 8 06:54:52 2013 (r256135) +++ projects/random_number_generator/sys/dev/xen/control/control.c Tue Oct 8 07:02:23 2013 (r256136) @@ -371,6 +371,7 @@ xctrl_suspend() mtx_unlock(&Giant); #ifdef SMP + CPU_ZERO(&cpu_suspend_map); /* silence gcc */ if (smp_started) { /* * Suspend other CPUs. This prevents IPIs while we Modified: projects/random_number_generator/sys/i386/ibcs2/ibcs2_sysvec.c ============================================================================== --- projects/random_number_generator/sys/i386/ibcs2/ibcs2_sysvec.c Tue Oct 8 06:54:52 2013 (r256135) +++ projects/random_number_generator/sys/i386/ibcs2/ibcs2_sysvec.c Tue Oct 8 07:02:23 2013 (r256136) @@ -54,8 +54,6 @@ MODULE_VERSION(ibcs2, 1); extern int bsd_to_ibcs2_errno[]; extern struct sysent ibcs2_sysent[IBCS2_SYS_MAXSYSCALL]; -extern int szsigcode; -extern char sigcode[]; static int ibcs2_fixup(register_t **, struct image_params *); struct sysentvec ibcs2_svr3_sysvec = { Modified: projects/random_number_generator/sys/i386/include/xen/xen-os.h ============================================================================== --- projects/random_number_generator/sys/i386/include/xen/xen-os.h Tue Oct 8 06:54:52 2013 (r256135) +++ projects/random_number_generator/sys/i386/include/xen/xen-os.h Tue Oct 8 07:02:23 2013 (r256136) @@ -37,9 +37,6 @@ /* Everything below this point is not included by assembler (.S) files. */ #ifndef __ASSEMBLY__ -/* Force a proper event-channel callback from Xen. */ -void force_evtchn_callback(void); - /* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */ static inline void rep_nop(void) { Modified: projects/random_number_generator/sys/netinet6/ip6_mroute.c ============================================================================== --- projects/random_number_generator/sys/netinet6/ip6_mroute.c Tue Oct 8 06:54:52 2013 (r256135) +++ projects/random_number_generator/sys/netinet6/ip6_mroute.c Tue Oct 8 07:02:23 2013 (r256136) @@ -616,7 +616,7 @@ X_ip6_mrouter_done(void) for (rte = rt->mf6c_stall; rte != NULL; ) { struct rtdetq *n = rte->next; - m_free(rte->m); + m_freem(rte->m); free(rte, M_MRTABLE6); rte = n; } Modified: projects/random_number_generator/sys/ofed/include/rdma/ib_verbs.h ============================================================================== --- projects/random_number_generator/sys/ofed/include/rdma/ib_verbs.h Tue Oct 8 06:54:52 2013 (r256135) +++ projects/random_number_generator/sys/ofed/include/rdma/ib_verbs.h Tue Oct 8 07:02:23 2013 (r256136) @@ -660,7 +660,7 @@ struct ib_qp_init_attr { union { struct ib_qp *qpg_parent; /* see qpg_type */ struct ib_qpg_init_attrib parent_attrib; - }; + } pp; enum ib_sig_type sq_sig_type; enum ib_qp_type qp_type; enum ib_qp_create_flags create_flags; Modified: projects/random_number_generator/sys/sys/elf_common.h ============================================================================== --- projects/random_number_generator/sys/sys/elf_common.h Tue Oct 8 06:54:52 2013 (r256135) +++ projects/random_number_generator/sys/sys/elf_common.h Tue Oct 8 07:02:23 2013 (r256136) @@ -487,6 +487,7 @@ typedef struct { #define DF_1_LOADFLTR 0x00000010 /* Immediate loading of filtees */ #define DF_1_NOOPEN 0x00000040 /* Do not allow loading on dlopen() */ #define DF_1_ORIGIN 0x00000080 /* Process $ORIGIN */ +#define DF_1_INTERPOSE 0x00000400 /* Interpose all objects but main */ #define DF_1_NODEFLIB 0x00000800 /* Do not search default paths */ /* Values for n_type. Used in core files. */ Modified: projects/random_number_generator/sys/x86/include/stdarg.h ============================================================================== --- projects/random_number_generator/sys/x86/include/stdarg.h Tue Oct 8 06:54:52 2013 (r256135) +++ projects/random_number_generator/sys/x86/include/stdarg.h Tue Oct 8 07:02:23 2013 (r256136) @@ -64,6 +64,8 @@ typedef __va_list va_list; (((sizeof(type) + sizeof(long) - 1) / sizeof(long)) * sizeof(long)) #define va_start(ap, last) \ ((ap) = (va_list)&(last) + __va_size(last)) +#define va_copy(dst, src) \ + ((dst) = (src)) #define va_arg(ap, type) \ (*(type *)((ap) += __va_size(type), (ap) - __va_size(type))) #define va_end(ap) Modified: projects/random_number_generator/tools/regression/lib/libutil/Makefile ============================================================================== --- projects/random_number_generator/tools/regression/lib/libutil/Makefile Tue Oct 8 06:54:52 2013 (r256135) +++ projects/random_number_generator/tools/regression/lib/libutil/Makefile Tue Oct 8 07:02:23 2013 (r256136) @@ -1,6 +1,7 @@ # $FreeBSD$ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Tue Oct 8 11:05:28 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id AF38AA11; Tue, 8 Oct 2013 11:05:28 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9C94928C6; Tue, 8 Oct 2013 11:05:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r98B5StG049530; Tue, 8 Oct 2013 11:05:28 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r98B5RmC049521; Tue, 8 Oct 2013 11:05:27 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201310081105.r98B5RmC049521@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Tue, 8 Oct 2013 11:05:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256138 - in projects/random_number_generator/sys: conf dev/random kern modules/random sys X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Oct 2013 11:05:28 -0000 Author: des Date: Tue Oct 8 11:05:26 2013 New Revision: 256138 URL: http://svnweb.freebsd.org/changeset/base/256138 Log: Add YARROW_RNG and FORTUNA_RNG to sys/conf/options. Add a SYSINIT that forces a reseed during proc0 setup, which happens fairly late in the boot process. Add a RANDOM_DEBUG option which enables some debugging printf()s. Add a new RANDOM_ATTACH entropy source which harvests entropy from the get_cyclecount() delta across each call to a device attach method. Modified: projects/random_number_generator/sys/conf/options projects/random_number_generator/sys/dev/random/random_adaptors.c projects/random_number_generator/sys/dev/random/randomdev_soft.c projects/random_number_generator/sys/dev/random/yarrow.c projects/random_number_generator/sys/kern/subr_bus.c projects/random_number_generator/sys/modules/random/Makefile projects/random_number_generator/sys/sys/random.h Modified: projects/random_number_generator/sys/conf/options ============================================================================== --- projects/random_number_generator/sys/conf/options Tue Oct 8 08:16:17 2013 (r256137) +++ projects/random_number_generator/sys/conf/options Tue Oct 8 11:05:26 2013 (r256138) @@ -904,3 +904,8 @@ RACCT opt_global.h # Resource Limits RCTL opt_global.h + +# Random number generator(s) +YARROW_RNG opt_random.h +FORTUNA_RNG opt_random.h +RANDOM_DEBUG opt_random.h Modified: projects/random_number_generator/sys/dev/random/random_adaptors.c ============================================================================== --- projects/random_number_generator/sys/dev/random/random_adaptors.c Tue Oct 8 08:16:17 2013 (r256137) +++ projects/random_number_generator/sys/dev/random/random_adaptors.c Tue Oct 8 11:05:26 2013 (r256138) @@ -227,3 +227,17 @@ SYSINIT(random_adaptors, SI_SUB_DRIVERS, NULL); SYSUNINIT(random_adaptors, SI_SUB_DRIVERS, SI_ORDER_FIRST, random_adaptors_deinit, NULL); + +static void +random_adaptors_reseed(void *unused) +{ + + (void)unused; + if (random_adaptor != NULL) { + (*random_adaptor->reseed)(); + random_adaptor->seeded = 1; + } + arc4rand(NULL, 0, 1); +} +SYSINIT(random_reseed, SI_SUB_INTRINSIC_POST, SI_ORDER_SECOND, + random_adaptors_reseed, NULL); Modified: projects/random_number_generator/sys/dev/random/randomdev_soft.c ============================================================================== --- projects/random_number_generator/sys/dev/random/randomdev_soft.c Tue Oct 8 08:16:17 2013 (r256137) +++ projects/random_number_generator/sys/dev/random/randomdev_soft.c Tue Oct 8 11:05:26 2013 (r256138) @@ -26,11 +26,16 @@ * */ +#include "opt_random.h" + #if !defined(YARROW_RNG) && !defined(FORTUNA_RNG) #define YARROW_RNG #elif defined(YARROW_RNG) && defined(FORTUNA_RNG) #error "Must define either YARROW_RNG or FORTUNA_RNG" #endif +#if defined(FORTUNA_RNG) +#error "Fortuna is not yet implemented" +#endif #include __FBSDID("$FreeBSD$"); Modified: projects/random_number_generator/sys/dev/random/yarrow.c ============================================================================== --- projects/random_number_generator/sys/dev/random/yarrow.c Tue Oct 8 08:16:17 2013 (r256137) +++ projects/random_number_generator/sys/dev/random/yarrow.c Tue Oct 8 11:05:26 2013 (r256138) @@ -28,6 +28,8 @@ #include __FBSDID("$FreeBSD$"); +#include "opt_random.h" + #include #include #include @@ -398,5 +400,17 @@ generator_gate(void) void random_yarrow_reseed(void) { +#ifdef RANDOM_DEBUG + int i; + + printf("%s(): fast:", __func__); + for (i = RANDOM_START; i < ENTROPYSOURCE; ++i) + printf(" %d", random_state.pool[FAST].source[i].bits); + printf("\n"); + printf("%s(): slow:", __func__); + for (i = RANDOM_START; i < ENTROPYSOURCE; ++i) + printf(" %d", random_state.pool[SLOW].source[i].bits); + printf("\n"); +#endif reseed(SLOW); } Modified: projects/random_number_generator/sys/kern/subr_bus.c ============================================================================== --- projects/random_number_generator/sys/kern/subr_bus.c Tue Oct 8 08:16:17 2013 (r256137) +++ projects/random_number_generator/sys/kern/subr_bus.c Tue Oct 8 11:05:26 2013 (r256138) @@ -28,6 +28,7 @@ __FBSDID("$FreeBSD$"); #include "opt_bus.h" +#include "opt_random.h" #include #include @@ -44,6 +45,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -55,6 +57,7 @@ __FBSDID("$FreeBSD$"); #include +#include #include #include @@ -2766,6 +2769,7 @@ device_probe_and_attach(device_t dev) int device_attach(device_t dev) { + uint64_t attachtime; int error; if (resource_disabled(dev->driver->name, dev->unit)) { @@ -2778,6 +2782,7 @@ device_attach(device_t dev) device_sysctl_init(dev); if (!device_is_quiet(dev)) device_print_child(dev->parent, dev); + attachtime = get_cyclecount(); dev->state = DS_ATTACHING; if ((error = DEVICE_ATTACH(dev)) != 0) { printf("device_attach: %s%d attach returned %d\n", @@ -2790,6 +2795,17 @@ device_attach(device_t dev) dev->state = DS_NOTPRESENT; return (error); } + attachtime = get_cyclecount() - attachtime; + /* + * 4 bits per device is a reasonable value for desktop and server + * hardware with good get_cyclecount() implementations, but may + * need to be adjusted on other platforms. + */ +#ifdef RANDOM_DEBUG + printf("%s(): feeding %d bit(s) of entropy from %s%d\n", + __func__, 4, dev->driver->name, dev->unit); +#endif + random_harvest(&attachtime, sizeof(attachtime), 4, RANDOM_ATTACH); device_sysctl_update(dev); if (dev->busy) dev->state = DS_BUSY; Modified: projects/random_number_generator/sys/modules/random/Makefile ============================================================================== --- projects/random_number_generator/sys/modules/random/Makefile Tue Oct 8 08:16:17 2013 (r256137) +++ projects/random_number_generator/sys/modules/random/Makefile Tue Oct 8 11:05:26 2013 (r256138) @@ -12,7 +12,7 @@ SRCS+= ivy.c .endif SRCS+= randomdev_soft.c yarrow.c hash.c SRCS+= rijndael-alg-fst.c rijndael-api-fst.c sha2.c -SRCS+= bus_if.h device_if.h vnode_if.h opt_cpu.h +SRCS+= bus_if.h device_if.h vnode_if.h opt_cpu.h opt_random.h CFLAGS+= -I${.CURDIR}/../.. Modified: projects/random_number_generator/sys/sys/random.h ============================================================================== --- projects/random_number_generator/sys/sys/random.h Tue Oct 8 08:16:17 2013 (r256137) +++ projects/random_number_generator/sys/sys/random.h Tue Oct 8 11:05:26 2013 (r256138) @@ -46,6 +46,7 @@ enum esource { RANDOM_NET_ETHER, RANDOM_NET_NG, RANDOM_INTERRUPT, + RANDOM_ATTACH, RANDOM_SWI, RANDOM_PURE_OCTEON, RANDOM_PURE_SAFE, From owner-svn-src-projects@FreeBSD.ORG Tue Oct 8 14:10:32 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id C1CAC1B6; Tue, 8 Oct 2013 14:10:32 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 96727262D; Tue, 8 Oct 2013 14:10:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r98EAWPv046652; Tue, 8 Oct 2013 14:10:32 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r98EAWuG046651; Tue, 8 Oct 2013 14:10:32 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201310081410.r98EAWuG046651@svn.freebsd.org> From: Gleb Smirnoff Date: Tue, 8 Oct 2013 14:10:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256150 - projects/ifnet X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Oct 2013 14:10:32 -0000 Author: glebius Date: Tue Oct 8 14:10:32 2013 New Revision: 256150 URL: http://svnweb.freebsd.org/changeset/base/256150 Log: ifnet cleanup project Added: - copied from r256149, head/ Directory Properties: projects/ifnet/ (props changed) From owner-svn-src-projects@FreeBSD.ORG Tue Oct 8 18:48:12 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 430C49D3; Tue, 8 Oct 2013 18:48:12 +0000 (UTC) (envelope-from markm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2114427D7; Tue, 8 Oct 2013 18:48:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r98ImBLF092667; Tue, 8 Oct 2013 18:48:12 GMT (envelope-from markm@svn.freebsd.org) Received: (from markm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r98ImBOA092666; Tue, 8 Oct 2013 18:48:11 GMT (envelope-from markm@svn.freebsd.org) Message-Id: <201310081848.r98ImBOA092666@svn.freebsd.org> From: Mark Murray Date: Tue, 8 Oct 2013 18:48:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256159 - projects/random_number_generator/sys/dev/random X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Oct 2013 18:48:12 -0000 Author: markm Date: Tue Oct 8 18:48:11 2013 New Revision: 256159 URL: http://svnweb.freebsd.org/changeset/base/256159 Log: Time to eat crow for me. I replaced the sx_* locks that Arthur used with regular mutexes; this turned out the be the wrong thing to do as the locks need to be sleepable. Revert this folly. Submitted by: Arthur Mesh (In original diff) Modified: projects/random_number_generator/sys/dev/random/live_entropy_sources.c Modified: projects/random_number_generator/sys/dev/random/live_entropy_sources.c ============================================================================== --- projects/random_number_generator/sys/dev/random/live_entropy_sources.c Tue Oct 8 18:09:00 2013 (r256158) +++ projects/random_number_generator/sys/dev/random/live_entropy_sources.c Tue Oct 8 18:48:11 2013 (r256159) @@ -53,10 +53,9 @@ LIST_HEAD(les_head, live_entropy_sources static struct les_head sources = LIST_HEAD_INITIALIZER(sources); /* - * The harvest mutex protects the consistency of the entropy fifos and - * empty fifo and other associated structures. + * The live_lock protects the consistency of the "struct les_head sources" */ -struct mtx live_mtx; +static struct sx les_lock; /* need a sleepable lock */ void live_entropy_source_register(struct random_hardware_source *rsource) @@ -68,9 +67,9 @@ live_entropy_source_register(struct rand les = malloc(sizeof(struct live_entropy_sources), M_ENTROPY, M_WAITOK); les->rsource = rsource; - mtx_lock(&live_mtx); + sx_xlock(&les_lock); LIST_INSERT_HEAD(&sources, les, entries); - mtx_unlock(&live_mtx); + sx_xunlock(&les_lock); } void @@ -80,13 +79,13 @@ live_entropy_source_deregister(struct ra KASSERT(rsource != NULL, ("invalid input to %s", __func__)); - mtx_lock(&live_mtx); + sx_xlock(&les_lock); LIST_FOREACH(les, &sources, entries) if (les->rsource == rsource) { LIST_REMOVE(les, entries); break; } - mtx_unlock(&live_mtx); + sx_xunlock(&les_lock); if (les != NULL) free(les, M_ENTROPY); } @@ -99,7 +98,7 @@ live_entropy_source_handler(SYSCTL_HANDL count = error = 0; - mtx_lock(&live_mtx); + sx_slock(&les_lock); if (LIST_EMPTY(&sources)) error = SYSCTL_OUT(req, "", 0); @@ -116,7 +115,7 @@ live_entropy_source_handler(SYSCTL_HANDL } } - mtx_unlock(&live_mtx); + sx_sunlock(&les_lock); return (error); } @@ -130,7 +129,7 @@ live_entropy_sources_init(void *unused) NULL, 0, live_entropy_source_handler, "", "List of Active Live Entropy Sources"); - mtx_init(&live_mtx, "live entropy source mutex", NULL, MTX_DEF); + sx_init(&les_lock, "live_entropy_sources"); } /* @@ -151,7 +150,7 @@ live_entropy_sources_feed(int rounds, ev struct live_entropy_sources *les; int i, n; - mtx_lock(&live_mtx); + sx_slock(&les_lock); /* * Walk over all of live entropy sources, and feed their output @@ -180,14 +179,14 @@ live_entropy_sources_feed(int rounds, ev } - mtx_unlock(&live_mtx); + sx_sunlock(&les_lock); } static void live_entropy_sources_deinit(void *unused) { - mtx_destroy(&live_mtx); + sx_destroy(&les_lock); } SYSINIT(random_adaptors, SI_SUB_DRIVERS, SI_ORDER_FIRST, From owner-svn-src-projects@FreeBSD.ORG Tue Oct 8 18:57:47 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 63DA71FA; Tue, 8 Oct 2013 18:57:47 +0000 (UTC) (envelope-from markm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 50D792898; Tue, 8 Oct 2013 18:57:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r98IvljZ098307; Tue, 8 Oct 2013 18:57:47 GMT (envelope-from markm@svn.freebsd.org) Received: (from markm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r98Ivl2G098306; Tue, 8 Oct 2013 18:57:47 GMT (envelope-from markm@svn.freebsd.org) Message-Id: <201310081857.r98Ivl2G098306@svn.freebsd.org> From: Mark Murray Date: Tue, 8 Oct 2013 18:57:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256160 - projects/random_number_generator/sys/sys X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Oct 2013 18:57:47 -0000 Author: markm Date: Tue Oct 8 18:57:46 2013 New Revision: 256160 URL: http://svnweb.freebsd.org/changeset/base/256160 Log: Make a mildly sylistic change to the order of sources in this enum. Modified: projects/random_number_generator/sys/sys/random.h Modified: projects/random_number_generator/sys/sys/random.h ============================================================================== --- projects/random_number_generator/sys/sys/random.h Tue Oct 8 18:48:11 2013 (r256159) +++ projects/random_number_generator/sys/sys/random.h Tue Oct 8 18:57:46 2013 (r256160) @@ -40,13 +40,13 @@ int read_random(void *, int); enum esource { RANDOM_START = 0, RANDOM_CACHED = 0, + RANDOM_ATTACH, RANDOM_KEYBOARD, RANDOM_MOUSE, RANDOM_NET_TUN, RANDOM_NET_ETHER, RANDOM_NET_NG, RANDOM_INTERRUPT, - RANDOM_ATTACH, RANDOM_SWI, RANDOM_PURE_OCTEON, RANDOM_PURE_SAFE, From owner-svn-src-projects@FreeBSD.ORG Tue Oct 8 19:07:52 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 4598B6B7; Tue, 8 Oct 2013 19:07:52 +0000 (UTC) (envelope-from markm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2FBB02981; Tue, 8 Oct 2013 19:07:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r98J7qgb003513; Tue, 8 Oct 2013 19:07:52 GMT (envelope-from markm@svn.freebsd.org) Received: (from markm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r98J7mwu003458; Tue, 8 Oct 2013 19:07:48 GMT (envelope-from markm@svn.freebsd.org) Message-Id: <201310081907.r98J7mwu003458@svn.freebsd.org> From: Mark Murray Date: Tue, 8 Oct 2013 19:07:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256162 - in projects/random_number_generator: sbin/nvmecontrol sbin/route sys/cddl/contrib/opensolaris/uts/common/dtrace sys/cddl/dev/dtrace sys/dev/ath/ath_hal/ar5212 sys/dev/nvd sys/... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Oct 2013 19:07:52 -0000 Author: markm Date: Tue Oct 8 19:07:48 2013 New Revision: 256162 URL: http://svnweb.freebsd.org/changeset/base/256162 Log: MFC - tracking commit. Modified: projects/random_number_generator/sbin/nvmecontrol/perftest.c projects/random_number_generator/sbin/route/route.c projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/random_number_generator/sys/cddl/dev/dtrace/dtrace_load.c projects/random_number_generator/sys/cddl/dev/dtrace/dtrace_unload.c projects/random_number_generator/sys/dev/ath/ath_hal/ar5212/ar5212.h projects/random_number_generator/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c projects/random_number_generator/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c projects/random_number_generator/sys/dev/nvd/nvd.c projects/random_number_generator/sys/dev/nvme/nvme.c projects/random_number_generator/sys/dev/nvme/nvme.h projects/random_number_generator/sys/dev/nvme/nvme_ctrlr.c projects/random_number_generator/sys/dev/nvme/nvme_ns.c projects/random_number_generator/sys/dev/nvme/nvme_private.h projects/random_number_generator/sys/dev/nvme/nvme_test.c projects/random_number_generator/sys/dev/random/ivy.c projects/random_number_generator/usr.sbin/bhyve/bhyverun.c projects/random_number_generator/usr.sbin/bhyve/dbgport.h Directory Properties: projects/random_number_generator/ (props changed) projects/random_number_generator/sbin/ (props changed) projects/random_number_generator/sys/ (props changed) projects/random_number_generator/sys/cddl/contrib/opensolaris/ (props changed) projects/random_number_generator/usr.sbin/bhyve/ (props changed) Modified: projects/random_number_generator/sbin/nvmecontrol/perftest.c ============================================================================== --- projects/random_number_generator/sbin/nvmecontrol/perftest.c Tue Oct 8 18:59:41 2013 (r256161) +++ projects/random_number_generator/sbin/nvmecontrol/perftest.c Tue Oct 8 19:07:48 2013 (r256162) @@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -45,7 +46,8 @@ __FBSDID("$FreeBSD$"); static void print_perftest(struct nvme_io_test *io_test, bool perthread) { - uint32_t i, io_completed = 0, iops, mbps; + uint64_t io_completed = 0, iops, mbps; + uint32_t i; for (i = 0; i < io_test->num_threads; i++) io_completed += io_test->io_completed[i]; @@ -53,15 +55,15 @@ print_perftest(struct nvme_io_test *io_t iops = io_completed/io_test->time; mbps = iops * io_test->size / (1024*1024); - printf("Threads: %2d Size: %6d %5s Time: %3d IO/s: %7d MB/s: %4d\n", + printf("Threads: %2d Size: %6d %5s Time: %3d IO/s: %7ju MB/s: %4ju\n", io_test->num_threads, io_test->size, io_test->opc == NVME_OPC_READ ? "READ" : "WRITE", - io_test->time, iops, mbps); + io_test->time, (uintmax_t)iops, (uintmax_t)mbps); if (perthread) for (i = 0; i < io_test->num_threads; i++) - printf("\t%3d: %8d IO/s\n", i, - io_test->io_completed[i]/io_test->time); + printf("\t%3d: %8ju IO/s\n", i, + (uintmax_t)io_test->io_completed[i]/io_test->time); exit(1); } Modified: projects/random_number_generator/sbin/route/route.c ============================================================================== --- projects/random_number_generator/sbin/route/route.c Tue Oct 8 18:59:41 2013 (r256161) +++ projects/random_number_generator/sbin/route/route.c Tue Oct 8 19:07:48 2013 (r256162) @@ -928,6 +928,11 @@ newroute(int argc, char **argv) } } + if (so[RTAX_DST].ss_len == 0) { + warnx("destination parameter required"); + usage(NULL); + } + if (nrflags & F_FORCEHOST) { nrflags |= F_ISHOST; #ifdef INET6 Modified: projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c ============================================================================== --- projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Tue Oct 8 18:59:41 2013 (r256161) +++ projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Tue Oct 8 19:07:48 2013 (r256162) @@ -15751,10 +15751,6 @@ dtrace_open(struct cdev *dev, int oflags #else devfs_set_cdevpriv(state, dtrace_dtr); #endif - /* This code actually belongs in dtrace_attach() */ - if (dtrace_opens == 1) - dtrace_taskq = taskq_create("dtrace_taskq", 1, maxclsyspri, - 1, INT_MAX, 0); #endif mutex_exit(&cpu_lock); @@ -15842,11 +15838,6 @@ dtrace_dtr(void *data) (void) kdi_dtrace_set(KDI_DTSET_DTRACE_DEACTIVATE); #else --dtrace_opens; - /* This code actually belongs in dtrace_detach() */ - if ((dtrace_opens == 0) && (dtrace_taskq != NULL)) { - taskq_destroy(dtrace_taskq); - dtrace_taskq = NULL; - } #endif mutex_exit(&dtrace_lock); Modified: projects/random_number_generator/sys/cddl/dev/dtrace/dtrace_load.c ============================================================================== --- projects/random_number_generator/sys/cddl/dev/dtrace/dtrace_load.c Tue Oct 8 18:59:41 2013 (r256161) +++ projects/random_number_generator/sys/cddl/dev/dtrace/dtrace_load.c Tue Oct 8 19:07:48 2013 (r256162) @@ -56,6 +56,8 @@ dtrace_load(void *dummy) /* Hang our hook for exceptions. */ dtrace_invop_init(); + dtrace_taskq = taskq_create("dtrace_taskq", 1, maxclsyspri, 0, 0, 0); + /* Register callbacks for linker file load and unload events. */ dtrace_kld_load_tag = EVENTHANDLER_REGISTER(kld_load, dtrace_kld_load, NULL, EVENTHANDLER_PRI_ANY); Modified: projects/random_number_generator/sys/cddl/dev/dtrace/dtrace_unload.c ============================================================================== --- projects/random_number_generator/sys/cddl/dev/dtrace/dtrace_unload.c Tue Oct 8 18:59:41 2013 (r256161) +++ projects/random_number_generator/sys/cddl/dev/dtrace/dtrace_unload.c Tue Oct 8 19:07:48 2013 (r256162) @@ -127,6 +127,8 @@ dtrace_unload() mutex_destroy(&dtrace_errlock); #endif + taskq_destroy(dtrace_taskq); + /* Reset our hook for exceptions. */ dtrace_invop_uninit(); Modified: projects/random_number_generator/sys/dev/ath/ath_hal/ar5212/ar5212.h ============================================================================== --- projects/random_number_generator/sys/dev/ath/ath_hal/ar5212/ar5212.h Tue Oct 8 18:59:41 2013 (r256161) +++ projects/random_number_generator/sys/dev/ath/ath_hal/ar5212/ar5212.h Tue Oct 8 19:07:48 2013 (r256162) @@ -335,6 +335,16 @@ struct ath_hal_5212 { uint8_t ah_txTrigLev; /* current Tx trigger level */ uint8_t ah_maxTxTrigLev; /* max tx trigger level */ + + /* + * Channel Tx, Rx, Rx Clear State + */ + uint32_t ah_cycleCount; + uint32_t ah_ctlBusy; + uint32_t ah_rxBusy; + uint32_t ah_txBusy; + uint32_t ah_rx_chainmask; + uint32_t ah_tx_chainmask; }; #define AH5212(_ah) ((struct ath_hal_5212 *)(_ah)) Modified: projects/random_number_generator/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c ============================================================================== --- projects/random_number_generator/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c Tue Oct 8 18:59:41 2013 (r256161) +++ projects/random_number_generator/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c Tue Oct 8 19:07:48 2013 (r256162) @@ -865,16 +865,40 @@ static int32_t ar5212AniGetListenTime(struct ath_hal *ah) { struct ath_hal_5212 *ahp = AH5212(ah); - struct ar5212AniState *aniState; - uint32_t txFrameCount, rxFrameCount, cycleCount; - int32_t listenTime; + struct ar5212AniState *aniState = NULL; + int32_t listenTime = 0; + int good; + HAL_SURVEY_SAMPLE hs; + HAL_CHANNEL_SURVEY *cs = AH_NULL; + + /* + * We shouldn't see ah_curchan be NULL, but just in case.. + */ + if (AH_PRIVATE(ah)->ah_curchan == AH_NULL) { + ath_hal_printf(ah, "%s: ah_curchan = NULL?\n", __func__); + return (0); + } - txFrameCount = OS_REG_READ(ah, AR_TFCNT); - rxFrameCount = OS_REG_READ(ah, AR_RFCNT); - cycleCount = OS_REG_READ(ah, AR_CCCNT); + cs = &ahp->ah_chansurvey; + + /* + * Fetch the current statistics, squirrel away the current + * sample, bump the sequence/sample counter. + */ + OS_MEMZERO(&hs, sizeof(hs)); + good = ar5212GetMibCycleCounts(ah, &hs); + if (cs != AH_NULL) { + OS_MEMCPY(&cs->samples[cs->cur_sample], &hs, sizeof(hs)); + cs->samples[cs->cur_sample].seq_num = cs->cur_seq; + cs->cur_sample = + (cs->cur_sample + 1) % CHANNEL_SURVEY_SAMPLE_COUNT; + cs->cur_seq++; + } - aniState = ahp->ah_curani; - if (aniState->cycleCount == 0 || aniState->cycleCount > cycleCount) { + if (ANI_ENA(ah)) + aniState = ahp->ah_curani; + + if (good == AH_FALSE) { /* * Cycle counter wrap (or initial call); it's not possible * to accurately calculate a value because the registers @@ -882,15 +906,29 @@ ar5212AniGetListenTime(struct ath_hal *a */ listenTime = 0; ahp->ah_stats.ast_ani_lzero++; - } else { - int32_t ccdelta = cycleCount - aniState->cycleCount; - int32_t rfdelta = rxFrameCount - aniState->rxFrameCount; - int32_t tfdelta = txFrameCount - aniState->txFrameCount; + } else if (ANI_ENA(ah)) { + /* + * Only calculate and update the cycle count if we have + * an ANI state. + */ + int32_t ccdelta = + AH5212(ah)->ah_cycleCount - aniState->cycleCount; + int32_t rfdelta = + AH5212(ah)->ah_rxBusy - aniState->rxFrameCount; + int32_t tfdelta = + AH5212(ah)->ah_txBusy - aniState->txFrameCount; listenTime = (ccdelta - rfdelta - tfdelta) / CLOCK_RATE; } - aniState->cycleCount = cycleCount; - aniState->txFrameCount = txFrameCount; - aniState->rxFrameCount = rxFrameCount; + + /* + * Again, only update ANI state if we have it. + */ + if (ANI_ENA(ah)) { + aniState->cycleCount = AH5212(ah)->ah_cycleCount; + aniState->rxFrameCount = AH5212(ah)->ah_rxBusy; + aniState->txFrameCount = AH5212(ah)->ah_txBusy; + } + return listenTime; } @@ -956,13 +994,15 @@ ar5212AniPoll(struct ath_hal *ah, const const struct ar5212AniParams *params; int32_t listenTime; + /* Always update from the MIB, for statistics gathering */ + listenTime = ar5212AniGetListenTime(ah); + /* XXX can aniState be null? */ if (aniState == AH_NULL) return; if (!ANI_ENA(ah)) return; - listenTime = ar5212AniGetListenTime(ah); if (listenTime < 0) { ahp->ah_stats.ast_ani_lneg++; /* restart ANI period if listenTime is invalid */ Modified: projects/random_number_generator/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c ============================================================================== --- projects/random_number_generator/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c Tue Oct 8 18:59:41 2013 (r256161) +++ projects/random_number_generator/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c Tue Oct 8 19:07:48 2013 (r256162) @@ -1405,13 +1405,47 @@ ar5212Get11nExtBusy(struct ath_hal *ah) } /* - * There's no channel survey support for the AR5212. + * Channel survey support. */ HAL_BOOL ar5212GetMibCycleCounts(struct ath_hal *ah, HAL_SURVEY_SAMPLE *hsample) { + struct ath_hal_5212 *ahp = AH5212(ah); + u_int32_t good = AH_TRUE; - return (AH_FALSE); + /* XXX freeze/unfreeze mib counters */ + uint32_t rc = OS_REG_READ(ah, AR_RCCNT); + uint32_t rf = OS_REG_READ(ah, AR_RFCNT); + uint32_t tf = OS_REG_READ(ah, AR_TFCNT); + uint32_t cc = OS_REG_READ(ah, AR_CCCNT); /* read cycles last */ + + if (ahp->ah_cycleCount == 0 || ahp->ah_cycleCount > cc) { + /* + * Cycle counter wrap (or initial call); it's not possible + * to accurately calculate a value because the registers + * right shift rather than wrap--so punt and return 0. + */ + HALDEBUG(ah, HAL_DEBUG_ANY, + "%s: cycle counter wrap. ExtBusy = 0\n", __func__); + good = AH_FALSE; + } else { + hsample->cycle_count = cc - ahp->ah_cycleCount; + hsample->chan_busy = rc - ahp->ah_ctlBusy; + hsample->ext_chan_busy = 0; + hsample->rx_busy = rf - ahp->ah_rxBusy; + hsample->tx_busy = tf - ahp->ah_txBusy; + } + + /* + * Keep a copy of the MIB results so the next sample has something + * to work from. + */ + ahp->ah_cycleCount = cc; + ahp->ah_rxBusy = rf; + ahp->ah_ctlBusy = rc; + ahp->ah_txBusy = tf; + + return (good); } void Modified: projects/random_number_generator/sys/dev/nvd/nvd.c ============================================================================== --- projects/random_number_generator/sys/dev/nvd/nvd.c Tue Oct 8 18:59:41 2013 (r256161) +++ projects/random_number_generator/sys/dev/nvd/nvd.c Tue Oct 8 19:07:48 2013 (r256162) @@ -187,17 +187,6 @@ nvd_done(void *arg, const struct nvme_co atomic_add_int(&ndisk->cur_depth, -1); - /* - * TODO: add more extensive translation of NVMe status codes - * to different bio error codes (i.e. EIO, EINVAL, etc.) - */ - if (nvme_completion_is_error(cpl)) { - bp->bio_error = EIO; - bp->bio_flags |= BIO_ERROR; - bp->bio_resid = bp->bio_bcount; - } else - bp->bio_resid = 0; - biodone(bp); } Modified: projects/random_number_generator/sys/dev/nvme/nvme.c ============================================================================== --- projects/random_number_generator/sys/dev/nvme/nvme.c Tue Oct 8 18:59:41 2013 (r256161) +++ projects/random_number_generator/sys/dev/nvme/nvme.c Tue Oct 8 19:07:48 2013 (r256162) @@ -221,8 +221,10 @@ nvme_attach(device_t dev) status = nvme_ctrlr_construct(ctrlr, dev); - if (status != 0) + if (status != 0) { + nvme_ctrlr_destruct(ctrlr, dev); return (status); + } /* * Reset controller twice to ensure we do a transition from cc.en==1 @@ -230,12 +232,16 @@ nvme_attach(device_t dev) * the controller was left in when boot handed off to OS. */ status = nvme_ctrlr_hw_reset(ctrlr); - if (status != 0) + if (status != 0) { + nvme_ctrlr_destruct(ctrlr, dev); return (status); + } status = nvme_ctrlr_hw_reset(ctrlr); - if (status != 0) + if (status != 0) { + nvme_ctrlr_destruct(ctrlr, dev); return (status); + } nvme_sysctl_initialize_ctrlr(ctrlr); Modified: projects/random_number_generator/sys/dev/nvme/nvme.h ============================================================================== --- projects/random_number_generator/sys/dev/nvme/nvme.h Tue Oct 8 18:59:41 2013 (r256161) +++ projects/random_number_generator/sys/dev/nvme/nvme.h Tue Oct 8 19:07:48 2013 (r256162) @@ -535,7 +535,7 @@ struct nvme_controller_data { uint8_t reserved6[1024]; /* bytes 3072-4095: vendor specific */ - uint8_t reserved7[1024]; + uint8_t vs[1024]; } __packed __aligned(4); struct nvme_namespace_data { @@ -720,7 +720,7 @@ struct nvme_io_test { uint32_t time; /* in seconds */ uint32_t num_threads; uint32_t flags; - uint32_t io_completed[NVME_TEST_MAX_THREADS]; + uint64_t io_completed[NVME_TEST_MAX_THREADS]; }; enum nvme_io_test_flags { Modified: projects/random_number_generator/sys/dev/nvme/nvme_ctrlr.c ============================================================================== --- projects/random_number_generator/sys/dev/nvme/nvme_ctrlr.c Tue Oct 8 18:59:41 2013 (r256161) +++ projects/random_number_generator/sys/dev/nvme/nvme_ctrlr.c Tue Oct 8 19:07:48 2013 (r256162) @@ -617,9 +617,35 @@ nvme_ctrlr_get_log_page_size(struct nvme } static void +nvme_ctrlr_log_critical_warnings(struct nvme_controller *ctrlr, + union nvme_critical_warning_state state) +{ + + if (state.bits.available_spare == 1) + nvme_printf(ctrlr, "available spare space below threshold\n"); + + if (state.bits.temperature == 1) + nvme_printf(ctrlr, "temperature above threshold\n"); + + if (state.bits.device_reliability == 1) + nvme_printf(ctrlr, "device reliability degraded\n"); + + if (state.bits.read_only == 1) + nvme_printf(ctrlr, "media placed in read only mode\n"); + + if (state.bits.volatile_memory_backup == 1) + nvme_printf(ctrlr, "volatile memory backup device failed\n"); + + if (state.bits.reserved != 0) + nvme_printf(ctrlr, + "unknown critical warning(s): state = 0x%02x\n", state.raw); +} + +static void nvme_ctrlr_async_event_log_page_cb(void *arg, const struct nvme_completion *cpl) { - struct nvme_async_event_request *aer = arg; + struct nvme_async_event_request *aer = arg; + struct nvme_health_information_page *health_info; /* * If the log page fetch for some reason completed with an error, @@ -629,13 +655,33 @@ nvme_ctrlr_async_event_log_page_cb(void if (nvme_completion_is_error(cpl)) nvme_notify_async_consumers(aer->ctrlr, &aer->cpl, aer->log_page_id, NULL, 0); - else + else { + if (aer->log_page_id == NVME_LOG_HEALTH_INFORMATION) { + health_info = (struct nvme_health_information_page *) + aer->log_page_buffer; + nvme_ctrlr_log_critical_warnings(aer->ctrlr, + health_info->critical_warning); + /* + * Critical warnings reported through the + * SMART/health log page are persistent, so + * clear the associated bits in the async event + * config so that we do not receive repeated + * notifications for the same event. + */ + aer->ctrlr->async_event_config.raw &= + ~health_info->critical_warning.raw; + nvme_ctrlr_cmd_set_async_event_config(aer->ctrlr, + aer->ctrlr->async_event_config, NULL, NULL); + } + + /* * Pass the cpl data from the original async event completion, * not the log page fetch. */ nvme_notify_async_consumers(aer->ctrlr, &aer->cpl, aer->log_page_id, aer->log_page_buffer, aer->log_page_size); + } /* * Repost another asynchronous event request to replace the one @@ -708,13 +754,27 @@ nvme_ctrlr_construct_and_submit_aer(stru static void nvme_ctrlr_configure_aer(struct nvme_controller *ctrlr) { - union nvme_critical_warning_state state; + struct nvme_completion_poll_status status; struct nvme_async_event_request *aer; uint32_t i; - state.raw = 0xFF; - state.bits.reserved = 0; - nvme_ctrlr_cmd_set_async_event_config(ctrlr, state, NULL, NULL); + ctrlr->async_event_config.raw = 0xFF; + ctrlr->async_event_config.bits.reserved = 0; + + status.done = FALSE; + nvme_ctrlr_cmd_get_feature(ctrlr, NVME_FEAT_TEMPERATURE_THRESHOLD, + 0, NULL, 0, nvme_completion_poll_cb, &status); + while (status.done == FALSE) + pause("nvme", 1); + if (nvme_completion_is_error(&status.cpl) || + (status.cpl.cdw0 & 0xFFFF) == 0xFFFF || + (status.cpl.cdw0 & 0xFFFF) == 0x0000) { + nvme_printf(ctrlr, "temperature threshold not supported\n"); + ctrlr->async_event_config.bits.temperature = 0; + } + + nvme_ctrlr_cmd_set_async_event_config(ctrlr, + ctrlr->async_event_config, NULL, NULL); /* aerl is a zero-based value, so we need to add 1 here. */ ctrlr->num_aers = min(NVME_MAX_ASYNC_EVENTS, (ctrlr->cdata.aerl+1)); Modified: projects/random_number_generator/sys/dev/nvme/nvme_ns.c ============================================================================== --- projects/random_number_generator/sys/dev/nvme/nvme_ns.c Tue Oct 8 18:59:41 2013 (r256161) +++ projects/random_number_generator/sys/dev/nvme/nvme_ns.c Tue Oct 8 19:07:48 2013 (r256162) @@ -34,13 +34,31 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include +#include + #include "nvme_private.h" +static void nvme_bio_child_inbed(struct bio *parent, int bio_error); +static void nvme_bio_child_done(void *arg, + const struct nvme_completion *cpl); +static uint32_t nvme_get_num_segments(uint64_t addr, uint64_t size, + uint32_t alignment); +static void nvme_free_child_bios(int num_bios, + struct bio **child_bios); +static struct bio ** nvme_allocate_child_bios(int num_bios); +static struct bio ** nvme_construct_child_bios(struct bio *bp, + uint32_t alignment, + int *num_bios); +static int nvme_ns_split_bio(struct nvme_namespace *ns, + struct bio *bp, + uint32_t alignment); + static int nvme_ns_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int flag, struct thread *td) @@ -202,18 +220,218 @@ nvme_ns_bio_done(void *arg, const struct if (bp->bio_driver2) free(bp->bio_driver2, M_NVME); + if (nvme_completion_is_error(status)) { + bp->bio_flags |= BIO_ERROR; + if (bp->bio_error == 0) + bp->bio_error = EIO; + } + + if ((bp->bio_flags & BIO_ERROR) == 0) + bp->bio_resid = 0; + else + bp->bio_resid = bp->bio_bcount; + bp_cb_fn(bp, status); } +static void +nvme_bio_child_inbed(struct bio *parent, int bio_error) +{ + struct nvme_completion parent_cpl; + int inbed; + + if (bio_error != 0) { + parent->bio_flags |= BIO_ERROR; + parent->bio_error = bio_error; + } + + /* + * atomic_fetchadd will return value before adding 1, so we still + * must add 1 to get the updated inbed number. + */ + inbed = atomic_fetchadd_int(&parent->bio_inbed, 1) + 1; + if (inbed == parent->bio_children) { + bzero(&parent_cpl, sizeof(parent_cpl)); + if (parent->bio_flags & BIO_ERROR) + parent_cpl.status.sc = NVME_SC_DATA_TRANSFER_ERROR; + nvme_ns_bio_done(parent, &parent_cpl); + } +} + +static void +nvme_bio_child_done(void *arg, const struct nvme_completion *cpl) +{ + struct bio *child = arg; + struct bio *parent; + int bio_error; + + parent = child->bio_parent; + g_destroy_bio(child); + bio_error = nvme_completion_is_error(cpl) ? EIO : 0; + nvme_bio_child_inbed(parent, bio_error); +} + +static uint32_t +nvme_get_num_segments(uint64_t addr, uint64_t size, uint32_t align) +{ + uint32_t num_segs, offset, remainder; + + if (align == 0) + return (1); + + KASSERT((align & (align - 1)) == 0, ("alignment not power of 2\n")); + + num_segs = size / align; + remainder = size & (align - 1); + offset = addr & (align - 1); + if (remainder > 0 || offset > 0) + num_segs += 1 + (remainder + offset - 1) / align; + return (num_segs); +} + +static void +nvme_free_child_bios(int num_bios, struct bio **child_bios) +{ + int i; + + for (i = 0; i < num_bios; i++) { + if (child_bios[i] != NULL) + g_destroy_bio(child_bios[i]); + } + + free(child_bios, M_NVME); +} + +static struct bio ** +nvme_allocate_child_bios(int num_bios) +{ + struct bio **child_bios; + int err = 0, i; + + child_bios = malloc(num_bios * sizeof(struct bio *), M_NVME, M_NOWAIT); + if (child_bios == NULL) + return (NULL); + + for (i = 0; i < num_bios; i++) { + child_bios[i] = g_new_bio(); + if (child_bios[i] == NULL) + err = ENOMEM; + } + + if (err == ENOMEM) { + nvme_free_child_bios(num_bios, child_bios); + return (NULL); + } + + return (child_bios); +} + +static struct bio ** +nvme_construct_child_bios(struct bio *bp, uint32_t alignment, int *num_bios) +{ + struct bio **child_bios; + struct bio *child; + uint64_t cur_offset; + caddr_t data; + uint32_t rem_bcount; + int i; +#ifdef NVME_UNMAPPED_BIO_SUPPORT + struct vm_page **ma; + uint32_t ma_offset; +#endif + + *num_bios = nvme_get_num_segments(bp->bio_offset, bp->bio_bcount, + alignment); + child_bios = nvme_allocate_child_bios(*num_bios); + if (child_bios == NULL) + return (NULL); + + bp->bio_children = *num_bios; + bp->bio_inbed = 0; + cur_offset = bp->bio_offset; + rem_bcount = bp->bio_bcount; + data = bp->bio_data; +#ifdef NVME_UNMAPPED_BIO_SUPPORT + ma_offset = bp->bio_ma_offset; + ma = bp->bio_ma; +#endif + + for (i = 0; i < *num_bios; i++) { + child = child_bios[i]; + child->bio_parent = bp; + child->bio_cmd = bp->bio_cmd; + child->bio_offset = cur_offset; + child->bio_bcount = min(rem_bcount, + alignment - (cur_offset & (alignment - 1))); + child->bio_flags = bp->bio_flags; +#ifdef NVME_UNMAPPED_BIO_SUPPORT + if (bp->bio_flags & BIO_UNMAPPED) { + child->bio_ma_offset = ma_offset; + child->bio_ma = ma; + child->bio_ma_n = + nvme_get_num_segments(child->bio_ma_offset, + child->bio_bcount, PAGE_SIZE); + ma_offset = (ma_offset + child->bio_bcount) & + PAGE_MASK; + ma += child->bio_ma_n; + if (ma_offset != 0) + ma -= 1; + } else +#endif + { + child->bio_data = data; + data += child->bio_bcount; + } + cur_offset += child->bio_bcount; + rem_bcount -= child->bio_bcount; + } + + return (child_bios); +} + +static int +nvme_ns_split_bio(struct nvme_namespace *ns, struct bio *bp, + uint32_t alignment) +{ + struct bio *child; + struct bio **child_bios; + int err, i, num_bios; + + child_bios = nvme_construct_child_bios(bp, alignment, &num_bios); + if (child_bios == NULL) + return (ENOMEM); + + for (i = 0; i < num_bios; i++) { + child = child_bios[i]; + err = nvme_ns_bio_process(ns, child, nvme_bio_child_done); + if (err != 0) { + nvme_bio_child_inbed(bp, err); + g_destroy_bio(child); + } + } + + free(child_bios, M_NVME); + return (0); +} + int nvme_ns_bio_process(struct nvme_namespace *ns, struct bio *bp, nvme_cb_fn_t cb_fn) { struct nvme_dsm_range *dsm_range; + uint32_t num_bios; int err; bp->bio_driver1 = cb_fn; + if (ns->stripesize > 0 && + (bp->bio_cmd == BIO_READ || bp->bio_cmd == BIO_WRITE)) { + num_bios = nvme_get_num_segments(bp->bio_offset, + bp->bio_bcount, ns->stripesize); + if (num_bios > 1) + return (nvme_ns_split_bio(ns, bp, ns->stripesize)); + } + switch (bp->bio_cmd) { case BIO_READ: err = nvme_ns_cmd_read_bio(ns, bp, nvme_ns_bio_done, bp); @@ -276,6 +494,11 @@ nvme_ns_construct(struct nvme_namespace ns->ctrlr = ctrlr; ns->id = id; + ns->stripesize = 0; + + if (pci_get_devid(ctrlr->dev) == 0x09538086 && ctrlr->cdata.vs[3] != 0) + ns->stripesize = + (1 << ctrlr->cdata.vs[3]) * ctrlr->min_page_size; /* * Namespaces are reconstructed after a controller reset, so check Modified: projects/random_number_generator/sys/dev/nvme/nvme_private.h ============================================================================== --- projects/random_number_generator/sys/dev/nvme/nvme_private.h Tue Oct 8 18:59:41 2013 (r256161) +++ projects/random_number_generator/sys/dev/nvme/nvme_private.h Tue Oct 8 19:07:48 2013 (r256162) @@ -238,6 +238,7 @@ struct nvme_namespace { uint16_t flags; struct cdev *cdev; void *cons_cookie[NVME_MAX_CONSUMERS]; + uint32_t stripesize; struct mtx lock; }; @@ -321,6 +322,9 @@ struct nvme_controller { struct cdev *cdev; + /** bit mask of warning types currently enabled for async events */ + union nvme_critical_warning_state async_event_config; + uint32_t num_aers; struct nvme_async_event_request aer[NVME_MAX_ASYNC_EVENTS]; Modified: projects/random_number_generator/sys/dev/nvme/nvme_test.c ============================================================================== --- projects/random_number_generator/sys/dev/nvme/nvme_test.c Tue Oct 8 18:59:41 2013 (r256161) +++ projects/random_number_generator/sys/dev/nvme/nvme_test.c Tue Oct 8 19:07:48 2013 (r256162) @@ -53,7 +53,7 @@ struct nvme_io_test_thread { void *buf; uint32_t size; uint32_t time; - uint32_t io_completed; + uint64_t io_completed; }; struct nvme_io_test_internal { @@ -66,7 +66,7 @@ struct nvme_io_test_internal { uint32_t td_active; uint32_t td_idx; uint32_t flags; - uint32_t io_completed[NVME_TEST_MAX_THREADS]; + uint64_t io_completed[NVME_TEST_MAX_THREADS]; }; static void @@ -90,8 +90,8 @@ nvme_ns_bio_test(void *arg) struct cdev *dev; void *buf; struct timeval t; - uint64_t offset; - uint32_t idx, io_completed = 0; + uint64_t io_completed = 0, offset; + uint32_t idx; #if __FreeBSD_version >= 900017 int ref; #endif Modified: projects/random_number_generator/sys/dev/random/ivy.c ============================================================================== --- projects/random_number_generator/sys/dev/random/ivy.c Tue Oct 8 18:59:41 2013 (r256161) +++ projects/random_number_generator/sys/dev/random/ivy.c Tue Oct 8 19:07:48 2013 (r256162) @@ -74,12 +74,12 @@ ivy_rng_store(uint64_t *tmp) __asm __volatile( #ifdef __amd64__ - ".byte\t0x48,0x0f,0xc7,0xf0\n\t" /* rdrand %rax */ + "rdrand\t%%rax\n\t" "jnc\t1f\n\t" "movq\t%%rax,%1\n\t" "movl\t$8,%%eax\n" #else /* i386 */ - ".byte\t0x0f,0xc7,0xf0\n\t" /* rdrand %eax */ + "rdrand\t%%eax\n\t" "jnc\t1f\n\t" "movl\t%%eax,%1\n\t" "movl\t$4,%%eax\n" Modified: projects/random_number_generator/usr.sbin/bhyve/bhyverun.c ============================================================================== --- projects/random_number_generator/usr.sbin/bhyve/bhyverun.c Tue Oct 8 18:59:41 2013 (r256161) +++ projects/random_number_generator/usr.sbin/bhyve/bhyverun.c Tue Oct 8 19:07:48 2013 (r256162) @@ -123,7 +123,7 @@ usage(int code) " \n" " -a: local apic is in XAPIC mode (default is X2APIC)\n" " -A: create an ACPI table\n" - " -g: gdb port (default is %d and 0 means don't open)\n" + " -g: gdb port\n" " -c: # cpus (default 1)\n" " -p: pin vcpu 'n' to host cpu 'pincpu + n'\n" " -H: vmexit from the guest on hlt\n" @@ -134,7 +134,7 @@ usage(int code) " -s: PCI slot config\n" " -S: legacy PCI slot config\n" " -m: memory size in MB\n", - progname, DEFAULT_GDB_PORT); + progname); exit(code); } @@ -217,17 +217,6 @@ fbsdrun_addcpu(struct vmctx *ctx, int vc } static int -fbsdrun_get_next_cpu(int curcpu) -{ - - /* - * Get the next available CPU. Assumes they arrive - * in ascending order with no gaps. - */ - return ((curcpu + 1) % foundcpus); -} - -static int vmexit_catch_reset(void) { stats.io_reset++; @@ -504,7 +493,7 @@ main(int argc, char *argv[]) bvmcons = 0; progname = basename(argv[0]); - gdb_port = DEFAULT_GDB_PORT; + gdb_port = 0; guest_ncpus = 1; ioapic = 0; memsize = 256 * MB; Modified: projects/random_number_generator/usr.sbin/bhyve/dbgport.h ============================================================================== --- projects/random_number_generator/usr.sbin/bhyve/dbgport.h Tue Oct 8 18:59:41 2013 (r256161) +++ projects/random_number_generator/usr.sbin/bhyve/dbgport.h Tue Oct 8 19:07:48 2013 (r256162) @@ -29,8 +29,6 @@ #ifndef _DBGPORT_H_ #define _DBGPORT_H_ -#define DEFAULT_GDB_PORT 6466 - void init_dbgport(int port); #endif From owner-svn-src-projects@FreeBSD.ORG Tue Oct 8 22:14:09 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id E2049C3A; Tue, 8 Oct 2013 22:14:08 +0000 (UTC) (envelope-from markm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CEB4C2663; Tue, 8 Oct 2013 22:14:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r98ME8vj002408; Tue, 8 Oct 2013 22:14:08 GMT (envelope-from markm@svn.freebsd.org) Received: (from markm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r98ME7wN002397; Tue, 8 Oct 2013 22:14:07 GMT (envelope-from markm@svn.freebsd.org) Message-Id: <201310082214.r98ME7wN002397@svn.freebsd.org> From: Mark Murray Date: Tue, 8 Oct 2013 22:14:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256168 - projects/random_number_generator/sys/dev/random X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Oct 2013 22:14:09 -0000 Author: markm Date: Tue Oct 8 22:14:07 2013 New Revision: 256168 URL: http://svnweb.freebsd.org/changeset/base/256168 Log: Fix some just-noticed problems: o Allow this to work with "nodevice random" by fixing where the MALLOC pool is defined. o Fix the explicit reseed code. This was correct as submitted, but in the project branch doesn't need to set the "seeded" bit as this is done correctly in the "unblock" function. o Remove some debug ifdeffing. o Adjust comments. Modified: projects/random_number_generator/sys/dev/random/ivy.c projects/random_number_generator/sys/dev/random/nehemiah.c projects/random_number_generator/sys/dev/random/random_adaptors.c projects/random_number_generator/sys/dev/random/random_adaptors.h projects/random_number_generator/sys/dev/random/random_harvestq.c projects/random_number_generator/sys/dev/random/randomdev.c projects/random_number_generator/sys/dev/random/randomdev.h Modified: projects/random_number_generator/sys/dev/random/ivy.c ============================================================================== --- projects/random_number_generator/sys/dev/random/ivy.c Tue Oct 8 20:39:38 2013 (r256167) +++ projects/random_number_generator/sys/dev/random/ivy.c Tue Oct 8 22:14:07 2013 (r256168) @@ -57,15 +57,6 @@ struct random_hardware_source random_ivy .read = random_ivy_read }; -#if 1 -static inline int -ivy_rng_store(uint64_t *tmp) -{ - *tmp = 0xF001FACE; - - return (sizeof(uint64_t)); -} -#else static inline int ivy_rng_store(uint64_t *tmp) { @@ -91,7 +82,6 @@ ivy_rng_store(uint64_t *tmp) return (0); #endif } -#endif static int random_ivy_read(void *buf, int c) @@ -124,10 +114,6 @@ rdrand_modevent(module_t mod, int type, switch (type) { case MOD_LOAD: -#if 1 - live_entropy_source_register(&random_ivy); - printf("%s: CRAP RDRAND is present\n", random_ivy.ident); -#else if (cpu_feature2 & CPUID2_RDRAND) live_entropy_source_register(&random_ivy); else @@ -136,7 +122,6 @@ rdrand_modevent(module_t mod, int type, #endif printf("%s: RDRAND is not present\n", random_ivy.ident); -#endif break; case MOD_UNLOAD: Modified: projects/random_number_generator/sys/dev/random/nehemiah.c ============================================================================== --- projects/random_number_generator/sys/dev/random/nehemiah.c Tue Oct 8 20:39:38 2013 (r256167) +++ projects/random_number_generator/sys/dev/random/nehemiah.c Tue Oct 8 22:14:07 2013 (r256168) @@ -57,10 +57,13 @@ struct random_hardware_source random_neh .read = random_nehemiah_read }; -/* This H/W RNG never stores more than 8 bytes in one go */ - +/* TODO: now that the Davies-Meyer hash is gone and we only use + * the 'xstore' instruction, do we still need to preserve the + * FPU state with fpu_kern_(enter|leave)() ? + */ static struct fpu_kern_ctx *fpu_ctx_save; +/* This H/W source never stores more than 8 bytes in one go */ /* ARGSUSED */ static __inline size_t VIA_RNG_store(void *buf) Modified: projects/random_number_generator/sys/dev/random/random_adaptors.c ============================================================================== --- projects/random_number_generator/sys/dev/random/random_adaptors.c Tue Oct 8 20:39:38 2013 (r256167) +++ projects/random_number_generator/sys/dev/random/random_adaptors.c Tue Oct 8 22:14:07 2013 (r256168) @@ -55,6 +55,8 @@ static struct sysctl_ctx_list random_cli struct random_adaptor *random_adaptor; +MALLOC_DEFINE(M_ENTROPY, "entropy", "Entropy harvesting buffers and data structures"); + int random_adaptor_register(const char *name, struct random_adaptor *rsp) { @@ -233,10 +235,8 @@ random_adaptors_reseed(void *unused) { (void)unused; - if (random_adaptor != NULL) { + if (random_adaptor != NULL) (*random_adaptor->reseed)(); - random_adaptor->seeded = 1; - } arc4rand(NULL, 0, 1); } SYSINIT(random_reseed, SI_SUB_INTRINSIC_POST, SI_ORDER_SECOND, Modified: projects/random_number_generator/sys/dev/random/random_adaptors.h ============================================================================== --- projects/random_number_generator/sys/dev/random/random_adaptors.h Tue Oct 8 20:39:38 2013 (r256167) +++ projects/random_number_generator/sys/dev/random/random_adaptors.h Tue Oct 8 22:14:07 2013 (r256168) @@ -31,6 +31,8 @@ #include +MALLOC_DECLARE(M_ENTROPY); + struct random_adaptors { LIST_ENTRY(random_adaptors) entries; /* list of providers */ const char *name; /* name of random adaptor */ Modified: projects/random_number_generator/sys/dev/random/random_harvestq.c ============================================================================== --- projects/random_number_generator/sys/dev/random/random_harvestq.c Tue Oct 8 20:39:38 2013 (r256167) +++ projects/random_number_generator/sys/dev/random/random_harvestq.c Tue Oct 8 22:14:07 2013 (r256168) @@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include Modified: projects/random_number_generator/sys/dev/random/randomdev.c ============================================================================== --- projects/random_number_generator/sys/dev/random/randomdev.c Tue Oct 8 20:39:38 2013 (r256167) +++ projects/random_number_generator/sys/dev/random/randomdev.c Tue Oct 8 22:14:07 2013 (r256168) @@ -74,8 +74,6 @@ static struct cdevsw random_cdevsw = { .d_name = "random", }; -MALLOC_DEFINE(M_ENTROPY, "entropy", "Entropy harvesting buffers"); - /* For use with make_dev(9)/destroy_dev(9). */ static struct cdev *random_dev; Modified: projects/random_number_generator/sys/dev/random/randomdev.h ============================================================================== --- projects/random_number_generator/sys/dev/random/randomdev.h Tue Oct 8 20:39:38 2013 (r256167) +++ projects/random_number_generator/sys/dev/random/randomdev.h Tue Oct 8 22:14:07 2013 (r256168) @@ -30,8 +30,6 @@ * and non algorithm-specific for the entropy processor */ -MALLOC_DECLARE(M_ENTROPY); - typedef void random_init_func_t(void); typedef void random_deinit_func_t(void); typedef int random_block_func_t(int); From owner-svn-src-projects@FreeBSD.ORG Wed Oct 9 07:55:26 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id E081F866; Wed, 9 Oct 2013 07:55:26 +0000 (UTC) (envelope-from markm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CC19922C4; Wed, 9 Oct 2013 07:55:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r997tQi3009992; Wed, 9 Oct 2013 07:55:26 GMT (envelope-from markm@svn.freebsd.org) Received: (from markm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r997tLxH009963; Wed, 9 Oct 2013 07:55:21 GMT (envelope-from markm@svn.freebsd.org) Message-Id: <201310090755.r997tLxH009963@svn.freebsd.org> From: Mark Murray Date: Wed, 9 Oct 2013 07:55:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256180 - in projects/random_number_generator: . lib/libvmmapi share/examples/bhyve sys/amd64/amd64 sys/cam/ctl sys/conf sys/dev/nvme sys/mips/atheros sys/mips/conf sys/mips/include sys... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Oct 2013 07:55:26 -0000 Author: markm Date: Wed Oct 9 07:55:21 2013 New Revision: 256180 URL: http://svnweb.freebsd.org/changeset/base/256180 Log: MFC - tracking commit Modified: projects/random_number_generator/UPDATING projects/random_number_generator/lib/libvmmapi/vmmapi.c projects/random_number_generator/lib/libvmmapi/vmmapi.h projects/random_number_generator/share/examples/bhyve/vmrun.sh projects/random_number_generator/sys/amd64/amd64/pmap.c projects/random_number_generator/sys/cam/ctl/ctl_frontend_iscsi.c projects/random_number_generator/sys/conf/options.mips projects/random_number_generator/sys/dev/nvme/nvme_ns.c projects/random_number_generator/sys/mips/atheros/apb.c projects/random_number_generator/sys/mips/atheros/ar71xxreg.h projects/random_number_generator/sys/mips/atheros/ar934xreg.h projects/random_number_generator/sys/mips/conf/AR934X_BASE projects/random_number_generator/sys/mips/include/asm.h projects/random_number_generator/sys/mips/include/cpuregs.h projects/random_number_generator/sys/mips/mips/elf_trampoline.c projects/random_number_generator/sys/ofed/drivers/infiniband/core/ucm.c projects/random_number_generator/usr.sbin/bhyve/Makefile projects/random_number_generator/usr.sbin/bhyve/bhyverun.c projects/random_number_generator/usr.sbin/bhyve/pci_ahci.c projects/random_number_generator/usr.sbin/bhyvectl/Makefile projects/random_number_generator/usr.sbin/bhyveload/Makefile projects/random_number_generator/usr.sbin/bhyveload/bhyveload.8 projects/random_number_generator/usr.sbin/bhyveload/bhyveload.c Directory Properties: projects/random_number_generator/ (props changed) projects/random_number_generator/lib/libvmmapi/ (props changed) projects/random_number_generator/sys/ (props changed) projects/random_number_generator/sys/conf/ (props changed) projects/random_number_generator/usr.sbin/bhyve/ (props changed) projects/random_number_generator/usr.sbin/bhyvectl/ (props changed) projects/random_number_generator/usr.sbin/bhyveload/ (props changed) Modified: projects/random_number_generator/UPDATING ============================================================================== --- projects/random_number_generator/UPDATING Wed Oct 9 07:02:03 2013 (r256179) +++ projects/random_number_generator/UPDATING Wed Oct 9 07:55:21 2013 (r256180) @@ -77,19 +77,6 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 has been updated to use this support. A new gcc is required to build the aesni module on both i386 and amd64. -20130827: - Thomas Dickey (vendor author thereof) reports that dialog(1) since - 2011/10/18 has a bug in handling --hline. Testers and I noticed the - --hline is not ignored but displayed as a NULL string, regardless of - value. This will cause confusion in some bsdconfig dialogs where the - --hline is used to inform users which keybindings to use. This will - likewise affect any other persons relying on --hline. It also looks - rather strange seeing "[]" at the bottom of dialog(1) widgets when - passing --hline "anything". Thomas said he will have a look in a few - weeks. NOTE: The "[]" brackets appear with the left-edge where it - would normally appear given the width of text to display, but the - displayed text is not there (part of the bug). - 20130821: The PADLOCK_RNG and RDRAND_RNG kernel options are now devices. Thus "device padlock_rng" and "device rdrand_rng" should be Modified: projects/random_number_generator/lib/libvmmapi/vmmapi.c ============================================================================== --- projects/random_number_generator/lib/libvmmapi/vmmapi.c Wed Oct 9 07:02:03 2013 (r256179) +++ projects/random_number_generator/lib/libvmmapi/vmmapi.c Wed Oct 9 07:55:21 2013 (r256180) @@ -43,11 +43,14 @@ __FBSDID("$FreeBSD$"); #include #include +#include + #include #include #include "vmmapi.h" +#define MB (1024 * 1024UL) #define GB (1024 * 1024 * 1024UL) struct vmctx { @@ -124,6 +127,30 @@ vm_destroy(struct vmctx *vm) } int +vm_parse_memsize(const char *optarg, size_t *ret_memsize) +{ + char *endptr; + size_t optval; + int error; + + optval = strtoul(optarg, &endptr, 0); + if (*optarg != '\0' && *endptr == '\0') { + /* + * For the sake of backward compatibility if the memory size + * specified on the command line is less than a megabyte then + * it is interpreted as being in units of MB. + */ + if (optval < MB) + optval *= MB; + *ret_memsize = optval; + error = 0; + } else + error = expand_number(optarg, ret_memsize); + + return (error); +} + +int vm_get_memory_seg(struct vmctx *ctx, vm_paddr_t gpa, size_t *ret_len, int *wired) { Modified: projects/random_number_generator/lib/libvmmapi/vmmapi.h ============================================================================== --- projects/random_number_generator/lib/libvmmapi/vmmapi.h Wed Oct 9 07:02:03 2013 (r256179) +++ projects/random_number_generator/lib/libvmmapi/vmmapi.h Wed Oct 9 07:55:21 2013 (r256180) @@ -45,6 +45,7 @@ enum vm_mmap_style { int vm_create(const char *name); struct vmctx *vm_open(const char *name); void vm_destroy(struct vmctx *ctx); +int vm_parse_memsize(const char *optarg, size_t *memsize); int vm_get_memory_seg(struct vmctx *ctx, vm_paddr_t gpa, size_t *ret_len, int *wired); int vm_setup_memory(struct vmctx *ctx, size_t len, enum vm_mmap_style s); Modified: projects/random_number_generator/share/examples/bhyve/vmrun.sh ============================================================================== --- projects/random_number_generator/share/examples/bhyve/vmrun.sh Wed Oct 9 07:02:03 2013 (r256179) +++ projects/random_number_generator/share/examples/bhyve/vmrun.sh Wed Oct 9 07:55:21 2013 (r256180) @@ -31,7 +31,7 @@ LOADER=/usr/sbin/bhyveload BHYVECTL=/usr/sbin/bhyvectl FBSDRUN=/usr/sbin/bhyve -DEFAULT_MEMSIZE=512 +DEFAULT_MEMSIZE=512M DEFAULT_CPUS=2 DEFAULT_TAPDEV=tap0 @@ -47,7 +47,7 @@ usage() { echo " -g: listen for connection from kgdb at " echo " -i: force boot of the Installation CDROM image" echo " -I: Installation CDROM image location (default is ${DEFAULT_ISOFILE})" - echo " -m: memory size in MB (default is ${DEFAULT_MEMSIZE}MB)" + echo " -m: memory size (default is ${DEFAULT_MEMSIZE})" echo " -t: tap device for virtio-net (default is $DEFAULT_TAPDEV)" echo "" echo " This script needs to be executed with superuser privileges" Modified: projects/random_number_generator/sys/amd64/amd64/pmap.c ============================================================================== --- projects/random_number_generator/sys/amd64/amd64/pmap.c Wed Oct 9 07:02:03 2013 (r256179) +++ projects/random_number_generator/sys/amd64/amd64/pmap.c Wed Oct 9 07:55:21 2013 (r256180) @@ -2705,6 +2705,7 @@ reclaim_pv_chunk(pmap_t locked_pmap, str KASSERT(lockp != NULL, ("reclaim_pv_chunk: lockp is NULL")); pmap = NULL; m_pc = NULL; + PG_G = PG_A = PG_M = PG_RW = 0; SLIST_INIT(&free); TAILQ_INIT(&new_tail); mtx_lock(&pv_chunks_mutex); Modified: projects/random_number_generator/sys/cam/ctl/ctl_frontend_iscsi.c ============================================================================== --- projects/random_number_generator/sys/cam/ctl/ctl_frontend_iscsi.c Wed Oct 9 07:02:03 2013 (r256179) +++ projects/random_number_generator/sys/cam/ctl/ctl_frontend_iscsi.c Wed Oct 9 07:55:21 2013 (r256180) @@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -2301,7 +2302,8 @@ cfiscsi_datamove_in(union ctl_io *io) if (response == NULL) { CFISCSI_SESSION_WARN(cs, "failed to " "allocate memory; dropping connection"); - icl_pdu_free(request); + ctl_set_busy(&io->scsiio); + io->scsiio.be_move_done(io); cfiscsi_session_terminate(cs); return; } @@ -2330,8 +2332,9 @@ cfiscsi_datamove_in(union ctl_io *io) if (error != 0) { CFISCSI_SESSION_WARN(cs, "failed to " "allocate memory; dropping connection"); - icl_pdu_free(request); icl_pdu_free(response); + ctl_set_busy(&io->scsiio); + io->scsiio.be_move_done(io); cfiscsi_session_terminate(cs); return; } @@ -2428,8 +2431,10 @@ cfiscsi_datamove_out(union ctl_io *io) if (cdw == NULL) { CFISCSI_SESSION_WARN(cs, "failed to " "allocate memory; dropping connection"); - icl_pdu_free(request); + ctl_set_busy(&io->scsiio); + io->scsiio.be_move_done(io); cfiscsi_session_terminate(cs); + return; } cdw->cdw_ctl_io = io; cdw->cdw_target_transfer_tag = htonl(target_transfer_tag); @@ -2462,8 +2467,10 @@ cfiscsi_datamove_out(union ctl_io *io) if (response == NULL) { CFISCSI_SESSION_WARN(cs, "failed to " "allocate memory; dropping connection"); - icl_pdu_free(request); + ctl_set_busy(&io->scsiio); + io->scsiio.be_move_done(io); cfiscsi_session_terminate(cs); + return; } bhsr2t = (struct iscsi_bhs_r2t *)response->ip_bhs; bhsr2t->bhsr2t_opcode = ISCSI_BHS_OPCODE_R2T; Modified: projects/random_number_generator/sys/conf/options.mips ============================================================================== --- projects/random_number_generator/sys/conf/options.mips Wed Oct 9 07:02:03 2013 (r256179) +++ projects/random_number_generator/sys/conf/options.mips Wed Oct 9 07:55:21 2013 (r256180) @@ -29,6 +29,8 @@ # $FreeBSD$ CPU_MIPS4KC opt_global.h +CPU_MIPS24KC opt_global.h +CPU_MIPS74KC opt_global.h CPU_MIPS32 opt_global.h CPU_MIPS64 opt_global.h CPU_SENTRY5 opt_global.h Modified: projects/random_number_generator/sys/dev/nvme/nvme_ns.c ============================================================================== --- projects/random_number_generator/sys/dev/nvme/nvme_ns.c Wed Oct 9 07:02:03 2013 (r256179) +++ projects/random_number_generator/sys/dev/nvme/nvme_ns.c Wed Oct 9 07:55:21 2013 (r256180) @@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include Modified: projects/random_number_generator/sys/mips/atheros/apb.c ============================================================================== --- projects/random_number_generator/sys/mips/atheros/apb.c Wed Oct 9 07:02:03 2013 (r256179) +++ projects/random_number_generator/sys/mips/atheros/apb.c Wed Oct 9 07:55:21 2013 (r256180) @@ -359,6 +359,9 @@ apb_filter(void *arg) case AR71XX_SOC_AR7242: case AR71XX_SOC_AR9330: case AR71XX_SOC_AR9331: + case AR71XX_SOC_AR9341: + case AR71XX_SOC_AR9342: + case AR71XX_SOC_AR9344: /* Ack/clear the irq on status register for AR724x */ ATH_WRITE_REG(AR71XX_MISC_INTR_STATUS, reg & ~(1 << irq)); Modified: projects/random_number_generator/sys/mips/atheros/ar71xxreg.h ============================================================================== --- projects/random_number_generator/sys/mips/atheros/ar71xxreg.h Wed Oct 9 07:02:03 2013 (r256179) +++ projects/random_number_generator/sys/mips/atheros/ar71xxreg.h Wed Oct 9 07:55:21 2013 (r256180) @@ -336,6 +336,7 @@ typedef enum { #define MAC_MII_CFG_SCAN_AUTO_INC (1 << 5) #define MAC_MII_CFG_PREAMBLE_SUP (1 << 4) #define MAC_MII_CFG_CLOCK_SELECT_MASK 0x7 +#define MAC_MII_CFG_CLOCK_SELECT_MASK_AR933X 0xf #define MAC_MII_CFG_CLOCK_DIV_4 0 #define MAC_MII_CFG_CLOCK_DIV_6 2 #define MAC_MII_CFG_CLOCK_DIV_8 3 @@ -343,6 +344,17 @@ typedef enum { #define MAC_MII_CFG_CLOCK_DIV_14 5 #define MAC_MII_CFG_CLOCK_DIV_20 6 #define MAC_MII_CFG_CLOCK_DIV_28 7 + +/* .. and the AR933x/AR934x extensions */ +#define MAC_MII_CFG_CLOCK_DIV_34 8 +#define MAC_MII_CFG_CLOCK_DIV_42 9 +#define MAC_MII_CFG_CLOCK_DIV_50 10 +#define MAC_MII_CFG_CLOCK_DIV_58 11 +#define MAC_MII_CFG_CLOCK_DIV_66 12 +#define MAC_MII_CFG_CLOCK_DIV_74 13 +#define MAC_MII_CFG_CLOCK_DIV_82 14 +#define MAC_MII_CFG_CLOCK_DIV_98 15 + #define AR71XX_MAC_MII_CMD 0x24 #define MAC_MII_CMD_SCAN_CYCLE (1 << 1) #define MAC_MII_CMD_READ 1 Modified: projects/random_number_generator/sys/mips/atheros/ar934xreg.h ============================================================================== --- projects/random_number_generator/sys/mips/atheros/ar934xreg.h Wed Oct 9 07:02:03 2013 (r256179) +++ projects/random_number_generator/sys/mips/atheros/ar934xreg.h Wed Oct 9 07:55:21 2013 (r256180) @@ -29,6 +29,8 @@ #ifndef __AR934X_REG_H__ #define __AR934X_REG_H__ +#define AR934X_GMAC_BASE (AR71XX_APB_BASE + 0x00070000) +#define AR934X_GMAC_SIZE 0x14 #define AR934X_WMAC_BASE (AR71XX_APB_BASE + 0x00100000) #define AR934X_WMAC_SIZE 0x20000 #define AR934X_EHCI_BASE 0x1b000000 @@ -36,6 +38,23 @@ #define AR934X_SRIF_BASE (AR71XX_APB_BASE + 0x00116000) #define AR934X_SRIF_SIZE 0x1000 +/* AR934x GMAC configuration */ +#define AR934X_GMAC_REG_ETH_CFG (AR934X_GMAC_BASE + 0x00) + +#define AR934X_ETH_CFG_RGMII_GMAC0 (1 << 0) +#define AR934X_ETH_CFG_MII_GMAC0 (1 << 1) +#define AR934X_ETH_CFG_GMII_GMAC0 (1 << 2) +#define AR934X_ETH_CFG_MII_GMAC0_MASTER (1 << 3) +#define AR934X_ETH_CFG_MII_GMAC0_SLAVE (1 << 4) +#define AR934X_ETH_CFG_MII_GMAC0_ERR_EN (1 << 5) +#define AR934X_ETH_CFG_SW_ONLY_MODE (1 << 6) +#define AR934X_ETH_CFG_SW_PHY_SWAP (1 << 7) +#define AR934X_ETH_CFG_SW_APB_ACCESS (1 << 9) +#define AR934X_ETH_CFG_RMII_GMAC0 (1 << 10) +#define AR933X_ETH_CFG_MII_CNTL_SPEED (1 << 11) +#define AR934X_ETH_CFG_RMII_GMAC0_MASTER (1 << 12) +#define AR934X_ETH_CFG_SW_ACC_MSB_FIRST (1 << 13) + #define AR934X_DDR_REG_FLUSH_GE0 (AR71XX_APB_BASE + 0x9c) #define AR934X_DDR_REG_FLUSH_GE1 (AR71XX_APB_BASE + 0xa0) #define AR934X_DDR_REG_FLUSH_USB (AR71XX_APB_BASE + 0xa4) @@ -45,6 +64,9 @@ #define AR934X_PLL_CPU_CONFIG_REG (AR71XX_PLL_CPU_BASE + 0x00) #define AR934X_PLL_DDR_CONFIG_REG (AR71XX_PLL_CPU_BASE + 0x04) #define AR934X_PLL_CPU_DDR_CLK_CTRL_REG (AR71XX_PLL_CPU_BASE + 0x08) +#define AR934X_PLL_SWITCH_CLOCK_CONTROL_REG (AR71XX_PLL_CPU_BASE + 0x24) +#define AR934X_PLL_SWITCH_CLOCK_CONTROL_MDIO_CLK_SEL (1 << 6) +#define AR934X_PLL_ETH_XMII_CONTROL_REG (AR71XX_PLL_CPU_BASE + 0x2c) #define AR934X_PLL_CPU_CONFIG_NFRAC_SHIFT 0 #define AR934X_PLL_CPU_CONFIG_NFRAC_MASK 0x3f @@ -81,7 +103,13 @@ #define AR934X_RESET_REG_BOOTSTRAP (AR71XX_RST_BLOCK_BASE + 0xb0) #define AR934X_RESET_REG_PCIE_WMAC_INT_STATUS (AR71XX_RST_BLOCK_BASE + 0xac) +#define AR934X_RESET_GE1_MDIO (1 << 23) +#define AR934X_RESET_GE0_MDIO (1 << 22) +#define AR934X_RESET_GE1_MAC (1 << 13) +#define AR934X_RESET_ETH_SWITCH_ANALOG (1 << 12) #define AR934X_RESET_USB_PHY_ANALOG (1 << 11) +#define AR934X_RESET_GE0_MAC (1 << 9) +#define AR934X_RESET_ETH_SWITCH (1 << 8) #define AR934X_RESET_USB_HOST (1 << 5) #define AR934X_RESET_USB_PHY (1 << 4) #define AR934X_RESET_USBSUS_OVERRIDE (1 << 3) @@ -153,4 +181,9 @@ #define AR934X_SRIF_DPLL2_OUTDIV_SHIFT 13 #define AR934X_SRIF_DPLL2_OUTDIV_MASK 0x7 +/* XXX verify! */ +#define AR934X_PLL_VAL_1000 0x16000000 +#define AR934X_PLL_VAL_100 0x00000101 +#define AR934X_PLL_VAL_10 0x00001616 + #endif /* __AR934X_REG_H__ */ Modified: projects/random_number_generator/sys/mips/conf/AR934X_BASE ============================================================================== --- projects/random_number_generator/sys/mips/conf/AR934X_BASE Wed Oct 9 07:02:03 2013 (r256179) +++ projects/random_number_generator/sys/mips/conf/AR934X_BASE Wed Oct 9 07:55:21 2013 (r256180) @@ -12,7 +12,7 @@ machine mips mips ident AR934X_BASE -cpu CPU_MIPS4KC +cpu CPU_MIPS74KC makeoptions KERNLOADADDR=0x80050000 options HZ=1000 Modified: projects/random_number_generator/sys/mips/include/asm.h ============================================================================== --- projects/random_number_generator/sys/mips/include/asm.h Wed Oct 9 07:02:03 2013 (r256179) +++ projects/random_number_generator/sys/mips/include/asm.h Wed Oct 9 07:55:21 2013 (r256180) @@ -725,9 +725,12 @@ _C_LABEL(x): #elif defined(CPU_RMI) #define HAZARD_DELAY #define ITLBNOPFIX +#elif defined(CPU_MIPS74KC) +#define HAZARD_DELAY sll $0,$0,3 +#define ITLBNOPFIX sll $0,$0,3 #else -#define ITLBNOPFIX nop;nop;nop;nop;nop;nop;nop;nop;nop;nop; -#define HAZARD_DELAY nop;nop;nop;nop;nop; +#define ITLBNOPFIX nop;nop;nop;nop;nop;nop;nop;nop;nop;sll $0,$0,3; +#define HAZARD_DELAY nop;nop;nop;nop;sll $0,$0,3; #endif #endif /* !_MACHINE_ASM_H_ */ Modified: projects/random_number_generator/sys/mips/include/cpuregs.h ============================================================================== --- projects/random_number_generator/sys/mips/include/cpuregs.h Wed Oct 9 07:02:03 2013 (r256179) +++ projects/random_number_generator/sys/mips/include/cpuregs.h Wed Oct 9 07:55:21 2013 (r256180) @@ -149,6 +149,11 @@ #define MIPS_CCA_CC 0x05 /* Cacheable Coherent. */ #endif +#if defined(CPU_MIPS74KC) +#define MIPS_CCA_UNCACHED 0x02 +#define MIPS_CCA_CACHED 0x00 +#endif + #ifndef MIPS_CCA_UNCACHED #define MIPS_CCA_UNCACHED MIPS_CCA_UC #endif @@ -204,12 +209,14 @@ #define COP0_SYNC .word 0xc0 /* ehb */ #elif defined(CPU_SB1) #define COP0_SYNC ssnop; ssnop; ssnop; ssnop; ssnop; ssnop; ssnop; ssnop; ssnop +#elif defined(CPU_MIPS74KC) +#define COP0_SYNC .word 0xc0 /* ehb */ #else /* * Pick a reasonable default based on the "typical" spacing described in the * "CP0 Hazards" chapter of MIPS Architecture Book Vol III. */ -#define COP0_SYNC ssnop; ssnop; ssnop; ssnop; ssnop +#define COP0_SYNC ssnop; ssnop; ssnop; ssnop; .word 0xc0; #endif #define COP0_HAZARD_FPUENABLE nop; nop; nop; nop; Modified: projects/random_number_generator/sys/mips/mips/elf_trampoline.c ============================================================================== --- projects/random_number_generator/sys/mips/mips/elf_trampoline.c Wed Oct 9 07:02:03 2013 (r256179) +++ projects/random_number_generator/sys/mips/mips/elf_trampoline.c Wed Oct 9 07:55:21 2013 (r256180) @@ -32,10 +32,6 @@ __FBSDID("$FreeBSD$"); #else #include #endif -#include -#include -#include -#include /* * Since we are compiled outside of the normal kernel build process, we @@ -43,6 +39,11 @@ __FBSDID("$FreeBSD$"); */ #include "opt_global.h" +#include +#include +#include +#include + #ifndef KERNNAME #error Kernel name not provided #endif Modified: projects/random_number_generator/sys/ofed/drivers/infiniband/core/ucm.c ============================================================================== --- projects/random_number_generator/sys/ofed/drivers/infiniband/core/ucm.c Wed Oct 9 07:02:03 2013 (r256179) +++ projects/random_number_generator/sys/ofed/drivers/infiniband/core/ucm.c Wed Oct 9 07:55:21 2013 (r256180) @@ -104,9 +104,6 @@ enum { IB_UCM_MAX_DEVICES = 32 }; -/* ib_cm and ib_user_cm modules share /sys/class/infiniband_cm */ -extern struct class cm_class; - #define IB_UCM_BASE_DEV MKDEV(IB_UCM_MAJOR, IB_UCM_BASE_MINOR) static void ib_ucm_add_one(struct ib_device *device); Modified: projects/random_number_generator/usr.sbin/bhyve/Makefile ============================================================================== --- projects/random_number_generator/usr.sbin/bhyve/Makefile Wed Oct 9 07:02:03 2013 (r256179) +++ projects/random_number_generator/usr.sbin/bhyve/Makefile Wed Oct 9 07:55:21 2013 (r256180) @@ -17,8 +17,8 @@ SRCS+= vmm_instruction_emul.c NO_MAN= -DPADD= ${LIBVMMAPI} ${LIBMD} ${LIBPTHREAD} -LDADD= -lvmmapi -lmd -lpthread +DPADD= ${LIBVMMAPI} ${LIBMD} ${LIBUTIL} ${LIBPTHREAD} +LDADD= -lvmmapi -lmd -lutil -lpthread WARNS?= 2 Modified: projects/random_number_generator/usr.sbin/bhyve/bhyverun.c ============================================================================== --- projects/random_number_generator/usr.sbin/bhyve/bhyverun.c Wed Oct 9 07:02:03 2013 (r256179) +++ projects/random_number_generator/usr.sbin/bhyve/bhyverun.c Wed Oct 9 07:55:21 2013 (r256180) @@ -37,12 +37,14 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include #include #include #include +#include #include #include @@ -529,7 +531,9 @@ main(int argc, char *argv[]) else break; case 'm': - memsize = strtoul(optarg, NULL, 0) * MB; + error = vm_parse_memsize(optarg, &memsize); + if (error) + errx(EX_USAGE, "invalid memsize '%s'", optarg); break; case 'H': guest_vmexit_on_hlt = 1; Modified: projects/random_number_generator/usr.sbin/bhyve/pci_ahci.c ============================================================================== --- projects/random_number_generator/usr.sbin/bhyve/pci_ahci.c Wed Oct 9 07:02:03 2013 (r256179) +++ projects/random_number_generator/usr.sbin/bhyve/pci_ahci.c Wed Oct 9 07:55:21 2013 (r256180) @@ -119,8 +119,8 @@ struct ahci_ioreq { struct ahci_port { struct blockif_ctxt *bctx; struct pci_ahci_softc *pr_sc; - uint64_t cmd_lst; - uint64_t rfis; + uint8_t *cmd_lst; + uint8_t *rfis; int atapi; int reset; int mult_sectors; @@ -222,7 +222,7 @@ ahci_write_fis(struct ahci_port *p, enum { int offset, len, irq; - if (p->rfis == 0 || !(p->cmd & AHCI_P_CMD_FRE)) + if (p->rfis == NULL || !(p->cmd & AHCI_P_CMD_FRE)) return; switch (ft) { @@ -396,7 +396,7 @@ ahci_handle_dma(struct ahci_port *p, int sc = p->pr_sc; prdt = (struct ahci_prdt_entry *)(cfis + 0x80); - hdr = p->cmd_lst + slot * AHCI_CL_SIZE; + hdr = (struct ahci_cmd_hdr *)(p->cmd_lst + slot * AHCI_CL_SIZE); ncq = 0; readop = 1; @@ -508,7 +508,7 @@ write_prdt(struct ahci_port *p, int slot void *from; int i, len; - hdr = p->cmd_lst + slot * AHCI_CL_SIZE; + hdr = (struct ahci_cmd_hdr *)(p->cmd_lst + slot * AHCI_CL_SIZE); len = size; from = buf; prdt = (struct ahci_prdt_entry *)(cfis + 0x80); @@ -528,7 +528,7 @@ handle_identify(struct ahci_port *p, int { struct ahci_cmd_hdr *hdr; - hdr = p->cmd_lst + slot * AHCI_CL_SIZE; + hdr = (struct ahci_cmd_hdr *)(p->cmd_lst + slot * AHCI_CL_SIZE); if (p->atapi || hdr->prdtl == 0) { p->tfd = (ATA_E_ABORT << 8) | ATA_S_READY | ATA_S_ERROR; p->is |= AHCI_P_IX_TFE; @@ -869,7 +869,7 @@ atapi_read(struct ahci_port *p, int slot sc = p->pr_sc; acmd = cfis + 0x40; - hdr = p->cmd_lst + slot * AHCI_CL_SIZE; + hdr = (struct ahci_cmd_hdr *)(p->cmd_lst + slot * AHCI_CL_SIZE); prdt = (struct ahci_prdt_entry *)(cfis + 0x80); prdt += seek; @@ -1178,7 +1178,7 @@ ahci_handle_cmd(struct ahci_port *p, int } case ATA_SET_MULTI: if (cfis[12] != 0 && - (cfis[12] > 128 || (cfis[12] & cfis[12] - 1))) { + (cfis[12] > 128 || (cfis[12] & (cfis[12] - 1)))) { p->tfd = ATA_S_ERROR | ATA_S_READY; p->tfd |= (ATA_ERROR_ABORT << 8); } else { @@ -1241,7 +1241,7 @@ ahci_handle_slot(struct ahci_port *p, in int cfl; sc = p->pr_sc; - hdr = p->cmd_lst + slot * AHCI_CL_SIZE; + hdr = (struct ahci_cmd_hdr *)(p->cmd_lst + slot * AHCI_CL_SIZE); cfl = (hdr->flags & 0x1f) * 4; cfis = paddr_guest2host(ahci_ctx(sc), hdr->ctba, 0x80 + hdr->prdtl * sizeof(struct ahci_prdt_entry)); @@ -1318,7 +1318,7 @@ ata_ioreq_cb(struct blockif_req *br, int slot = aior->slot; pending = aior->prdtl; sc = p->pr_sc; - hdr = p->cmd_lst + slot * AHCI_CL_SIZE; + hdr = (struct ahci_cmd_hdr *)(p->cmd_lst + slot * AHCI_CL_SIZE); if (cfis[2] == ATA_WRITE_FPDMA_QUEUED || cfis[2] == ATA_READ_FPDMA_QUEUED) @@ -1380,7 +1380,7 @@ atapi_ioreq_cb(struct blockif_req *br, i slot = aior->slot; pending = aior->prdtl; sc = p->pr_sc; - hdr = p->cmd_lst + aior->slot * AHCI_CL_SIZE; + hdr = (struct ahci_cmd_hdr *)(p->cmd_lst + aior->slot * AHCI_CL_SIZE); pthread_mutex_lock(&sc->mtx); Modified: projects/random_number_generator/usr.sbin/bhyvectl/Makefile ============================================================================== --- projects/random_number_generator/usr.sbin/bhyvectl/Makefile Wed Oct 9 07:02:03 2013 (r256179) +++ projects/random_number_generator/usr.sbin/bhyvectl/Makefile Wed Oct 9 07:55:21 2013 (r256180) @@ -7,8 +7,8 @@ SRCS= bhyvectl.c NO_MAN= -DPADD= ${LIBVMMAPI} -LDADD= -lvmmapi +DPADD= ${LIBVMMAPI} ${LIBUTIL} +LDADD= -lvmmapi -lutil WARNS?= 3 Modified: projects/random_number_generator/usr.sbin/bhyveload/Makefile ============================================================================== --- projects/random_number_generator/usr.sbin/bhyveload/Makefile Wed Oct 9 07:02:03 2013 (r256179) +++ projects/random_number_generator/usr.sbin/bhyveload/Makefile Wed Oct 9 07:55:21 2013 (r256180) @@ -4,8 +4,8 @@ PROG= bhyveload SRCS= bhyveload.c MAN= bhyveload.8 -DPADD+= ${LIBVMMAPI} -LDADD+= -lvmmapi +DPADD+= ${LIBVMMAPI} ${LIBUTIL} +LDADD+= -lvmmapi -lutil WARNS?= 3 Modified: projects/random_number_generator/usr.sbin/bhyveload/bhyveload.8 ============================================================================== --- projects/random_number_generator/usr.sbin/bhyveload/bhyveload.8 Wed Oct 9 07:02:03 2013 (r256179) +++ projects/random_number_generator/usr.sbin/bhyveload/bhyveload.8 Wed Oct 9 07:55:21 2013 (r256180) @@ -1,4 +1,4 @@ -.\" +\" .\" Copyright (c) 2012 NetApp Inc .\" All rights reserved. .\" @@ -60,13 +60,29 @@ and will be created if it does not alrea .Sh OPTIONS The following options are available: .Bl -tag -width indent -.It Fl m Ar mem-size +.It Fl m Ar mem-size Xo +.Sm off +.Op Cm K | k | M | m | G | g | T | t +.Xc +.Sm on +.Ar mem-size +is the amount of memory allocated to the guest. +.Pp +The .Ar mem-size -is the amount of memory allocated to the guest in units of megabytes. +argument may be suffixed with one of +.Cm K , +.Cm M , +.Cm G +or +.Cm T +(either upper or lower case) to indicate a multiple of +Kilobytes, Megabytes, Gigabytes or Terabytes +respectively. .Pp The default value of .Ar mem-size -is 256. +is 256M. .It Fl d Ar disk-path The .Ar disk-path @@ -83,7 +99,7 @@ that boots off the ISO image .Pa /freebsd/release.iso and has 1GB memory allocated to it: .Pp -.Dl "bhyveload -m 1024 -d /freebsd/release.iso freebsd-vm" +.Dl "bhyveload -m 1G -d /freebsd/release.iso freebsd-vm" .Sh SEE ALSO .Xr bhyve 4 , .Xr bhyve 8 , Modified: projects/random_number_generator/usr.sbin/bhyveload/bhyveload.c ============================================================================== --- projects/random_number_generator/usr.sbin/bhyveload/bhyveload.c Wed Oct 9 07:02:03 2013 (r256179) +++ projects/random_number_generator/usr.sbin/bhyveload/bhyveload.c Wed Oct 9 07:55:21 2013 (r256180) @@ -67,12 +67,14 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include #include #include #include +#include #include #include @@ -581,9 +583,10 @@ main(int argc, char** argv) break; case 'm': - mem_size = strtoul(optarg, NULL, 0) * MB; + error = vm_parse_memsize(optarg, &mem_size); + if (error != 0) + errx(EX_USAGE, "Invalid memsize '%s'", optarg); break; - case '?': usage(); } From owner-svn-src-projects@FreeBSD.ORG Wed Oct 9 09:11:16 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 5929C924; Wed, 9 Oct 2013 09:11:16 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 455C226E7; Wed, 9 Oct 2013 09:11:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r999BGOn050261; Wed, 9 Oct 2013 09:11:16 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r999BEbN050252; Wed, 9 Oct 2013 09:11:14 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201310090911.r999BEbN050252@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Wed, 9 Oct 2013 09:11:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256182 - projects/random_number_generator/sys/dev/random X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Oct 2013 09:11:16 -0000 Author: des Date: Wed Oct 9 09:11:14 2013 New Revision: 256182 URL: http://svnweb.freebsd.org/changeset/base/256182 Log: Add missing include guards and move the existing ones out of the implementation namespace. Modified: projects/random_number_generator/sys/dev/random/hash.h projects/random_number_generator/sys/dev/random/live_entropy_sources.h projects/random_number_generator/sys/dev/random/random_adaptors.h projects/random_number_generator/sys/dev/random/random_harvestq.h projects/random_number_generator/sys/dev/random/randomdev.h projects/random_number_generator/sys/dev/random/randomdev_soft.h projects/random_number_generator/sys/dev/random/rwfile.h projects/random_number_generator/sys/dev/random/yarrow.h Modified: projects/random_number_generator/sys/dev/random/hash.h ============================================================================== --- projects/random_number_generator/sys/dev/random/hash.h Wed Oct 9 08:12:26 2013 (r256181) +++ projects/random_number_generator/sys/dev/random/hash.h Wed Oct 9 09:11:14 2013 (r256182) @@ -26,6 +26,9 @@ * $FreeBSD$ */ +#ifndef SYS_DEV_RANDOM_HASH_H_INCLUDED +#define SYS_DEV_RANDOM_HASH_H_INCLUDED + #define KEYSIZE 32 /* (in bytes) == 256 bits */ #define BLOCKSIZE 16 /* (in bytes) == 128 bits */ @@ -43,3 +46,5 @@ void randomdev_hash_iterate(struct rando void randomdev_hash_finish(struct randomdev_hash *, void *); void randomdev_encrypt_init(struct randomdev_key *, void *); void randomdev_encrypt(struct randomdev_key *context, void *, void *, unsigned); + +#endif Modified: projects/random_number_generator/sys/dev/random/live_entropy_sources.h ============================================================================== --- projects/random_number_generator/sys/dev/random/live_entropy_sources.h Wed Oct 9 08:12:26 2013 (r256181) +++ projects/random_number_generator/sys/dev/random/live_entropy_sources.h Wed Oct 9 09:11:14 2013 (r256182) @@ -27,8 +27,8 @@ * $FreeBSD$ */ -#ifndef __LIVE_ENTROPY_SOURCES__ -#define __LIVE_ENTROPY_SOURCES__ +#ifndef SYS_DEV_RANDOM_LIVE_ENTROPY_SOURCES_H_INCLUDED +#define SYS_DEV_RANDOM_LIVE_ENTROPY_SOURCES_H_INCLUDED /* * Live entropy source is a source of entropy that can provide @@ -57,4 +57,4 @@ void live_entropy_sources_feed(int, even MODULE_VERSION(name, ver); \ MODULE_DEPEND(name, random, 1, 1, 1); -#endif /* __LIVE_ENTROPY_SOURCES__ */ +#endif /* SYS_DEV_RANDOM_LIVE_ENTROPY_SOURCES_H_INCLUDED */ Modified: projects/random_number_generator/sys/dev/random/random_adaptors.h ============================================================================== --- projects/random_number_generator/sys/dev/random/random_adaptors.h Wed Oct 9 08:12:26 2013 (r256181) +++ projects/random_number_generator/sys/dev/random/random_adaptors.h Wed Oct 9 09:11:14 2013 (r256182) @@ -26,8 +26,8 @@ * $FreeBSD$ */ -#ifndef __RANDOM_ADAPTORS_H__ -#define __RANDOM_ADAPTORS_H__ +#ifndef SYS_DEV_RANDOM_RANDOM_ADAPTORS_H_INCLUDED +#define SYS_DEV_RANDOM_RANDOM_ADAPTORS_H_INCLUDED #include @@ -68,4 +68,4 @@ EVENTHANDLER_DECLARE(random_adaptor_atta SYSCTL_DECL(_kern_random); #endif /* SYSCTL_DECL */ -#endif /* __RANDOM_ADAPTORS_H__ */ +#endif /* SYS_DEV_RANDOM_RANDOM_ADAPTORS_H_INCLUDED */ Modified: projects/random_number_generator/sys/dev/random/random_harvestq.h ============================================================================== --- projects/random_number_generator/sys/dev/random/random_harvestq.h Wed Oct 9 08:12:26 2013 (r256181) +++ projects/random_number_generator/sys/dev/random/random_harvestq.h Wed Oct 9 09:11:14 2013 (r256182) @@ -26,8 +26,8 @@ * $FreeBSD$ */ -#ifndef __RANDOM_HARVEST_H__ -#define __RANDOM_HARVEST_H__ +#ifndef SYS_DEV_RANDOM_RANDOM_HARVESTQ_H_INCLUDED +#define SYS_DEV_RANDOM_RANDOM_HARVESTQ_H_INCLUDED typedef void (*event_proc_f)(struct harvest *event); @@ -39,4 +39,4 @@ void random_harvestq_internal(u_int64_t, extern int random_kthread_control; extern struct mtx harvest_mtx; -#endif /* __RANDOM_HARVEST_H__ */ +#endif /* SYS_DEV_RANDOM_RANDOM_HARVESTQ_H_INCLUDED */ Modified: projects/random_number_generator/sys/dev/random/randomdev.h ============================================================================== --- projects/random_number_generator/sys/dev/random/randomdev.h Wed Oct 9 08:12:26 2013 (r256181) +++ projects/random_number_generator/sys/dev/random/randomdev.h Wed Oct 9 09:11:14 2013 (r256182) @@ -26,6 +26,9 @@ * $FreeBSD$ */ +#ifndef SYS_DEV_RANDOM_RANDOMDEV_H_INCLUDED +#define SYS_DEV_RANDOM_RANDOMDEV_H_INCLUDED + /* This header contains only those definitions that are global * and non algorithm-specific for the entropy processor */ @@ -54,3 +57,5 @@ struct random_hardware_source { enum esource source; random_read_func_t *read; }; + +#endif Modified: projects/random_number_generator/sys/dev/random/randomdev_soft.h ============================================================================== --- projects/random_number_generator/sys/dev/random/randomdev_soft.h Wed Oct 9 08:12:26 2013 (r256181) +++ projects/random_number_generator/sys/dev/random/randomdev_soft.h Wed Oct 9 09:11:14 2013 (r256182) @@ -26,6 +26,9 @@ * $FreeBSD$ */ +#ifndef SYS_DEV_RANDOM_RANDOMDEV_SOFT_H_INCLUDED +#define SYS_DEV_RANDOM_RANDOMDEV_SOFT_H_INCLUDED + /* This header contains only those definitions that are global * and harvester-specific for the entropy processor */ @@ -79,3 +82,5 @@ random_check_uint_##name(SYSCTL_HANDLER_ return (sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, \ req)); \ } + +#endif Modified: projects/random_number_generator/sys/dev/random/rwfile.h ============================================================================== --- projects/random_number_generator/sys/dev/random/rwfile.h Wed Oct 9 08:12:26 2013 (r256181) +++ projects/random_number_generator/sys/dev/random/rwfile.h Wed Oct 9 09:11:14 2013 (r256182) @@ -26,5 +26,10 @@ * $FreeBSD$ */ +#ifndef SYS_DEV_RANDOM_RWFILE_H_INCLUDED +#define SYS_DEV_RANDOM_RWFILE_H_INCLUDED + int randomdev_read_file(const char *filename, void *buf, size_t); int randomdev_write_file(const char *filename, void *buf, size_t); + +#endif Modified: projects/random_number_generator/sys/dev/random/yarrow.h ============================================================================== --- projects/random_number_generator/sys/dev/random/yarrow.h Wed Oct 9 08:12:26 2013 (r256181) +++ projects/random_number_generator/sys/dev/random/yarrow.h Wed Oct 9 09:11:14 2013 (r256182) @@ -26,7 +26,12 @@ * $FreeBSD$ */ +#ifndef SYS_DEV_RANDOM_YARROW_H_INCLUDED +#define SYS_DEV_RANDOM_YARROW_H_INCLUDED + void random_yarrow_init_alg(struct sysctl_ctx_list *); void random_yarrow_deinit_alg(void); int random_yarrow_read(void *, int); void random_yarrow_reseed(void); + +#endif From owner-svn-src-projects@FreeBSD.ORG Wed Oct 9 09:12:45 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 49223A36; Wed, 9 Oct 2013 09:12:45 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 370E526F4; Wed, 9 Oct 2013 09:12:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r999CjoZ050795; Wed, 9 Oct 2013 09:12:45 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r999CjN7050794; Wed, 9 Oct 2013 09:12:45 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201310090912.r999CjN7050794@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Wed, 9 Oct 2013 09:12:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256183 - projects/random_number_generator/sys/dev/random X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Oct 2013 09:12:45 -0000 Author: des Date: Wed Oct 9 09:12:44 2013 New Revision: 256183 URL: http://svnweb.freebsd.org/changeset/base/256183 Log: comment nit Modified: projects/random_number_generator/sys/dev/random/random_harvestq.c Modified: projects/random_number_generator/sys/dev/random/random_harvestq.c ============================================================================== --- projects/random_number_generator/sys/dev/random/random_harvestq.c Wed Oct 9 09:11:14 2013 (r256182) +++ projects/random_number_generator/sys/dev/random/random_harvestq.c Wed Oct 9 09:12:44 2013 (r256183) @@ -112,7 +112,7 @@ random_harvestq_cache(void *arg __unused } /* Read and attempt to overwrite the entropy cache files. - * If the file exists, can be read and then overwritten,i + * If the file exists, can be read and then overwritten, * then use it. Ignore it otherwise, but print out what is * going on. */ From owner-svn-src-projects@FreeBSD.ORG Wed Oct 9 09:13:12 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id EC3F6B14; Wed, 9 Oct 2013 09:13:12 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D8C6C26F5; Wed, 9 Oct 2013 09:13:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r999DChv050966; Wed, 9 Oct 2013 09:13:12 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r999DCTo050965; Wed, 9 Oct 2013 09:13:12 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201310090913.r999DCTo050965@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Wed, 9 Oct 2013 09:13:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256184 - projects/random_number_generator/sys/dev/random X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Oct 2013 09:13:13 -0000 Author: des Date: Wed Oct 9 09:13:12 2013 New Revision: 256184 URL: http://svnweb.freebsd.org/changeset/base/256184 Log: Re-add /dev/urandom for compatibility purposes. Modified: projects/random_number_generator/sys/dev/random/randomdev.c Modified: projects/random_number_generator/sys/dev/random/randomdev.c ============================================================================== --- projects/random_number_generator/sys/dev/random/randomdev.c Wed Oct 9 09:12:44 2013 (r256183) +++ projects/random_number_generator/sys/dev/random/randomdev.c Wed Oct 9 09:13:12 2013 (r256184) @@ -179,6 +179,7 @@ random_initialize(void *p, struct random * with daemons */ random_dev = make_dev_credf(MAKEDEV_ETERNAL_KLD, &random_cdevsw, RANDOM_MINOR, NULL, UID_ROOT, GID_WHEEL, 0666, "random"); + make_dev_alias(random_dev, "urandom"); /* compatibility */ /* mark random(4) as initialized, to avoid being called again */ random_inited = 1; From owner-svn-src-projects@FreeBSD.ORG Wed Oct 9 17:41:50 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 7CCF739F; Wed, 9 Oct 2013 17:41:50 +0000 (UTC) (envelope-from markm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 66FA428BA; Wed, 9 Oct 2013 17:41:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r99HfoY3020838; Wed, 9 Oct 2013 17:41:50 GMT (envelope-from markm@svn.freebsd.org) Received: (from markm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r99Hfllf020817; Wed, 9 Oct 2013 17:41:47 GMT (envelope-from markm@svn.freebsd.org) Message-Id: <201310091741.r99Hfllf020817@svn.freebsd.org> From: Mark Murray Date: Wed, 9 Oct 2013 17:41:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256202 - in projects/random_number_generator: . gnu/usr.bin gnu/usr.bin/rcs share/doc/psd share/doc/psd/13.rcs share/man/man5 share/mk sys/arm/s3c2xx0 sys/cam sys/cam/ctl sys/contrib/i... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Oct 2013 17:41:50 -0000 Author: markm Date: Wed Oct 9 17:41:47 2013 New Revision: 256202 URL: http://svnweb.freebsd.org/changeset/base/256202 Log: MFC - tracking commit Added: projects/random_number_generator/gnu/usr.bin/rcs/ - copied from r256201, head/gnu/usr.bin/rcs/ projects/random_number_generator/share/doc/psd/13.rcs/ - copied from r256201, head/share/doc/psd/13.rcs/ projects/random_number_generator/tools/build/options/WITHOUT_RCS - copied unchanged from r256201, head/tools/build/options/WITHOUT_RCS Modified: projects/random_number_generator/ObsoleteFiles.inc projects/random_number_generator/UPDATING projects/random_number_generator/gnu/usr.bin/Makefile projects/random_number_generator/share/doc/psd/Makefile projects/random_number_generator/share/man/man5/src.conf.5 projects/random_number_generator/share/mk/bsd.own.mk projects/random_number_generator/sys/arm/s3c2xx0/uart_bus_s3c2410.c projects/random_number_generator/sys/arm/s3c2xx0/uart_cpu_s3c2410.c projects/random_number_generator/sys/cam/cam_xpt.c projects/random_number_generator/sys/cam/ctl/ctl_frontend_iscsi.c projects/random_number_generator/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c projects/random_number_generator/sys/dev/e1000/e1000_80003es2lan.c projects/random_number_generator/sys/dev/e1000/e1000_80003es2lan.h projects/random_number_generator/sys/dev/e1000/e1000_82571.c projects/random_number_generator/sys/dev/e1000/e1000_82575.c projects/random_number_generator/sys/dev/e1000/e1000_82575.h projects/random_number_generator/sys/dev/e1000/e1000_api.c projects/random_number_generator/sys/dev/e1000/e1000_defines.h projects/random_number_generator/sys/dev/e1000/e1000_hw.h projects/random_number_generator/sys/dev/e1000/e1000_i210.c projects/random_number_generator/sys/dev/e1000/e1000_i210.h projects/random_number_generator/sys/dev/e1000/e1000_ich8lan.c projects/random_number_generator/sys/dev/e1000/e1000_ich8lan.h projects/random_number_generator/sys/dev/e1000/e1000_mac.c projects/random_number_generator/sys/dev/e1000/e1000_osdep.h projects/random_number_generator/sys/dev/e1000/e1000_phy.c projects/random_number_generator/sys/dev/e1000/e1000_phy.h projects/random_number_generator/sys/dev/e1000/e1000_regs.h projects/random_number_generator/sys/dev/e1000/e1000_vf.h projects/random_number_generator/sys/dev/e1000/if_igb.c projects/random_number_generator/sys/dev/e1000/if_igb.h projects/random_number_generator/sys/dev/iscsi/iscsi.c projects/random_number_generator/sys/dev/netmap/if_igb_netmap.h projects/random_number_generator/sys/kern/uipc_sockbuf.c projects/random_number_generator/sys/netinet/tcp_input.c projects/random_number_generator/sys/sys/sockbuf.h projects/random_number_generator/tools/build/mk/OptionalObsoleteFiles.inc projects/random_number_generator/usr.sbin/bsdconfig/bsdconfig projects/random_number_generator/usr.sbin/bsdconfig/console/ttys projects/random_number_generator/usr.sbin/bsdconfig/mouse/enable projects/random_number_generator/usr.sbin/bsdconfig/networking/devices projects/random_number_generator/usr.sbin/bsdconfig/networking/share/device.subr projects/random_number_generator/usr.sbin/bsdconfig/networking/share/hostname.subr projects/random_number_generator/usr.sbin/bsdconfig/networking/share/ipaddr.subr projects/random_number_generator/usr.sbin/bsdconfig/networking/share/media.subr projects/random_number_generator/usr.sbin/bsdconfig/networking/share/netmask.subr projects/random_number_generator/usr.sbin/bsdconfig/networking/share/resolv.subr projects/random_number_generator/usr.sbin/bsdconfig/networking/share/routing.subr projects/random_number_generator/usr.sbin/bsdconfig/password/share/password.subr projects/random_number_generator/usr.sbin/bsdconfig/security/kern_securelevel projects/random_number_generator/usr.sbin/bsdconfig/security/security projects/random_number_generator/usr.sbin/bsdconfig/share/common.subr projects/random_number_generator/usr.sbin/bsdconfig/share/device.subr projects/random_number_generator/usr.sbin/bsdconfig/share/dialog.subr projects/random_number_generator/usr.sbin/bsdconfig/share/media/any.subr projects/random_number_generator/usr.sbin/bsdconfig/share/media/cdrom.subr projects/random_number_generator/usr.sbin/bsdconfig/share/media/common.subr projects/random_number_generator/usr.sbin/bsdconfig/share/media/dos.subr projects/random_number_generator/usr.sbin/bsdconfig/share/media/floppy.subr projects/random_number_generator/usr.sbin/bsdconfig/share/media/ftp.subr projects/random_number_generator/usr.sbin/bsdconfig/share/media/http.subr projects/random_number_generator/usr.sbin/bsdconfig/share/media/nfs.subr projects/random_number_generator/usr.sbin/bsdconfig/share/media/options.subr projects/random_number_generator/usr.sbin/bsdconfig/share/media/tcpip.subr projects/random_number_generator/usr.sbin/bsdconfig/share/media/ufs.subr projects/random_number_generator/usr.sbin/bsdconfig/share/media/usb.subr projects/random_number_generator/usr.sbin/bsdconfig/share/mustberoot.subr projects/random_number_generator/usr.sbin/bsdconfig/share/packages/packages.subr projects/random_number_generator/usr.sbin/bsdconfig/startup/misc projects/random_number_generator/usr.sbin/bsdconfig/startup/rcconf projects/random_number_generator/usr.sbin/bsdconfig/startup/rcdelete projects/random_number_generator/usr.sbin/bsdconfig/startup/rcvar projects/random_number_generator/usr.sbin/bsdconfig/startup/share/rcconf.subr projects/random_number_generator/usr.sbin/bsdconfig/startup/share/rcedit.subr projects/random_number_generator/usr.sbin/bsdconfig/timezone/timezone projects/random_number_generator/usr.sbin/bsdconfig/usermgmt/groupdel projects/random_number_generator/usr.sbin/bsdconfig/usermgmt/groupedit projects/random_number_generator/usr.sbin/bsdconfig/usermgmt/groupinput projects/random_number_generator/usr.sbin/bsdconfig/usermgmt/share/group_input.subr projects/random_number_generator/usr.sbin/bsdconfig/usermgmt/share/user_input.subr projects/random_number_generator/usr.sbin/bsdconfig/usermgmt/userdel projects/random_number_generator/usr.sbin/bsdconfig/usermgmt/useredit projects/random_number_generator/usr.sbin/bsdconfig/usermgmt/userinput projects/random_number_generator/usr.sbin/bsdconfig/usermgmt/usermgmt projects/random_number_generator/usr.sbin/ctladm/ctladm.c projects/random_number_generator/usr.sbin/ctld/kernel.c projects/random_number_generator/usr.sbin/ctld/login.c projects/random_number_generator/usr.sbin/iscsid/discovery.c Directory Properties: projects/random_number_generator/ (props changed) projects/random_number_generator/sys/ (props changed) projects/random_number_generator/sys/contrib/ipfilter/ (props changed) Modified: projects/random_number_generator/ObsoleteFiles.inc ============================================================================== --- projects/random_number_generator/ObsoleteFiles.inc Wed Oct 9 17:34:45 2013 (r256201) +++ projects/random_number_generator/ObsoleteFiles.inc Wed Oct 9 17:41:47 2013 (r256202) @@ -38,29 +38,6 @@ # xargs -n1 | sort | uniq -d; # done -# 20131015: removal of RCS from base -OLD_FILES+=usr/bin/ci -OLD_FILES+=usr/bin/co -OLD_FILES+=usr/bin/ident -OLD_FILES+=usr/bin/merge -OLD_FILES+=usr/bin/rcs -OLD_FILES+=usr/bin/rcsclean -OLD_FILES+=usr/bin/rcsdiff -OLD_FILES+=usr/bin/rcsfreeze -OLD_FILES+=usr/bin/rcsmerge -OLD_FILES+=usr/bin/rlog -OLD_FILES+=usr/share/man/man1/ci.1.gz -OLD_FILES+=usr/share/man/man1/co.1.gz -OLD_FILES+=usr/share/man/man1/ident.1.gz -OLD_FILES+=usr/share/man/man1/merge.1.gz -OLD_FILES+=usr/share/man/man1/rcs.1.gz -OLD_FILES+=usr/share/man/man1/rcsclean.1.gz -OLD_FILES+=usr/share/man/man1/rcsdiff.1.gz -OLD_FILES+=usr/share/man/man1/rcsfreeze.1.gz -OLD_FILES+=usr/share/man/man1/rcsintro.1.gz -OLD_FILES+=usr/share/man/man1/rcsmerge.1.gz -OLD_FILES+=usr/share/man/man1/rlog.1.gz -OLD_FILES+=usr/share/man/man5/rcsfile.5.gz # 20131001: ar and ranlib from binutils not used OLD_FILES+=usr/bin/gnu-ar OLD_FILES+=usr/bin/gnu-ranlib Modified: projects/random_number_generator/UPDATING ============================================================================== --- projects/random_number_generator/UPDATING Wed Oct 9 17:34:45 2013 (r256201) +++ projects/random_number_generator/UPDATING Wed Oct 9 17:41:47 2013 (r256202) @@ -31,10 +31,6 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) -20131006: - RCS has been removed from the base system. If you need RCS - install either devel/rcs or devel/rcs57. - 20130930: BIND has been removed from the base system. If all you need is a local resolver, simply enable and start the local_unbound Modified: projects/random_number_generator/gnu/usr.bin/Makefile ============================================================================== --- projects/random_number_generator/gnu/usr.bin/Makefile Wed Oct 9 17:34:45 2013 (r256201) +++ projects/random_number_generator/gnu/usr.bin/Makefile Wed Oct 9 17:41:47 2013 (r256202) @@ -12,6 +12,7 @@ SUBDIR= ${_binutils} \ ${_gperf} \ grep \ ${_groff} \ + ${_rcs} \ sdiff \ send-pr \ ${_texinfo} @@ -31,6 +32,10 @@ _dtc= dtc _texinfo= texinfo .endif +.if ${MK_RCS} != "no" +_rcs= rcs +.endif + .if ${MK_BINUTILS} != "no" _binutils= binutils .endif Modified: projects/random_number_generator/share/doc/psd/Makefile ============================================================================== --- projects/random_number_generator/share/doc/psd/Makefile Wed Oct 9 17:34:45 2013 (r256201) +++ projects/random_number_generator/share/doc/psd/Makefile Wed Oct 9 17:41:47 2013 (r256202) @@ -20,6 +20,7 @@ SUBDIR= title \ 05.sysman \ 06.Clang \ 12.make \ + 13.rcs \ 15.yacc \ 16.lex \ 17.m4 \ Modified: projects/random_number_generator/share/man/man5/src.conf.5 ============================================================================== --- projects/random_number_generator/share/man/man5/src.conf.5 Wed Oct 9 17:34:45 2013 (r256201) +++ projects/random_number_generator/share/man/man5/src.conf.5 Wed Oct 9 17:41:47 2013 (r256202) @@ -909,6 +909,11 @@ This includes .Xr rlogin 1 , .Xr rsh 1 , etc. +.It Va WITHOUT_RCS +.\" from FreeBSD: head/tools/build/options/WITHOUT_RCS 156932 2006-03-21 07:50:50Z ru +Set to not build +.Xr rcs 1 +and related utilities. .It Va WITHOUT_RESCUE .\" from FreeBSD: head/tools/build/options/WITHOUT_RESCUE 156932 2006-03-21 07:50:50Z ru Set to not build Modified: projects/random_number_generator/share/mk/bsd.own.mk ============================================================================== --- projects/random_number_generator/share/mk/bsd.own.mk Wed Oct 9 17:34:45 2013 (r256201) +++ projects/random_number_generator/share/mk/bsd.own.mk Wed Oct 9 17:41:47 2013 (r256202) @@ -334,6 +334,7 @@ __DEFAULT_YES_OPTIONS = \ PROFILE \ QUOTAS \ RCMDS \ + RCS \ RESCUE \ ROUTED \ SENDMAIL \ Modified: projects/random_number_generator/sys/arm/s3c2xx0/uart_bus_s3c2410.c ============================================================================== --- projects/random_number_generator/sys/arm/s3c2xx0/uart_bus_s3c2410.c Wed Oct 9 17:34:45 2013 (r256201) +++ projects/random_number_generator/sys/arm/s3c2xx0/uart_bus_s3c2410.c Wed Oct 9 17:41:47 2013 (r256202) @@ -35,7 +35,6 @@ static driver_t uart_s3c2410_driver = { sizeof(struct uart_softc), }; -extern struct uart_class uart_s3c2410_class; extern SLIST_HEAD(uart_devinfo_list, uart_devinfo) uart_sysdevs; static int uart_s3c2410_probe(device_t dev) Modified: projects/random_number_generator/sys/arm/s3c2xx0/uart_cpu_s3c2410.c ============================================================================== --- projects/random_number_generator/sys/arm/s3c2xx0/uart_cpu_s3c2410.c Wed Oct 9 17:34:45 2013 (r256201) +++ projects/random_number_generator/sys/arm/s3c2xx0/uart_cpu_s3c2410.c Wed Oct 9 17:41:47 2013 (r256202) @@ -47,8 +47,6 @@ extern struct uart_ops uart_s3c2410_ops; vm_offset_t s3c2410_uart_vaddr; unsigned int s3c2410_pclk; -extern struct uart_class uart_s3c2410_class; - int uart_cpu_eqres(struct uart_bas *b1, struct uart_bas *b2) { Modified: projects/random_number_generator/sys/cam/cam_xpt.c ============================================================================== --- projects/random_number_generator/sys/cam/cam_xpt.c Wed Oct 9 17:34:45 2013 (r256201) +++ projects/random_number_generator/sys/cam/cam_xpt.c Wed Oct 9 17:41:47 2013 (r256202) @@ -2415,7 +2415,7 @@ xptsetasyncbusfunc(struct cam_eb *bus, v struct ccb_setasync *csa = (struct ccb_setasync *)arg; xpt_compile_path(&path, /*periph*/NULL, - bus->sim->path_id, + bus->path_id, CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD); xpt_setup_ccb(&cpi.ccb_h, &path, CAM_PRIORITY_NORMAL); @@ -3840,13 +3840,8 @@ xpt_bus_register(struct cam_sim *sim, de /* Couldn't satisfy request */ return (CAM_RESRC_UNAVAIL); } - if (strcmp(sim->sim_name, "xpt") != 0) { - sim->path_id = - xptpathid(sim->sim_name, sim->unit_number, sim->bus_id); - } TAILQ_INIT(&new_bus->et_entries); - new_bus->path_id = sim->path_id; cam_sim_hold(sim); new_bus->sim = sim; timevalclear(&new_bus->last_reset); @@ -3855,6 +3850,8 @@ xpt_bus_register(struct cam_sim *sim, de new_bus->generation = 0; xpt_lock_buses(); + sim->path_id = new_bus->path_id = + xptpathid(sim->sim_name, sim->unit_number, sim->bus_id); old_bus = TAILQ_FIRST(&xsoftc.xpt_busses); while (old_bus != NULL && old_bus->path_id < new_bus->path_id) @@ -3958,8 +3955,8 @@ xptnextfreepathid(void) path_id_t pathid; const char *strval; + mtx_assert(&xsoftc.xpt_topo_lock, MA_OWNED); pathid = 0; - xpt_lock_buses(); bus = TAILQ_FIRST(&xsoftc.xpt_busses); retry: /* Find an unoccupied pathid */ @@ -3968,7 +3965,6 @@ retry: pathid++; bus = TAILQ_NEXT(bus, links); } - xpt_unlock_buses(); /* * Ensure that this pathid is not reserved for @@ -3977,7 +3973,6 @@ retry: if (resource_string_value("scbus", pathid, "at", &strval) == 0) { ++pathid; /* Start the search over */ - xpt_lock_buses(); goto retry; } return (pathid); @@ -3993,6 +3988,8 @@ xptpathid(const char *sim_name, int sim_ pathid = CAM_XPT_PATH_ID; snprintf(buf, sizeof(buf), "%s%d", sim_name, sim_unit); + if (strcmp(buf, "xpt0") == 0 && sim_bus == 0) + return (pathid); i = 0; while ((resource_find_match(&i, &dname, &dunit, "at", buf)) == 0) { if (strcmp(dname, "scbus")) { Modified: projects/random_number_generator/sys/cam/ctl/ctl_frontend_iscsi.c ============================================================================== --- projects/random_number_generator/sys/cam/ctl/ctl_frontend_iscsi.c Wed Oct 9 17:34:45 2013 (r256201) +++ projects/random_number_generator/sys/cam/ctl/ctl_frontend_iscsi.c Wed Oct 9 17:41:47 2013 (r256202) @@ -229,8 +229,6 @@ cfiscsi_pdu_update_cmdsn(const struct ic /* * The target MUST silently ignore any non-immediate command outside * of this range. - * - * XXX: ... or non-immediate duplicates within the range. */ if (cmdsn < cs->cs_cmdsn || cmdsn > cs->cs_cmdsn + maxcmdsn_delta) { CFISCSI_SESSION_UNLOCK(cs); @@ -288,8 +286,8 @@ cfiscsi_pdu_handle(struct icl_pdu *reque CFISCSI_SESSION_WARN(cs, "received PDU with unsupported " "opcode 0x%x; dropping connection", request->ip_bhs->bhs_opcode); - cfiscsi_session_terminate(cs); icl_pdu_free(request); + cfiscsi_session_terminate(cs); } } @@ -455,6 +453,9 @@ cfiscsi_pdu_handle_nop_out(struct icl_pd struct iscsi_bhs_nop_out *bhsno; struct iscsi_bhs_nop_in *bhsni; struct icl_pdu *response; + void *data = NULL; + size_t datasize; + int error; cs = PDU_SESSION(request); bhsno = (struct iscsi_bhs_nop_out *)request->ip_bhs; @@ -468,9 +469,26 @@ cfiscsi_pdu_handle_nop_out(struct icl_pd return; } + datasize = icl_pdu_data_segment_length(request); + if (datasize > 0) { + data = malloc(datasize, M_CFISCSI, M_NOWAIT | M_ZERO); + if (data == NULL) { + CFISCSI_SESSION_WARN(cs, "failed to allocate memory; " + "dropping connection"); + icl_pdu_free(request); + cfiscsi_session_terminate(cs); + return; + } + icl_pdu_get_data(request, 0, data, datasize); + } + response = cfiscsi_pdu_new_response(request, M_NOWAIT); if (response == NULL) { + CFISCSI_SESSION_WARN(cs, "failed to allocate memory; " + "droppping connection"); + free(data, M_CFISCSI); icl_pdu_free(request); + cfiscsi_session_terminate(cs); return; } bhsni = (struct iscsi_bhs_nop_in *)response->ip_bhs; @@ -478,14 +496,19 @@ cfiscsi_pdu_handle_nop_out(struct icl_pd bhsni->bhsni_flags = 0x80; bhsni->bhsni_initiator_task_tag = bhsno->bhsno_initiator_task_tag; bhsni->bhsni_target_transfer_tag = 0xffffffff; - -#if 0 - /* XXX */ - response->ip_data_len = request->ip_data_len; - response->ip_data_mbuf = request->ip_data_mbuf; - request->ip_data_len = 0; - request->ip_data_mbuf = NULL; -#endif + if (datasize > 0) { + error = icl_pdu_append_data(response, data, datasize, M_NOWAIT); + if (error != 0) { + CFISCSI_SESSION_WARN(cs, "failed to allocate memory; " + "dropping connection"); + free(data, M_CFISCSI); + icl_pdu_free(request); + icl_pdu_free(response); + cfiscsi_session_terminate(cs); + return; + } + free(data, M_CFISCSI); + } icl_pdu_free(request); cfiscsi_pdu_queue(response); @@ -507,14 +530,16 @@ cfiscsi_pdu_handle_scsi_command(struct i if (request->ip_data_len > 0 && cs->cs_immediate_data == false) { CFISCSI_SESSION_WARN(cs, "unsolicited data with " "ImmediateData=No; dropping connection"); - cfiscsi_session_terminate(cs); icl_pdu_free(request); + cfiscsi_session_terminate(cs); return; } io = ctl_alloc_io(cs->cs_target->ct_softc->fe.ctl_pool_ref); if (io == NULL) { - CFISCSI_SESSION_WARN(cs, "can't allocate ctl_io"); + CFISCSI_SESSION_WARN(cs, "can't allocate ctl_io; " + "dropping connection"); icl_pdu_free(request); + cfiscsi_session_terminate(cs); return; } ctl_zero_io(io); @@ -554,10 +579,12 @@ cfiscsi_pdu_handle_scsi_command(struct i refcount_acquire(&cs->cs_outstanding_ctl_pdus); error = ctl_queue(io); if (error != CTL_RETVAL_COMPLETE) { - CFISCSI_SESSION_WARN(cs, "ctl_queue() failed; error %d", error); + CFISCSI_SESSION_WARN(cs, "ctl_queue() failed; error %d; " + "dropping connection", error); ctl_free_io(io); refcount_release(&cs->cs_outstanding_ctl_pdus); icl_pdu_free(request); + cfiscsi_session_terminate(cs); } } @@ -575,8 +602,10 @@ cfiscsi_pdu_handle_task_request(struct i bhstmr = (struct iscsi_bhs_task_management_request *)request->ip_bhs; io = ctl_alloc_io(cs->cs_target->ct_softc->fe.ctl_pool_ref); if (io == NULL) { - CFISCSI_SESSION_WARN(cs, "can't allocate ctl_io"); + CFISCSI_SESSION_WARN(cs, "can't allocate ctl_io;" + "dropping connection"); icl_pdu_free(request); + cfiscsi_session_terminate(cs); return; } ctl_zero_io(io); @@ -617,7 +646,10 @@ cfiscsi_pdu_handle_task_request(struct i response = cfiscsi_pdu_new_response(request, M_NOWAIT); if (response == NULL) { + CFISCSI_SESSION_WARN(cs, "failed to allocate memory; " + "dropping connection"); icl_pdu_free(request); + cfiscsi_session_terminate(cs); return; } bhstmr2 = (struct iscsi_bhs_task_management_response *) @@ -636,10 +668,12 @@ cfiscsi_pdu_handle_task_request(struct i refcount_acquire(&cs->cs_outstanding_ctl_pdus); error = ctl_queue(io); if (error != CTL_RETVAL_COMPLETE) { - CFISCSI_SESSION_WARN(cs, "ctl_queue() failed; error %d", error); + CFISCSI_SESSION_WARN(cs, "ctl_queue() failed; error %d; " + "dropping connection", error); ctl_free_io(io); refcount_release(&cs->cs_outstanding_ctl_pdus); icl_pdu_free(request); + cfiscsi_session_terminate(cs); } } @@ -649,7 +683,7 @@ cfiscsi_handle_data_segment(struct icl_p struct iscsi_bhs_data_out *bhsdo; struct cfiscsi_session *cs; struct ctl_sg_entry ctl_sg_entry, *ctl_sglist; - size_t copy_len, off, buffer_offset; + size_t copy_len, len, off, buffer_offset; int ctl_sg_count; union ctl_io *io; @@ -684,10 +718,6 @@ cfiscsi_handle_data_segment(struct icl_p ctl_sglist->len = io->scsiio.kern_data_len; ctl_sg_count = 1; } -#if 0 - if (ctl_sg_count > 1) - CFISCSI_SESSION_DEBUG(cs, "ctl_sg_count = %d", ctl_sg_count); -#endif if ((request->ip_bhs->bhs_opcode & ~ISCSI_BHS_OPCODE_IMMEDIATE) == ISCSI_BHS_OPCODE_SCSI_DATA_OUT) @@ -707,7 +737,20 @@ cfiscsi_handle_data_segment(struct icl_p return (true); } + /* + * This is the offset within the PDU data segment, as opposed + * to buffer_offset, which is the offset within the task (SCSI + * command). + */ off = 0; + len = icl_pdu_data_segment_length(request); + + /* + * Iterate over the scatter/gather segments, filling them with data + * from the PDU data segment. Note that this can get called multiple + * times for one SCSI command; the cdw structure holds state for the + * scatter/gather list. + */ for (;;) { KASSERT(cdw->cdw_sg_index < ctl_sg_count, ("cdw->cdw_sg_index >= ctl_sg_count")); @@ -715,7 +758,8 @@ cfiscsi_handle_data_segment(struct icl_p cdw->cdw_sg_addr = ctl_sglist[cdw->cdw_sg_index].addr; cdw->cdw_sg_len = ctl_sglist[cdw->cdw_sg_index].len; } - copy_len = icl_pdu_data_segment_length(request) - off; + KASSERT(off <= len, ("len > off")); + copy_len = len - off; if (copy_len > cdw->cdw_sg_len) copy_len = cdw->cdw_sg_len; @@ -726,15 +770,27 @@ cfiscsi_handle_data_segment(struct icl_p io->scsiio.ext_data_filled += copy_len; if (cdw->cdw_sg_len == 0) { - if (cdw->cdw_sg_index == ctl_sg_count - 1) + /* + * End of current segment. + */ + if (cdw->cdw_sg_index == ctl_sg_count - 1) { + /* + * Last segment in scatter/gather list. + */ break; + } cdw->cdw_sg_index++; } - if (off == icl_pdu_data_segment_length(request)) + + if (off == len) { + /* + * End of PDU payload. + */ break; + } } - if (off < icl_pdu_data_segment_length(request)) { + if (len > off) { CFISCSI_SESSION_WARN(cs, "received too much data: got %zd bytes, " "expected %zd", icl_pdu_data_segment_length(request), off); cfiscsi_session_terminate(cs); @@ -808,8 +864,8 @@ cfiscsi_pdu_handle_data_out(struct icl_p CFISCSI_SESSION_UNLOCK(cs); if (cdw == NULL) { CFISCSI_SESSION_WARN(cs, "data transfer tag 0x%x, initiator task tag " - "0x%x, not found", bhsdo->bhsdo_target_transfer_tag, - bhsdo->bhsdo_initiator_task_tag); + "0x%x, not found; dropping connection", + bhsdo->bhsdo_target_transfer_tag, bhsdo->bhsdo_initiator_task_tag); icl_pdu_free(request); cfiscsi_session_terminate(cs); return; @@ -846,6 +902,7 @@ cfiscsi_pdu_handle_logout_request(struct case BHSLR_REASON_CLOSE_CONNECTION: response = cfiscsi_pdu_new_response(request, M_NOWAIT); if (response == NULL) { + CFISCSI_SESSION_DEBUG(cs, "failed to allocate memory"); icl_pdu_free(request); cfiscsi_session_terminate(cs); return; @@ -863,6 +920,8 @@ cfiscsi_pdu_handle_logout_request(struct case BHSLR_REASON_REMOVE_FOR_RECOVERY: response = cfiscsi_pdu_new_response(request, M_NOWAIT); if (response == NULL) { + CFISCSI_SESSION_WARN(cs, + "failed to allocate memory; dropping connection"); icl_pdu_free(request); cfiscsi_session_terminate(cs); return; @@ -934,7 +993,7 @@ cfiscsi_callout(void *context) cp = icl_pdu_new_bhs(cs->cs_conn, M_NOWAIT); if (cp == NULL) { - CFISCSI_SESSION_WARN(cs, "failed to allocate PDU"); + CFISCSI_SESSION_WARN(cs, "failed to allocate memory"); return; } bhsni = (struct iscsi_bhs_nop_in *)cp->ip_bhs; @@ -2275,11 +2334,6 @@ cfiscsi_datamove_in(union ctl_io *io) */ PDU_TOTAL_TRANSFER_LEN(request) = io->scsiio.kern_total_len; -#if 0 - if (ctl_sg_count > 1) - CFISCSI_SESSION_DEBUG(cs, "ctl_sg_count = %d", ctl_sg_count); -#endif - /* * This is the offset within the current SCSI command; * i.e. for the first call of datamove(), it will be 0, @@ -2287,8 +2341,6 @@ cfiscsi_datamove_in(union ctl_io *io) * of previous ones. */ off = htonl(io->scsiio.kern_rel_offset); - if (off > 1) - CFISCSI_SESSION_DEBUG(cs, "off = %zd", off); i = 0; addr = NULL; @@ -2361,7 +2413,7 @@ cfiscsi_datamove_in(union ctl_io *io) /* * Can't stuff more data into the current PDU; * queue it. Note that's not enough to check - * for kern_data_resid == 0 instead; there + * for kern_data_resid == 0 instead; there * may be several Data-In PDUs for the final * call to cfiscsi_datamove(), and we want * to set the F flag only on the last of them. @@ -2380,10 +2432,12 @@ cfiscsi_datamove_in(union ctl_io *io) if (response != NULL) { if (off == io->scsiio.kern_total_len) { bhsdi->bhsdi_flags |= BHSDI_FLAGS_F; +#if 0 } else { CFISCSI_SESSION_DEBUG(cs, "not setting the F flag; " "have %zd, need %zd", off, (size_t)io->scsiio.kern_total_len); +#endif } KASSERT(response->ip_data_len > 0, ("sending empty Data-In")); cfiscsi_pdu_queue(response); Modified: projects/random_number_generator/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c ============================================================================== --- projects/random_number_generator/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c Wed Oct 9 17:34:45 2013 (r256201) +++ projects/random_number_generator/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c Wed Oct 9 17:41:47 2013 (r256202) @@ -159,7 +159,7 @@ ipf_p_rcmd_portmsg(fin, aps, nat) ip6_t *ip6; #endif int tcpsz; - int slen; + int slen = 0; /* silence gcc */ ip_t *ip; mb_t *m; Modified: projects/random_number_generator/sys/dev/e1000/e1000_80003es2lan.c ============================================================================== --- projects/random_number_generator/sys/dev/e1000/e1000_80003es2lan.c Wed Oct 9 17:34:45 2013 (r256201) +++ projects/random_number_generator/sys/dev/e1000/e1000_80003es2lan.c Wed Oct 9 17:41:47 2013 (r256202) @@ -1,6 +1,6 @@ /****************************************************************************** - Copyright (c) 2001-2011, Intel Corporation + Copyright (c) 2001-2013, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without @@ -32,16 +32,12 @@ ******************************************************************************/ /*$FreeBSD$*/ -/* - * 80003ES2LAN Gigabit Ethernet Controller (Copper) +/* 80003ES2LAN Gigabit Ethernet Controller (Copper) * 80003ES2LAN Gigabit Ethernet Controller (Serdes) */ #include "e1000_api.h" -static s32 e1000_init_phy_params_80003es2lan(struct e1000_hw *hw); -static s32 e1000_init_nvm_params_80003es2lan(struct e1000_hw *hw); -static s32 e1000_init_mac_params_80003es2lan(struct e1000_hw *hw); static s32 e1000_acquire_phy_80003es2lan(struct e1000_hw *hw); static void e1000_release_phy_80003es2lan(struct e1000_hw *hw); static s32 e1000_acquire_nvm_80003es2lan(struct e1000_hw *hw); @@ -71,14 +67,12 @@ static s32 e1000_read_kmrn_reg_80003es2 u16 *data); static s32 e1000_write_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset, u16 data); -static s32 e1000_copper_link_setup_gg82563_80003es2lan(struct e1000_hw *hw); static void e1000_initialize_hw_bits_80003es2lan(struct e1000_hw *hw); static void e1000_release_swfw_sync_80003es2lan(struct e1000_hw *hw, u16 mask); static s32 e1000_read_mac_addr_80003es2lan(struct e1000_hw *hw); static void e1000_power_down_phy_copper_80003es2lan(struct e1000_hw *hw); -/* - * A table for the GG82563 cable length where the range is defined +/* A table for the GG82563 cable length where the range is defined * with a lower bound at "index" and the upper bound at * "index + 5". */ @@ -95,13 +89,13 @@ static const u16 e1000_gg82563_cable_len static s32 e1000_init_phy_params_80003es2lan(struct e1000_hw *hw) { struct e1000_phy_info *phy = &hw->phy; - s32 ret_val = E1000_SUCCESS; + s32 ret_val; DEBUGFUNC("e1000_init_phy_params_80003es2lan"); if (hw->phy.media_type != e1000_media_type_copper) { phy->type = e1000_phy_none; - goto out; + return E1000_SUCCESS; } else { phy->ops.power_up = e1000_power_up_phy_copper; phy->ops.power_down = e1000_power_down_phy_copper_80003es2lan; @@ -133,12 +127,9 @@ static s32 e1000_init_phy_params_80003es ret_val = e1000_get_phy_id(hw); /* Verify phy id */ - if (phy->id != GG82563_E_PHY_ID) { - ret_val = -E1000_ERR_PHY; - goto out; - } + if (phy->id != GG82563_E_PHY_ID) + return -E1000_ERR_PHY; -out: return ret_val; } @@ -176,8 +167,7 @@ static s32 e1000_init_nvm_params_80003es size = (u16)((eecd & E1000_EECD_SIZE_EX_MASK) >> E1000_EECD_SIZE_EX_SHIFT); - /* - * Added to a constant, "size" becomes the left-shift value + /* Added to a constant, "size" becomes the left-shift value * for setting word_size. */ size += NVM_WORD_SIZE_BASE_SHIFT; @@ -234,8 +224,8 @@ static s32 e1000_init_mac_params_80003es /* FWSM register */ mac->has_fwsm = TRUE; /* ARC supported; valid only if manageability features are enabled. */ - mac->arc_subsystem_valid = (E1000_READ_REG(hw, E1000_FWSM) & - E1000_FWSM_MODE_MASK) ? TRUE : FALSE; + mac->arc_subsystem_valid = !!(E1000_READ_REG(hw, E1000_FWSM) & + E1000_FWSM_MODE_MASK); /* Adaptive IFS not supported */ mac->adaptive_ifs = FALSE; @@ -377,14 +367,13 @@ static s32 e1000_acquire_nvm_80003es2lan ret_val = e1000_acquire_swfw_sync_80003es2lan(hw, E1000_SWFW_EEP_SM); if (ret_val) - goto out; + return ret_val; ret_val = e1000_acquire_nvm_generic(hw); if (ret_val) e1000_release_swfw_sync_80003es2lan(hw, E1000_SWFW_EEP_SM); -out: return ret_val; } @@ -415,23 +404,20 @@ static s32 e1000_acquire_swfw_sync_80003 u32 swfw_sync; u32 swmask = mask; u32 fwmask = mask << 16; - s32 ret_val = E1000_SUCCESS; - s32 i = 0, timeout = 50; + s32 i = 0; + s32 timeout = 50; DEBUGFUNC("e1000_acquire_swfw_sync_80003es2lan"); while (i < timeout) { - if (e1000_get_hw_semaphore_generic(hw)) { - ret_val = -E1000_ERR_SWFW_SYNC; - goto out; - } + if (e1000_get_hw_semaphore_generic(hw)) + return -E1000_ERR_SWFW_SYNC; swfw_sync = E1000_READ_REG(hw, E1000_SW_FW_SYNC); if (!(swfw_sync & (fwmask | swmask))) break; - /* - * Firmware currently using resource (fwmask) + /* Firmware currently using resource (fwmask) * or other software thread using resource (swmask) */ e1000_put_hw_semaphore_generic(hw); @@ -441,8 +427,7 @@ static s32 e1000_acquire_swfw_sync_80003 if (i == timeout) { DEBUGOUT("Driver can't access resource, SW_FW_SYNC timeout.\n"); - ret_val = -E1000_ERR_SWFW_SYNC; - goto out; + return -E1000_ERR_SWFW_SYNC; } swfw_sync |= swmask; @@ -450,8 +435,7 @@ static s32 e1000_acquire_swfw_sync_80003 e1000_put_hw_semaphore_generic(hw); -out: - return ret_val; + return E1000_SUCCESS; } /** @@ -497,14 +481,13 @@ static s32 e1000_read_phy_reg_gg82563_80 ret_val = e1000_acquire_phy_80003es2lan(hw); if (ret_val) - goto out; + return ret_val; /* Select Configuration Page */ if ((offset & MAX_PHY_REG_ADDRESS) < GG82563_MIN_ALT_REG) { page_select = GG82563_PHY_PAGE_SELECT; } else { - /* - * Use Alternative Page Select register to access + /* Use Alternative Page Select register to access * registers 30 and 31 */ page_select = GG82563_PHY_PAGE_SELECT_ALT; @@ -514,12 +497,11 @@ static s32 e1000_read_phy_reg_gg82563_80 ret_val = e1000_write_phy_reg_mdic(hw, page_select, temp); if (ret_val) { e1000_release_phy_80003es2lan(hw); - goto out; + return ret_val; } - if (hw->dev_spec._80003es2lan.mdic_wa_enable == TRUE) { - /* - * The "ready" bit in the MDIC register may be incorrectly set + if (hw->dev_spec._80003es2lan.mdic_wa_enable) { + /* The "ready" bit in the MDIC register may be incorrectly set * before the device has completed the "Page Select" MDI * transaction. So we wait 200us after each MDI command... */ @@ -529,9 +511,8 @@ static s32 e1000_read_phy_reg_gg82563_80 ret_val = e1000_read_phy_reg_mdic(hw, page_select, &temp); if (((u16)offset >> GG82563_PAGE_SHIFT) != temp) { - ret_val = -E1000_ERR_PHY; e1000_release_phy_80003es2lan(hw); - goto out; + return -E1000_ERR_PHY; } usec_delay(200); @@ -549,7 +530,6 @@ static s32 e1000_read_phy_reg_gg82563_80 e1000_release_phy_80003es2lan(hw); -out: return ret_val; } @@ -572,14 +552,13 @@ static s32 e1000_write_phy_reg_gg82563_8 ret_val = e1000_acquire_phy_80003es2lan(hw); if (ret_val) - goto out; + return ret_val; /* Select Configuration Page */ if ((offset & MAX_PHY_REG_ADDRESS) < GG82563_MIN_ALT_REG) { page_select = GG82563_PHY_PAGE_SELECT; } else { - /* - * Use Alternative Page Select register to access + /* Use Alternative Page Select register to access * registers 30 and 31 */ page_select = GG82563_PHY_PAGE_SELECT_ALT; @@ -589,12 +568,11 @@ static s32 e1000_write_phy_reg_gg82563_8 ret_val = e1000_write_phy_reg_mdic(hw, page_select, temp); if (ret_val) { e1000_release_phy_80003es2lan(hw); - goto out; + return ret_val; } - if (hw->dev_spec._80003es2lan.mdic_wa_enable == TRUE) { - /* - * The "ready" bit in the MDIC register may be incorrectly set + if (hw->dev_spec._80003es2lan.mdic_wa_enable) { + /* The "ready" bit in the MDIC register may be incorrectly set * before the device has completed the "Page Select" MDI * transaction. So we wait 200us after each MDI command... */ @@ -604,9 +582,8 @@ static s32 e1000_write_phy_reg_gg82563_8 ret_val = e1000_read_phy_reg_mdic(hw, page_select, &temp); if (((u16)offset >> GG82563_PAGE_SHIFT) != temp) { - ret_val = -E1000_ERR_PHY; e1000_release_phy_80003es2lan(hw); - goto out; + return -E1000_ERR_PHY; } usec_delay(200); @@ -624,7 +601,6 @@ static s32 e1000_write_phy_reg_gg82563_8 e1000_release_phy_80003es2lan(hw); -out: return ret_val; } @@ -655,7 +631,6 @@ static s32 e1000_write_nvm_80003es2lan(s static s32 e1000_get_cfg_done_80003es2lan(struct e1000_hw *hw) { s32 timeout = PHY_CFG_TIMEOUT; - s32 ret_val = E1000_SUCCESS; u32 mask = E1000_NVM_CFG_DONE_PORT_0; DEBUGFUNC("e1000_get_cfg_done_80003es2lan"); @@ -671,12 +646,10 @@ static s32 e1000_get_cfg_done_80003es2la } if (!timeout) { DEBUGOUT("MNG configuration cycle has not completed.\n"); - ret_val = -E1000_ERR_RESET; - goto out; + return -E1000_ERR_RESET; } -out: - return ret_val; + return E1000_SUCCESS; } /** @@ -688,33 +661,32 @@ out: **/ static s32 e1000_phy_force_speed_duplex_80003es2lan(struct e1000_hw *hw) { - s32 ret_val = E1000_SUCCESS; + s32 ret_val; u16 phy_data; bool link; DEBUGFUNC("e1000_phy_force_speed_duplex_80003es2lan"); if (!(hw->phy.ops.read_reg)) - goto out; + return E1000_SUCCESS; - /* - * Clear Auto-Crossover to force MDI manually. M88E1000 requires MDI + /* Clear Auto-Crossover to force MDI manually. M88E1000 requires MDI * forced whenever speed and duplex are forced. */ ret_val = hw->phy.ops.read_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data); if (ret_val) - goto out; + return ret_val; phy_data &= ~GG82563_PSCR_CROSSOVER_MODE_AUTO; ret_val = hw->phy.ops.write_reg(hw, GG82563_PHY_SPEC_CTRL, phy_data); if (ret_val) - goto out; + return ret_val; DEBUGOUT1("GG82563 PSCR: %X\n", phy_data); ret_val = hw->phy.ops.read_reg(hw, PHY_CONTROL, &phy_data); if (ret_val) - goto out; + return ret_val; e1000_phy_force_speed_duplex_setup(hw, &phy_data); @@ -723,7 +695,7 @@ static s32 e1000_phy_force_speed_duplex_ ret_val = hw->phy.ops.write_reg(hw, PHY_CONTROL, phy_data); if (ret_val) - goto out; + return ret_val; usec_delay(1); @@ -733,32 +705,30 @@ static s32 e1000_phy_force_speed_duplex_ ret_val = e1000_phy_has_link_generic(hw, PHY_FORCE_LIMIT, 100000, &link); if (ret_val) - goto out; + return ret_val; if (!link) { - /* - * We didn't get link. + /* We didn't get link. * Reset the DSP and cross our fingers. */ ret_val = e1000_phy_reset_dsp_generic(hw); if (ret_val) - goto out; + return ret_val; } /* Try once more */ ret_val = e1000_phy_has_link_generic(hw, PHY_FORCE_LIMIT, 100000, &link); if (ret_val) - goto out; + return ret_val; } ret_val = hw->phy.ops.read_reg(hw, GG82563_PHY_MAC_SPEC_CTRL, &phy_data); if (ret_val) - goto out; + return ret_val; - /* - * Resetting the phy means we need to verify the TX_CLK corresponds + /* Resetting the phy means we need to verify the TX_CLK corresponds * to the link speed. 10Mbps -> 2.5MHz, else 25MHz. */ phy_data &= ~GG82563_MSCR_TX_CLK_MASK; @@ -767,15 +737,13 @@ static s32 e1000_phy_force_speed_duplex_ else phy_data |= GG82563_MSCR_TX_CLK_100MBPS_25; - /* - * In addition, we must re-enable CRS on Tx for both half and full + /* In addition, we must re-enable CRS on Tx for both half and full * duplex. */ phy_data |= GG82563_MSCR_ASSERT_CRS_ON_TX; ret_val = hw->phy.ops.write_reg(hw, GG82563_PHY_MAC_SPEC_CTRL, phy_data); -out: return ret_val; } @@ -789,32 +757,29 @@ out: static s32 e1000_get_cable_length_80003es2lan(struct e1000_hw *hw) { struct e1000_phy_info *phy = &hw->phy; - s32 ret_val = E1000_SUCCESS; + s32 ret_val; u16 phy_data, index; DEBUGFUNC("e1000_get_cable_length_80003es2lan"); if (!(hw->phy.ops.read_reg)) - goto out; + return E1000_SUCCESS; ret_val = hw->phy.ops.read_reg(hw, GG82563_PHY_DSP_DISTANCE, &phy_data); if (ret_val) - goto out; + return ret_val; index = phy_data & GG82563_DSPD_CABLE_LENGTH; - if (index >= GG82563_CABLE_LENGTH_TABLE_SIZE - 5) { - ret_val = -E1000_ERR_PHY; - goto out; - } + if (index >= GG82563_CABLE_LENGTH_TABLE_SIZE - 5) + return -E1000_ERR_PHY; phy->min_cable_length = e1000_gg82563_cable_length_table[index]; phy->max_cable_length = e1000_gg82563_cable_length_table[index + 5]; phy->cable_length = (phy->min_cable_length + phy->max_cable_length) / 2; -out: - return ret_val; + return E1000_SUCCESS; } /** @@ -855,11 +820,11 @@ static s32 e1000_reset_hw_80003es2lan(st { u32 ctrl; s32 ret_val; + u16 kum_reg_data; DEBUGFUNC("e1000_reset_hw_80003es2lan"); - /* - * Prevent the PCI-E bus from sticking if there is no TLP connection + /* Prevent the PCI-E bus from sticking if there is no TLP connection * on the last TLP read/write transaction when MAC is reset. */ ret_val = e1000_disable_pcie_master_generic(hw); @@ -878,23 +843,30 @@ static s32 e1000_reset_hw_80003es2lan(st ctrl = E1000_READ_REG(hw, E1000_CTRL); ret_val = e1000_acquire_phy_80003es2lan(hw); + if (ret_val) + return ret_val; + DEBUGOUT("Issuing a global reset to MAC\n"); E1000_WRITE_REG(hw, E1000_CTRL, ctrl | E1000_CTRL_RST); e1000_release_phy_80003es2lan(hw); + /* Disable IBIST slave mode (far-end loopback) */ + e1000_read_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM, + &kum_reg_data); + kum_reg_data |= E1000_KMRNCTRLSTA_IBIST_DISABLE; + e1000_write_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM, + kum_reg_data); + ret_val = e1000_get_auto_rd_done_generic(hw); if (ret_val) /* We don't want to continue accessing MAC registers. */ - goto out; + return ret_val; /* Clear any pending interrupt events. */ E1000_WRITE_REG(hw, E1000_IMC, 0xffffffff); E1000_READ_REG(hw, E1000_ICR); - ret_val = e1000_check_alt_mac_addr_generic(hw); - -out: - return ret_val; + return e1000_check_alt_mac_addr_generic(hw); } *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Wed Oct 9 17:50:37 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 4C4C471A; Wed, 9 Oct 2013 17:50:37 +0000 (UTC) (envelope-from markm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3A1A72934; Wed, 9 Oct 2013 17:50:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r99HobTR025153; Wed, 9 Oct 2013 17:50:37 GMT (envelope-from markm@svn.freebsd.org) Received: (from markm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r99HobGh025151; Wed, 9 Oct 2013 17:50:37 GMT (envelope-from markm@svn.freebsd.org) Message-Id: <201310091750.r99HobGh025151@svn.freebsd.org> From: Mark Murray Date: Wed, 9 Oct 2013 17:50:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256203 - projects/random_number_generator/sys/dev/random X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Oct 2013 17:50:37 -0000 Author: markm Date: Wed Oct 9 17:50:36 2013 New Revision: 256203 URL: http://svnweb.freebsd.org/changeset/base/256203 Log: Wrap some policy-rich code in 'if NOTYET' until we can thresh out what it really needs to do. Modified: projects/random_number_generator/sys/dev/random/random_harvestq.c Modified: projects/random_number_generator/sys/dev/random/random_harvestq.c ============================================================================== --- projects/random_number_generator/sys/dev/random/random_harvestq.c Wed Oct 9 17:41:47 2013 (r256202) +++ projects/random_number_generator/sys/dev/random/random_harvestq.c Wed Oct 9 17:50:36 2013 (r256203) @@ -84,6 +84,7 @@ static const char *entropy_files[] = { NULL }; +#ifdef NOTYET /* This is full of policy stuff, needs further discussion */ /* Deal with entropy cached externally if this is present. * Lots of policy may eventually arrive in this function. * Called after / is mounted. @@ -138,6 +139,7 @@ random_harvestq_cache(void *arg __unused free(data, M_ENTROPY); } EVENTHANDLER_DEFINE(mountroot, random_harvestq_cache, NULL, 0); +#endif /* NOTYET */ static void random_kthread(void *arg) From owner-svn-src-projects@FreeBSD.ORG Wed Oct 9 17:51:39 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 9B851852; Wed, 9 Oct 2013 17:51:39 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8911C295F; Wed, 9 Oct 2013 17:51:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r99Hpd2q025924; Wed, 9 Oct 2013 17:51:39 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r99Hpdqb025922; Wed, 9 Oct 2013 17:51:39 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201310091751.r99Hpdqb025922@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Wed, 9 Oct 2013 17:51:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256204 - projects/random_number_generator/sys/dev/random X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Oct 2013 17:51:39 -0000 Author: des Date: Wed Oct 9 17:51:38 2013 New Revision: 256204 URL: http://svnweb.freebsd.org/changeset/base/256204 Log: staticize struct random_hardware_source Modified: projects/random_number_generator/sys/dev/random/ivy.c projects/random_number_generator/sys/dev/random/nehemiah.c Modified: projects/random_number_generator/sys/dev/random/ivy.c ============================================================================== --- projects/random_number_generator/sys/dev/random/ivy.c Wed Oct 9 17:50:36 2013 (r256203) +++ projects/random_number_generator/sys/dev/random/ivy.c Wed Oct 9 17:51:38 2013 (r256204) @@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$"); static int random_ivy_read(void *, int); -struct random_hardware_source random_ivy = { +static struct random_hardware_source random_ivy = { .ident = "Hardware, Intel IvyBridge+ RNG", .source = RANDOM_PURE_RDRAND, .read = random_ivy_read Modified: projects/random_number_generator/sys/dev/random/nehemiah.c ============================================================================== --- projects/random_number_generator/sys/dev/random/nehemiah.c Wed Oct 9 17:50:36 2013 (r256203) +++ projects/random_number_generator/sys/dev/random/nehemiah.c Wed Oct 9 17:51:38 2013 (r256204) @@ -51,7 +51,7 @@ static void random_nehemiah_init(void); static void random_nehemiah_deinit(void); static int random_nehemiah_read(void *, int); -struct random_hardware_source random_nehemiah = { +static struct random_hardware_source random_nehemiah = { .ident = "Hardware, VIA Nehemiah Padlock RNG", .source = RANDOM_PURE_NEHEMIAH, .read = random_nehemiah_read From owner-svn-src-projects@FreeBSD.ORG Wed Oct 9 18:11:16 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 0A95FE44; Wed, 9 Oct 2013 18:11:16 +0000 (UTC) (envelope-from markm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E630A2AC6; Wed, 9 Oct 2013 18:11:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r99IBFTY036596; Wed, 9 Oct 2013 18:11:15 GMT (envelope-from markm@svn.freebsd.org) Received: (from markm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r99IBFVr036595; Wed, 9 Oct 2013 18:11:15 GMT (envelope-from markm@svn.freebsd.org) Message-Id: <201310091811.r99IBFVr036595@svn.freebsd.org> From: Mark Murray Date: Wed, 9 Oct 2013 18:11:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256205 - projects/random_number_generator/sys/dev/random X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Oct 2013 18:11:16 -0000 Author: markm Date: Wed Oct 9 18:11:15 2013 New Revision: 256205 URL: http://svnweb.freebsd.org/changeset/base/256205 Log: Sigh. I can't even get a single #ifdef right. Who's got the hat? Modified: projects/random_number_generator/sys/dev/random/random_harvestq.c Modified: projects/random_number_generator/sys/dev/random/random_harvestq.c ============================================================================== --- projects/random_number_generator/sys/dev/random/random_harvestq.c Wed Oct 9 17:51:38 2013 (r256204) +++ projects/random_number_generator/sys/dev/random/random_harvestq.c Wed Oct 9 18:11:15 2013 (r256205) @@ -79,12 +79,12 @@ int random_kthread_control = 0; static struct proc *random_kthread_proc; +#ifdef NOTYET /* This is full of policy stuff, needs further discussion */ static const char *entropy_files[] = { "/entropy", NULL }; -#ifdef NOTYET /* This is full of policy stuff, needs further discussion */ /* Deal with entropy cached externally if this is present. * Lots of policy may eventually arrive in this function. * Called after / is mounted. From owner-svn-src-projects@FreeBSD.ORG Wed Oct 9 20:13:00 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 75F57AA4; Wed, 9 Oct 2013 20:13:00 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 635E922C3; Wed, 9 Oct 2013 20:13:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r99KD0OH002108; Wed, 9 Oct 2013 20:13:00 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r99KD0ML002107; Wed, 9 Oct 2013 20:13:00 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201310092013.r99KD0ML002107@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Wed, 9 Oct 2013 20:13:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256239 - projects/random_number_generator/sys/sys X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Oct 2013 20:13:00 -0000 Author: des Date: Wed Oct 9 20:12:59 2013 New Revision: 256239 URL: http://svnweb.freebsd.org/changeset/base/256239 Log: Define RANDOM_PURE_RNDTEST for rndtest(4). Modified: projects/random_number_generator/sys/sys/random.h Modified: projects/random_number_generator/sys/sys/random.h ============================================================================== --- projects/random_number_generator/sys/sys/random.h Wed Oct 9 20:09:58 2013 (r256238) +++ projects/random_number_generator/sys/sys/random.h Wed Oct 9 20:12:59 2013 (r256239) @@ -55,6 +55,7 @@ enum esource { RANDOM_PURE_HIFN, RANDOM_PURE_RDRAND, RANDOM_PURE_NEHEMIAH, + RANDOM_PURE_RNDTEST, ENTROPYSOURCE }; void random_harvest(void *, u_int, u_int, enum esource); From owner-svn-src-projects@FreeBSD.ORG Wed Oct 9 20:14:18 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 05BA3BAE; Wed, 9 Oct 2013 20:14:18 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D887C22D3; Wed, 9 Oct 2013 20:14:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r99KEHaA002840; Wed, 9 Oct 2013 20:14:17 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r99KEGmv002798; Wed, 9 Oct 2013 20:14:16 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201310092014.r99KEGmv002798@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Wed, 9 Oct 2013 20:14:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256240 - in projects/random_number_generator/sys: conf dev/random X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Oct 2013 20:14:18 -0000 Author: des Date: Wed Oct 9 20:14:16 2013 New Revision: 256240 URL: http://svnweb.freebsd.org/changeset/base/256240 Log: Add a RANDOM_RWFILE option and hide the entropy cache code behind it. Rename YARROW_RNG and FORTUNA_RNG to RANDOM_YARROW and RANDOM_FORTUNA. Add the RANDOM_* options to LINT. Modified: projects/random_number_generator/sys/conf/NOTES projects/random_number_generator/sys/conf/options projects/random_number_generator/sys/dev/random/random_harvestq.c projects/random_number_generator/sys/dev/random/randomdev_soft.c projects/random_number_generator/sys/dev/random/rwfile.c projects/random_number_generator/sys/dev/random/rwfile.h Modified: projects/random_number_generator/sys/conf/NOTES ============================================================================== --- projects/random_number_generator/sys/conf/NOTES Wed Oct 9 20:12:59 2013 (r256239) +++ projects/random_number_generator/sys/conf/NOTES Wed Oct 9 20:14:16 2013 (r256240) @@ -2962,3 +2962,8 @@ options RCTL options BROOKTREE_ALLOC_PAGES=(217*4+1) options MAXFILES=999 +# Random number generator +options RANDOM_YARROW # Yarrow RNG +##options RANDOM_FORTUNA # Fortuna RNG - not yet implemented +options RANDOM_DEBUG # Debugging messages +options RANDOM_RWFILE # Read and write entropy cache Modified: projects/random_number_generator/sys/conf/options ============================================================================== --- projects/random_number_generator/sys/conf/options Wed Oct 9 20:12:59 2013 (r256239) +++ projects/random_number_generator/sys/conf/options Wed Oct 9 20:14:16 2013 (r256240) @@ -906,6 +906,7 @@ RACCT opt_global.h RCTL opt_global.h # Random number generator(s) -YARROW_RNG opt_random.h -FORTUNA_RNG opt_random.h +RANDOM_YARROW opt_random.h +RANDOM_FORTUNA opt_random.h RANDOM_DEBUG opt_random.h +RANDOM_RWFILE opt_random.h Modified: projects/random_number_generator/sys/dev/random/random_harvestq.c ============================================================================== --- projects/random_number_generator/sys/dev/random/random_harvestq.c Wed Oct 9 20:12:59 2013 (r256239) +++ projects/random_number_generator/sys/dev/random/random_harvestq.c Wed Oct 9 20:14:16 2013 (r256240) @@ -30,6 +30,8 @@ #include __FBSDID("$FreeBSD$"); +#include "opt_random.h" + #include #include #include @@ -79,11 +81,12 @@ int random_kthread_control = 0; static struct proc *random_kthread_proc; -#ifdef NOTYET /* This is full of policy stuff, needs further discussion */ +#ifdef RANDOM_RWFILE static const char *entropy_files[] = { "/entropy", NULL }; +#endif /* Deal with entropy cached externally if this is present. * Lots of policy may eventually arrive in this function. @@ -92,10 +95,13 @@ static const char *entropy_files[] = { static void random_harvestq_cache(void *arg __unused) { - const char **entropy_file; - uint8_t *keyfile, *data, *zbuf; + uint8_t *keyfile, *data; size_t size, i; +#ifdef RANDOM_RWFILE + const char **entropy_file; + uint8_t *zbuf; int error; +#endif /* Get stuff that may have been preloaded by loader(8) */ keyfile = preload_search_by_type("/boot/entropy"); @@ -112,6 +118,7 @@ random_harvestq_cache(void *arg __unused printf("random: no preloaded entropy cache available\n"); } +#ifdef RANDOM_RWFILE /* Read and attempt to overwrite the entropy cache files. * If the file exists, can be read and then overwritten, * then use it. Ignore it otherwise, but print out what is @@ -137,9 +144,9 @@ random_harvestq_cache(void *arg __unused } bzero(data, PAGE_SIZE); free(data, M_ENTROPY); +#endif } EVENTHANDLER_DEFINE(mountroot, random_harvestq_cache, NULL, 0); -#endif /* NOTYET */ static void random_kthread(void *arg) Modified: projects/random_number_generator/sys/dev/random/randomdev_soft.c ============================================================================== --- projects/random_number_generator/sys/dev/random/randomdev_soft.c Wed Oct 9 20:12:59 2013 (r256239) +++ projects/random_number_generator/sys/dev/random/randomdev_soft.c Wed Oct 9 20:14:16 2013 (r256240) @@ -28,12 +28,12 @@ #include "opt_random.h" -#if !defined(YARROW_RNG) && !defined(FORTUNA_RNG) -#define YARROW_RNG -#elif defined(YARROW_RNG) && defined(FORTUNA_RNG) -#error "Must define either YARROW_RNG or FORTUNA_RNG" +#if !defined(RANDOM_YARROW) && !defined(RANDOM_FORTUNA) +#define RANDOM_YARROW +#elif defined(RANDOM_YARROW) && defined(RANDOM_FORTUNA) +#error "Must define either RANDOM_YARROW or RANDOM_FORTUNA" #endif -#if defined(FORTUNA_RNG) +#if defined(RANDOM_FORTUNA) #error "Fortuna is not yet implemented" #endif @@ -62,10 +62,10 @@ __FBSDID("$FreeBSD$"); #include #include #include -#if defined(YARROW_RNG) +#if defined(RANDOM_YARROW) #include #endif -#if defined(FORTUNA_RNG) +#if defined(RANDOM_FORTUNA) #include #endif @@ -74,7 +74,7 @@ static int randomdev_poll(int event, str static int randomdev_block(int flag); static void randomdev_flush_reseed(void); -#if defined(YARROW_RNG) +#if defined(RANDOM_YARROW) static struct random_adaptor random_context = { .ident = "Software, Yarrow", .init = randomdev_init, @@ -89,7 +89,7 @@ static struct random_adaptor random_cont #define RANDOM_CSPRNG_NAME "yarrow" #endif -#if defined(FORTUNA_RNG) +#if defined(RANDOM_FORTUNA) static struct random_adaptor random_context = { .ident = "Software, Fortuna", .init = randomdev_init, @@ -123,10 +123,10 @@ randomdev_init(void) { struct sysctl_oid *random_sys_o, *random_sys_harvest_o; -#if defined(YARROW_RNG) +#if defined(RANDOM_YARROW) random_yarrow_init_alg(&random_clist); #endif -#if defined(FORTUNA_RNG) +#if defined(RANDOM_FORTUNA) random_fortuna_init_alg(&random_clist); #endif @@ -186,10 +186,10 @@ randomdev_deinit(void) random_kthread_control = -1; tsleep((void *)&random_kthread_control, 0, "term", 0); -#if defined(YARROW_RNG) +#if defined(RANDOM_YARROW) random_yarrow_deinit_alg(); #endif -#if defined(FORTUNA_RNG) +#if defined(RANDOM_FORTUNA) random_fortuna_deinit_alg(); #endif @@ -258,11 +258,11 @@ randomdev_flush_reseed(void) while (random_kthread_control) pause("-", hz / 10); -#if defined(YARROW_RNG) +#if defined(RANDOM_YARROW) /* This ultimately calls randomdev_unblock() */ random_yarrow_reseed(); #endif -#if defined(FORTUNA_RNG) +#if defined(RANDOM_FORTUNA) /* This ultimately calls randomdev_unblock() */ random_fortuna_reseed(); #endif Modified: projects/random_number_generator/sys/dev/random/rwfile.c ============================================================================== --- projects/random_number_generator/sys/dev/random/rwfile.c Wed Oct 9 20:12:59 2013 (r256239) +++ projects/random_number_generator/sys/dev/random/rwfile.c Wed Oct 9 20:14:16 2013 (r256240) @@ -28,6 +28,10 @@ #include __FBSDID("$FreeBSD$"); +#include "opt_random.h" + +#ifdef RANDOM_RWFILE + #include #include #include @@ -88,3 +92,5 @@ randomdev_write_file(const char *filenam return (error); } + +#endif Modified: projects/random_number_generator/sys/dev/random/rwfile.h ============================================================================== --- projects/random_number_generator/sys/dev/random/rwfile.h Wed Oct 9 20:12:59 2013 (r256239) +++ projects/random_number_generator/sys/dev/random/rwfile.h Wed Oct 9 20:14:16 2013 (r256240) @@ -29,7 +29,11 @@ #ifndef SYS_DEV_RANDOM_RWFILE_H_INCLUDED #define SYS_DEV_RANDOM_RWFILE_H_INCLUDED +#ifdef RANDOM_RWFILE + int randomdev_read_file(const char *filename, void *buf, size_t); int randomdev_write_file(const char *filename, void *buf, size_t); #endif + +#endif From owner-svn-src-projects@FreeBSD.ORG Wed Oct 9 21:03:38 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id B2D3E249; Wed, 9 Oct 2013 21:03:38 +0000 (UTC) (envelope-from markm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9DE31259D; Wed, 9 Oct 2013 21:03:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r99L3c2O028542; Wed, 9 Oct 2013 21:03:38 GMT (envelope-from markm@svn.freebsd.org) Received: (from markm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r99L3YYp028514; Wed, 9 Oct 2013 21:03:34 GMT (envelope-from markm@svn.freebsd.org) Message-Id: <201310092103.r99L3YYp028514@svn.freebsd.org> From: Mark Murray Date: Wed, 9 Oct 2013 21:03:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256243 - in projects/random_number_generator: . bin bin/freebsd-version lib/libprocstat libexec libexec/freebsd-version sys/dev/cxgbe sys/dev/isci sys/dev/iscsi sys/dev/ixgbe sys/kern ... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Oct 2013 21:03:38 -0000 Author: markm Date: Wed Oct 9 21:03:34 2013 New Revision: 256243 URL: http://svnweb.freebsd.org/changeset/base/256243 Log: MFC - tracking commit. Added: projects/random_number_generator/bin/freebsd-version/ - copied from r256242, head/bin/freebsd-version/ Deleted: projects/random_number_generator/libexec/freebsd-version/ Modified: projects/random_number_generator/ObsoleteFiles.inc projects/random_number_generator/bin/Makefile projects/random_number_generator/lib/libprocstat/libprocstat.c projects/random_number_generator/libexec/Makefile projects/random_number_generator/sys/dev/cxgbe/t4_main.c projects/random_number_generator/sys/dev/isci/isci_io_request.c projects/random_number_generator/sys/dev/isci/isci_sysctl.c projects/random_number_generator/sys/dev/isci/isci_task_request.c projects/random_number_generator/sys/dev/iscsi/icl.c projects/random_number_generator/sys/dev/iscsi/iscsi.c projects/random_number_generator/sys/dev/ixgbe/ixgbe.c projects/random_number_generator/sys/kern/kern_descrip.c projects/random_number_generator/sys/kern/vfs_bio.c projects/random_number_generator/sys/kern/vfs_subr.c projects/random_number_generator/sys/net/if.h projects/random_number_generator/sys/net/if_ethersubr.c projects/random_number_generator/sys/net/if_lagg.c projects/random_number_generator/usr.sbin/bhyveload/bhyveload.8 Directory Properties: projects/random_number_generator/ (props changed) projects/random_number_generator/sys/ (props changed) projects/random_number_generator/usr.sbin/bhyveload/ (props changed) Modified: projects/random_number_generator/ObsoleteFiles.inc ============================================================================== --- projects/random_number_generator/ObsoleteFiles.inc Wed Oct 9 20:58:50 2013 (r256242) +++ projects/random_number_generator/ObsoleteFiles.inc Wed Oct 9 21:03:34 2013 (r256243) @@ -38,6 +38,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20131009: freebsd-version moved from /libexec to /bin +OLD_FILES+=/libexec/freebsd-version # 20131001: ar and ranlib from binutils not used OLD_FILES+=usr/bin/gnu-ar OLD_FILES+=usr/bin/gnu-ranlib Modified: projects/random_number_generator/bin/Makefile ============================================================================== --- projects/random_number_generator/bin/Makefile Wed Oct 9 20:58:50 2013 (r256242) +++ projects/random_number_generator/bin/Makefile Wed Oct 9 21:03:34 2013 (r256243) @@ -15,6 +15,7 @@ SUBDIR= cat \ echo \ ed \ expr \ + freebsd-version \ getfacl \ hostname \ kenv \ Modified: projects/random_number_generator/lib/libprocstat/libprocstat.c ============================================================================== --- projects/random_number_generator/lib/libprocstat/libprocstat.c Wed Oct 9 20:58:50 2013 (r256242) +++ projects/random_number_generator/lib/libprocstat/libprocstat.c Wed Oct 9 21:03:34 2013 (r256243) @@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #define _KERNEL #include #include @@ -395,7 +396,10 @@ filestat_new_entry(void *typedep, int ty entry->fs_ref_count = refcount; entry->fs_offset = offset; entry->fs_path = path; - entry->fs_cap_rights = *cap_rightsp; + if (cap_rightsp != NULL) + entry->fs_cap_rights = *cap_rightsp; + else + cap_rights_init(&entry->fs_cap_rights); return (entry); } @@ -478,21 +482,21 @@ procstat_getfiles_kvm(struct procstat *p /* root directory vnode, if one. */ if (filed.fd_rdir) { entry = filestat_new_entry(filed.fd_rdir, PS_FST_TYPE_VNODE, -1, - PS_FST_FFLAG_READ, PS_FST_UFLAG_RDIR, 0, 0, NULL, 0); + PS_FST_FFLAG_READ, PS_FST_UFLAG_RDIR, 0, 0, NULL, NULL); if (entry != NULL) STAILQ_INSERT_TAIL(head, entry, next); } /* current working directory vnode. */ if (filed.fd_cdir) { entry = filestat_new_entry(filed.fd_cdir, PS_FST_TYPE_VNODE, -1, - PS_FST_FFLAG_READ, PS_FST_UFLAG_CDIR, 0, 0, NULL, 0); + PS_FST_FFLAG_READ, PS_FST_UFLAG_CDIR, 0, 0, NULL, NULL); if (entry != NULL) STAILQ_INSERT_TAIL(head, entry, next); } /* jail root, if any. */ if (filed.fd_jdir) { entry = filestat_new_entry(filed.fd_jdir, PS_FST_TYPE_VNODE, -1, - PS_FST_FFLAG_READ, PS_FST_UFLAG_JAIL, 0, 0, NULL, 0); + PS_FST_FFLAG_READ, PS_FST_UFLAG_JAIL, 0, 0, NULL, NULL); if (entry != NULL) STAILQ_INSERT_TAIL(head, entry, next); } @@ -500,14 +504,14 @@ procstat_getfiles_kvm(struct procstat *p if (kp->ki_tracep) { entry = filestat_new_entry(kp->ki_tracep, PS_FST_TYPE_VNODE, -1, PS_FST_FFLAG_READ | PS_FST_FFLAG_WRITE, - PS_FST_UFLAG_TRACE, 0, 0, NULL, 0); + PS_FST_UFLAG_TRACE, 0, 0, NULL, NULL); if (entry != NULL) STAILQ_INSERT_TAIL(head, entry, next); } /* text vnode, if one */ if (kp->ki_textvp) { entry = filestat_new_entry(kp->ki_textvp, PS_FST_TYPE_VNODE, -1, - PS_FST_FFLAG_READ, PS_FST_UFLAG_TEXT, 0, 0, NULL, 0); + PS_FST_FFLAG_READ, PS_FST_UFLAG_TEXT, 0, 0, NULL, NULL); if (entry != NULL) STAILQ_INSERT_TAIL(head, entry, next); } @@ -515,7 +519,7 @@ procstat_getfiles_kvm(struct procstat *p if ((vp = getctty(kd, kp)) != NULL) { entry = filestat_new_entry(vp, PS_FST_TYPE_VNODE, -1, PS_FST_FFLAG_READ | PS_FST_FFLAG_WRITE, - PS_FST_UFLAG_CTTY, 0, 0, NULL, 0); + PS_FST_UFLAG_CTTY, 0, 0, NULL, NULL); if (entry != NULL) STAILQ_INSERT_TAIL(head, entry, next); } @@ -578,7 +582,7 @@ procstat_getfiles_kvm(struct procstat *p } /* XXXRW: No capability rights support for kvm yet. */ entry = filestat_new_entry(data, type, i, - to_filestat_flags(file.f_flag), 0, 0, 0, NULL, 0); + to_filestat_flags(file.f_flag), 0, 0, 0, NULL, NULL); if (entry != NULL) STAILQ_INSERT_TAIL(head, entry, next); } @@ -637,7 +641,7 @@ do_mmapped: */ entry = filestat_new_entry(object.handle, PS_FST_TYPE_VNODE, -1, fflags, - PS_FST_UFLAG_MMAP, 0, 0, NULL, 0); + PS_FST_UFLAG_MMAP, 0, 0, NULL, NULL); if (entry != NULL) STAILQ_INSERT_TAIL(head, entry, next); } @@ -878,7 +882,7 @@ procstat_getfiles_sysctl(struct procstat path = NULL; entry = filestat_new_entry(kve, PS_FST_TYPE_VNODE, -1, fflags, PS_FST_UFLAG_MMAP, refcount, offset, path, - 0); + NULL); if (entry != NULL) STAILQ_INSERT_TAIL(head, entry, next); } Modified: projects/random_number_generator/libexec/Makefile ============================================================================== --- projects/random_number_generator/libexec/Makefile Wed Oct 9 20:58:50 2013 (r256242) +++ projects/random_number_generator/libexec/Makefile Wed Oct 9 21:03:34 2013 (r256243) @@ -8,7 +8,6 @@ SUBDIR= ${_atf} \ bootpd \ ${_comsat} \ fingerd \ - freebsd-version \ ftpd \ getty \ ${_mail.local} \ Modified: projects/random_number_generator/sys/dev/cxgbe/t4_main.c ============================================================================== --- projects/random_number_generator/sys/dev/cxgbe/t4_main.c Wed Oct 9 20:58:50 2013 (r256242) +++ projects/random_number_generator/sys/dev/cxgbe/t4_main.c Wed Oct 9 21:03:34 2013 (r256243) @@ -950,7 +950,7 @@ cxgbe_probe(device_t dev) #define T4_CAP (IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_MTU | IFCAP_HWCSUM | \ IFCAP_VLAN_HWCSUM | IFCAP_TSO | IFCAP_JUMBO_MTU | IFCAP_LRO | \ - IFCAP_VLAN_HWTSO | IFCAP_LINKSTATE | IFCAP_HWCSUM_IPV6) + IFCAP_VLAN_HWTSO | IFCAP_LINKSTATE | IFCAP_HWCSUM_IPV6 | IFCAP_HWSTATS) #define T4_CAP_ENABLE (T4_CAP) static int Modified: projects/random_number_generator/sys/dev/isci/isci_io_request.c ============================================================================== --- projects/random_number_generator/sys/dev/isci/isci_io_request.c Wed Oct 9 20:58:50 2013 (r256242) +++ projects/random_number_generator/sys/dev/isci/isci_io_request.c Wed Oct 9 21:03:34 2013 (r256243) @@ -153,11 +153,16 @@ isci_io_request_complete(SCI_CONTROLLER_ case SCI_IO_FAILURE_REMOTE_DEVICE_RESET_REQUIRED: isci_remote_device_reset(isci_remote_device, NULL); + ccb->ccb_h.status |= CAM_REQ_TERMIO; + isci_log_message(0, "ISCI", + "isci: bus=%x target=%x lun=%x cdb[0]=%x remote device reset required\n", + ccb->ccb_h.path_id, ccb->ccb_h.target_id, + ccb->ccb_h.target_lun, ccb->csio.cdb_io.cdb_bytes[0]); + break; - /* drop through */ case SCI_IO_FAILURE_TERMINATED: ccb->ccb_h.status |= CAM_REQ_TERMIO; - isci_log_message(1, "ISCI", + isci_log_message(0, "ISCI", "isci: bus=%x target=%x lun=%x cdb[0]=%x terminated\n", ccb->ccb_h.path_id, ccb->ccb_h.target_id, ccb->ccb_h.target_lun, ccb->csio.cdb_io.cdb_bytes[0]); Modified: projects/random_number_generator/sys/dev/isci/isci_sysctl.c ============================================================================== --- projects/random_number_generator/sys/dev/isci/isci_sysctl.c Wed Oct 9 20:58:50 2013 (r256242) +++ projects/random_number_generator/sys/dev/isci/isci_sysctl.c Wed Oct 9 21:03:34 2013 (r256243) @@ -193,6 +193,35 @@ isci_sysctl_start_phy(SYSCTL_HANDLER_ARG return 0; } +static int +isci_sysctl_log_frozen_lun_masks(SYSCTL_HANDLER_ARGS) +{ + struct isci_softc *isci = (struct isci_softc *)arg1; + struct ISCI_REMOTE_DEVICE *device; + int32_t log_frozen_devices = 0; + int error, i, j; + + error = sysctl_handle_int(oidp, &log_frozen_devices, 0, req); + + if (error || log_frozen_devices == 0) + return (error); + + for (i = 0; i < isci->controller_count; i++) { + for (j = 0; j < SCI_MAX_REMOTE_DEVICES; j++) { + device = isci->controllers[i].remote_device[j]; + + if (device == NULL) + continue; + + device_printf(isci->device, + "controller %d device %3d frozen_lun_mask 0x%02x\n", + i, j, device->frozen_lun_mask); + } + } + + return (0); +} + void isci_sysctl_initialize(struct isci_softc *isci) { struct sysctl_ctx_list *sysctl_ctx = device_get_sysctl_ctx(isci->device); @@ -225,5 +254,10 @@ void isci_sysctl_initialize(struct isci_ SYSCTL_ADD_PROC(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree), OID_AUTO, "start_phy", CTLTYPE_UINT| CTLFLAG_RW, isci, 0, isci_sysctl_start_phy, "IU", "Start PHY on a controller"); + + SYSCTL_ADD_PROC(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree), OID_AUTO, + "log_frozen_lun_masks", CTLTYPE_UINT| CTLFLAG_RW, isci, 0, + isci_sysctl_log_frozen_lun_masks, "IU", + "Log frozen lun masks to kernel log"); } Modified: projects/random_number_generator/sys/dev/isci/isci_task_request.c ============================================================================== --- projects/random_number_generator/sys/dev/isci/isci_task_request.c Wed Oct 9 20:58:50 2013 (r256242) +++ projects/random_number_generator/sys/dev/isci/isci_task_request.c Wed Oct 9 21:03:34 2013 (r256243) @@ -194,11 +194,20 @@ isci_task_request_complete(SCI_CONTROLLE break; case SCI_TASK_FAILURE_INVALID_STATE: + retry_task = TRUE; + isci_log_message(0, "ISCI", + "task failure (invalid state) - retrying\n"); + break; + case SCI_TASK_FAILURE_INSUFFICIENT_RESOURCES: - case SCI_FAILURE_TIMEOUT: retry_task = TRUE; isci_log_message(0, "ISCI", - "unhandled task completion code 0x%x\n", completion_status); + "task failure (insufficient resources) - retrying\n"); + break; + + case SCI_FAILURE_TIMEOUT: + retry_task = TRUE; + isci_log_message(0, "ISCI", "task timeout - retrying\n"); break; case SCI_TASK_FAILURE: Modified: projects/random_number_generator/sys/dev/iscsi/icl.c ============================================================================== --- projects/random_number_generator/sys/dev/iscsi/icl.c Wed Oct 9 20:58:50 2013 (r256242) +++ projects/random_number_generator/sys/dev/iscsi/icl.c Wed Oct 9 21:03:34 2013 (r256243) @@ -564,6 +564,7 @@ icl_conn_receive_pdu(struct icl_conn *ic "MaxDataSegmentLength %zd; " "dropping connection", len, ic->ic_max_data_segment_length); + error = EINVAL; break; } Modified: projects/random_number_generator/sys/dev/iscsi/iscsi.c ============================================================================== --- projects/random_number_generator/sys/dev/iscsi/iscsi.c Wed Oct 9 20:58:50 2013 (r256242) +++ projects/random_number_generator/sys/dev/iscsi/iscsi.c Wed Oct 9 21:03:34 2013 (r256243) @@ -950,40 +950,59 @@ iscsi_pdu_handle_data_in(struct icl_pdu csio = &io->io_ccb->csio; - if (ntohl(bhsdi->bhsdi_buffer_offset) + data_segment_len > - csio->dxfer_len) { + if (io->io_received + data_segment_len > csio->dxfer_len) { ISCSI_SESSION_WARN(is, "oversize data segment (%zd bytes " - "at offset %d, buffer is %d)", - data_segment_len, ntohl(bhsdi->bhsdi_buffer_offset), - csio->dxfer_len); + "at offset %zd, buffer is %d)", + data_segment_len, io->io_received, csio->dxfer_len); icl_pdu_free(response); iscsi_session_reconnect(is); return; } - icl_pdu_get_data(response, 0, csio->data_ptr + ntohl(bhsdi->bhsdi_buffer_offset), data_segment_len); + icl_pdu_get_data(response, 0, csio->data_ptr + io->io_received, data_segment_len); io->io_received += data_segment_len; /* * XXX: Check DataSN. * XXX: Check F. */ - if (bhsdi->bhsdi_flags & BHSDI_FLAGS_S) { - //ISCSI_SESSION_DEBUG(is, "got S flag; status 0x%x", bhsdi->bhsdi_status); - if (bhsdi->bhsdi_status == 0) { - io->io_ccb->ccb_h.status = CAM_REQ_CMP; - } else { - if ((io->io_ccb->ccb_h.status & CAM_DEV_QFRZN) == 0) { - xpt_freeze_devq(io->io_ccb->ccb_h.path, 1); - ISCSI_SESSION_DEBUG(is, "freezing devq"); + if ((bhsdi->bhsdi_flags & BHSDI_FLAGS_S) == 0) { + /* + * Nothing more to do. + */ + icl_pdu_free(response); + return; + } + + //ISCSI_SESSION_DEBUG(is, "got S flag; status 0x%x", bhsdi->bhsdi_status); + if (bhsdi->bhsdi_status == 0) { + io->io_ccb->ccb_h.status = CAM_REQ_CMP; + } else { + if ((io->io_ccb->ccb_h.status & CAM_DEV_QFRZN) == 0) { + xpt_freeze_devq(io->io_ccb->ccb_h.path, 1); + ISCSI_SESSION_DEBUG(is, "freezing devq"); + } + io->io_ccb->ccb_h.status = CAM_SCSI_STATUS_ERROR | CAM_DEV_QFRZN; + csio->scsi_status = bhsdi->bhsdi_status; + } + + if ((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { + KASSERT(io->io_received <= csio->dxfer_len, + ("io->io_received > csio->dxfer_len")); + if (io->io_received < csio->dxfer_len) { + csio->resid = ntohl(bhsdi->bhsdi_residual_count); + if (csio->resid != csio->dxfer_len - io->io_received) { + ISCSI_SESSION_WARN(is, "underflow mismatch: " + "target indicates %d, we calculated %zd", + csio->resid, + csio->dxfer_len - io->io_received); } - io->io_ccb->ccb_h.status = CAM_SCSI_STATUS_ERROR | CAM_DEV_QFRZN; - csio->scsi_status = bhsdi->bhsdi_status; + csio->resid = csio->dxfer_len - io->io_received; } - xpt_done(io->io_ccb); - iscsi_outstanding_remove(is, io); } + xpt_done(io->io_ccb); + iscsi_outstanding_remove(is, io); icl_pdu_free(response); } @@ -1033,8 +1052,24 @@ iscsi_pdu_handle_r2t(struct icl_pdu *res */ io->io_datasn = 0; + off = ntohl(bhsr2t->bhsr2t_buffer_offset); + if (off > csio->dxfer_len) { + ISCSI_SESSION_WARN(is, "target requested invalid offset " + "%zd, buffer is is %d; reconnecting", off, csio->dxfer_len); + icl_pdu_free(response); + iscsi_session_reconnect(is); + return; + } + total_len = ntohl(bhsr2t->bhsr2t_desired_data_transfer_length); + if (total_len == 0 || total_len > csio->dxfer_len) { + ISCSI_SESSION_WARN(is, "target requested invalid length " + "%zd, buffer is %d; reconnecting", total_len, csio->dxfer_len); + icl_pdu_free(response); + iscsi_session_reconnect(is); + return; + } //ISCSI_SESSION_DEBUG(is, "r2t; off %zd, len %zd", off, total_len); @@ -1045,7 +1080,8 @@ iscsi_pdu_handle_r2t(struct icl_pdu *res len = is->is_max_data_segment_length; if (off + len > csio->dxfer_len) { - ISCSI_SESSION_WARN(is, "bad off %zd, len %d", + ISCSI_SESSION_WARN(is, "target requested invalid " + "length/offset %zd, buffer is %d; reconnecting", off + len, csio->dxfer_len); icl_pdu_free(response); iscsi_session_reconnect(is); @@ -1068,8 +1104,11 @@ iscsi_pdu_handle_r2t(struct icl_pdu *res bhsr2t->bhsr2t_target_transfer_tag; bhsdo->bhsdo_datasn = htonl(io->io_datasn++); bhsdo->bhsdo_buffer_offset = htonl(off); - error = icl_pdu_append_data(request, csio->data_ptr + off, len, M_NOWAIT); + error = icl_pdu_append_data(request, csio->data_ptr + off, len, + M_NOWAIT); if (error != 0) { + ISCSI_SESSION_WARN(is, "failed to allocate memory; " + "reconnecting"); icl_pdu_free(request); icl_pdu_free(response); iscsi_session_reconnect(is); Modified: projects/random_number_generator/sys/dev/ixgbe/ixgbe.c ============================================================================== --- projects/random_number_generator/sys/dev/ixgbe/ixgbe.c Wed Oct 9 20:58:50 2013 (r256242) +++ projects/random_number_generator/sys/dev/ixgbe/ixgbe.c Wed Oct 9 21:03:34 2013 (r256243) @@ -2662,7 +2662,8 @@ ixgbe_setup_interface(device_t dev, stru ifp->if_capabilities |= IFCAP_LRO; ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_HWTSO - | IFCAP_VLAN_MTU; + | IFCAP_VLAN_MTU + | IFCAP_HWSTATS; ifp->if_capenable = ifp->if_capabilities; /* Modified: projects/random_number_generator/sys/kern/kern_descrip.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_descrip.c Wed Oct 9 20:58:50 2013 (r256242) +++ projects/random_number_generator/sys/kern/kern_descrip.c Wed Oct 9 21:03:34 2013 (r256243) @@ -119,6 +119,7 @@ static int closefp(struct filedesc *fdp, static int fd_first_free(struct filedesc *fdp, int low, int size); static int fd_last_used(struct filedesc *fdp, int size); static void fdgrowtable(struct filedesc *fdp, int nfd); +static void fdgrowtable_exp(struct filedesc *fdp, int nfd); static void fdunused(struct filedesc *fdp, int fd); static void fdused(struct filedesc *fdp, int fd); static int fill_pipe_info(struct pipe *pi, struct kinfo_file *kif); @@ -129,6 +130,7 @@ static int fill_sem_info(struct file *fp static int fill_shm_info(struct file *fp, struct kinfo_file *kif); static int fill_socket_info(struct socket *so, struct kinfo_file *kif); static int fill_vnode_info(struct vnode *vp, struct kinfo_file *kif); +static int getmaxfd(struct proc *p); /* * Each process has: @@ -771,6 +773,18 @@ kern_fcntl(struct thread *td, int fd, in return (error); } +static int +getmaxfd(struct proc *p) +{ + int maxfd; + + PROC_LOCK(p); + maxfd = min((int)lim_cur(p, RLIMIT_NOFILE), maxfilesperproc); + PROC_UNLOCK(p); + + return (maxfd); +} + /* * Common code for dup, dup2, fcntl(F_DUPFD) and fcntl(F_DUP2FD). */ @@ -797,9 +811,7 @@ do_dup(struct thread *td, int flags, int return (EBADF); if (new < 0) return (flags & DUP_FCNTL ? EINVAL : EBADF); - PROC_LOCK(p); - maxfd = min((int)lim_cur(p, RLIMIT_NOFILE), maxfilesperproc); - PROC_UNLOCK(p); + maxfd = getmaxfd(p); if (new >= maxfd) return (flags & DUP_FCNTL ? EINVAL : EBADF); @@ -844,7 +856,7 @@ do_dup(struct thread *td, int flags, int return (EMFILE); } #endif - fdgrowtable(fdp, new + 1); + fdgrowtable_exp(fdp, new + 1); oldfde = &fdp->fd_ofiles[old]; } newfde = &fdp->fd_ofiles[new]; @@ -1467,6 +1479,24 @@ filecaps_validate(const struct filecaps ("%s: ioctls without CAP_IOCTL", func)); } +static void +fdgrowtable_exp(struct filedesc *fdp, int nfd) +{ + int nfd1, maxfd; + + FILEDESC_XLOCK_ASSERT(fdp); + + nfd1 = fdp->fd_nfiles * 2; + if (nfd1 < nfd) + nfd1 = nfd; + maxfd = getmaxfd(curproc); + if (maxfd < nfd1) + nfd1 = maxfd; + KASSERT(nfd <= nfd1, + ("too low nfd1 %d %d %d %d", nfd, fdp->fd_nfiles, maxfd, nfd1)); + fdgrowtable(fdp, nfd1); +} + /* * Grow the file table to accomodate (at least) nfd descriptors. */ @@ -1563,9 +1593,7 @@ fdalloc(struct thread *td, int minfd, in if (fdp->fd_freefile > minfd) minfd = fdp->fd_freefile; - PROC_LOCK(p); - maxfd = min((int)lim_cur(p, RLIMIT_NOFILE), maxfilesperproc); - PROC_UNLOCK(p); + maxfd = getmaxfd(p); /* * Search the bitmap for a free descriptor starting at minfd. @@ -1587,7 +1615,7 @@ fdalloc(struct thread *td, int minfd, in * fd is already equal to first free descriptor >= minfd, so * we only need to grow the table and we are done. */ - fdgrowtable(fdp, allocfd); + fdgrowtable_exp(fdp, allocfd); } /* @@ -1652,9 +1680,7 @@ fdavail(struct thread *td, int n) * call racct_add() from there instead of dealing with containers * here. */ - PROC_LOCK(p); - lim = min((int)lim_cur(p, RLIMIT_NOFILE), maxfilesperproc); - PROC_UNLOCK(p); + lim = getmaxfd(p); if ((i = lim - fdp->fd_nfiles) > 0 && (n -= i) <= 0) return (1); last = min(fdp->fd_nfiles, lim); Modified: projects/random_number_generator/sys/kern/vfs_bio.c ============================================================================== --- projects/random_number_generator/sys/kern/vfs_bio.c Wed Oct 9 20:58:50 2013 (r256242) +++ projects/random_number_generator/sys/kern/vfs_bio.c Wed Oct 9 21:03:34 2013 (r256243) @@ -2076,7 +2076,8 @@ getnewbuf_bufd_help(struct vnode *vp, in wait = MNT_NOWAIT; mtx_lock(&nblock); while (needsbuffer & flags) { - if (vp != NULL && (td->td_pflags & TDP_BUFNEED) == 0) { + if (vp != NULL && vp->v_type != VCHR && + (td->td_pflags & TDP_BUFNEED) == 0) { mtx_unlock(&nblock); /* Modified: projects/random_number_generator/sys/kern/vfs_subr.c ============================================================================== --- projects/random_number_generator/sys/kern/vfs_subr.c Wed Oct 9 20:58:50 2013 (r256242) +++ projects/random_number_generator/sys/kern/vfs_subr.c Wed Oct 9 21:03:34 2013 (r256243) @@ -1315,6 +1315,8 @@ vinvalbuf(struct vnode *vp, int flags, i CTR3(KTR_VFS, "%s: vp %p with flags %d", __func__, vp, flags); ASSERT_VOP_LOCKED(vp, "vinvalbuf"); + if (vp->v_object != NULL && vp->v_object->handle != vp) + return (0); return (bufobj_invalbuf(&vp->v_bufobj, flags, slpflag, slptimeo)); } Modified: projects/random_number_generator/sys/net/if.h ============================================================================== --- projects/random_number_generator/sys/net/if.h Wed Oct 9 20:58:50 2013 (r256242) +++ projects/random_number_generator/sys/net/if.h Wed Oct 9 21:03:34 2013 (r256243) @@ -231,6 +231,7 @@ struct if_data { #define IFCAP_NETMAP 0x100000 /* netmap mode supported/enabled */ #define IFCAP_RXCSUM_IPV6 0x200000 /* can offload checksum on IPv6 RX */ #define IFCAP_TXCSUM_IPV6 0x400000 /* can offload checksum on IPv6 TX */ +#define IFCAP_HWSTATS 0x800000 /* manages counters internally */ #define IFCAP_HWCSUM_IPV6 (IFCAP_RXCSUM_IPV6 | IFCAP_TXCSUM_IPV6) Modified: projects/random_number_generator/sys/net/if_ethersubr.c ============================================================================== --- projects/random_number_generator/sys/net/if_ethersubr.c Wed Oct 9 20:58:50 2013 (r256242) +++ projects/random_number_generator/sys/net/if_ethersubr.c Wed Oct 9 21:03:34 2013 (r256243) @@ -528,7 +528,8 @@ ether_input_internal(struct ifnet *ifp, m->m_flags &= ~M_HASFCS; } - ifp->if_ibytes += m->m_pkthdr.len; + if (!(ifp->if_capenable & IFCAP_HWSTATS)) + ifp->if_ibytes += m->m_pkthdr.len; /* Allow monitor mode to claim this frame, after stats are updated. */ if (ifp->if_flags & IFF_MONITOR) { Modified: projects/random_number_generator/sys/net/if_lagg.c ============================================================================== --- projects/random_number_generator/sys/net/if_lagg.c Wed Oct 9 20:58:50 2013 (r256242) +++ projects/random_number_generator/sys/net/if_lagg.c Wed Oct 9 21:03:34 2013 (r256243) @@ -347,6 +347,7 @@ lagg_clone_create(struct if_clone *ifc, ifp->if_init = lagg_init; ifp->if_ioctl = lagg_ioctl; ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST; + ifp->if_capenable = ifp->if_capabilities = IFCAP_HWSTATS; /* * Attach as an ordinary ethernet device, children will be attached Modified: projects/random_number_generator/usr.sbin/bhyveload/bhyveload.8 ============================================================================== --- projects/random_number_generator/usr.sbin/bhyveload/bhyveload.8 Wed Oct 9 20:58:50 2013 (r256242) +++ projects/random_number_generator/usr.sbin/bhyveload/bhyveload.8 Wed Oct 9 21:03:34 2013 (r256243) @@ -1,4 +1,4 @@ -\" +.\" .\" Copyright (c) 2012 NetApp Inc .\" All rights reserved. .\" From owner-svn-src-projects@FreeBSD.ORG Thu Oct 10 07:39:19 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id CBA23595; Thu, 10 Oct 2013 07:39:19 +0000 (UTC) (envelope-from markm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B9E972687; Thu, 10 Oct 2013 07:39:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9A7dJq2053833; Thu, 10 Oct 2013 07:39:19 GMT (envelope-from markm@svn.freebsd.org) Received: (from markm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9A7dJHT053832; Thu, 10 Oct 2013 07:39:19 GMT (envelope-from markm@svn.freebsd.org) Message-Id: <201310100739.r9A7dJHT053832@svn.freebsd.org> From: Mark Murray Date: Thu, 10 Oct 2013 07:39:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256254 - projects/random_number_generator/sys/dev/random X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Oct 2013 07:39:19 -0000 Author: markm Date: Thu Oct 10 07:39:19 2013 New Revision: 256254 URL: http://svnweb.freebsd.org/changeset/base/256254 Log: Fix a constant printf which is (int) on some architectures and (long int) on others. Modified: projects/random_number_generator/sys/dev/random/random_harvestq.c Modified: projects/random_number_generator/sys/dev/random/random_harvestq.c ============================================================================== --- projects/random_number_generator/sys/dev/random/random_harvestq.c Thu Oct 10 07:23:11 2013 (r256253) +++ projects/random_number_generator/sys/dev/random/random_harvestq.c Thu Oct 10 07:39:19 2013 (r256254) @@ -129,7 +129,7 @@ random_harvestq_cache(void *arg __unused for (entropy_file = entropy_files; *entropy_file; entropy_file++) { error = randomdev_read_file(*entropy_file, data, PAGE_SIZE); if (error == 0) { - printf("random: entropy cache '%s' provides %d bytes\n", *entropy_file, PAGE_SIZE); + printf("random: entropy cache '%s' provides %ld bytes\n", *entropy_file, (long)PAGE_SIZE); error = randomdev_write_file(*entropy_file, zbuf, PAGE_SIZE); if (error == 0) { printf("random: entropy cache '%s' contents used and successfully overwritten\n", *entropy_file); From owner-svn-src-projects@FreeBSD.ORG Thu Oct 10 11:02:06 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A928BCDF; Thu, 10 Oct 2013 11:02:06 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 93B872202; Thu, 10 Oct 2013 11:02:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9AB269p060249; Thu, 10 Oct 2013 11:02:06 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9AB250S060243; Thu, 10 Oct 2013 11:02:05 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201310101102.r9AB250S060243@svn.freebsd.org> From: Alexander Motin Date: Thu, 10 Oct 2013 11:02:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256260 - in projects/camlock: . bin bin/freebsd-version cddl/contrib/opensolaris/cmd/dtrace contrib/binutils/opcodes etc etc/defaults etc/rc.d gnu/usr.bin gnu/usr.bin/rcs lib/libprocst... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Oct 2013 11:02:06 -0000 Author: mav Date: Thu Oct 10 11:02:05 2013 New Revision: 256260 URL: http://svnweb.freebsd.org/changeset/base/256260 Log: MFC @ r256259 Added: projects/camlock/bin/freebsd-version/ - copied from r256259, head/bin/freebsd-version/ projects/camlock/gnu/usr.bin/rcs/ - copied from r256259, head/gnu/usr.bin/rcs/ projects/camlock/share/doc/psd/13.rcs/ - copied from r256259, head/share/doc/psd/13.rcs/ projects/camlock/share/man/man9/VOP_ADVISE.9 - copied unchanged from r256259, head/share/man/man9/VOP_ADVISE.9 projects/camlock/share/man/man9/VOP_ALLOCATE.9 - copied unchanged from r256259, head/share/man/man9/VOP_ALLOCATE.9 projects/camlock/tools/build/options/WITHOUT_RCS - copied unchanged from r256259, head/tools/build/options/WITHOUT_RCS projects/camlock/tools/regression/lib/libutil/test-humanize_number.c - copied unchanged from r256259, head/tools/regression/lib/libutil/test-humanize_number.c projects/camlock/tools/regression/lib/libutil/test-humanize_number.t - copied unchanged from r256259, head/tools/regression/lib/libutil/test-humanize_number.t Deleted: projects/camlock/libexec/freebsd-version/ Modified: projects/camlock/ObsoleteFiles.inc projects/camlock/UPDATING projects/camlock/bin/Makefile projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 projects/camlock/contrib/binutils/opcodes/i386-dis.c projects/camlock/contrib/binutils/opcodes/i386-opc.h projects/camlock/contrib/binutils/opcodes/i386-opc.tbl projects/camlock/contrib/binutils/opcodes/i386-tbl.h projects/camlock/etc/defaults/rc.conf projects/camlock/etc/network.subr projects/camlock/etc/rc.d/jail projects/camlock/etc/rc.d/netif projects/camlock/etc/rc.d/sshd projects/camlock/etc/rc.subr projects/camlock/gnu/usr.bin/Makefile projects/camlock/lib/libprocstat/libprocstat.c projects/camlock/lib/libstand/tftp.c projects/camlock/lib/libutil/humanize_number.3 projects/camlock/lib/libutil/humanize_number.c projects/camlock/lib/libvmmapi/vmmapi.c projects/camlock/lib/libvmmapi/vmmapi.h projects/camlock/libexec/Makefile projects/camlock/release/release.sh projects/camlock/sbin/camcontrol/camcontrol.c projects/camlock/sbin/camcontrol/fwdownload.c projects/camlock/sbin/nvmecontrol/perftest.c projects/camlock/sbin/route/route.c projects/camlock/share/doc/psd/Makefile projects/camlock/share/examples/bhyve/vmrun.sh projects/camlock/share/man/man4/altera_avgen.4 projects/camlock/share/man/man4/rsu.4 projects/camlock/share/man/man5/rc.conf.5 projects/camlock/share/man/man5/src.conf.5 projects/camlock/share/man/man8/picobsd.8 projects/camlock/share/man/man9/Makefile projects/camlock/share/man/man9/VOP_FSYNC.9 projects/camlock/share/man/man9/firmware.9 projects/camlock/share/man/man9/vm_page_grab.9 projects/camlock/share/man/man9/vnode.9 projects/camlock/share/misc/bsd-family-tree projects/camlock/share/mk/bsd.own.mk projects/camlock/sys/amd64/amd64/pmap.c projects/camlock/sys/arm/s3c2xx0/uart_bus_s3c2410.c projects/camlock/sys/arm/s3c2xx0/uart_cpu_s3c2410.c projects/camlock/sys/cam/cam_xpt.c projects/camlock/sys/cam/ctl/ctl_frontend_iscsi.c projects/camlock/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c projects/camlock/sys/cddl/dev/dtrace/dtrace_load.c projects/camlock/sys/cddl/dev/dtrace/dtrace_unload.c projects/camlock/sys/conf/options.mips projects/camlock/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c projects/camlock/sys/contrib/ipfilter/netinet/ip_tftp_pxy.c projects/camlock/sys/dev/ath/ath_hal/ar5212/ar5212.h projects/camlock/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c projects/camlock/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c projects/camlock/sys/dev/cxgbe/t4_main.c projects/camlock/sys/dev/cxgbe/t4_sge.c projects/camlock/sys/dev/e1000/e1000_80003es2lan.c projects/camlock/sys/dev/e1000/e1000_80003es2lan.h projects/camlock/sys/dev/e1000/e1000_82571.c projects/camlock/sys/dev/e1000/e1000_82575.c projects/camlock/sys/dev/e1000/e1000_82575.h projects/camlock/sys/dev/e1000/e1000_api.c projects/camlock/sys/dev/e1000/e1000_defines.h projects/camlock/sys/dev/e1000/e1000_hw.h projects/camlock/sys/dev/e1000/e1000_i210.c projects/camlock/sys/dev/e1000/e1000_i210.h projects/camlock/sys/dev/e1000/e1000_ich8lan.c projects/camlock/sys/dev/e1000/e1000_ich8lan.h projects/camlock/sys/dev/e1000/e1000_mac.c projects/camlock/sys/dev/e1000/e1000_osdep.h projects/camlock/sys/dev/e1000/e1000_phy.c projects/camlock/sys/dev/e1000/e1000_phy.h projects/camlock/sys/dev/e1000/e1000_regs.h projects/camlock/sys/dev/e1000/e1000_vf.h projects/camlock/sys/dev/e1000/if_igb.c projects/camlock/sys/dev/e1000/if_igb.h projects/camlock/sys/dev/isci/isci.c projects/camlock/sys/dev/isci/isci_io_request.c projects/camlock/sys/dev/isci/isci_sysctl.c projects/camlock/sys/dev/isci/isci_task_request.c projects/camlock/sys/dev/iscsi/icl.c projects/camlock/sys/dev/iscsi/iscsi.c projects/camlock/sys/dev/ixgbe/ixgbe.c projects/camlock/sys/dev/netmap/if_igb_netmap.h projects/camlock/sys/dev/nvd/nvd.c projects/camlock/sys/dev/nvme/nvme.c projects/camlock/sys/dev/nvme/nvme.h projects/camlock/sys/dev/nvme/nvme_ctrlr.c projects/camlock/sys/dev/nvme/nvme_ns.c projects/camlock/sys/dev/nvme/nvme_private.h projects/camlock/sys/dev/nvme/nvme_test.c projects/camlock/sys/dev/random/ivy.c projects/camlock/sys/dev/xen/control/control.c projects/camlock/sys/i386/ibcs2/ibcs2_sysvec.c projects/camlock/sys/i386/include/xen/xen-os.h projects/camlock/sys/kern/kern_descrip.c projects/camlock/sys/kern/uipc_sockbuf.c projects/camlock/sys/kern/vfs_bio.c projects/camlock/sys/kern/vfs_subr.c projects/camlock/sys/mips/atheros/apb.c projects/camlock/sys/mips/atheros/ar71xxreg.h projects/camlock/sys/mips/atheros/ar934xreg.h projects/camlock/sys/mips/conf/AR934X_BASE projects/camlock/sys/mips/include/asm.h projects/camlock/sys/mips/include/cpuregs.h projects/camlock/sys/mips/mips/bus_space_generic.c projects/camlock/sys/mips/mips/elf_trampoline.c projects/camlock/sys/net/if.h projects/camlock/sys/net/if_ethersubr.c projects/camlock/sys/net/if_lagg.c projects/camlock/sys/netinet/tcp_input.c projects/camlock/sys/netinet6/in6_ifattach.c projects/camlock/sys/ofed/drivers/infiniband/core/ucm.c projects/camlock/sys/ofed/include/rdma/ib_verbs.h projects/camlock/sys/sys/sockbuf.h projects/camlock/tools/build/mk/OptionalObsoleteFiles.inc projects/camlock/tools/regression/lib/libutil/Makefile projects/camlock/usr.sbin/bhyve/Makefile projects/camlock/usr.sbin/bhyve/bhyverun.c projects/camlock/usr.sbin/bhyve/dbgport.h projects/camlock/usr.sbin/bhyve/pci_ahci.c projects/camlock/usr.sbin/bhyve/pci_emul.c projects/camlock/usr.sbin/bhyvectl/Makefile projects/camlock/usr.sbin/bhyveload/Makefile projects/camlock/usr.sbin/bhyveload/bhyveload.8 projects/camlock/usr.sbin/bhyveload/bhyveload.c projects/camlock/usr.sbin/bsdconfig/bsdconfig projects/camlock/usr.sbin/bsdconfig/console/ttys projects/camlock/usr.sbin/bsdconfig/mouse/enable projects/camlock/usr.sbin/bsdconfig/networking/devices projects/camlock/usr.sbin/bsdconfig/networking/share/device.subr projects/camlock/usr.sbin/bsdconfig/networking/share/hostname.subr projects/camlock/usr.sbin/bsdconfig/networking/share/ipaddr.subr projects/camlock/usr.sbin/bsdconfig/networking/share/media.subr projects/camlock/usr.sbin/bsdconfig/networking/share/netmask.subr projects/camlock/usr.sbin/bsdconfig/networking/share/resolv.subr projects/camlock/usr.sbin/bsdconfig/networking/share/routing.subr projects/camlock/usr.sbin/bsdconfig/password/share/password.subr projects/camlock/usr.sbin/bsdconfig/security/kern_securelevel projects/camlock/usr.sbin/bsdconfig/security/security projects/camlock/usr.sbin/bsdconfig/share/common.subr projects/camlock/usr.sbin/bsdconfig/share/device.subr projects/camlock/usr.sbin/bsdconfig/share/dialog.subr projects/camlock/usr.sbin/bsdconfig/share/media/any.subr projects/camlock/usr.sbin/bsdconfig/share/media/cdrom.subr projects/camlock/usr.sbin/bsdconfig/share/media/common.subr projects/camlock/usr.sbin/bsdconfig/share/media/dos.subr projects/camlock/usr.sbin/bsdconfig/share/media/floppy.subr projects/camlock/usr.sbin/bsdconfig/share/media/ftp.subr projects/camlock/usr.sbin/bsdconfig/share/media/http.subr projects/camlock/usr.sbin/bsdconfig/share/media/nfs.subr projects/camlock/usr.sbin/bsdconfig/share/media/options.subr projects/camlock/usr.sbin/bsdconfig/share/media/tcpip.subr projects/camlock/usr.sbin/bsdconfig/share/media/ufs.subr projects/camlock/usr.sbin/bsdconfig/share/media/usb.subr projects/camlock/usr.sbin/bsdconfig/share/mustberoot.subr projects/camlock/usr.sbin/bsdconfig/share/packages/packages.subr projects/camlock/usr.sbin/bsdconfig/startup/misc projects/camlock/usr.sbin/bsdconfig/startup/rcconf projects/camlock/usr.sbin/bsdconfig/startup/rcdelete projects/camlock/usr.sbin/bsdconfig/startup/rcvar projects/camlock/usr.sbin/bsdconfig/startup/share/rcconf.subr projects/camlock/usr.sbin/bsdconfig/startup/share/rcedit.subr projects/camlock/usr.sbin/bsdconfig/timezone/timezone projects/camlock/usr.sbin/bsdconfig/usermgmt/groupdel projects/camlock/usr.sbin/bsdconfig/usermgmt/groupedit projects/camlock/usr.sbin/bsdconfig/usermgmt/groupinput projects/camlock/usr.sbin/bsdconfig/usermgmt/share/group_input.subr projects/camlock/usr.sbin/bsdconfig/usermgmt/share/user_input.subr projects/camlock/usr.sbin/bsdconfig/usermgmt/userdel projects/camlock/usr.sbin/bsdconfig/usermgmt/useredit projects/camlock/usr.sbin/bsdconfig/usermgmt/userinput projects/camlock/usr.sbin/bsdconfig/usermgmt/usermgmt projects/camlock/usr.sbin/ctladm/ctladm.c projects/camlock/usr.sbin/ctld/kernel.c projects/camlock/usr.sbin/ctld/login.c projects/camlock/usr.sbin/iscsid/discovery.c projects/camlock/usr.sbin/jail/jail.c Directory Properties: projects/camlock/ (props changed) projects/camlock/cddl/ (props changed) projects/camlock/cddl/contrib/opensolaris/ (props changed) projects/camlock/contrib/binutils/ (props changed) projects/camlock/lib/libutil/ (props changed) projects/camlock/lib/libvmmapi/ (props changed) projects/camlock/sbin/ (props changed) projects/camlock/share/man/man4/ (props changed) projects/camlock/sys/ (props changed) projects/camlock/sys/cddl/contrib/opensolaris/ (props changed) projects/camlock/sys/conf/ (props changed) projects/camlock/sys/contrib/ipfilter/ (props changed) projects/camlock/usr.sbin/bhyve/ (props changed) projects/camlock/usr.sbin/bhyvectl/ (props changed) projects/camlock/usr.sbin/bhyveload/ (props changed) projects/camlock/usr.sbin/jail/ (props changed) Modified: projects/camlock/ObsoleteFiles.inc ============================================================================== --- projects/camlock/ObsoleteFiles.inc Thu Oct 10 09:53:46 2013 (r256259) +++ projects/camlock/ObsoleteFiles.inc Thu Oct 10 11:02:05 2013 (r256260) @@ -38,29 +38,8 @@ # xargs -n1 | sort | uniq -d; # done -# 20131015: removal of RCS from base -OLD_FILES+=usr/bin/ci -OLD_FILES+=usr/bin/co -OLD_FILES+=usr/bin/ident -OLD_FILES+=usr/bin/merge -OLD_FILES+=usr/bin/rcs -OLD_FILES+=usr/bin/rcsclean -OLD_FILES+=usr/bin/rcsdiff -OLD_FILES+=usr/bin/rcsfreeze -OLD_FILES+=usr/bin/rcsmerge -OLD_FILES+=usr/bin/rlog -OLD_FILES+=usr/share/man/man1/ci.1.gz -OLD_FILES+=usr/share/man/man1/co.1.gz -OLD_FILES+=usr/share/man/man1/ident.1.gz -OLD_FILES+=usr/share/man/man1/merge.1.gz -OLD_FILES+=usr/share/man/man1/rcs.1.gz -OLD_FILES+=usr/share/man/man1/rcsclean.1.gz -OLD_FILES+=usr/share/man/man1/rcsdiff.1.gz -OLD_FILES+=usr/share/man/man1/rcsfreeze.1.gz -OLD_FILES+=usr/share/man/man1/rcsintro.1.gz -OLD_FILES+=usr/share/man/man1/rcsmerge.1.gz -OLD_FILES+=usr/share/man/man1/rlog.1.gz -OLD_FILES+=usr/share/man/man5/rcsfile.5.gz +# 20131009: freebsd-version moved from /libexec to /bin +OLD_FILES+=/libexec/freebsd-version # 20131001: ar and ranlib from binutils not used OLD_FILES+=usr/bin/gnu-ar OLD_FILES+=usr/bin/gnu-ranlib Modified: projects/camlock/UPDATING ============================================================================== --- projects/camlock/UPDATING Thu Oct 10 09:53:46 2013 (r256259) +++ projects/camlock/UPDATING Thu Oct 10 11:02:05 2013 (r256260) @@ -31,6 +31,25 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20131010: + The rc.d/jail script has been updated to support jail(8) + configuration file. The "jail__*" rc.conf(5) variables + for per-jail configuration are automatically converted to + /var/run/jail..conf before the jail(8) utility is invoked. + This is transparently backward compatible. See below about some + incompatibilities and rc.conf(5) manual page for more details. + + These variables are now deprecated in favor of jail(8) configuration + file. One can use "rc.d/jail config " command to generate + a jail(8) configuration file in /var/run/jail..conf without + running the jail(8) utility. The default pathname of the + configuration file is /etc/jail.conf and can be specified by + using $jail_conf or $jail__conf variables. + + Please note that jail_devfs_ruleset accepts an integer at + this moment. Please consider to rewrite the ruleset name + with an integer. + 20130930: BIND has been removed from the base system. If all you need is a local resolver, simply enable and start the local_unbound @@ -73,19 +92,6 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 has been updated to use this support. A new gcc is required to build the aesni module on both i386 and amd64. -20130827: - Thomas Dickey (vendor author thereof) reports that dialog(1) since - 2011/10/18 has a bug in handling --hline. Testers and I noticed the - --hline is not ignored but displayed as a NULL string, regardless of - value. This will cause confusion in some bsdconfig dialogs where the - --hline is used to inform users which keybindings to use. This will - likewise affect any other persons relying on --hline. It also looks - rather strange seeing "[]" at the bottom of dialog(1) widgets when - passing --hline "anything". Thomas said he will have a look in a few - weeks. NOTE: The "[]" brackets appear with the left-edge where it - would normally appear given the width of text to display, but the - displayed text is not there (part of the bug). - 20130821: The PADLOCK_RNG and RDRAND_RNG kernel options are now devices. Thus "device padlock_rng" and "device rdrand_rng" should be Modified: projects/camlock/bin/Makefile ============================================================================== --- projects/camlock/bin/Makefile Thu Oct 10 09:53:46 2013 (r256259) +++ projects/camlock/bin/Makefile Thu Oct 10 11:02:05 2013 (r256260) @@ -15,6 +15,7 @@ SUBDIR= cat \ echo \ ed \ expr \ + freebsd-version \ getfacl \ hostname \ kenv \ Modified: projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 ============================================================================== --- projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 Thu Oct 10 09:53:46 2013 (r256259) +++ projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 Thu Oct 10 11:02:05 2013 (r256260) @@ -2,7 +2,7 @@ .\" CDDL HEADER START .\" .\" The contents of this file are subject to the terms of the -.\" Common Development and Distribution License (the "License"). +.\" Common Development and Distribution License (the "License"). .\" You may not use this file except in compliance with the License. .\" .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE @@ -18,653 +18,660 @@ .\" .\" CDDL HEADER END .\" Copyright (c) 2006, Sun Microsystems, Inc. All Rights Reserved. -.TH dtrace 1M "5 Sep 2006" "SunOS 5.11" "System Administration Commands" -.SH NAME -dtrace \- DTrace dynamic tracing compiler and tracing utility -.SH SYNOPSIS -.LP -.nf -\fBdtrace\fR [\fB-32\fR | \fB-64\fR] [\fB-aACeFGHhlqSvVwZ\fR] [\fB-b\fR \fIbufsz\fR] [\fB-c\fR \fIcmd\fR] - [\fB-D\fR \fIname\fR [\fI=value\fR]] [\fB-I\fR \fIpath\fR] [\fB-L\fR \fIpath\fR] [\fB-o\fR \fIoutput\fR] - [\fB-s\fR \fIscript\fR] [\fB-U\fR \fIname\fR] [\fB-x\fR \fIarg\fR [\fI=val\fR]] - [\fB-X\fR a | c | s | t] [\fB-p\fR \fIpid\fR] - [\fB-P\fR \fIprovider\fR [[\fIpredicate\fR] \fIaction\fR]] - [\fB-m\fR [\fIprovider:\fR] \fImodule\fR [[\fIpredicate\fR] \fIaction\fR]] - [\fB-f\fR [[\fIprovider:\fR] \fImodule:\fR] \fIfunction\fR [[\fIpredicate\fR] \fIaction\fR]] - [\fB-n\fR [[[\fIprovider:\fR] \fImodule:\fR] \fIfunction:\fR] \fIname\fR [[\fIpredicate\fR] \fIaction\fR]] - [\fB-i\fR \fIprobe-id\fR [[\fIpredicate\fR] \fIaction\fR]] -.fi - -.SH DESCRIPTION -.sp -.LP -DTrace is a comprehensive dynamic tracing framework for the Solaris Operating System. DTrace provides a powerful infrastructure that permits administrators, developers, and service personnel to concisely answer arbitrary questions about the behavior of the operating system and user programs. -.sp -.LP -The \fISolaris Dynamic Tracing Guide\fR describes how to use DTrace to observe, debug, and tune system behavior. Refer to this book for a detailed description of DTrace features, including the bundled DTrace observability -tools, instrumentation providers, and the D programming language. -.sp -.LP -The \fBdtrace\fR command provides a generic interface to the essential services provided by the DTrace facility, including: -.RS +4 -.TP -.ie t \(bu -.el o +.\" +.\" $FreeBSD$ +.\" +.Dd October 5, 2013 +.Dt DTRACE 1 +.Os +.Sh NAME +.Nm dtrace +.Nd dynamic tracing compiler and tracing utility +.Sh SYNOPSIS +.Nm +.Op Fl 32 | Fl 64 +.Op Fl aACeFGhHlqSvVwZ +.Op Fl b Ar bufsz +.Op Fl c Ar cmd +.Op Fl D Ar name Op Ns = Ns value +.Op Fl I Ar path +.Op Fl L Ar path +.Op Fl o Ar output +.Op Fl s Ar script +.Op Fl U Ar name +.Op Fl x Ar arg Op Ns = Ns value +.Op Fl X Cm a | c | s | t +.Op Fl p Ar pid +.Op Fl P Ar provider Oo Oo Ar predicate Oc Ar action Oc +.Op Fl m Oo Ar provider : Oc Ar module Oo Oo Ar predicate Oc Ar action Oc +.Op Fl f Oo Oo Ar provider : Oc Ar module : Oc Ar function Oo Oo Ar predicate \ + Oc Ar action Oc +.Op Fl n Oo Oo Oo Ar provider : Oc Ar module : Oc Ar function : Oc Ar name \ + Oo Oo Ar predicate Oc Ar action Oc +.Op Fl i Ar probe-id Oo Oo Ar predicate Oc Ar action Oc +.Sh DESCRIPTION +DTrace is a comprehensive dynamic tracing framework ported from Solaris. +DTrace provides a powerful infrastructure that permits administrators, +developers, and service personnel to concisely answer arbitrary questions about +the behavior of the operating system and user programs. +.Pp +The +.Nm +command provides a generic interface to the essential services provided by the +DTrace facility, including: +.Bl -bullet -offset indent +.It Options that list the set of probes and providers currently published by DTrace -.RE -.RS +4 -.TP -.ie t \(bu -.el o -Options that enable probes directly using any of the probe description specifiers (provider, module, function, name) -.RE -.RS +4 -.TP -.ie t \(bu -.el o -Options that run the D compiler and compile one or more D program files or programs written directly on the command line -.RE -.RS +4 -.TP -.ie t \(bu -.el o +.It +Options that enable probes directly using any of the probe description +specifiers (provider, module, function, name) +.It +Options that run the D compiler and compile one or more D program files or +programs written directly on the command line +.It Options that generate anonymous tracing programs -.RE -.RS +4 -.TP -.ie t \(bu -.el o +.It Options that generate program stability reports -.RE -.RS +4 -.TP -.ie t \(bu -.el o -Options that modify DTrace tracing and buffering behavior and enable additional D compiler features -.RE -.sp -.LP -You can use \fBdtrace\fR to create D scripts by using it in a \fB#!\fR declaration to create an interpreter file. You can also use \fBdtrace\fR to attempt to compile D programs and determine their properties without actually enabling tracing using the \fB-e\fR option. See \fBOPTIONS\fR. See the \fISolaris Dynamic Tracing Guide\fR for detailed examples of how to use the \fBdtrace\fR utility to perform these tasks. -.SH OPTIONS -.sp -.LP -The arguments accepted by the \fB-P\fR, \fB-m\fR, \fB-f\fR, \fB-n\fR, and \fB-i\fR options can include an optional D language \fIpredicate\fR enclosed in slashes \fB//\fR and optional D language \fIaction\fR statement list enclosed in braces \fB{}\fR. D program code specified on the command line must be appropriately quoted to avoid intepretation of meta-characters by the shell. -.sp -.LP +.It +Options that modify DTrace tracing and buffering behavior and enable +additional D compiler features +.El +.Pp +You can use +.Nm +to create D scripts by using it in a shebang declaration to create an +interpreter file. +You can also use +.Nm +to attempt to compile D programs and determine their properties without +actually enabling traces using the +.Fl e +option. +.Sh OPTIONS +The arguments accepted by the +.Fl P , +.Fl m , +.Fl f , +.Fl n , +and +.Fl i +options can include an optional D language +.Ar predicate +enclosed in slashes and an optional D language +.Ar action +statement list enclosed in braces. +D program code specified on the command line must be appropriately quoted to +avoid interpretation of meta-characters by the shell. +.Pp The following options are supported: -.sp -.ne 2 -.mk -.na -\fB\fB-32\fR | \fB-64\fR\fR -.ad -.sp .6 -.RS 4n -The D compiler produces programs using the native data model of the operating system kernel. You can use the \fBisainfo\fR \fB-b\fR command to determine the current operating system data model. If the \fB-32\fR option is specified, \fBdtrace\fR forces -the D compiler to compile a D program using the 32-bit data model. If the \fB-64\fR option is specified, \fBdtrace\fR forces the D compiler to compile a D program using the 64-bit data model. These options are typically not required as \fBdtrace\fR selects the -native data model as the default. The data model affects the sizes of integer types and other language properties. D programs compiled for either data model can be executed on both 32-bit and 64-bit kernels. The \fB-32\fR and \fB-64\fR options also determine the ELF file format -(ELF32 or ELF64) produced by the \fB-G\fR option. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-a\fR\fR -.ad -.sp .6 -.RS 4n -Claim anonymous tracing state and display the traced data. You can combine the \fB-a\fR option with the \fB-e\fR option to force \fBdtrace\fR to exit immediately after consuming the anonymous tracing state rather than continuing to wait for new -data. See the \fISolaris Dynamic Tracing Guide\fR for more information about anonymous tracing. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-A\fR\fR -.ad -.sp .6 -.RS 4n -Generate \fBdriver.conf\fR(4) directives for anonymous tracing. This option constructs a set of \fBdtrace\fR(7D) configuration file directives to enable the specified probes for anonymous tracing and then exits. By default, \fBdtrace\fR attempts to store the directives to the file \fB/kernel/drv/dtrace.conf\fR. You can modify this behavior if you use the \fB-o\fR option to specify an alternate output file. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-b\fR \fIbufsz\fR\fR -.ad -.sp .6 -.RS 4n -Set principal trace buffer size (\fIbufsz\fR). The trace buffer size can include any of the size suffixes \fBk\fR, \fBm\fR, \fBg\fR, or \fBt\fR. If the buffer space cannot be allocated, \fBdtrace\fR attempts -to reduce the buffer size or exit depending on the setting of the \fBbufresize\fR property. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-c\fR \fIcmd\fR\fR -.ad -.sp .6 -.RS 4n -Run the specified command \fIcmd\fR and exit upon its completion. If more than one \fB-c\fR option is present on the command line, \fBdtrace\fR exits when all commands have exited, reporting the exit status for each child process as it -terminates. The process-ID of the first command is made available to any D programs specified on the command line or using the \fB-s\fR option through the \fB$target\fR macro variable. Refer to the \fISolaris Dynamic Tracing Guide\fR for more information -on macro variables. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-C\fR\fR -.ad -.sp .6 -.RS 4n -Run the C preprocessor \fBcpp\fR(1) over D programs before compiling them. You can pass options to the C preprocessor using the \fB-D\fR, \fB-U\fR, \fB-I\fR, and \fB-H\fR options. You can select the degree of C standard conformance if you use the \fB-X\fR option. For a description of the set of tokens defined by the D compiler when invoking the C preprocessor, see \fB-X\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-D\fR \fIname\fR \fB[=\fR\fIvalue\fR\fB]\fR\fR -.ad -.sp .6 -.RS 4n -Define \fIname\fR when invoking \fBcpp\fR(1) (enabled using the \fB-C\fR option). If you specify the equals sign (\fB=\fR) -and additional \fIvalue\fR, the name is assigned the corresponding value. This option passes the \fB-D\fR option to each \fBcpp\fR invocation. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-e\fR\fR -.ad -.sp .6 -.RS 4n -Exit after compiling any requests and consuming anonymous tracing state (\fB-a\fR option) but prior to enabling any probes. You can combine this option with the \fB-a\fR option to print anonymous tracing data and exit. You can also combine this option with D -compiler options. This combination verifies that the programs compile without actually executing them and enabling the corresponding instrumentation. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-f\fR\fB[[\fR\fIprovider\fR\fB:]\fR\fImodule\fR\fB:]\fR\fIfunction\fR\fB[[\fR\fIpredicate\fR\fB]\fR\fIaction\fR\fB]]\fR\fR -.ad -.sp .6 -.RS 4n -Specify function name to trace or list (\fB-l\fR option). The corresponding argument can include any of the probe description forms \fIprovider:module:function\fR, \fImodule:function\fR, or \fIfunction\fR. -Unspecified probe description fields are left blank and match any probes regardless of the values in those fields. If no qualifiers other than \fIfunction\fR are specified in the description, all probes with the corresponding \fIfunction\fR are matched. -The \fB-f\fR argument can be suffixed with an optional D probe clause. You can specify more than one \fB-f\fR option on the command line at a time. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-F\fR\fR -.ad -.sp .6 -.RS 4n -Coalesce trace output by identifying function entry and return. Function entry probe reports are indented and their output is prefixed with \fB->\fR. Function return probe reports are unindented and their output is prefixed with \fB<-\fR\&. System call -entry probe reports are indented and their output is prefixed with \fB=>\fR. System call return probe reports are unindented and their output is prefixed with \fB<=\fR\&. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-G\fR\fR -.ad -.sp .6 -.RS 4n -Generate an ELF file containing an embedded DTrace program. The DTrace probes specified in the program are saved inside of a relocatable ELF object which can be linked into another program. If the \fB-o\fR option is present, the ELF file is saved using the pathname specified -as the argument for this operand. If the \fB-o\fR option is not present and the DTrace program is contained with a file whose name is \fB\fIfilename\fR.d\fR, then the ELF file is saved using the name \fB\fIfilename\fR.o\fR. -Otherwise the ELF file is saved using the name \fBd.out\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-H\fR\fR -.ad -.sp .6 -.RS 4n -Print the pathnames of included files when invoking \fBcpp\fR(1) (enabled using the \fB-C\fR option). This option passes the \fB-H\fR option -to each \fBcpp\fR invocation, causing it to display the list of pathnames, one for each line, to \fBstderr\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-h\fR\fR -.ad -.sp .6 -.RS 4n -Generate a header file containing macros that correspond to probes in the specified provider definitions. This option should be used to generate a header file that is included by other source files for later use with the \fB-G\fR option. If the \fB-o\fR option -is present, the header file is saved using the pathname specified as the argument for that option. If the \fB-o\fR option is not present and the DTrace program is contained with a file whose name is \fIfilename\fR\fB\&.d\fR, then the header file is saved -using the name \fIfilename\fR\fB\&.h\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-i\fR \fIprobe-id\fR\fB[[\fR\fIpredicate\fR] \fIaction\fR\fB]\fR\fR -.ad -.sp .6 -.RS 4n -Specify probe identifier (\fIprobe-id\fR) to trace or list (\fB-l\fR option). You can specify probe IDs using decimal integers as shown by \fBdtrace\fR \fB-l\fR. The \fB-i\fR argument can be suffixed with an optional -D probe clause. You can specify more than one \fB-i\fR option at a time. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-I\fR \fIpath\fR\fR -.ad -.sp .6 -.RS 4n -Add the specified directory \fIpath\fR to the search path for \fB#include\fR files when invoking \fBcpp\fR(1) (enabled -using the \fB-C\fR option). This option passes the \fB-I\fR option to each \fBcpp\fR invocation. The specified \fIpath\fR is inserted into the search path ahead of the default directory list. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-L\fR \fIpath\fR\fR -.ad -.sp .6 -.RS 4n -Add the specified directory \fIpath\fR to the search path for DTrace libraries. DTrace libraries are used to contain common definitions that can be used when writing D programs. The specified \fIpath\fR is added after the default library -search path. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-l\fR\fR -.ad -.sp .6 -.RS 4n -List probes instead of enabling them. If the \fB-l\fR option is specified, \fBdtrace\fR produces a report of the probes matching the descriptions given using the \fB-P\fR, \fB-m\fR, \fB-f\fR, \fB-n\fR, \fB-i\fR, -and \fB-s\fR options. If none of these options are specified, this option lists all probes. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-m\fR [[\fIprovider:\fR] \fImodule:\fR [[\fIpredicate\fR] \fIaction\fR]]\fR -.ad -.sp .6 -.RS 4n -Specify module name to trace or list (\fB-l\fR option). The corresponding argument can include any of the probe description forms \fIprovider:module\fR or \fImodule\fR. Unspecified probe description fields are left blank and match -any probes regardless of the values in those fields. If no qualifiers other than \fImodule\fR are specified in the description, all probes with a corresponding \fImodule\fR are matched. The \fB-m\fR argument can be suffixed with an optional D -probe clause. More than one \fB-m\fR option can be specified on the command line at a time. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-n\fR [[[\fIprovider:\fR] \fImodule:\fR] \fIfunction:\fR] \fIname\fR [[\fIpredicate\fR] \fIaction\fR]\fR -.ad -.sp .6 -.RS 4n -Specify probe name to trace or list (\fB-l\fR option). The corresponding argument can include any of the probe description forms \fIprovider:module:function:name\fR, \fImodule:function:name\fR, \fIfunction:name\fR, -or \fIname\fR. Unspecified probe description fields are left blank and match any probes regardless of the values in those fields. If no qualifiers other than \fIname\fR are specified in the description, all probes with a corresponding \fIname\fR are -matched. The \fB-n\fR argument can be suffixed with an optional D probe clause. More than one \fB-n\fR option can be specified on the command line at a time. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-o\fR \fIoutput\fR\fR -.ad -.sp .6 -.RS 4n -Specify the \fIoutput\fR file for the \fB-A\fR , \fB-G\fR, and \fB-l\fR options, or for the traced data itself. If the \fB-A\fR option is present and \fB-o\fR is not present, the default output file is \fB/kernel/drv/dtrace.conf\fR. If the \fB-G\fR option is present and the \fB-s\fR option's argument is of the form \fB\fIfilename\fR.d\fR and \fB-o\fR is not present, the default output file is \fB\fIfilename\fR.o\fR. -Otherwise the default output file is \fBd.out\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-p\fR \fIpid\fR\fR -.ad -.sp .6 -.RS 4n -Grab the specified process-ID \fIpid\fR, cache its symbol tables, and exit upon its completion. If more than one \fB-p\fR option is present on the command line, \fBdtrace\fR exits when all commands have exited, reporting the exit status -for each process as it terminates. The first process-ID is made available to any D programs specified on the command line or using the \fB-s\fR option through the \fB$target\fR macro variable. Refer to the \fISolaris Dynamic Tracing Guide\fR for -more information on macro variables. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-P\fR \fIprovider\fR \fB[[\fR\fIpredicate\fR\fB]\fR \fIaction\fR]\fR -.ad -.sp .6 -.RS 4n -Specify provider name to trace or list (\fB-l\fR option). The remaining probe description fields module, function, and name are left blank and match any probes regardless of the values in those fields. The \fB-P\fR argument can be suffixed with an optional D -probe clause. You can specify more than one \fB-P\fR option on the command line at a time. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-q\fR\fR -.ad -.sp .6 -.RS 4n -Set quiet mode. \fBdtrace\fR suppresses messages such as the number of probes matched by the specified options and D programs and does not print column headers, the CPU ID, the probe ID, or insert newlines into the output. Only data traced and formatted by D program -statements such as \fBtrace()\fR and \fBprintf()\fR is displayed to \fBstdout\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-s\fR\fR -.ad -.sp .6 -.RS 4n -Compile the specified D program source file. If the \fB-e\fR option is present, the program is compiled but instrumentation is not enabled. If the \fB-l\fR option is present, the program is compiled and the set of probes matched by it is listed, but instrumentation -is not enabled. If none of \fB-e\fR, \fB-l\fR, \fB-G\fR, or \fB-A\fR are present, the instrumentation specified by the D program is enabled and tracing begins. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-S\fR\fR -.ad -.sp .6 -.RS 4n -Show D compiler intermediate code. The D compiler produces a report of the intermediate code generated for each D program to \fBstderr\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-U\fR \fIname\fR\fR -.ad -.sp .6 -.RS 4n -Undefine the specified \fIname\fR when invoking \fBcpp\fR(1) (enabled using the \fB-C\fR option). This option passes the \fB-U\fR option to each \fBcpp\fR invocation. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-v\fR\fR -.ad -.sp .6 -.RS 4n -Set verbose mode. If the \fB-v\fR option is specified, \fBdtrace\fR produces a program stability report showing the minimum interface stability and dependency level for the specified D programs. DTrace stability levels are explained in further detail in the \fISolaris Dynamic Tracing Guide\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-V\fR\fR -.ad -.sp .6 -.RS 4n -Report the highest D programming interface version supported by \fBdtrace\fR. The version information is printed to \fBstdout\fR and the \fBdtrace\fR command exits. Refer to the \fISolaris Dynamic Tracing Guide\fR for -more information about DTrace versioning features. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-w\fR\fR -.ad -.sp .6 -.RS 4n -Permit destructive actions in D programs specified using the \fB-s\fR, \fB-P\fR, \fB-m\fR, \fB-f\fR, \fB-n\fR, or \fB-i\fR options. If the \fB-w\fR option is not specified, \fBdtrace\fR does not -permit the compilation or enabling of a D program that contains destructive actions. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-x\fR \fIarg\fR [\fI=val\fR]\fR -.ad -.sp .6 -.RS 4n -Enable or modify a DTrace runtime option or D compiler option. The list of options is found in the \fISolaris Dynamic Tracing Guide\fR. Boolean options are enabled by specifying their name. Options with values are set by separating the option name and -value with an equals sign (\fB=\fR). -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-X\fR \fBa | c | s | t\fR\fR -.ad -.sp .6 -.RS 4n -Specify the degree of conformance to the ISO C standard that should be selected when invoking \fBcpp\fR(1) (enabled using the \fB-C\fR option). -The \fB-X\fR option argument affects the value and presence of the \fB__STDC__\fR macro depending upon the value of the argument letter. -.sp -The \fB-X\fR option supports the following arguments: -.sp -.ne 2 -.mk -.na -\fB\fBa\fR\fR -.ad -.RS 5n -.rt -Default. ISO C plus K&R compatibility extensions, with semantic changes required by ISO C. This is the default mode if \fB-X\fR is not specified. The predefined macro \fB__STDC__\fR has a value of 0 when \fBcpp\fR is invoked in conjunction -with the \fB-Xa\fR option. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fBc\fR\fR -.ad -.RS 5n -.rt -Conformance. Strictly conformant ISO C, without K&R C compatibility extensions. The predefined macro \fB__STDC__\fR has a value of 1 when \fBcpp\fR is invoked in conjunction with the \fB-Xc\fR option. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fBs\fR\fR -.ad -.RS 5n -.rt -K&R C only. The macro \fB__STDC__\fR is not defined when \fBcpp\fR is invoked in conjunction with the \fB-Xs\fR option. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fBt\fR\fR -.ad -.RS 5n -.rt -Transition. ISO C plus K&R C compatibility extensions, without semantic changes required by ISO C. The predefined macro \fB__STDC__\fR has a value of 0 when \fBcpp\fR is invoked in conjunction with the \fB-Xt\fR option. -.RE - -As the \fB-X\fR option only affects how the D compiler invokes the C preprocessor, the \fB-Xa\fR and \fB-Xt\fR options are equivalent from the perspective of D and both are provided only to ease re-use of settings from a C build environment. -.sp -Regardless of the \fB-X\fR mode, the following additional C preprocessor definitions are always specified and valid in all modes: -.RS +4 -.TP -.ie t \(bu -.el o -\fB__sun\fR -.RE -.RS +4 -.TP -.ie t \(bu -.el o -\fB__unix\fR -.RE -.RS +4 -.TP -.ie t \(bu -.el o -\fB__SVR4\fR -.RE -.RS +4 -.TP -.ie t \(bu -.el o -\fB__sparc\fR (on SPARC systems only) -.RE -.RS +4 -.TP -.ie t \(bu -.el o -\fB__sparcv9\fR (on SPARC systems only when 64-bit programs are compiled) -.RE -.RS +4 -.TP -.ie t \(bu -.el o -\fB__i386\fR (on x86 systems only when 32-bit programs are compiled) -.RE -.RS +4 -.TP -.ie t \(bu -.el o -\fB__amd64\fR (on x86 systems only when 64-bit programs are compiled) -.RE -.RS +4 -.TP -.ie t \(bu -.el o -\fB__\fI`uname -s`\fR_\fI`uname -r`\fR\fR (for example, \fB__SunOS_5_10\fR) -.RE -.RS +4 -.TP -.ie t \(bu -.el o -\fB__SUNW_D=1\fR -.RE -.RS +4 -.TP -.ie t \(bu -.el o -\fB__SUNW_D_VERSION=0x\fIMMmmmuuu\fR\fR -.sp -Where \fIMM\fR is the major release value in hexadecimal, \fImmm\fR is the minor release value in hexadecimal, and \fIuuu\fR is the -micro release value in hexadecimal. Refer to the \fISolaris Dynamic Tracing Guide\fR for more information about DTrace versioning. -.RE -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-Z\fR\fR -.ad -.sp .6 -.RS 4n -Permit probe descriptions that match zero probes. If the \fB-Z\fR option is not specified, \fBdtrace\fR reports an error and exits if any probe descriptions specified in D program files (\fB-s\fR option) or on the command line (\fB-P\fR, \fB-m\fR, \fB-f\fR, \fB-n\fR, or \fB-i\fR options) contain descriptions that do not match any known probes. -.RE - -.SH OPERANDS -.sp -.LP -You can specify zero or more additional arguments on the \fBdtrace\fR command line to define a set of macro variables (\fB$1\fR, \fB$2\fR, and so forth). The additional arguments can be used in D programs specified using the \fB-s\fR option -or on the command line. The use of macro variables is described further in the \fISolaris Dynamic Tracing Guide\fR. -.SH EXIT STATUS -.sp -.LP -The following exit values are returned: -.sp -.ne 2 -.mk -.na -\fB0\fR -.ad -.RS 5n -.rt -Successful completion. -.sp -For D program requests, an exit status of \fB0\fR indicates that programs were successfully compiled, probes were successfully enabled, or anonymous state was successfully retrieved. \fBdtrace\fR returns \fB0\fR even if the specified tracing requests -encountered errors or drops. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB1\fR\fR -.ad -.RS 5n -.rt +.Bl -tag -width indent +.It Fl 32 | Fl 64 +The D compiler produces programs using the native data model of the operating +system kernel. +If the +.Fl 32 +option is specified, +.Nm +forces the D compiler to compile a D program using the 32-bit data model. +If the +.Fl 64 +option is specified, +.Nm +forces the D compiler to compile a D program using the 64-bit data model. +These options are typically not required as +.Nm +selects the native data model as the default. +The data model affects the sizes of integer types and other language properties. +D programs compiled for either data model can be executed on both 32-bit and +64-bit kernels. +The +.Fl 32 +and +.Fl 64 +options also determine the +.Xr elf 5 +file format (ELF32 or ELF64) produced by the +.Fl G +option. +.It Fl a +Claim anonymous tracing state and display the traced data. +You can combine the +.Fl a +option with the +.Fl e +option to force +.Nm +to exit immediately after consuming the anonymous tracing state rather than +continuing to wait for new data. +.It Fl A +Generate directives for anonymous tracing and write them to +.Pa /boot/dtrace.dof . +This option constructs a set of dtrace configuration file directives to enable +the specified probes for anonymous tracing and then exits. +By default, +.Nm +attempts to store the directives to the file +.Pa /boot/dtrace.dof . +This behavior can be modified using the +.Fl o +option to specify an alternate output file. +.It Fl b Ar bufsz +Set the principal trace buffer size to +.Ar bufsz . +The trace buffer size can include any of the size suffixes k, m, g, or t. +If the buffer space cannot be allocated, +.Nm dtrace +attempts to reduce the buffer size or exit depending on the setting of the +bufresize property. +.It Fl c Ar cmd +Run the specified command +.Ar cmd +and exit upon its completion. +If more than one +.Fl c +option is present on the command line, +.Nm dtrace +exits when all commands have exited, reporting the exit status for each child +process as it terminates. +The process ID of the first command is made available to any D programs +specified on the command line or using the +.Fl s +option through the +.Li $target +macro variable. +.It Fl C +Run the C preprocessor +.Xr cpp 1 +over D programs before compiling them. +You can pass options to the C preprocessor using the +.Fl D , +.Fl U , +.Fl I , +and +.Fl H +options. +You can select the degree of C standard conformance if you use the +.Fl X +option. +For a description of the set of tokens defined by the D compiler when invoking +the C preprocessor, see +.Fl X . +.It Fl D Ar name Op Ns = Ns value +Define +.Ar name +when invoking +.Xr cpp 1 +(enabled using the +.Fl C +option). +If you specify an additional +.Ar value , +the name is assigned the corresponding value. +This option passes the +.Fl D +option to each +.Xr cpp 1 +invocation. +.It Fl e +Exit after compiling any requests and consuming anonymous tracing state +.Fl ( a +option) but prior to enabling any probes. +You can combine this option with the +.Fl a +option to print anonymous tracing data and exit. +You can also combine this option with D compiler options. +This combination verifies that the programs compile without actually executing +them and enabling the corresponding instrumentation. +.It Fl f Oo Oo Ar provider : Oc Ar module : Oc Ar function Oo Oo Ar predicate \ + Oc Ar action Oc +Specify function name to trace or list +.Fl ( l +option). +The corresponding argument can include any of the probe description forms +.Ar provider:module:function , +.Ar module:function , +or +.Ar function . +Unspecified probe description fields are left blank and match any probes +regardless of the values in those fields. +If no qualifiers other than +.Ar function +are specified in the description, all probes with the corresponding +.Ar function +are matched. +The +.Fl f +argument can be suffixed with an optional D probe clause. +You can specify more than one +.Fl f +option on the command line at a time. +.It Fl F +Coalesce trace output by identifying function entry and return. +Function entry probe reports are indented and their output is prefixed with +.Ql -> . +Function return probe reports are unindented and their output is prefixed with +.Ql <- . +System call entry probe reports are indented and their output is prefixed with +.Ql => . +System call return probe reports are unindented and their output is prefixed +with +.Ql <= . +.It Fl G +Generate an ELF file containing an embedded DTrace program. +The DTrace probes specified in the program are saved inside of a relocatable ELF +object which can be linked into another program. +If the +.Fl o +option is present, the ELF file is saved using the pathname specified as the +argument for this operand. +If the +.Fl o +option is not present and the DTrace program is contained with a file whose name +is +.Ar filename.d , +then the ELF file is saved using the name +.Ar filename.o . +Otherwise the ELF file is saved using the name d.out. +.It Fl h +Generate a header file containing macros that correspond to probes in the +specified provider definitions. +This option should be used to generate a header file that is included by other +source files for later use with the +.It Fl H +Print the pathnames of included files when invoking +.Xr cpp 1 +(enabled using the +.Fl C +option). +This option passes the +.Fl H +option to each +.Xr cpp 1 +invocation, causing it to display the list of pathnames, one for each line, to +standard error. +.Fl G +option. +If the +.Fl o +option +is present, the header file is saved using the pathname specified as the +argument for that option. +If the +.Fl o +option is not present and the DTrace program is contained with a file whose +name is +.Ar filename.d , +then the header file is saved using the name +.Ar filename.h . +.It Fl i Ar probe-id Op Oo Ar predicate Oc Ar action +Specify probe identifier +.Ar ( probe-id ) +to trace or list +.Ar ( l +option). +You can specify probe IDs using decimal integers as shown by `dtrace -l`. *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Thu Oct 10 15:39:02 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 99AF6D8D; Thu, 10 Oct 2013 15:39:02 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 86FBC2548; Thu, 10 Oct 2013 15:39:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9AFd2Ln001978; Thu, 10 Oct 2013 15:39:02 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9AFd2vQ001976; Thu, 10 Oct 2013 15:39:02 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201310101539.r9AFd2vQ001976@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Thu, 10 Oct 2013 15:39:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256273 - projects/bhyve_svm/contrib/wpa/src/utils X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Oct 2013 15:39:02 -0000 Author: des Date: Thu Oct 10 15:39:02 2013 New Revision: 256273 URL: http://svnweb.freebsd.org/changeset/base/256273 Log: Revert spurious RCSID change, reducing diff against head. Approved by: grehan Modified: projects/bhyve_svm/contrib/wpa/src/utils/radiotap.h Modified: projects/bhyve_svm/contrib/wpa/src/utils/radiotap.h ============================================================================== --- projects/bhyve_svm/contrib/wpa/src/utils/radiotap.h Thu Oct 10 14:34:01 2013 (r256272) +++ projects/bhyve_svm/contrib/wpa/src/utils/radiotap.h Thu Oct 10 15:39:02 2013 (r256273) @@ -1,4 +1,4 @@ -/* $FreeBSD: projects/bhyve_svm/contrib/wpa/src/utils/radiotap.h 214734 2010-11-03 10:43:38Z rpaulo $ */ +/* $FreeBSD: head/contrib/wpa/src/utils/radiotap.h 214734 2010-11-03 10:43:38Z rpaulo $ */ /* $NetBSD: ieee80211_radiotap.h,v 1.11 2005/06/22 06:16:02 dyoung Exp $ */ /*- From owner-svn-src-projects@FreeBSD.ORG Thu Oct 10 16:31:48 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A16C966C; Thu, 10 Oct 2013 16:31:48 +0000 (UTC) (envelope-from cherry@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7F6EE2949; Thu, 10 Oct 2013 16:31:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9AGVmCI030160; Thu, 10 Oct 2013 16:31:48 GMT (envelope-from cherry@svn.freebsd.org) Received: (from cherry@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9AGVmIx030159; Thu, 10 Oct 2013 16:31:48 GMT (envelope-from cherry@svn.freebsd.org) Message-Id: <201310101631.r9AGVmIx030159@svn.freebsd.org> From: "Cherry G. Mathew" Date: Thu, 10 Oct 2013 16:31:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256277 - projects/amd64_xen_pv/sys/amd64/include/xen X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Oct 2013 16:31:48 -0000 Author: cherry Date: Thu Oct 10 16:31:47 2013 New Revision: 256277 URL: http://svnweb.freebsd.org/changeset/base/256277 Log: Cosmetic changes to make this closer to i386/include/xen/xen-os.h Approved by: gibbs (implicit) Modified: projects/amd64_xen_pv/sys/amd64/include/xen/xen-os.h Modified: projects/amd64_xen_pv/sys/amd64/include/xen/xen-os.h ============================================================================== --- projects/amd64_xen_pv/sys/amd64/include/xen/xen-os.h Thu Oct 10 16:25:53 2013 (r256276) +++ projects/amd64_xen_pv/sys/amd64/include/xen/xen-os.h Thu Oct 10 16:31:47 2013 (r256277) @@ -43,7 +43,9 @@ static inline int smp_processor_id(void) { + if (__predict_true(gdtset)) return PCPU_GET(cpuid); + return 0; } #else @@ -92,7 +94,7 @@ void trap_init(void); #define __cli() \ do { \ vcpu_info_t *_vcpu; \ - _vcpu = &HYPERVISOR_shared_info->vcpu_info[PCPU_GET(cpuid)]; \ + _vcpu = &HYPERVISOR_shared_info->vcpu_info[smp_processor_id()]; \ _vcpu->evtchn_upcall_mask = 1; \ barrier(); \ } while (0) @@ -101,7 +103,7 @@ do { do { \ vcpu_info_t *_vcpu; \ barrier(); \ - _vcpu = &HYPERVISOR_shared_info->vcpu_info[PCPU_GET(cpuid)]; \ + _vcpu = &HYPERVISOR_shared_info->vcpu_info[smp_processor_id()]; \ _vcpu->evtchn_upcall_mask = 0; \ barrier(); /* unmask then check (avoid races) */ \ if ( unlikely(_vcpu->evtchn_upcall_pending) ) \ @@ -112,7 +114,7 @@ do { do { \ vcpu_info_t *_vcpu; \ barrier(); \ - _vcpu = &HYPERVISOR_shared_info->vcpu_info[PCPU_GET(cpuid)]; \ + _vcpu = &HYPERVISOR_shared_info->vcpu_info[smp_processor_id()]; \ if ((_vcpu->evtchn_upcall_mask = (x)) == 0) { \ barrier(); /* unmask then check (avoid races) */ \ if ( unlikely(_vcpu->evtchn_upcall_pending) ) \ @@ -127,7 +129,7 @@ do { #define __save_and_cli(x) \ do { \ vcpu_info_t *_vcpu; \ - _vcpu = &HYPERVISOR_shared_info->vcpu_info[PCPU_GET(cpuid)]; \ + _vcpu = &HYPERVISOR_shared_info->vcpu_info[smp_processor_id()]; \ (x) = _vcpu->evtchn_upcall_mask; \ _vcpu->evtchn_upcall_mask = 1; \ barrier(); \ From owner-svn-src-projects@FreeBSD.ORG Thu Oct 10 16:46:02 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A6D532EB; Thu, 10 Oct 2013 16:46:02 +0000 (UTC) (envelope-from cherry@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 86DF52A74; Thu, 10 Oct 2013 16:46:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9AGk2lA036338; Thu, 10 Oct 2013 16:46:02 GMT (envelope-from cherry@svn.freebsd.org) Received: (from cherry@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9AGk2Dq036337; Thu, 10 Oct 2013 16:46:02 GMT (envelope-from cherry@svn.freebsd.org) Message-Id: <201310101646.r9AGk2Dq036337@svn.freebsd.org> From: "Cherry G. Mathew" Date: Thu, 10 Oct 2013 16:46:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256278 - projects/amd64_xen_pv/sys/amd64/xen X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Oct 2013 16:46:02 -0000 Author: cherry Date: Thu Oct 10 16:46:02 2013 New Revision: 256278 URL: http://svnweb.freebsd.org/changeset/base/256278 Log: Use pmap->pm_cr3 to cache the Machine Address of the current process VA. Approved by: gibbs(implicit) Modified: projects/amd64_xen_pv/sys/amd64/xen/pmap.c Modified: projects/amd64_xen_pv/sys/amd64/xen/pmap.c ============================================================================== --- projects/amd64_xen_pv/sys/amd64/xen/pmap.c Thu Oct 10 16:31:47 2013 (r256277) +++ projects/amd64_xen_pv/sys/amd64/xen/pmap.c Thu Oct 10 16:46:02 2013 (r256278) @@ -641,6 +641,7 @@ pmap_bootstrap(vm_paddr_t *firstaddr) */ PMAP_LOCK_INIT(kernel_pmap); kernel_pmap->pm_pml4 = (pdp_entry_t *)KPML4phys; + kernel_pmap->pm_cr3 = pmap_kextract_ma((vm_offset_t) KPML4phys); kernel_pmap->pm_root.rt_root = 0; CPU_FILL(&kernel_pmap->pm_active); /* don't allow deactivation */ pmap_pv_init(); @@ -751,6 +752,7 @@ pmap_pinit0(pmap_t pmap) { PMAP_LOCK_INIT(pmap); pmap->pm_pml4 = (void *) KPML4phys; + pmap->pm_cr3 = pmap_kextract_ma((vm_offset_t) KPML4phys); pmap->pm_root.rt_root = 0; CPU_ZERO(&pmap->pm_active); PCPU_SET(curpmap, pmap); @@ -771,6 +773,8 @@ pmap_pinit(pmap_t pmap) pmap->pm_pml4 = (void *) kmem_malloc(kernel_arena, PAGE_SIZE, M_ZERO); if (pmap->pm_pml4 == NULL) return 0; + pmap->pm_cr3 = pmap_kextract_ma((vm_offset_t)pmap->pm_pml4); + /* * We do not wire in kernel space, or the self-referencial * entry in userspace pmaps becase both kernel and userland @@ -784,7 +788,7 @@ pmap_pinit(pmap_t pmap) pmap_xen_setpages_ro((uintptr_t)pmap->pm_pml4, 1); - xen_pgdir_pin(pmap_kextract_ma((uintptr_t)pmap->pm_pml4)); + xen_pgdir_pin(pmap->pm_cr3); pmap->pm_root.rt_root = 0; CPU_ZERO(&pmap->pm_active); @@ -810,7 +814,7 @@ void pmap_xen_userload(pmap_t pmap) PT_UPDATES_FLUSH(); /* Tell xen about user pmap switch */ - xen_pt_user_switch(vtomach(pmap->pm_pml4)); + xen_pt_user_switch(pmap->pm_cr3); } void @@ -819,7 +823,7 @@ pmap_release(pmap_t pmap) KASSERT(pmap != kernel_pmap, ("%s: kernel pmap released", __func__)); - xen_pgdir_unpin(pmap_kextract_ma((uintptr_t)pmap->pm_pml4)); + xen_pgdir_unpin(pmap->pm_cr3); pmap_xen_setpages_rw((uintptr_t)pmap->pm_pml4, 1); bzero(pmap->pm_pml4, PAGE_SIZE); @@ -2108,7 +2112,6 @@ pmap_activate(struct thread *td) { pmap_t pmap, oldpmap; u_int cpuid; - u_int64_t cr3; critical_enter(); pmap = vmspace_pmap(td->td_proc->p_vmspace); @@ -2117,14 +2120,15 @@ pmap_activate(struct thread *td) #ifdef SMP CPU_CLR_ATOMIC(cpuid, &oldpmap->pm_active); CPU_SET_ATOMIC(cpuid, &pmap->pm_active); + CPU_SET_ATOMIC(cpuid, &pmap->pm_save); #else CPU_CLR(cpuid, &oldpmap->pm_active); CPU_SET(cpuid, &pmap->pm_active); + CPU_SET(cpuid, &pmap->pm_save); #endif - cr3 = pmap_kextract((vm_offset_t)pmap->pm_pml4); - td->td_pcb->pcb_cr3 = cr3; + td->td_pcb->pcb_cr3 = pmap->pm_cr3; if (__predict_false(pmap == kernel_pmap)) { - xen_load_cr3(cr3); + load_cr3(pmap->pm_cr3); } else { pmap_xen_userload(pmap); From owner-svn-src-projects@FreeBSD.ORG Thu Oct 10 18:34:47 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 1781561D; Thu, 10 Oct 2013 18:34:47 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EACA72281; Thu, 10 Oct 2013 18:34:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9AIYkPX092931; Thu, 10 Oct 2013 18:34:46 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9AIYk6N092930; Thu, 10 Oct 2013 18:34:46 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201310101834.r9AIYk6N092930@svn.freebsd.org> From: Alexander Motin Date: Thu, 10 Oct 2013 18:34:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256286 - projects/camlock/sys/geom X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Oct 2013 18:34:47 -0000 Author: mav Date: Thu Oct 10 18:34:46 2013 New Revision: 256286 URL: http://svnweb.freebsd.org/changeset/base/256286 Log: Avoid BIO clonning (memory allocation) inside GEOM DISK when request is within maximal allowed size and so it is not going to be splitted. In such case the only conflicting field in struct bio is bio_done. So, instead of allocating whole new struct bio for that only field, copy that field into bio_to, that is GEOM-specific and should not be used by disk drivers below. On request completion reconstruct original bio_done field from bio_to and original bio_to field from bio_disk. Modified: projects/camlock/sys/geom/geom_disk.c Modified: projects/camlock/sys/geom/geom_disk.c ============================================================================== --- projects/camlock/sys/geom/geom_disk.c Thu Oct 10 18:18:04 2013 (r256285) +++ projects/camlock/sys/geom/geom_disk.c Thu Oct 10 18:34:46 2013 (r256286) @@ -256,6 +256,25 @@ g_disk_done(struct bio *bp) g_destroy_bio(bp); } +static void +g_disk_done_single(struct bio *bp) +{ + struct bintime now; + struct g_disk_softc *sc; + + bp->bio_completed = bp->bio_length - bp->bio_resid; + bp->bio_done = (void *)bp->bio_to; + bp->bio_to = LIST_FIRST(&bp->bio_disk->d_geom->provider); + if ((bp->bio_cmd & (BIO_READ|BIO_WRITE|BIO_DELETE)) != 0) { + binuptime(&now); + sc = bp->bio_to->private; + mtx_lock(&sc->done_mtx); + devstat_end_transaction_bio_bt(sc->dp->d_devstat, bp, &now); + mtx_unlock(&sc->done_mtx); + } + g_io_deliver(bp, bp->bio_error); +} + static int g_disk_ioctl(struct g_provider *pp, u_long cmd, void * data, int fflag, struct thread *td) { @@ -281,7 +300,7 @@ g_disk_start(struct bio *bp) struct disk *dp; struct g_disk_softc *sc; int error; - off_t off; + off_t d_maxsize, off; sc = bp->bio_to->private; if (sc == NULL || (dp = sc->dp) == NULL || dp->d_destroyed) { @@ -298,6 +317,22 @@ g_disk_start(struct bio *bp) /* fall-through */ case BIO_READ: case BIO_WRITE: + d_maxsize = (bp->bio_cmd == BIO_DELETE) ? + dp->d_delmaxsize : dp->d_maxsize; + if (bp->bio_length <= d_maxsize) { + bp->bio_disk = dp; + bp->bio_to = (void *)bp->bio_done; + bp->bio_done = g_disk_done_single; + bp->bio_pblkno = bp->bio_offset / dp->d_sectorsize; + bp->bio_bcount = bp->bio_length; + mtx_lock(&sc->start_mtx); + devstat_start_transaction_bio(dp->d_devstat, bp); + mtx_unlock(&sc->start_mtx); + g_disk_lock_giant(dp); + dp->d_strategy(bp); + g_disk_unlock_giant(dp); + break; + } off = 0; bp3 = NULL; bp2 = g_clone_bio(bp); @@ -306,10 +341,6 @@ g_disk_start(struct bio *bp) break; } do { - off_t d_maxsize; - - d_maxsize = (bp->bio_cmd == BIO_DELETE) ? - dp->d_delmaxsize : dp->d_maxsize; bp2->bio_offset += off; bp2->bio_length -= off; if ((bp->bio_flags & BIO_UNMAPPED) == 0) { @@ -408,15 +439,11 @@ g_disk_start(struct bio *bp) error = EOPNOTSUPP; break; } - bp2 = g_clone_bio(bp); - if (bp2 == NULL) { - g_io_deliver(bp, ENOMEM); - return; - } - bp2->bio_done = g_disk_done; - bp2->bio_disk = dp; + bp->bio_disk = dp; + bp->bio_to = (void *)bp->bio_done; + bp->bio_done = g_disk_done_single; g_disk_lock_giant(dp); - dp->d_strategy(bp2); + dp->d_strategy(bp); g_disk_unlock_giant(dp); break; default: From owner-svn-src-projects@FreeBSD.ORG Thu Oct 10 20:03:55 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 38FDD82B; Thu, 10 Oct 2013 20:03:55 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0CB1E28E7; Thu, 10 Oct 2013 20:03:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9AK3si6038369; Thu, 10 Oct 2013 20:03:54 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9AK3smQ038364; Thu, 10 Oct 2013 20:03:54 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201310102003.r9AK3smQ038364@svn.freebsd.org> From: Alexander Motin Date: Thu, 10 Oct 2013 20:03:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256295 - in projects/camlock/sys: geom kern X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Oct 2013 20:03:55 -0000 Author: mav Date: Thu Oct 10 20:03:54 2013 New Revision: 256295 URL: http://svnweb.freebsd.org/changeset/base/256295 Log: Use the same satistics for disk and its GEOM provider. Avoiding double accounting allows to reduce CPU load on I/O, especially on machines with slow timecounter. As side effect it also makes gstat show statistics for raw disk providers even when kern.geom.collectstats is set to zero, making that mode more usable. Modified: projects/camlock/sys/geom/geom_disk.c projects/camlock/sys/geom/geom_io.c projects/camlock/sys/kern/subr_devstat.c Modified: projects/camlock/sys/geom/geom_disk.c ============================================================================== --- projects/camlock/sys/geom/geom_disk.c Thu Oct 10 19:56:31 2013 (r256294) +++ projects/camlock/sys/geom/geom_disk.c Thu Oct 10 20:03:54 2013 (r256295) @@ -554,6 +554,9 @@ g_disk_create(void *arg, int flag) gp = g_new_geomf(&g_disk_class, "%s%d", dp->d_name, dp->d_unit); gp->softc = sc; pp = g_new_providerf(gp, "%s", gp->name); + devstat_remove_entry(pp->stat); + pp->stat = NULL; + dp->d_devstat->id = pp; pp->mediasize = dp->d_mediasize; pp->sectorsize = dp->d_sectorsize; pp->stripeoffset = dp->d_stripeoffset; Modified: projects/camlock/sys/geom/geom_io.c ============================================================================== --- projects/camlock/sys/geom/geom_io.c Thu Oct 10 19:56:31 2013 (r256294) +++ projects/camlock/sys/geom/geom_io.c Thu Oct 10 20:03:54 2013 (r256295) @@ -510,7 +510,7 @@ g_io_request(struct bio *bp, struct g_co KASSERT(!(bp->bio_flags & BIO_ONQUEUE), ("Bio already on queue bp=%p", bp)); - if (g_collectstats) + if ((g_collectstats & ~(pp->stat ? 0 : 1)) != 0) binuptime(&bp->bio_t0); else getbinuptime(&bp->bio_t0); @@ -647,7 +647,7 @@ g_io_deliver(struct bio *bp, int error) * can not update one instance of the statistics from more * than one thread at a time, so grab the lock first. */ - if (g_collectstats) + if ((g_collectstats & ~(pp->stat ? 0 : 1)) != 0) binuptime(&now); mtxp = mtx_pool_find(mtxpool_sleep, cp); mtx_lock(mtxp); Modified: projects/camlock/sys/kern/subr_devstat.c ============================================================================== --- projects/camlock/sys/kern/subr_devstat.c Thu Oct 10 19:56:31 2013 (r256294) +++ projects/camlock/sys/kern/subr_devstat.c Thu Oct 10 20:03:54 2013 (r256295) @@ -131,6 +131,7 @@ devstat_new_entry(const void *dev_name, ds = devstat_alloc(); mtx_lock(&devstat_mutex); if (unit_number == -1) { + ds->unit_number = unit_number; ds->id = dev_name; binuptime(&ds->creation_time); devstat_generation++; @@ -242,7 +243,7 @@ devstat_remove_entry(struct devstat *ds) /* Remove this entry from the devstat queue */ atomic_add_acq_int(&ds->sequence1, 1); - if (ds->id == NULL) { + if (ds->unit_number != -1) { devstat_num_devs--; STAILQ_REMOVE(devstat_head, ds, devstat, dev_links); } From owner-svn-src-projects@FreeBSD.ORG Thu Oct 10 21:46:52 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id C4DE8143; Thu, 10 Oct 2013 21:46:52 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AD00920C3; Thu, 10 Oct 2013 21:46:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9ALkqr3090185; Thu, 10 Oct 2013 21:46:52 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9ALkoNn090172; Thu, 10 Oct 2013 21:46:50 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310102146.r9ALkoNn090172@svn.freebsd.org> From: Alan Somers Date: Thu, 10 Oct 2013 21:46:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256301 - in projects/zfsd/head: . bin bin/chflags bin/dd bin/freebsd-version bin/ls bin/pkill bin/ps bin/sh cddl/contrib/opensolaris/cmd/dtrace cddl/contrib/opensolaris/cmd/dtrace/test... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Oct 2013 21:46:52 -0000 Author: asomers Date: Thu Oct 10 21:46:43 2013 New Revision: 256301 URL: http://svnweb.freebsd.org/changeset/base/256301 Log: IFC @256277 Approved by: ken (mentor) Added: projects/zfsd/head/bin/freebsd-version/ - copied from r256277, head/bin/freebsd-version/ projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sizedkeys.d - copied unchanged from r256277, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sizedkeys.d projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sizedkeys.d.out - copied unchanged from r256277, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sizedkeys.d.out projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d.out - copied unchanged from r256277, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d.out projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compcast.d - copied unchanged from r256277, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compcast.d projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compcast.d.out - copied unchanged from r256277, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compcast.d.out projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compnarrowassign.d - copied unchanged from r256277, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compnarrowassign.d projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compnarrowassign.d.out - copied unchanged from r256277, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compnarrowassign.d.out projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.execcast.d - copied unchanged from r256277, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.execcast.d projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.execcast.d.out - copied unchanged from r256277, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.execcast.d.out projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_AGG.bad.d - copied unchanged from r256277, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_AGG.bad.d projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.dyn.d - copied unchanged from r256277, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.dyn.d projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d - copied unchanged from r256277, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d.out - copied unchanged from r256277, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d.out projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.signs.d - copied unchanged from r256277, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.signs.d projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.signs.d.out - copied unchanged from r256277, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.signs.d.out projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/err.D_TRACE_AGG.bad.d - copied unchanged from r256277, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/err.D_TRACE_AGG.bad.d projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/tst.dyn.d - copied unchanged from r256277, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/tst.dyn.d projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability1.ksh - copied unchanged from r256277, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability1.ksh projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability1.ksh.out - copied unchanged from r256277, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability1.ksh.out projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability2.ksh - copied unchanged from r256277, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability2.ksh projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability2.ksh.out - copied unchanged from r256277, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability2.ksh.out projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/types/tst.const.d - copied unchanged from r256277, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/types/tst.const.d projects/zfsd/head/cddl/lib/libdtrace/ip.d - copied unchanged from r256277, head/cddl/lib/libdtrace/ip.d projects/zfsd/head/cddl/lib/libdtrace/tcp.d - copied unchanged from r256277, head/cddl/lib/libdtrace/tcp.d projects/zfsd/head/cddl/lib/libdtrace/udp.d - copied unchanged from r256277, head/cddl/lib/libdtrace/udp.d projects/zfsd/head/contrib/apr-util/crypto/apr_passwd.c - copied unchanged from r256277, head/contrib/apr-util/crypto/apr_passwd.c projects/zfsd/head/contrib/apr-util/crypto/crypt_blowfish.c - copied unchanged from r256277, head/contrib/apr-util/crypto/crypt_blowfish.c projects/zfsd/head/contrib/apr-util/crypto/crypt_blowfish.h - copied unchanged from r256277, head/contrib/apr-util/crypto/crypt_blowfish.h projects/zfsd/head/contrib/bmake/unit-tests/sunshcmd - copied unchanged from r256277, head/contrib/bmake/unit-tests/sunshcmd projects/zfsd/head/contrib/dialog/package/freebsd/ - copied from r256277, head/contrib/dialog/package/freebsd/ projects/zfsd/head/contrib/dialog/po/fa.po - copied unchanged from r256277, head/contrib/dialog/po/fa.po projects/zfsd/head/contrib/ipfilter/WhatsNew50.txt - copied unchanged from r256277, head/contrib/ipfilter/WhatsNew50.txt projects/zfsd/head/contrib/ipfilter/arc4random.c - copied unchanged from r256277, head/contrib/ipfilter/arc4random.c projects/zfsd/head/contrib/ipfilter/genmask.c - copied unchanged from r256277, head/contrib/ipfilter/genmask.c projects/zfsd/head/contrib/ipfilter/ip_dstlist.c - copied unchanged from r256277, head/contrib/ipfilter/ip_dstlist.c projects/zfsd/head/contrib/ipfilter/ip_dstlist.h - copied unchanged from r256277, head/contrib/ipfilter/ip_dstlist.h projects/zfsd/head/contrib/ipfilter/ip_fil_compat.c - copied unchanged from r256277, head/contrib/ipfilter/ip_fil_compat.c projects/zfsd/head/contrib/ipfilter/ipf_rb.h - copied unchanged from r256277, head/contrib/ipfilter/ipf_rb.h projects/zfsd/head/contrib/ipfilter/lib/allocmbt.c - copied unchanged from r256277, head/contrib/ipfilter/lib/allocmbt.c projects/zfsd/head/contrib/ipfilter/lib/assigndefined.c - copied unchanged from r256277, head/contrib/ipfilter/lib/assigndefined.c projects/zfsd/head/contrib/ipfilter/lib/connecttcp.c - copied unchanged from r256277, head/contrib/ipfilter/lib/connecttcp.c projects/zfsd/head/contrib/ipfilter/lib/dupmbt.c - copied unchanged from r256277, head/contrib/ipfilter/lib/dupmbt.c projects/zfsd/head/contrib/ipfilter/lib/familyname.c - copied unchanged from r256277, head/contrib/ipfilter/lib/familyname.c projects/zfsd/head/contrib/ipfilter/lib/findword.c - copied unchanged from r256277, head/contrib/ipfilter/lib/findword.c projects/zfsd/head/contrib/ipfilter/lib/freembt.c - copied unchanged from r256277, head/contrib/ipfilter/lib/freembt.c projects/zfsd/head/contrib/ipfilter/lib/ftov.c - copied unchanged from r256277, head/contrib/ipfilter/lib/ftov.c projects/zfsd/head/contrib/ipfilter/lib/geticmptype.c - copied unchanged from r256277, head/contrib/ipfilter/lib/geticmptype.c projects/zfsd/head/contrib/ipfilter/lib/icmptypename.c - copied unchanged from r256277, head/contrib/ipfilter/lib/icmptypename.c projects/zfsd/head/contrib/ipfilter/lib/icmptypes.c - copied unchanged from r256277, head/contrib/ipfilter/lib/icmptypes.c projects/zfsd/head/contrib/ipfilter/lib/interror.c - copied unchanged from r256277, head/contrib/ipfilter/lib/interror.c projects/zfsd/head/contrib/ipfilter/lib/ipf_perror.c - copied unchanged from r256277, head/contrib/ipfilter/lib/ipf_perror.c projects/zfsd/head/contrib/ipfilter/lib/load_dstlist.c - copied unchanged from r256277, head/contrib/ipfilter/lib/load_dstlist.c projects/zfsd/head/contrib/ipfilter/lib/load_dstlistnode.c - copied unchanged from r256277, head/contrib/ipfilter/lib/load_dstlistnode.c projects/zfsd/head/contrib/ipfilter/lib/mb_hexdump.c - copied unchanged from r256277, head/contrib/ipfilter/lib/mb_hexdump.c projects/zfsd/head/contrib/ipfilter/lib/msgdsize.c - copied unchanged from r256277, head/contrib/ipfilter/lib/msgdsize.c projects/zfsd/head/contrib/ipfilter/lib/parsefields.c - copied unchanged from r256277, head/contrib/ipfilter/lib/parsefields.c projects/zfsd/head/contrib/ipfilter/lib/parseipfexpr.c - copied unchanged from r256277, head/contrib/ipfilter/lib/parseipfexpr.c projects/zfsd/head/contrib/ipfilter/lib/parsewhoisline.c - copied unchanged from r256277, head/contrib/ipfilter/lib/parsewhoisline.c projects/zfsd/head/contrib/ipfilter/lib/poolio.c - copied unchanged from r256277, head/contrib/ipfilter/lib/poolio.c projects/zfsd/head/contrib/ipfilter/lib/prependmbt.c - copied unchanged from r256277, head/contrib/ipfilter/lib/prependmbt.c projects/zfsd/head/contrib/ipfilter/lib/printactiveaddr.c - copied unchanged from r256277, head/contrib/ipfilter/lib/printactiveaddr.c projects/zfsd/head/contrib/ipfilter/lib/printaddr.c - copied unchanged from r256277, head/contrib/ipfilter/lib/printaddr.c projects/zfsd/head/contrib/ipfilter/lib/printdstl_live.c - copied unchanged from r256277, head/contrib/ipfilter/lib/printdstl_live.c projects/zfsd/head/contrib/ipfilter/lib/printdstlist.c - copied unchanged from r256277, head/contrib/ipfilter/lib/printdstlist.c projects/zfsd/head/contrib/ipfilter/lib/printdstlistdata.c - copied unchanged from r256277, head/contrib/ipfilter/lib/printdstlistdata.c projects/zfsd/head/contrib/ipfilter/lib/printdstlistnode.c - copied unchanged from r256277, head/contrib/ipfilter/lib/printdstlistnode.c projects/zfsd/head/contrib/ipfilter/lib/printdstlistpolicy.c - copied unchanged from r256277, head/contrib/ipfilter/lib/printdstlistpolicy.c projects/zfsd/head/contrib/ipfilter/lib/printfieldhdr.c - copied unchanged from r256277, head/contrib/ipfilter/lib/printfieldhdr.c projects/zfsd/head/contrib/ipfilter/lib/printhost.c - copied unchanged from r256277, head/contrib/ipfilter/lib/printhost.c projects/zfsd/head/contrib/ipfilter/lib/printipfexpr.c - copied unchanged from r256277, head/contrib/ipfilter/lib/printipfexpr.c projects/zfsd/head/contrib/ipfilter/lib/printiphdr.c - copied unchanged from r256277, head/contrib/ipfilter/lib/printiphdr.c projects/zfsd/head/contrib/ipfilter/lib/printlookup.c - copied unchanged from r256277, head/contrib/ipfilter/lib/printlookup.c projects/zfsd/head/contrib/ipfilter/lib/printnataddr.c - copied unchanged from r256277, head/contrib/ipfilter/lib/printnataddr.c projects/zfsd/head/contrib/ipfilter/lib/printnatfield.c - copied unchanged from r256277, head/contrib/ipfilter/lib/printnatfield.c projects/zfsd/head/contrib/ipfilter/lib/printnatside.c - copied unchanged from r256277, head/contrib/ipfilter/lib/printnatside.c projects/zfsd/head/contrib/ipfilter/lib/printpoolfield.c - copied unchanged from r256277, head/contrib/ipfilter/lib/printpoolfield.c projects/zfsd/head/contrib/ipfilter/lib/printstatefields.c - copied unchanged from r256277, head/contrib/ipfilter/lib/printstatefields.c projects/zfsd/head/contrib/ipfilter/lib/printtcpflags.c - copied unchanged from r256277, head/contrib/ipfilter/lib/printtcpflags.c projects/zfsd/head/contrib/ipfilter/lib/printunit.c - copied unchanged from r256277, head/contrib/ipfilter/lib/printunit.c projects/zfsd/head/contrib/ipfilter/lib/save_execute.c - copied unchanged from r256277, head/contrib/ipfilter/lib/save_execute.c projects/zfsd/head/contrib/ipfilter/lib/save_file.c - copied unchanged from r256277, head/contrib/ipfilter/lib/save_file.c projects/zfsd/head/contrib/ipfilter/lib/save_nothing.c - copied unchanged from r256277, head/contrib/ipfilter/lib/save_nothing.c projects/zfsd/head/contrib/ipfilter/lib/save_syslog.c - copied unchanged from r256277, head/contrib/ipfilter/lib/save_syslog.c projects/zfsd/head/contrib/ipfilter/lib/save_v1trap.c - copied unchanged from r256277, head/contrib/ipfilter/lib/save_v1trap.c projects/zfsd/head/contrib/ipfilter/lib/save_v2trap.c - copied unchanged from r256277, head/contrib/ipfilter/lib/save_v2trap.c projects/zfsd/head/contrib/ipfilter/lib/vtof.c - copied unchanged from r256277, head/contrib/ipfilter/lib/vtof.c - copied unchanged from r256277, head/contrib/ipfilter/ml_ipl.c - copied unchanged from r256277, head/contrib/ipfilter/mlfk_ipl.c - copied unchanged from r256277, head/contrib/ipfilter/mli_ipl.c - copied unchanged from r256277, head/contrib/ipfilter/mln_ipl.c projects/zfsd/head/contrib/ipfilter/mln_rule.c - copied unchanged from r256277, head/contrib/ipfilter/mln_rule.c projects/zfsd/head/contrib/ipfilter/mlo_ipl.c - copied unchanged from r256277, head/contrib/ipfilter/mlo_ipl.c projects/zfsd/head/contrib/ipfilter/mlo_rule.c - copied unchanged from r256277, head/contrib/ipfilter/mlo_rule.c - copied unchanged from r256277, head/contrib/ipfilter/mls_ipl.c projects/zfsd/head/contrib/ipfilter/mls_rule.c - copied unchanged from r256277, head/contrib/ipfilter/mls_rule.c projects/zfsd/head/contrib/ipfilter/mlso_rule.c - copied unchanged from r256277, head/contrib/ipfilter/mlso_rule.c projects/zfsd/head/contrib/ipfilter/radix_ipf.c - copied unchanged from r256277, head/contrib/ipfilter/radix_ipf.c projects/zfsd/head/contrib/ipfilter/sys/ - copied from r256277, head/contrib/ipfilter/sys/ projects/zfsd/head/contrib/ipfilter/tools/ipfsyncd.c - copied unchanged from r256277, head/contrib/ipfilter/tools/ipfsyncd.c projects/zfsd/head/contrib/ldns-host/ - copied from r256277, head/contrib/ldns-host/ projects/zfsd/head/contrib/ldns/drill/config.h - copied unchanged from r256277, head/contrib/ldns/drill/config.h projects/zfsd/head/contrib/ldns/drill/drill.1 - copied unchanged from r256277, head/contrib/ldns/drill/drill.1 - copied from r256277, head/contrib/libexecinfo/ projects/zfsd/head/contrib/llvm/tools/lldb/ - copied from r256277, head/contrib/llvm/tools/lldb/ projects/zfsd/head/contrib/nvi/catalog/zh_CN.GB2312.base - copied unchanged from r256277, head/contrib/nvi/catalog/zh_CN.GB2312.base projects/zfsd/head/contrib/nvi/catalog/zh_CN.GB2312.owner - copied unchanged from r256277, head/contrib/nvi/catalog/zh_CN.GB2312.owner projects/zfsd/head/contrib/nvi/cl/extern.h - copied unchanged from r256277, head/contrib/nvi/cl/extern.h projects/zfsd/head/contrib/nvi/common/conv.c - copied unchanged from r256277, head/contrib/nvi/common/conv.c projects/zfsd/head/contrib/nvi/common/conv.h - copied unchanged from r256277, head/contrib/nvi/common/conv.h projects/zfsd/head/contrib/nvi/common/encoding.c - copied unchanged from r256277, head/contrib/nvi/common/encoding.c projects/zfsd/head/contrib/nvi/common/extern.h - copied unchanged from r256277, head/contrib/nvi/common/extern.h projects/zfsd/head/contrib/nvi/common/multibyte.h - copied unchanged from r256277, head/contrib/nvi/common/multibyte.h projects/zfsd/head/contrib/nvi/common/options_def.h - copied unchanged from r256277, head/contrib/nvi/common/options_def.h projects/zfsd/head/contrib/nvi/ex/ex_def.h - copied unchanged from r256277, head/contrib/nvi/ex/ex_def.h projects/zfsd/head/contrib/nvi/ex/extern.h - copied unchanged from r256277, head/contrib/nvi/ex/extern.h projects/zfsd/head/contrib/nvi/regex/ - copied from r256277, head/contrib/nvi/regex/ projects/zfsd/head/contrib/nvi/vi/extern.h - copied unchanged from r256277, head/contrib/nvi/vi/extern.h projects/zfsd/head/contrib/openpam/lib/libpam/ - copied from r256277, head/contrib/openpam/lib/libpam/ projects/zfsd/head/contrib/openpam/m4/ - copied from r256277, head/contrib/openpam/m4/ projects/zfsd/head/contrib/openpam/mkpkgng.in - copied unchanged from r256277, head/contrib/openpam/mkpkgng.in projects/zfsd/head/contrib/openpam/t/t_file.c - copied unchanged from r256277, head/contrib/openpam/t/t_file.c projects/zfsd/head/contrib/openpam/test-driver - copied unchanged from r256277, head/contrib/openpam/test-driver projects/zfsd/head/contrib/serf/SConstruct - copied unchanged from r256277, head/contrib/serf/SConstruct projects/zfsd/head/contrib/serf/auth/auth_spnego.c - copied unchanged from r256277, head/contrib/serf/auth/auth_spnego.c projects/zfsd/head/contrib/serf/auth/auth_spnego.h - copied unchanged from r256277, head/contrib/serf/auth/auth_spnego.h projects/zfsd/head/contrib/serf/auth/auth_spnego_gss.c - copied unchanged from r256277, head/contrib/serf/auth/auth_spnego_gss.c projects/zfsd/head/contrib/serf/auth/auth_spnego_sspi.c - copied unchanged from r256277, head/contrib/serf/auth/auth_spnego_sspi.c projects/zfsd/head/contrib/serf/build/check.py - copied unchanged from r256277, head/contrib/serf/build/check.py projects/zfsd/head/contrib/serf/build/serf.pc.in - copied unchanged from r256277, head/contrib/serf/build/serf.pc.in projects/zfsd/head/contrib/unbound/config.h - copied unchanged from r256277, head/contrib/unbound/config.h projects/zfsd/head/contrib/unbound/doc/libunbound.3 - copied unchanged from r256277, head/contrib/unbound/doc/libunbound.3 projects/zfsd/head/contrib/unbound/doc/unbound-anchor.8 - copied unchanged from r256277, head/contrib/unbound/doc/unbound-anchor.8 projects/zfsd/head/contrib/unbound/doc/unbound-checkconf.8 - copied unchanged from r256277, head/contrib/unbound/doc/unbound-checkconf.8 projects/zfsd/head/contrib/unbound/doc/unbound-control.8 - copied unchanged from r256277, head/contrib/unbound/doc/unbound-control.8 projects/zfsd/head/contrib/unbound/doc/unbound.8 - copied unchanged from r256277, head/contrib/unbound/doc/unbound.8 projects/zfsd/head/contrib/unbound/doc/unbound.conf.5 - copied unchanged from r256277, head/contrib/unbound/doc/unbound.conf.5 projects/zfsd/head/contrib/unbound/freebsd-configure.sh - copied unchanged from r256277, head/contrib/unbound/freebsd-configure.sh projects/zfsd/head/contrib/unbound/freebsd-sources.pl - copied unchanged from r256277, head/contrib/unbound/freebsd-sources.pl projects/zfsd/head/contrib/unbound/libunbound/worker.h - copied unchanged from r256277, head/contrib/unbound/libunbound/worker.h projects/zfsd/head/contrib/unbound/smallapp/unbound-control-setup.sh.in - copied unchanged from r256277, head/contrib/unbound/smallapp/unbound-control-setup.sh.in projects/zfsd/head/crypto/openssh/Makefile.in - copied unchanged from r256277, head/crypto/openssh/Makefile.in projects/zfsd/head/crypto/openssh/buildpkg.sh.in - copied unchanged from r256277, head/crypto/openssh/buildpkg.sh.in projects/zfsd/head/crypto/openssh/config.sub - copied unchanged from r256277, head/crypto/openssh/config.sub projects/zfsd/head/crypto/openssh/configure - copied unchanged from r256277, head/crypto/openssh/configure projects/zfsd/head/crypto/openssh/configure.ac - copied unchanged from r256277, head/crypto/openssh/configure.ac projects/zfsd/head/crypto/openssh/contrib/ - copied from r256277, head/crypto/openssh/contrib/ projects/zfsd/head/crypto/openssh/fixalgorithms - copied unchanged from r256277, head/crypto/openssh/fixalgorithms projects/zfsd/head/crypto/openssh/freebsd-configure.sh - copied unchanged from r256277, head/crypto/openssh/freebsd-configure.sh projects/zfsd/head/crypto/openssh/install-sh - copied unchanged from r256277, head/crypto/openssh/install-sh projects/zfsd/head/crypto/openssh/krb5_config.h - copied unchanged from r256277, head/crypto/openssh/krb5_config.h projects/zfsd/head/crypto/openssh/mdoc2man.awk - copied unchanged from r256277, head/crypto/openssh/mdoc2man.awk projects/zfsd/head/crypto/openssh/moduli.0 - copied unchanged from r256277, head/crypto/openssh/moduli.0 projects/zfsd/head/crypto/openssh/nchan.ms - copied unchanged from r256277, head/crypto/openssh/nchan.ms projects/zfsd/head/crypto/openssh/nchan2.ms - copied unchanged from r256277, head/crypto/openssh/nchan2.ms projects/zfsd/head/crypto/openssh/openbsd-compat/Makefile.in - copied unchanged from r256277, head/crypto/openssh/openbsd-compat/Makefile.in projects/zfsd/head/crypto/openssh/openbsd-compat/getopt.h - copied unchanged from r256277, head/crypto/openssh/openbsd-compat/getopt.h projects/zfsd/head/crypto/openssh/openbsd-compat/getopt_long.c - copied unchanged from r256277, head/crypto/openssh/openbsd-compat/getopt_long.c projects/zfsd/head/crypto/openssh/openbsd-compat/getrrsetbyname-ldns.c - copied unchanged from r256277, head/crypto/openssh/openbsd-compat/getrrsetbyname-ldns.c projects/zfsd/head/crypto/openssh/openbsd-compat/regress/ - copied from r256277, head/crypto/openssh/openbsd-compat/regress/ projects/zfsd/head/crypto/openssh/openbsd-compat/strnlen.c - copied unchanged from r256277, head/crypto/openssh/openbsd-compat/strnlen.c projects/zfsd/head/crypto/openssh/openssh.xml.in - copied unchanged from r256277, head/crypto/openssh/openssh.xml.in projects/zfsd/head/crypto/openssh/opensshd.init.in - copied unchanged from r256277, head/crypto/openssh/opensshd.init.in projects/zfsd/head/crypto/openssh/regress/ - copied from r256277, head/crypto/openssh/regress/ projects/zfsd/head/crypto/openssh/sandbox-seccomp-filter.c - copied unchanged from r256277, head/crypto/openssh/sandbox-seccomp-filter.c projects/zfsd/head/crypto/openssh/scp.0 - copied unchanged from r256277, head/crypto/openssh/scp.0 projects/zfsd/head/crypto/openssh/sftp-server.0 - copied unchanged from r256277, head/crypto/openssh/sftp-server.0 projects/zfsd/head/crypto/openssh/sftp.0 - copied unchanged from r256277, head/crypto/openssh/sftp.0 projects/zfsd/head/crypto/openssh/ssh-add.0 - copied unchanged from r256277, head/crypto/openssh/ssh-add.0 projects/zfsd/head/crypto/openssh/ssh-agent.0 - copied unchanged from r256277, head/crypto/openssh/ssh-agent.0 projects/zfsd/head/crypto/openssh/ssh-keygen.0 - copied unchanged from r256277, head/crypto/openssh/ssh-keygen.0 projects/zfsd/head/crypto/openssh/ssh-keyscan.0 - copied unchanged from r256277, head/crypto/openssh/ssh-keyscan.0 projects/zfsd/head/crypto/openssh/ssh-keysign.0 - copied unchanged from r256277, head/crypto/openssh/ssh-keysign.0 projects/zfsd/head/crypto/openssh/ssh-pkcs11-helper.0 - copied unchanged from r256277, head/crypto/openssh/ssh-pkcs11-helper.0 projects/zfsd/head/crypto/openssh/ssh.0 - copied unchanged from r256277, head/crypto/openssh/ssh.0 projects/zfsd/head/crypto/openssh/ssh_config.0 - copied unchanged from r256277, head/crypto/openssh/ssh_config.0 projects/zfsd/head/crypto/openssh/sshd.0 - copied unchanged from r256277, head/crypto/openssh/sshd.0 projects/zfsd/head/crypto/openssh/sshd_config.0 - copied unchanged from r256277, head/crypto/openssh/sshd_config.0 projects/zfsd/head/crypto/openssh/survey.sh.in - copied unchanged from r256277, head/crypto/openssh/survey.sh.in projects/zfsd/head/etc/libmap.conf - copied unchanged from r256277, head/etc/libmap.conf projects/zfsd/head/etc/libmap32.conf - copied unchanged from r256277, head/etc/libmap32.conf projects/zfsd/head/etc/periodic/monthly/450.status-security - copied unchanged from r256277, head/etc/periodic/monthly/450.status-security projects/zfsd/head/etc/periodic/weekly/450.status-security - copied unchanged from r256277, head/etc/periodic/weekly/450.status-security projects/zfsd/head/etc/rc.d/ctld - copied unchanged from r256277, head/etc/rc.d/ctld projects/zfsd/head/etc/rc.d/iscsictl - copied unchanged from r256277, head/etc/rc.d/iscsictl projects/zfsd/head/etc/rc.d/iscsid - copied unchanged from r256277, head/etc/rc.d/iscsid projects/zfsd/head/etc/rc.d/local_unbound - copied unchanged from r256277, head/etc/rc.d/local_unbound projects/zfsd/head/gnu/usr.bin/cc/include/__wmmintrin_aes.h - copied unchanged from r256277, head/gnu/usr.bin/cc/include/__wmmintrin_aes.h projects/zfsd/head/gnu/usr.bin/cc/include/__wmmintrin_pclmul.h - copied unchanged from r256277, head/gnu/usr.bin/cc/include/__wmmintrin_pclmul.h projects/zfsd/head/include/mk-osreldate.sh - copied unchanged from r256277, head/include/mk-osreldate.sh projects/zfsd/head/lib/clang/liblldb/ - copied from r256277, head/lib/clang/liblldb/ projects/zfsd/head/lib/clang/liblldbAPI/ - copied from r256277, head/lib/clang/liblldbAPI/ projects/zfsd/head/lib/clang/liblldbBreakpoint/ - copied from r256277, head/lib/clang/liblldbBreakpoint/ projects/zfsd/head/lib/clang/liblldbCommands/ - copied from r256277, head/lib/clang/liblldbCommands/ projects/zfsd/head/lib/clang/liblldbCore/ - copied from r256277, head/lib/clang/liblldbCore/ projects/zfsd/head/lib/clang/liblldbDataFormatters/ - copied from r256277, head/lib/clang/liblldbDataFormatters/ projects/zfsd/head/lib/clang/liblldbExpression/ - copied from r256277, head/lib/clang/liblldbExpression/ projects/zfsd/head/lib/clang/liblldbHostCommon/ - copied from r256277, head/lib/clang/liblldbHostCommon/ projects/zfsd/head/lib/clang/liblldbHostFreeBSD/ - copied from r256277, head/lib/clang/liblldbHostFreeBSD/ projects/zfsd/head/lib/clang/liblldbInterpreter/ - copied from r256277, head/lib/clang/liblldbInterpreter/ projects/zfsd/head/lib/clang/liblldbPluginABISysV_x86_64/ - copied from r256277, head/lib/clang/liblldbPluginABISysV_x86_64/ projects/zfsd/head/lib/clang/liblldbPluginCXXItaniumABI/ - copied from r256277, head/lib/clang/liblldbPluginCXXItaniumABI/ projects/zfsd/head/lib/clang/liblldbPluginDisassemblerLLVM/ - copied from r256277, head/lib/clang/liblldbPluginDisassemblerLLVM/ projects/zfsd/head/lib/clang/liblldbPluginDynamicLoaderPosixDYLD/ - copied from r256277, head/lib/clang/liblldbPluginDynamicLoaderPosixDYLD/ projects/zfsd/head/lib/clang/liblldbPluginDynamicLoaderStatic/ - copied from r256277, head/lib/clang/liblldbPluginDynamicLoaderStatic/ projects/zfsd/head/lib/clang/liblldbPluginInstructionARM/ - copied from r256277, head/lib/clang/liblldbPluginInstructionARM/ projects/zfsd/head/lib/clang/liblldbPluginObjectContainerBSDArchive/ - copied from r256277, head/lib/clang/liblldbPluginObjectContainerBSDArchive/ projects/zfsd/head/lib/clang/liblldbPluginObjectFileELF/ - copied from r256277, head/lib/clang/liblldbPluginObjectFileELF/ projects/zfsd/head/lib/clang/liblldbPluginPlatformFreeBSD/ - copied from r256277, head/lib/clang/liblldbPluginPlatformFreeBSD/ projects/zfsd/head/lib/clang/liblldbPluginPlatformGDB/ - copied from r256277, head/lib/clang/liblldbPluginPlatformGDB/ projects/zfsd/head/lib/clang/liblldbPluginProcessElfCore/ - copied from r256277, head/lib/clang/liblldbPluginProcessElfCore/ projects/zfsd/head/lib/clang/liblldbPluginProcessFreeBSD/ - copied from r256277, head/lib/clang/liblldbPluginProcessFreeBSD/ projects/zfsd/head/lib/clang/liblldbPluginProcessGDBRemote/ - copied from r256277, head/lib/clang/liblldbPluginProcessGDBRemote/ projects/zfsd/head/lib/clang/liblldbPluginProcessPOSIX/ - copied from r256277, head/lib/clang/liblldbPluginProcessPOSIX/ projects/zfsd/head/lib/clang/liblldbPluginProcessUtility/ - copied from r256277, head/lib/clang/liblldbPluginProcessUtility/ projects/zfsd/head/lib/clang/liblldbPluginSymbolFileDWARF/ - copied from r256277, head/lib/clang/liblldbPluginSymbolFileDWARF/ projects/zfsd/head/lib/clang/liblldbPluginSymbolFileSymtab/ - copied from r256277, head/lib/clang/liblldbPluginSymbolFileSymtab/ projects/zfsd/head/lib/clang/liblldbPluginSymbolVendorELF/ - copied from r256277, head/lib/clang/liblldbPluginSymbolVendorELF/ projects/zfsd/head/lib/clang/liblldbPluginUnwindAssemblyInstEmulation/ - copied from r256277, head/lib/clang/liblldbPluginUnwindAssemblyInstEmulation/ projects/zfsd/head/lib/clang/liblldbPluginUnwindAssemblyX86/ - copied from r256277, head/lib/clang/liblldbPluginUnwindAssemblyX86/ projects/zfsd/head/lib/clang/liblldbSymbol/ - copied from r256277, head/lib/clang/liblldbSymbol/ projects/zfsd/head/lib/clang/liblldbTarget/ - copied from r256277, head/lib/clang/liblldbTarget/ projects/zfsd/head/lib/clang/liblldbUtility/ - copied from r256277, head/lib/clang/liblldbUtility/ projects/zfsd/head/lib/clang/lldb.lib.mk - copied unchanged from r256277, head/lib/clang/lldb.lib.mk projects/zfsd/head/lib/libc++/libc++.ldscript - copied unchanged from r256277, head/lib/libc++/libc++.ldscript projects/zfsd/head/lib/libc/capability/ - copied from r256277, head/lib/libc/capability/ projects/zfsd/head/lib/libc/gen/dup3.3 - copied unchanged from r256277, head/lib/libc/gen/dup3.3 projects/zfsd/head/lib/libc/gen/dup3.c - copied unchanged from r256277, head/lib/libc/gen/dup3.c projects/zfsd/head/lib/libc/include/errlst.h - copied unchanged from r256277, head/lib/libc/include/errlst.h projects/zfsd/head/lib/libc/sys/procctl.2 - copied unchanged from r256277, head/lib/libc/sys/procctl.2 projects/zfsd/head/lib/libexecinfo/ - copied from r256277, head/lib/libexecinfo/ projects/zfsd/head/lib/libiconv_compat/ - copied from r256277, head/lib/libiconv_compat/ projects/zfsd/head/lib/libunbound/ - copied from r256277, head/lib/libunbound/ projects/zfsd/head/lib/libusb/libusb-0.1.pc - copied unchanged from r256277, head/lib/libusb/libusb-0.1.pc projects/zfsd/head/lib/libusb/libusb-1.0.pc - copied unchanged from r256277, head/lib/libusb/libusb-1.0.pc projects/zfsd/head/lib/libusb/libusb-2.0.pc - copied unchanged from r256277, head/lib/libusb/libusb-2.0.pc projects/zfsd/head/lib/msun/src/imprecise.c - copied unchanged from r256277, head/lib/msun/src/imprecise.c projects/zfsd/head/sbin/mount/mount.conf.8 - copied unchanged from r256277, head/sbin/mount/mount.conf.8 projects/zfsd/head/share/examples/kld/random_adaptor/ - copied from r256277, head/share/examples/kld/random_adaptor/ projects/zfsd/head/share/man/man4/gpio.4 - copied unchanged from r256277, head/share/man/man4/gpio.4 projects/zfsd/head/share/man/man4/procdesc.4 - copied unchanged from r256277, head/share/man/man4/procdesc.4 projects/zfsd/head/share/man/man4/rsu.4 - copied unchanged from r256277, head/share/man/man4/rsu.4 projects/zfsd/head/share/man/man4/rsufw.4 - copied unchanged from r256277, head/share/man/man4/rsufw.4 projects/zfsd/head/share/man/man4/vmx.4 - copied unchanged from r256277, head/share/man/man4/vmx.4 projects/zfsd/head/share/man/man9/VOP_ADVISE.9 - copied unchanged from r256277, head/share/man/man9/VOP_ADVISE.9 projects/zfsd/head/share/man/man9/VOP_ALLOCATE.9 - copied unchanged from r256277, head/share/man/man9/VOP_ALLOCATE.9 projects/zfsd/head/share/man/man9/vm_page_busy.9 - copied unchanged from r256277, head/share/man/man9/vm_page_busy.9 projects/zfsd/head/share/monetdef/ca_ES.UTF-8.src - copied unchanged from r256277, head/share/monetdef/ca_ES.UTF-8.src projects/zfsd/head/share/monetdef/de_AT.UTF-8.src - copied unchanged from r256277, head/share/monetdef/de_AT.UTF-8.src projects/zfsd/head/share/monetdef/de_DE.UTF-8.src - copied unchanged from r256277, head/share/monetdef/de_DE.UTF-8.src projects/zfsd/head/share/monetdef/el_GR.UTF-8.src - copied unchanged from r256277, head/share/monetdef/el_GR.UTF-8.src projects/zfsd/head/share/monetdef/es_ES.UTF-8.src - copied unchanged from r256277, head/share/monetdef/es_ES.UTF-8.src projects/zfsd/head/share/monetdef/fi_FI.UTF-8.src - copied unchanged from r256277, head/share/monetdef/fi_FI.UTF-8.src projects/zfsd/head/share/monetdef/fr_BE.UTF-8.src - copied unchanged from r256277, head/share/monetdef/fr_BE.UTF-8.src projects/zfsd/head/share/monetdef/fr_FR.UTF-8.src - copied unchanged from r256277, head/share/monetdef/fr_FR.UTF-8.src projects/zfsd/head/share/monetdef/it_IT.UTF-8.src - copied unchanged from r256277, head/share/monetdef/it_IT.UTF-8.src projects/zfsd/head/share/monetdef/nl_BE.UTF-8.src - copied unchanged from r256277, head/share/monetdef/nl_BE.UTF-8.src projects/zfsd/head/share/monetdef/nl_NL.UTF-8.src - copied unchanged from r256277, head/share/monetdef/nl_NL.UTF-8.src projects/zfsd/head/sys/arm/allwinner/a20/ - copied from r256277, head/sys/arm/allwinner/a20/ projects/zfsd/head/sys/arm/broadcom/bcm2835/bcm2835_gpio.h - copied unchanged from r256277, head/sys/arm/broadcom/bcm2835/bcm2835_gpio.h projects/zfsd/head/sys/arm/conf/CUBIEBOARD2 - copied unchanged from r256277, head/sys/arm/conf/CUBIEBOARD2 projects/zfsd/head/sys/arm/conf/DIGI-CCWMX53 - copied unchanged from r256277, head/sys/arm/conf/DIGI-CCWMX53 projects/zfsd/head/sys/arm/freescale/imx/files.imx51 - copied unchanged from r256277, head/sys/arm/freescale/imx/files.imx51 projects/zfsd/head/sys/arm/freescale/imx/files.imx53 - copied unchanged from r256277, head/sys/arm/freescale/imx/files.imx53 projects/zfsd/head/sys/arm/freescale/imx/imx51_machdep.c - copied unchanged from r256277, head/sys/arm/freescale/imx/imx51_machdep.c projects/zfsd/head/sys/arm/freescale/imx/imx53_machdep.c - copied unchanged from r256277, head/sys/arm/freescale/imx/imx53_machdep.c projects/zfsd/head/sys/arm/freescale/imx/std.imx51 - copied unchanged from r256277, head/sys/arm/freescale/imx/std.imx51 projects/zfsd/head/sys/arm/freescale/imx/std.imx53 - copied unchanged from r256277, head/sys/arm/freescale/imx/std.imx53 projects/zfsd/head/sys/arm/ti/ti_sdhci.c - copied unchanged from r256277, head/sys/arm/ti/ti_sdhci.c projects/zfsd/head/sys/boot/fdt/dts/cubieboard2.dts - copied unchanged from r256277, head/sys/boot/fdt/dts/cubieboard2.dts projects/zfsd/head/sys/boot/fdt/dts/digi-ccwmx53.dts - copied unchanged from r256277, head/sys/boot/fdt/dts/digi-ccwmx53.dts projects/zfsd/head/sys/boot/fdt/dts/imx53x.dtsi - copied unchanged from r256277, head/sys/boot/fdt/dts/imx53x.dtsi projects/zfsd/head/sys/cam/ctl/ctl_frontend_iscsi.c - copied unchanged from r256277, head/sys/cam/ctl/ctl_frontend_iscsi.c projects/zfsd/head/sys/cam/ctl/ctl_frontend_iscsi.h - copied unchanged from r256277, head/sys/cam/ctl/ctl_frontend_iscsi.h projects/zfsd/head/sys/cddl/compat/opensolaris/sys/debug_compat.h - copied unchanged from r256277, head/sys/cddl/compat/opensolaris/sys/debug_compat.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_raidz.h - copied unchanged from r256277, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_raidz.h projects/zfsd/head/sys/compat/freebsd32/freebsd32_capability.c - copied unchanged from r256277, head/sys/compat/freebsd32/freebsd32_capability.c projects/zfsd/head/sys/compat/freebsd32/freebsd32_misc.h - copied unchanged from r256277, head/sys/compat/freebsd32/freebsd32_misc.h projects/zfsd/head/sys/contrib/dev/drm2/ - copied from r256277, head/sys/contrib/dev/drm2/ projects/zfsd/head/sys/contrib/dev/iwn/iwlwifi-2000-18.168.6.1.fw.uu - copied unchanged from r256277, head/sys/contrib/dev/iwn/iwlwifi-2000-18.168.6.1.fw.uu projects/zfsd/head/sys/contrib/dev/iwn/iwlwifi-6000g2a-18.168.6.1.fw.uu - copied unchanged from r256277, head/sys/contrib/dev/iwn/iwlwifi-6000g2a-18.168.6.1.fw.uu projects/zfsd/head/sys/contrib/dev/iwn/iwnwifi-2030-18.168.6.1.fw.uu - copied unchanged from r256277, head/sys/contrib/dev/iwn/iwnwifi-2030-18.168.6.1.fw.uu projects/zfsd/head/sys/contrib/dev/rsu/ - copied from r256277, head/sys/contrib/dev/rsu/ projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_dns_pxy.c - copied unchanged from r256277, head/sys/contrib/ipfilter/netinet/ip_dns_pxy.c projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_dstlist.c - copied unchanged from r256277, head/sys/contrib/ipfilter/netinet/ip_dstlist.c projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_dstlist.h - copied unchanged from r256277, head/sys/contrib/ipfilter/netinet/ip_dstlist.h projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_nat6.c - copied unchanged from r256277, head/sys/contrib/ipfilter/netinet/ip_nat6.c projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_tftp_pxy.c - copied unchanged from r256277, head/sys/contrib/ipfilter/netinet/ip_tftp_pxy.c projects/zfsd/head/sys/contrib/ipfilter/netinet/ipf_rb.h - copied unchanged from r256277, head/sys/contrib/ipfilter/netinet/ipf_rb.h projects/zfsd/head/sys/contrib/ipfilter/netinet/radix_ipf.c - copied unchanged from r256277, head/sys/contrib/ipfilter/netinet/radix_ipf.c projects/zfsd/head/sys/contrib/ipfilter/netinet/radix_ipf.h - copied unchanged from r256277, head/sys/contrib/ipfilter/netinet/radix_ipf.h projects/zfsd/head/sys/crypto/aesni/aesencdec.h - copied unchanged from r256277, head/sys/crypto/aesni/aesencdec.h projects/zfsd/head/sys/dev/bxe/57710_init_values.c - copied unchanged from r256277, head/sys/dev/bxe/57710_init_values.c projects/zfsd/head/sys/dev/bxe/57710_int_offsets.h - copied unchanged from r256277, head/sys/dev/bxe/57710_int_offsets.h projects/zfsd/head/sys/dev/bxe/57711_init_values.c - copied unchanged from r256277, head/sys/dev/bxe/57711_init_values.c projects/zfsd/head/sys/dev/bxe/57711_int_offsets.h - copied unchanged from r256277, head/sys/dev/bxe/57711_int_offsets.h projects/zfsd/head/sys/dev/bxe/57712_init_values.c - copied unchanged from r256277, head/sys/dev/bxe/57712_init_values.c projects/zfsd/head/sys/dev/bxe/57712_int_offsets.h - copied unchanged from r256277, head/sys/dev/bxe/57712_int_offsets.h projects/zfsd/head/sys/dev/bxe/bxe.c - copied unchanged from r256277, head/sys/dev/bxe/bxe.c projects/zfsd/head/sys/dev/bxe/bxe.h - copied unchanged from r256277, head/sys/dev/bxe/bxe.h projects/zfsd/head/sys/dev/bxe/bxe_dcb.h - copied unchanged from r256277, head/sys/dev/bxe/bxe_dcb.h projects/zfsd/head/sys/dev/bxe/bxe_debug.c - copied unchanged from r256277, head/sys/dev/bxe/bxe_debug.c projects/zfsd/head/sys/dev/bxe/bxe_elink.c - copied unchanged from r256277, head/sys/dev/bxe/bxe_elink.c projects/zfsd/head/sys/dev/bxe/bxe_elink.h - copied unchanged from r256277, head/sys/dev/bxe/bxe_elink.h projects/zfsd/head/sys/dev/bxe/bxe_stats.c - copied unchanged from r256277, head/sys/dev/bxe/bxe_stats.c projects/zfsd/head/sys/dev/bxe/bxe_stats.h - copied unchanged from r256277, head/sys/dev/bxe/bxe_stats.h projects/zfsd/head/sys/dev/bxe/ecore_fw_defs.h - copied unchanged from r256277, head/sys/dev/bxe/ecore_fw_defs.h projects/zfsd/head/sys/dev/bxe/ecore_hsi.h - copied unchanged from r256277, head/sys/dev/bxe/ecore_hsi.h projects/zfsd/head/sys/dev/bxe/ecore_init.h - copied unchanged from r256277, head/sys/dev/bxe/ecore_init.h projects/zfsd/head/sys/dev/bxe/ecore_init_ops.h - copied unchanged from r256277, head/sys/dev/bxe/ecore_init_ops.h projects/zfsd/head/sys/dev/bxe/ecore_mfw_req.h - copied unchanged from r256277, head/sys/dev/bxe/ecore_mfw_req.h projects/zfsd/head/sys/dev/bxe/ecore_reg.h - copied unchanged from r256277, head/sys/dev/bxe/ecore_reg.h projects/zfsd/head/sys/dev/bxe/ecore_sp.c - copied unchanged from r256277, head/sys/dev/bxe/ecore_sp.c projects/zfsd/head/sys/dev/bxe/ecore_sp.h - copied unchanged from r256277, head/sys/dev/bxe/ecore_sp.h projects/zfsd/head/sys/dev/cxgbe/t4_tracer.c - copied unchanged from r256277, head/sys/dev/cxgbe/t4_tracer.c projects/zfsd/head/sys/dev/drm2/ati_pcigart.c - copied unchanged from r256277, head/sys/dev/drm2/ati_pcigart.c projects/zfsd/head/sys/dev/drm2/drm_buffer.c - copied unchanged from r256277, head/sys/dev/drm2/drm_buffer.c projects/zfsd/head/sys/dev/drm2/drm_buffer.h - copied unchanged from r256277, head/sys/dev/drm2/drm_buffer.h projects/zfsd/head/sys/dev/drm2/drm_core.h - copied unchanged from r256277, head/sys/dev/drm2/drm_core.h projects/zfsd/head/sys/dev/drm2/drm_dp_helper.c - copied unchanged from r256277, head/sys/dev/drm2/drm_dp_helper.c projects/zfsd/head/sys/dev/drm2/drm_fixed.h - copied unchanged from r256277, head/sys/dev/drm2/drm_fixed.h projects/zfsd/head/sys/dev/drm2/drm_os_freebsd.h - copied unchanged from r256277, head/sys/dev/drm2/drm_os_freebsd.h projects/zfsd/head/sys/dev/drm2/radeon/ - copied from r256277, head/sys/dev/drm2/radeon/ projects/zfsd/head/sys/dev/etherswitch/arswitch/arswitch_vlans.c - copied unchanged from r256277, head/sys/dev/etherswitch/arswitch/arswitch_vlans.c projects/zfsd/head/sys/dev/etherswitch/arswitch/arswitch_vlans.h - copied unchanged from r256277, head/sys/dev/etherswitch/arswitch/arswitch_vlans.h projects/zfsd/head/sys/dev/hwpmc/hwpmc_mpc7xxx.c - copied unchanged from r256277, head/sys/dev/hwpmc/hwpmc_mpc7xxx.c projects/zfsd/head/sys/dev/hwpmc/hwpmc_powerpc.h - copied unchanged from r256277, head/sys/dev/hwpmc/hwpmc_powerpc.h - copied from r256277, head/sys/dev/hyperv/ projects/zfsd/head/sys/dev/iscsi/icl.c - copied unchanged from r256277, head/sys/dev/iscsi/icl.c projects/zfsd/head/sys/dev/iscsi/icl.h - copied unchanged from r256277, head/sys/dev/iscsi/icl.h projects/zfsd/head/sys/dev/iscsi/icl_proxy.c - copied unchanged from r256277, head/sys/dev/iscsi/icl_proxy.c projects/zfsd/head/sys/dev/iscsi/iscsi.c - copied unchanged from r256277, head/sys/dev/iscsi/iscsi.c projects/zfsd/head/sys/dev/iscsi/iscsi.h - copied unchanged from r256277, head/sys/dev/iscsi/iscsi.h projects/zfsd/head/sys/dev/iscsi/iscsi_ioctl.h - copied unchanged from r256277, head/sys/dev/iscsi/iscsi_ioctl.h projects/zfsd/head/sys/dev/iscsi/iscsi_proto.h - copied unchanged from r256277, head/sys/dev/iscsi/iscsi_proto.h projects/zfsd/head/sys/dev/iscsi_initiator/ - copied from r256277, head/sys/dev/iscsi_initiator/ projects/zfsd/head/sys/dev/iwn/if_iwn_devid.h - copied unchanged from r256277, head/sys/dev/iwn/if_iwn_devid.h projects/zfsd/head/sys/dev/nvme/nvme_util.c - copied unchanged from r256277, head/sys/dev/nvme/nvme_util.c projects/zfsd/head/sys/dev/random/pseudo_rng.c - copied unchanged from r256277, head/sys/dev/random/pseudo_rng.c projects/zfsd/head/sys/dev/random/random_adaptors.c - copied unchanged from r256277, head/sys/dev/random/random_adaptors.c projects/zfsd/head/sys/dev/random/random_adaptors.h - copied unchanged from r256277, head/sys/dev/random/random_adaptors.h projects/zfsd/head/sys/dev/random/random_harvestq.c - copied unchanged from r256277, head/sys/dev/random/random_harvestq.c projects/zfsd/head/sys/dev/random/random_harvestq.h - copied unchanged from r256277, head/sys/dev/random/random_harvestq.h projects/zfsd/head/sys/dev/uart/uart_dev_ns8250.h - copied unchanged from r256277, head/sys/dev/uart/uart_dev_ns8250.h projects/zfsd/head/sys/dev/uart/uart_dev_ti8250.c - copied unchanged from r256277, head/sys/dev/uart/uart_dev_ti8250.c projects/zfsd/head/sys/dev/usb/gadget/ - copied from r256277, head/sys/dev/usb/gadget/ projects/zfsd/head/sys/dev/usb/wlan/if_rsu.c - copied unchanged from r256277, head/sys/dev/usb/wlan/if_rsu.c projects/zfsd/head/sys/dev/usb/wlan/if_rsureg.h - copied unchanged from r256277, head/sys/dev/usb/wlan/if_rsureg.h projects/zfsd/head/sys/dev/vmware/ - copied from r256277, head/sys/dev/vmware/ projects/zfsd/head/sys/dev/wi/if_wi_macio.c - copied unchanged from r256277, head/sys/dev/wi/if_wi_macio.c projects/zfsd/head/sys/dev/xen/timer/ - copied from r256277, head/sys/dev/xen/timer/ projects/zfsd/head/sys/fs/ext2fs/ext2_extents.c - copied unchanged from r256277, head/sys/fs/ext2fs/ext2_extents.c projects/zfsd/head/sys/fs/ext2fs/ext2_extents.h - copied unchanged from r256277, head/sys/fs/ext2fs/ext2_extents.h projects/zfsd/head/sys/kern/subr_capability.c - copied unchanged from r256277, head/sys/kern/subr_capability.c projects/zfsd/head/sys/libkern/flsll.c - copied unchanged from r256277, head/sys/libkern/flsll.c projects/zfsd/head/sys/mips/atheros/ar934x_chip.c - copied unchanged from r256277, head/sys/mips/atheros/ar934x_chip.c projects/zfsd/head/sys/mips/atheros/ar934x_chip.h - copied unchanged from r256277, head/sys/mips/atheros/ar934x_chip.h projects/zfsd/head/sys/mips/conf/AR934X_BASE - copied unchanged from r256277, head/sys/mips/conf/AR934X_BASE projects/zfsd/head/sys/mips/conf/AR934X_BASE.hints - copied unchanged from r256277, head/sys/mips/conf/AR934X_BASE.hints projects/zfsd/head/sys/mips/conf/DB120 - copied unchanged from r256277, head/sys/mips/conf/DB120 projects/zfsd/head/sys/mips/conf/DB120.hints - copied unchanged from r256277, head/sys/mips/conf/DB120.hints projects/zfsd/head/sys/mips/conf/GXEMUL32 - copied unchanged from r256277, head/sys/mips/conf/GXEMUL32 projects/zfsd/head/sys/mips/conf/PICOSTATION_M2HP - copied unchanged from r256277, head/sys/mips/conf/PICOSTATION_M2HP projects/zfsd/head/sys/mips/conf/PICOSTATION_M2HP.hints - copied unchanged from r256277, head/sys/mips/conf/PICOSTATION_M2HP.hints projects/zfsd/head/sys/mips/conf/WZR-300HP - copied unchanged from r256277, head/sys/mips/conf/WZR-300HP projects/zfsd/head/sys/mips/conf/WZR-300HP.hints - copied unchanged from r256277, head/sys/mips/conf/WZR-300HP.hints projects/zfsd/head/sys/mips/malta/gt_pci_bus_space.c - copied unchanged from r256277, head/sys/mips/malta/gt_pci_bus_space.c projects/zfsd/head/sys/mips/malta/gt_pci_bus_space.h - copied unchanged from r256277, head/sys/mips/malta/gt_pci_bus_space.h projects/zfsd/head/sys/mips/mips/bcopy.S - copied unchanged from r256277, head/sys/mips/mips/bcopy.S projects/zfsd/head/sys/modules/drm2/radeonkms/ - copied from r256277, head/sys/modules/drm2/radeonkms/ projects/zfsd/head/sys/modules/drm2/radeonkmsfw/ - copied from r256277, head/sys/modules/drm2/radeonkmsfw/ - copied from r256277, head/sys/modules/hyperv/ projects/zfsd/head/sys/modules/ibcore/ - copied from r256277, head/sys/modules/ibcore/ projects/zfsd/head/sys/modules/ipoib/ - copied from r256277, head/sys/modules/ipoib/ projects/zfsd/head/sys/modules/iscsi_initiator/ - copied from r256277, head/sys/modules/iscsi_initiator/ projects/zfsd/head/sys/modules/iwnfw/iwn2000/ - copied from r256277, head/sys/modules/iwnfw/iwn2000/ projects/zfsd/head/sys/modules/iwnfw/iwn2030/ - copied from r256277, head/sys/modules/iwnfw/iwn2030/ projects/zfsd/head/sys/modules/usb/g_audio/ - copied from r256277, head/sys/modules/usb/g_audio/ projects/zfsd/head/sys/modules/usb/g_keyboard/ - copied from r256277, head/sys/modules/usb/g_keyboard/ projects/zfsd/head/sys/modules/usb/g_modem/ - copied from r256277, head/sys/modules/usb/g_modem/ projects/zfsd/head/sys/modules/usb/g_mouse/ - copied from r256277, head/sys/modules/usb/g_mouse/ projects/zfsd/head/sys/modules/usb/rsu/ - copied from r256277, head/sys/modules/usb/rsu/ projects/zfsd/head/sys/modules/usb/rsufw/ - copied from r256277, head/sys/modules/usb/rsufw/ projects/zfsd/head/sys/modules/usb/runfw/ - copied from r256277, head/sys/modules/usb/runfw/ projects/zfsd/head/sys/modules/vmware/ - copied from r256277, head/sys/modules/vmware/ projects/zfsd/head/sys/netinet/in_kdtrace.c - copied unchanged from r256277, head/sys/netinet/in_kdtrace.c projects/zfsd/head/sys/netinet/in_kdtrace.h - copied unchanged from r256277, head/sys/netinet/in_kdtrace.h projects/zfsd/head/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c - copied unchanged from r256277, head/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c projects/zfsd/head/sys/ofed/drivers/infiniband/hw/mlx4/cm.c - copied unchanged from r256277, head/sys/ofed/drivers/infiniband/hw/mlx4/cm.c projects/zfsd/head/sys/ofed/drivers/infiniband/hw/mlx4/mcg.c - copied unchanged from r256277, head/sys/ofed/drivers/infiniband/hw/mlx4/mcg.c projects/zfsd/head/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c - copied unchanged from r256277, head/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/resource_tracker.c - copied unchanged from r256277, head/sys/ofed/drivers/net/mlx4/resource_tracker.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/sys_tune.c - copied unchanged from r256277, head/sys/ofed/drivers/net/mlx4/sys_tune.c projects/zfsd/head/sys/ofed/include/linux/atomic.h - copied unchanged from r256277, head/sys/ofed/include/linux/atomic.h projects/zfsd/head/sys/ofed/include/linux/clocksource.h - copied unchanged from r256277, head/sys/ofed/include/linux/clocksource.h projects/zfsd/head/sys/ofed/include/rdma/ib_pma.h - copied unchanged from r256277, head/sys/ofed/include/rdma/ib_pma.h projects/zfsd/head/sys/powerpc/pseries/ - copied from r256277, head/sys/powerpc/pseries/ projects/zfsd/head/sys/sys/_unrhdr.h - copied unchanged from r256277, head/sys/sys/_unrhdr.h projects/zfsd/head/sys/sys/caprights.h - copied unchanged from r256277, head/sys/sys/caprights.h projects/zfsd/head/sys/sys/procctl.h - copied unchanged from r256277, head/sys/sys/procctl.h - copied unchanged from r256277, head/sys/x86/include/acpica_machdep.h projects/zfsd/head/sys/x86/xen/ - copied from r256277, head/sys/x86/xen/ projects/zfsd/head/sys/xen/evtchn/evtchnvar.h - copied unchanged from r256277, head/sys/xen/evtchn/evtchnvar.h projects/zfsd/head/sys/xen/xen-os.h - copied unchanged from r256277, head/sys/xen/xen-os.h projects/zfsd/head/tools/build/options/WITHOUT_GNUCXX - copied unchanged from r256277, head/tools/build/options/WITHOUT_GNUCXX projects/zfsd/head/tools/build/options/WITHOUT_ICONV - copied unchanged from r256277, head/tools/build/options/WITHOUT_ICONV projects/zfsd/head/tools/build/options/WITHOUT_LDNS_UTILS - copied unchanged from r256277, head/tools/build/options/WITHOUT_LDNS_UTILS projects/zfsd/head/tools/build/options/WITHOUT_UNBOUND - copied unchanged from r256277, head/tools/build/options/WITHOUT_UNBOUND projects/zfsd/head/tools/build/options/WITH_GCC - copied unchanged from r256277, head/tools/build/options/WITH_GCC projects/zfsd/head/tools/build/options/WITH_GNUCXX - copied unchanged from r256277, head/tools/build/options/WITH_GNUCXX projects/zfsd/head/tools/build/options/WITH_LIBICONV_COMPAT - copied unchanged from r256277, head/tools/build/options/WITH_LIBICONV_COMPAT projects/zfsd/head/tools/build/options/WITH_LLDB - copied unchanged from r256277, head/tools/build/options/WITH_LLDB projects/zfsd/head/tools/build/options/WITH_USB_GADGET_EXAMPLES - copied unchanged from r256277, head/tools/build/options/WITH_USB_GADGET_EXAMPLES projects/zfsd/head/tools/regression/bin/sh/builtins/alias4.0 - copied unchanged from r256277, head/tools/regression/bin/sh/builtins/alias4.0 projects/zfsd/head/tools/regression/bin/sh/builtins/jobid1.0 - copied unchanged from r256277, head/tools/regression/bin/sh/builtins/jobid1.0 projects/zfsd/head/tools/regression/bin/sh/builtins/jobid2.0 - copied unchanged from r256277, head/tools/regression/bin/sh/builtins/jobid2.0 projects/zfsd/head/tools/regression/bin/sh/builtins/local4.0 - copied unchanged from r256277, head/tools/regression/bin/sh/builtins/local4.0 projects/zfsd/head/tools/regression/bin/sh/builtins/return8.0 - copied unchanged from r256277, head/tools/regression/bin/sh/builtins/return8.0 projects/zfsd/head/tools/regression/bin/sh/builtins/type3.0 - copied unchanged from r256277, head/tools/regression/bin/sh/builtins/type3.0 projects/zfsd/head/tools/regression/bin/sh/expansion/arith13.0 - copied unchanged from r256277, head/tools/regression/bin/sh/expansion/arith13.0 projects/zfsd/head/tools/regression/bin/sh/parser/empty-cmd1.0 - copied unchanged from r256277, head/tools/regression/bin/sh/parser/empty-cmd1.0 projects/zfsd/head/tools/regression/bin/sh/parser/only-redir2.0 - copied unchanged from r256277, head/tools/regression/bin/sh/parser/only-redir2.0 projects/zfsd/head/tools/regression/bin/sh/parser/only-redir3.0 - copied unchanged from r256277, head/tools/regression/bin/sh/parser/only-redir3.0 projects/zfsd/head/tools/regression/bin/sh/parser/only-redir4.0 - copied unchanged from r256277, head/tools/regression/bin/sh/parser/only-redir4.0 projects/zfsd/head/tools/regression/file/fcntlflags/ - copied from r256277, head/tools/regression/file/fcntlflags/ projects/zfsd/head/tools/regression/iscsi/ - copied from r256277, head/tools/regression/iscsi/ projects/zfsd/head/tools/regression/lib/libc/stdio/test-fopen.c - copied unchanged from r256277, head/tools/regression/lib/libc/stdio/test-fopen.c projects/zfsd/head/tools/regression/lib/libc/stdio/test-fopen.t - copied unchanged from r256277, head/tools/regression/lib/libc/stdio/test-fopen.t projects/zfsd/head/tools/regression/lib/libc/stdio/test-mkostemp.c - copied unchanged from r256277, head/tools/regression/lib/libc/stdio/test-mkostemp.c projects/zfsd/head/tools/regression/lib/libc/stdio/test-mkostemp.t - copied unchanged from r256277, head/tools/regression/lib/libc/stdio/test-mkostemp.t projects/zfsd/head/tools/regression/lib/libutil/test-humanize_number.c - copied unchanged from r256277, head/tools/regression/lib/libutil/test-humanize_number.c projects/zfsd/head/tools/regression/lib/libutil/test-humanize_number.t - copied unchanged from r256277, head/tools/regression/lib/libutil/test-humanize_number.t projects/zfsd/head/tools/tools/drm/ - copied from r256277, head/tools/tools/drm/ projects/zfsd/head/tools/tools/usbtest/ - copied from r256277, head/tools/tools/usbtest/ projects/zfsd/head/usr.bin/calendar/calcpp.c - copied unchanged from r256277, head/usr.bin/calendar/calcpp.c projects/zfsd/head/usr.bin/calendar/calendars/ru_RU.UTF-8/ - copied from r256277, head/usr.bin/calendar/calendars/ru_RU.UTF-8/ projects/zfsd/head/usr.bin/clang/lldb/ - copied from r256277, head/usr.bin/clang/lldb/ projects/zfsd/head/usr.bin/drill/ - copied from r256277, head/usr.bin/drill/ projects/zfsd/head/usr.bin/iscsictl/ - copied from r256277, head/usr.bin/iscsictl/ projects/zfsd/head/usr.bin/protect/ - copied from r256277, head/usr.bin/protect/ projects/zfsd/head/usr.bin/vi/catalog/ - copied from r256277, head/usr.bin/vi/catalog/ projects/zfsd/head/usr.sbin/bhyve/ahci.h - copied unchanged from r256277, head/usr.sbin/bhyve/ahci.h projects/zfsd/head/usr.sbin/bhyve/block_if.c - copied unchanged from r256277, head/usr.sbin/bhyve/block_if.c projects/zfsd/head/usr.sbin/bhyve/block_if.h - copied unchanged from r256277, head/usr.sbin/bhyve/block_if.h projects/zfsd/head/usr.sbin/bhyve/pci_ahci.c - copied unchanged from r256277, head/usr.sbin/bhyve/pci_ahci.c projects/zfsd/head/usr.sbin/bhyve/virtio.c - copied unchanged from r256277, head/usr.sbin/bhyve/virtio.c projects/zfsd/head/usr.sbin/bsdconfig/examples/browse_packages_ftp.sh - copied unchanged from r256277, head/usr.sbin/bsdconfig/examples/browse_packages_ftp.sh projects/zfsd/head/usr.sbin/bsdconfig/examples/browse_packages_http.sh - copied unchanged from r256277, head/usr.sbin/bsdconfig/examples/browse_packages_http.sh projects/zfsd/head/usr.sbin/ctld/ - copied from r256277, head/usr.sbin/ctld/ projects/zfsd/head/usr.sbin/iscsid/ - copied from r256277, head/usr.sbin/iscsid/ projects/zfsd/head/usr.sbin/unbound/ - copied from r256277, head/usr.sbin/unbound/ Directory Properties: projects/zfsd/head/contrib/ipfilter/ml_ipl.c (props changed) projects/zfsd/head/contrib/ipfilter/mlfk_ipl.c (props changed) projects/zfsd/head/contrib/ipfilter/mli_ipl.c (props changed) projects/zfsd/head/contrib/ipfilter/mln_ipl.c (props changed) projects/zfsd/head/contrib/ipfilter/mls_ipl.c (props changed) projects/zfsd/head/contrib/libexecinfo/ (props changed) projects/zfsd/head/sys/dev/hyperv/ (props changed) projects/zfsd/head/sys/modules/hyperv/ (props changed) projects/zfsd/head/sys/x86/include/acpica_machdep.h (props changed) Replaced: projects/zfsd/head/contrib/openpam/lib/Makefile.am - copied unchanged from r256277, head/contrib/openpam/lib/Makefile.am projects/zfsd/head/contrib/openpam/lib/Makefile.in - copied unchanged from r256277, head/contrib/openpam/lib/Makefile.in Deleted: projects/zfsd/head/bin/sh/init.h projects/zfsd/head/bin/sh/mkinit.c projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_DYN.bad.d projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/man.TestTransStability.d projects/zfsd/head/contrib/apr-util/aprutil.dsp projects/zfsd/head/contrib/apr-util/crypto/apr_crypto_nss.dsp projects/zfsd/head/contrib/apr-util/crypto/apr_crypto_openssl.dsp projects/zfsd/head/contrib/apr-util/dbd/apr_dbd_freetds.dsp projects/zfsd/head/contrib/apr-util/dbd/apr_dbd_mysql.dsp projects/zfsd/head/contrib/apr-util/dbd/apr_dbd_odbc.dsp projects/zfsd/head/contrib/apr-util/dbd/apr_dbd_oracle.dsp projects/zfsd/head/contrib/apr-util/dbd/apr_dbd_pgsql.dsp projects/zfsd/head/contrib/apr-util/dbd/apr_dbd_sqlite2.dsp projects/zfsd/head/contrib/apr-util/dbd/apr_dbd_sqlite3.dsp projects/zfsd/head/contrib/apr-util/dbm/apr_dbm_db.dsp projects/zfsd/head/contrib/apr-util/dbm/apr_dbm_gdbm.dsp projects/zfsd/head/contrib/apr-util/ldap/apr_ldap.dsp projects/zfsd/head/contrib/apr-util/libaprutil.dsp projects/zfsd/head/contrib/apr-util/test/testutildll.dsp projects/zfsd/head/contrib/apr-util/test/testutillib.dsp projects/zfsd/head/contrib/bind9/ projects/zfsd/head/contrib/dialog/samples/copifuncs/ projects/zfsd/head/contrib/dialog/samples/install/ projects/zfsd/head/contrib/ipfilter/.cvsignore projects/zfsd/head/contrib/ipfilter/BSD/ projects/zfsd/head/contrib/ipfilter/FAQ.FreeBSD projects/zfsd/head/contrib/ipfilter/FWTK/ projects/zfsd/head/contrib/ipfilter/FreeBSD/ projects/zfsd/head/contrib/ipfilter/FreeBSD-2.2/ projects/zfsd/head/contrib/ipfilter/FreeBSD-3/ projects/zfsd/head/contrib/ipfilter/FreeBSD-4.0/ projects/zfsd/head/contrib/ipfilter/IMPORTANT projects/zfsd/head/contrib/ipfilter/INST.FreeBSD-2.2 projects/zfsd/head/contrib/ipfilter/INSTALL.FreeBSD projects/zfsd/head/contrib/ipfilter/INSTALL.xBSD projects/zfsd/head/contrib/ipfilter/IPF.KANJI projects/zfsd/head/contrib/ipfilter/WhatsNew40.txt projects/zfsd/head/contrib/ipfilter/bsdinstall projects/zfsd/head/contrib/ipfilter/etc/ projects/zfsd/head/contrib/ipfilter/iplang/.cvsignore projects/zfsd/head/contrib/ipfilter/ipsend/.cvsignore projects/zfsd/head/contrib/ipfilter/ipsend/README projects/zfsd/head/contrib/ipfilter/ipsend/hpux.c projects/zfsd/head/contrib/ipfilter/ipsend/in_var.h projects/zfsd/head/contrib/ipfilter/ipsend/ip_var.h projects/zfsd/head/contrib/ipfilter/ipsend/tcpip.h projects/zfsd/head/contrib/ipfilter/lib/ipft_ef.c projects/zfsd/head/contrib/ipfilter/lib/ipft_sn.c projects/zfsd/head/contrib/ipfilter/lib/ipft_td.c projects/zfsd/head/contrib/ipfilter/net/.cvsignore projects/zfsd/head/contrib/ipfilter/perl/ projects/zfsd/head/contrib/ipfilter/radix.c projects/zfsd/head/contrib/ipfilter/rules/.cvsignore projects/zfsd/head/contrib/ipfilter/samples/.cvsignore projects/zfsd/head/contrib/ipfilter/test/ projects/zfsd/head/contrib/ipfilter/todo projects/zfsd/head/contrib/nvi/FAQ projects/zfsd/head/contrib/nvi/LAYOUT projects/zfsd/head/contrib/nvi/build/ projects/zfsd/head/contrib/nvi/catalog/dutch projects/zfsd/head/contrib/nvi/catalog/dutch.check projects/zfsd/head/contrib/nvi/catalog/english projects/zfsd/head/contrib/nvi/catalog/english.base projects/zfsd/head/contrib/nvi/catalog/english.check projects/zfsd/head/contrib/nvi/catalog/french projects/zfsd/head/contrib/nvi/catalog/french.check projects/zfsd/head/contrib/nvi/catalog/german projects/zfsd/head/contrib/nvi/catalog/german.check projects/zfsd/head/contrib/nvi/catalog/polish projects/zfsd/head/contrib/nvi/catalog/polish.check projects/zfsd/head/contrib/nvi/catalog/ru_RU.KOI8-R projects/zfsd/head/contrib/nvi/catalog/ru_RU.KOI8-R.check projects/zfsd/head/contrib/nvi/catalog/spanish projects/zfsd/head/contrib/nvi/catalog/spanish.check projects/zfsd/head/contrib/nvi/catalog/swedish projects/zfsd/head/contrib/nvi/catalog/swedish.check projects/zfsd/head/contrib/nvi/catalog/uk_UA.KOI8-U projects/zfsd/head/contrib/nvi/cl/cl_bsd.c projects/zfsd/head/contrib/nvi/clib/ projects/zfsd/head/contrib/nvi/common/api.c projects/zfsd/head/contrib/nvi/ex/ex_perl.c projects/zfsd/head/contrib/nvi/ex/ex_tcl.c projects/zfsd/head/contrib/nvi/include/ projects/zfsd/head/contrib/nvi/ip/ projects/zfsd/head/contrib/nvi/ip_cl/ projects/zfsd/head/contrib/nvi/perl_api/ projects/zfsd/head/contrib/nvi/perl_scripts/ projects/zfsd/head/contrib/nvi/tcl_api/ projects/zfsd/head/contrib/nvi/tcl_scripts/ projects/zfsd/head/contrib/nvi/tk/ projects/zfsd/head/contrib/openbsm/m4/lt~obsolete.m4 projects/zfsd/head/contrib/openpam/FREEBSD-vendor projects/zfsd/head/contrib/openpam/lib/openpam_borrow_cred.c projects/zfsd/head/contrib/openpam/lib/openpam_check_owner_perms.c projects/zfsd/head/contrib/openpam/lib/openpam_configure.c projects/zfsd/head/contrib/openpam/lib/openpam_constants.c projects/zfsd/head/contrib/openpam/lib/openpam_constants.h projects/zfsd/head/contrib/openpam/lib/openpam_ctype.h projects/zfsd/head/contrib/openpam/lib/openpam_debug.h projects/zfsd/head/contrib/openpam/lib/openpam_dispatch.c projects/zfsd/head/contrib/openpam/lib/openpam_dynamic.c projects/zfsd/head/contrib/openpam/lib/openpam_features.c projects/zfsd/head/contrib/openpam/lib/openpam_features.h projects/zfsd/head/contrib/openpam/lib/openpam_findenv.c projects/zfsd/head/contrib/openpam/lib/openpam_free_data.c projects/zfsd/head/contrib/openpam/lib/openpam_free_envlist.c projects/zfsd/head/contrib/openpam/lib/openpam_get_feature.c projects/zfsd/head/contrib/openpam/lib/openpam_get_option.c projects/zfsd/head/contrib/openpam/lib/openpam_impl.h projects/zfsd/head/contrib/openpam/lib/openpam_load.c projects/zfsd/head/contrib/openpam/lib/openpam_log.c projects/zfsd/head/contrib/openpam/lib/openpam_nullconv.c projects/zfsd/head/contrib/openpam/lib/openpam_readline.c projects/zfsd/head/contrib/openpam/lib/openpam_readlinev.c projects/zfsd/head/contrib/openpam/lib/openpam_readword.c projects/zfsd/head/contrib/openpam/lib/openpam_restore_cred.c projects/zfsd/head/contrib/openpam/lib/openpam_set_feature.c projects/zfsd/head/contrib/openpam/lib/openpam_set_option.c projects/zfsd/head/contrib/openpam/lib/openpam_static.c projects/zfsd/head/contrib/openpam/lib/openpam_straddch.c projects/zfsd/head/contrib/openpam/lib/openpam_strlcat.h projects/zfsd/head/contrib/openpam/lib/openpam_strlcmp.h projects/zfsd/head/contrib/openpam/lib/openpam_strlcpy.h projects/zfsd/head/contrib/openpam/lib/openpam_subst.c projects/zfsd/head/contrib/openpam/lib/openpam_ttyconv.c projects/zfsd/head/contrib/openpam/lib/pam_acct_mgmt.c projects/zfsd/head/contrib/openpam/lib/pam_authenticate.c projects/zfsd/head/contrib/openpam/lib/pam_authenticate_secondary.c projects/zfsd/head/contrib/openpam/lib/pam_chauthtok.c projects/zfsd/head/contrib/openpam/lib/pam_close_session.c projects/zfsd/head/contrib/openpam/lib/pam_end.c projects/zfsd/head/contrib/openpam/lib/pam_error.c projects/zfsd/head/contrib/openpam/lib/pam_get_authtok.c projects/zfsd/head/contrib/openpam/lib/pam_get_data.c projects/zfsd/head/contrib/openpam/lib/pam_get_item.c projects/zfsd/head/contrib/openpam/lib/pam_get_mapped_authtok.c projects/zfsd/head/contrib/openpam/lib/pam_get_mapped_username.c projects/zfsd/head/contrib/openpam/lib/pam_get_user.c projects/zfsd/head/contrib/openpam/lib/pam_getenv.c projects/zfsd/head/contrib/openpam/lib/pam_getenvlist.c projects/zfsd/head/contrib/openpam/lib/pam_info.c projects/zfsd/head/contrib/openpam/lib/pam_open_session.c projects/zfsd/head/contrib/openpam/lib/pam_prompt.c projects/zfsd/head/contrib/openpam/lib/pam_putenv.c projects/zfsd/head/contrib/openpam/lib/pam_set_data.c projects/zfsd/head/contrib/openpam/lib/pam_set_item.c projects/zfsd/head/contrib/openpam/lib/pam_set_mapped_authtok.c projects/zfsd/head/contrib/openpam/lib/pam_set_mapped_username.c projects/zfsd/head/contrib/openpam/lib/pam_setcred.c projects/zfsd/head/contrib/openpam/lib/pam_setenv.c projects/zfsd/head/contrib/openpam/lib/pam_sm_acct_mgmt.c projects/zfsd/head/contrib/openpam/lib/pam_sm_authenticate.c projects/zfsd/head/contrib/openpam/lib/pam_sm_authenticate_secondary.c projects/zfsd/head/contrib/openpam/lib/pam_sm_chauthtok.c projects/zfsd/head/contrib/openpam/lib/pam_sm_close_session.c projects/zfsd/head/contrib/openpam/lib/pam_sm_get_mapped_authtok.c projects/zfsd/head/contrib/openpam/lib/pam_sm_get_mapped_username.c projects/zfsd/head/contrib/openpam/lib/pam_sm_open_session.c projects/zfsd/head/contrib/openpam/lib/pam_sm_set_mapped_authtok.c projects/zfsd/head/contrib/openpam/lib/pam_sm_set_mapped_username.c projects/zfsd/head/contrib/openpam/lib/pam_sm_setcred.c projects/zfsd/head/contrib/openpam/lib/pam_start.c projects/zfsd/head/contrib/openpam/lib/pam_strerror.c projects/zfsd/head/contrib/openpam/lib/pam_verror.c projects/zfsd/head/contrib/openpam/lib/pam_vinfo.c projects/zfsd/head/contrib/openpam/lib/pam_vprompt.c projects/zfsd/head/contrib/serf/Makefile.in projects/zfsd/head/contrib/serf/auth/auth_kerb.c projects/zfsd/head/contrib/serf/auth/auth_kerb.h projects/zfsd/head/contrib/serf/auth/auth_kerb_gss.c projects/zfsd/head/contrib/serf/auth/auth_kerb_sspi.c projects/zfsd/head/contrib/serf/build/apr_common.m4 projects/zfsd/head/contrib/serf/build/config.guess projects/zfsd/head/contrib/serf/build/config.sub projects/zfsd/head/contrib/serf/build/find_apr.m4 projects/zfsd/head/contrib/serf/build/find_apu.m4 projects/zfsd/head/contrib/serf/build/get-version.sh projects/zfsd/head/contrib/serf/build/install.sh projects/zfsd/head/contrib/serf/build/serf.def projects/zfsd/head/contrib/serf/buildconf projects/zfsd/head/contrib/serf/config.layout projects/zfsd/head/contrib/serf/configure projects/zfsd/head/contrib/serf/configure.in projects/zfsd/head/contrib/serf/serf.mak projects/zfsd/head/contrib/serf/serf.pc.in projects/zfsd/head/contrib/serf/serfmake projects/zfsd/head/crypto/openssh/openbsd-compat/getopt.c projects/zfsd/head/etc/mtree/BIND.chroot.dist projects/zfsd/head/etc/mtree/BIND.include.dist projects/zfsd/head/gnu/usr.bin/binutils/ar/Makefile projects/zfsd/head/gnu/usr.bin/binutils/ar/ar.1 projects/zfsd/head/gnu/usr.bin/binutils/ranlib/Makefile projects/zfsd/head/gnu/usr.bin/binutils/ranlib/ranlib.1 projects/zfsd/head/gnu/usr.bin/patch/ projects/zfsd/head/lib/bind/ projects/zfsd/head/lib/libpam/libpam/pam_std_option.c projects/zfsd/head/share/doc/bind9/ projects/zfsd/head/share/man/man9/vm_page_io.9 projects/zfsd/head/share/man/man9/vm_page_sleep_if_busy.9 projects/zfsd/head/share/man/man9/vm_page_wakeup.9 projects/zfsd/head/sys/amd64/conf/XENHVM projects/zfsd/head/sys/arm/freescale/imx/imx.files projects/zfsd/head/sys/arm/freescale/imx/imx_machdep.c projects/zfsd/head/sys/arm/freescale/imx/std.imx projects/zfsd/head/sys/contrib/dev/iwn/iwlwifi-6000g2a-17.168.5.3.fw.uu projects/zfsd/head/sys/contrib/ipfilter/netinet/QNX_OCL.txt projects/zfsd/head/sys/crypto/aesni/aesencdec_amd64.S projects/zfsd/head/sys/crypto/aesni/aesencdec_i386.S projects/zfsd/head/sys/dev/bxe/bxe_debug.h projects/zfsd/head/sys/dev/bxe/bxe_fw_defs.h projects/zfsd/head/sys/dev/bxe/bxe_hsi.h projects/zfsd/head/sys/dev/bxe/bxe_include.h projects/zfsd/head/sys/dev/bxe/bxe_init.h projects/zfsd/head/sys/dev/bxe/bxe_init_values_e1.h projects/zfsd/head/sys/dev/bxe/bxe_init_values_e1h.h projects/zfsd/head/sys/dev/bxe/bxe_link.c projects/zfsd/head/sys/dev/bxe/bxe_link.h projects/zfsd/head/sys/dev/bxe/bxe_reg.h projects/zfsd/head/sys/dev/bxe/bxe_self_test.h projects/zfsd/head/sys/dev/bxe/dump_e1.h projects/zfsd/head/sys/dev/bxe/dump_e1h.h projects/zfsd/head/sys/dev/bxe/hw_dump_reg_st.h projects/zfsd/head/sys/dev/bxe/if_bxe.c projects/zfsd/head/sys/dev/bxe/if_bxe.h projects/zfsd/head/sys/dev/iscsi/initiator/ projects/zfsd/head/sys/dev/random/probe.c projects/zfsd/head/sys/dev/xen/xenpci/evtchn.c projects/zfsd/head/sys/i386/conf/XENHVM projects/zfsd/head/sys/i386/include/xen/xen_clock_util.h projects/zfsd/head/sys/i386/xen/xen_clock_util.c projects/zfsd/head/sys/i386/xen/xen_rtc.c projects/zfsd/head/sys/kern/uipc_cow.c projects/zfsd/head/sys/modules/iscsi/initiator/ projects/zfsd/head/sys/modules/runfw/ projects/zfsd/head/sys/xen/evtchn/evtchn.c projects/zfsd/head/tools/build/options/WITHOUT_BIND projects/zfsd/head/tools/build/options/WITHOUT_BIND_DNSSEC projects/zfsd/head/tools/build/options/WITHOUT_BIND_ETC projects/zfsd/head/tools/build/options/WITHOUT_BIND_LIBS_LWRES projects/zfsd/head/tools/build/options/WITHOUT_BIND_MTREE projects/zfsd/head/tools/build/options/WITHOUT_BIND_NAMED projects/zfsd/head/tools/build/options/WITHOUT_BIND_UTILS projects/zfsd/head/tools/build/options/WITH_BIND_IDN projects/zfsd/head/tools/build/options/WITH_BIND_LARGE_FILE projects/zfsd/head/tools/build/options/WITH_BIND_LIBS projects/zfsd/head/tools/build/options/WITH_BIND_SIGCHASE projects/zfsd/head/tools/build/options/WITH_BIND_XML projects/zfsd/head/tools/build/options/WITH_BSDCONFIG projects/zfsd/head/tools/build/options/WITH_BSD_PATCH projects/zfsd/head/tools/build/options/WITH_ICONV projects/zfsd/head/tools/build/options/WITH_LDNS_UTILS projects/zfsd/head/usr.bin/dig/ projects/zfsd/head/usr.bin/nslookup/ projects/zfsd/head/usr.bin/nsupdate/ projects/zfsd/head/usr.bin/vi/port.h projects/zfsd/head/usr.sbin/arpaname/ projects/zfsd/head/usr.sbin/bsdconfig/examples/browse_packages.sh projects/zfsd/head/usr.sbin/ddns-confgen/ projects/zfsd/head/usr.sbin/dnssec-dsfromkey/ projects/zfsd/head/usr.sbin/dnssec-keyfromlabel/ projects/zfsd/head/usr.sbin/dnssec-keygen/ projects/zfsd/head/usr.sbin/dnssec-revoke/ projects/zfsd/head/usr.sbin/dnssec-settime/ projects/zfsd/head/usr.sbin/dnssec-signzone/ projects/zfsd/head/usr.sbin/genrandom/ projects/zfsd/head/usr.sbin/isc-hmac-fixup/ projects/zfsd/head/usr.sbin/named/ projects/zfsd/head/usr.sbin/named-checkconf/ projects/zfsd/head/usr.sbin/named-checkzone/ projects/zfsd/head/usr.sbin/named-journalprint/ projects/zfsd/head/usr.sbin/nsec3hash/ projects/zfsd/head/usr.sbin/rndc/ projects/zfsd/head/usr.sbin/rndc-confgen/ Modified: projects/zfsd/head/LOCKS projects/zfsd/head/MAINTAINERS (contents, props changed) projects/zfsd/head/Makefile projects/zfsd/head/Makefile.inc1 projects/zfsd/head/ObsoleteFiles.inc projects/zfsd/head/UPDATING projects/zfsd/head/bin/Makefile projects/zfsd/head/bin/chflags/chflags.1 projects/zfsd/head/bin/dd/dd.1 projects/zfsd/head/bin/ls/ls.1 projects/zfsd/head/bin/pkill/pkill.1 projects/zfsd/head/bin/pkill/pkill.c projects/zfsd/head/bin/ps/keyword.c projects/zfsd/head/bin/ps/ps.1 projects/zfsd/head/bin/sh/Makefile projects/zfsd/head/bin/sh/TOUR projects/zfsd/head/bin/sh/alias.c projects/zfsd/head/bin/sh/arith_yylex.c projects/zfsd/head/bin/sh/eval.c projects/zfsd/head/bin/sh/eval.h projects/zfsd/head/bin/sh/exec.c projects/zfsd/head/bin/sh/input.c projects/zfsd/head/bin/sh/input.h projects/zfsd/head/bin/sh/jobs.c projects/zfsd/head/bin/sh/jobs.h projects/zfsd/head/bin/sh/main.c projects/zfsd/head/bin/sh/output.c projects/zfsd/head/bin/sh/parser.c projects/zfsd/head/bin/sh/parser.h projects/zfsd/head/bin/sh/redir.c projects/zfsd/head/bin/sh/sh.1 projects/zfsd/head/bin/sh/shell.h projects/zfsd/head/bin/sh/trap.c projects/zfsd/head/bin/sh/trap.h projects/zfsd/head/bin/sh/var.c projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_VOID.bad.d projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PROTO_LEN.bad.d projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d.out projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.copyin.d projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.BufSizeVariations2.d projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/err.D_PROTO_LEN.bad.d projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/err.D_TRACE_VOID.bad.d projects/zfsd/head/cddl/contrib/opensolaris/cmd/zfs/zfs.8 projects/zfsd/head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c projects/zfsd/head/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 projects/zfsd/head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c projects/zfsd/head/cddl/contrib/opensolaris/cmd/ztest/ztest.c projects/zfsd/head/cddl/contrib/opensolaris/common/ctf/ctf_create.c projects/zfsd/head/cddl/contrib/opensolaris/common/ctf/ctf_error.c projects/zfsd/head/cddl/contrib/opensolaris/common/ctf/ctf_impl.h projects/zfsd/head/cddl/contrib/opensolaris/common/ctf/ctf_open.c projects/zfsd/head/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c projects/zfsd/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c projects/zfsd/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c projects/zfsd/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cg.c projects/zfsd/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c projects/zfsd/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_decl.c projects/zfsd/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c projects/zfsd/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_errtags.h projects/zfsd/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h projects/zfsd/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c projects/zfsd/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c projects/zfsd/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c projects/zfsd/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c projects/zfsd/head/cddl/contrib/opensolaris/lib/libdtrace/i386/dt_isadep.c projects/zfsd/head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h projects/zfsd/head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c projects/zfsd/head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c projects/zfsd/head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c projects/zfsd/head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c projects/zfsd/head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c projects/zfsd/head/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c projects/zfsd/head/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h projects/zfsd/head/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c projects/zfsd/head/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h projects/zfsd/head/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c projects/zfsd/head/cddl/contrib/opensolaris/tools/ctf/cvt/ctftools.h projects/zfsd/head/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c projects/zfsd/head/cddl/contrib/opensolaris/tools/ctf/cvt/st_parse.c projects/zfsd/head/cddl/lib/libdtrace/Makefile projects/zfsd/head/cddl/lib/libzpool/Makefile projects/zfsd/head/cddl/usr.bin/ztest/Makefile projects/zfsd/head/cddl/usr.sbin/zdb/Makefile projects/zfsd/head/contrib/apr-util/CHANGES projects/zfsd/head/contrib/apr-util/Makefile.win projects/zfsd/head/contrib/apr-util/NWGNUmakefile projects/zfsd/head/contrib/apr-util/apr-util.spec projects/zfsd/head/contrib/apr-util/buckets/apr_brigade.c projects/zfsd/head/contrib/apr-util/buckets/apr_buckets_alloc.c projects/zfsd/head/contrib/apr-util/build-outputs.mk projects/zfsd/head/contrib/apr-util/build.conf projects/zfsd/head/contrib/apr-util/configure projects/zfsd/head/contrib/apr-util/configure.in projects/zfsd/head/contrib/apr-util/crypto/apr_crypto.c projects/zfsd/head/contrib/apr-util/crypto/apr_crypto_nss.c projects/zfsd/head/contrib/apr-util/crypto/apr_crypto_openssl.c projects/zfsd/head/contrib/apr-util/crypto/apr_md5.c projects/zfsd/head/contrib/apr-util/dbd/NWGNUdbdmysql projects/zfsd/head/contrib/apr-util/dbd/apr_dbd_freetds.c projects/zfsd/head/contrib/apr-util/dbd/apr_dbd_mysql.c projects/zfsd/head/contrib/apr-util/dbd/apr_dbd_pgsql.c projects/zfsd/head/contrib/apr-util/dbd/apr_dbd_sqlite2.c projects/zfsd/head/contrib/apr-util/hooks/apr_hooks.c projects/zfsd/head/contrib/apr-util/include/apr_base64.h projects/zfsd/head/contrib/apr-util/include/apr_buckets.h projects/zfsd/head/contrib/apr-util/include/apr_md5.h projects/zfsd/head/contrib/apr-util/include/apr_queue.h projects/zfsd/head/contrib/apr-util/include/apu.h.in projects/zfsd/head/contrib/apr-util/include/apu_version.h projects/zfsd/head/contrib/apr-util/include/private/apr_crypto_internal.h projects/zfsd/head/contrib/apr-util/memcache/apr_memcache.c projects/zfsd/head/contrib/apr-util/misc/apr_thread_pool.c projects/zfsd/head/contrib/apr-util/test/Makefile.in projects/zfsd/head/contrib/apr-util/test/Makefile.win projects/zfsd/head/contrib/apr-util/test/NWGNUmakefile projects/zfsd/head/contrib/apr-util/test/testbuckets.c projects/zfsd/head/contrib/apr-util/test/testmd5.c projects/zfsd/head/contrib/apr-util/test/testmemcache.c projects/zfsd/head/contrib/apr-util/test/testpass.c projects/zfsd/head/contrib/apr-util/test/testuri.c projects/zfsd/head/contrib/apr-util/test/testutil.c projects/zfsd/head/contrib/apr-util/test/testutil.h projects/zfsd/head/contrib/apr-util/uri/apr_uri.c projects/zfsd/head/contrib/apr/CHANGES projects/zfsd/head/contrib/apr/Makefile.win projects/zfsd/head/contrib/apr/apr.spec projects/zfsd/head/contrib/apr/atomic/unix/ia32.c projects/zfsd/head/contrib/apr/atomic/unix/ppc.c projects/zfsd/head/contrib/apr/atomic/unix/s390.c projects/zfsd/head/contrib/apr/configure projects/zfsd/head/contrib/apr/docs/pool-design.html projects/zfsd/head/contrib/apr/file_io/unix/seek.c projects/zfsd/head/contrib/apr/include/apr.hw projects/zfsd/head/contrib/apr/include/apr_allocator.h projects/zfsd/head/contrib/apr/include/apr_general.h projects/zfsd/head/contrib/apr/include/apr_network_io.h projects/zfsd/head/contrib/apr/include/apr_pools.h projects/zfsd/head/contrib/apr/include/apr_strings.h projects/zfsd/head/contrib/apr/include/apr_thread_proc.h projects/zfsd/head/contrib/apr/include/apr_version.h projects/zfsd/head/contrib/apr/libapr.rc projects/zfsd/head/contrib/apr/network_io/unix/multicast.c projects/zfsd/head/contrib/apr/network_io/unix/sendrecv.c projects/zfsd/head/contrib/apr/network_io/unix/sockaddr.c projects/zfsd/head/contrib/apr/network_io/unix/sockopt.c projects/zfsd/head/contrib/apr/random/unix/sha2.c projects/zfsd/head/contrib/apr/random/unix/sha2.h projects/zfsd/head/contrib/apr/random/unix/sha2_glue.c projects/zfsd/head/contrib/apr/tables/apr_tables.c projects/zfsd/head/contrib/apr/threadproc/unix/thread.c projects/zfsd/head/contrib/binutils/bfd/elflink.c projects/zfsd/head/contrib/binutils/bfd/elfxx-mips.c projects/zfsd/head/contrib/binutils/binutils/readelf.c projects/zfsd/head/contrib/binutils/gas/config/tc-arm.c projects/zfsd/head/contrib/binutils/gas/config/tc-i386.c projects/zfsd/head/contrib/binutils/include/elf/common.h projects/zfsd/head/contrib/binutils/ld/ldmain.c projects/zfsd/head/contrib/binutils/opcodes/i386-dis.c projects/zfsd/head/contrib/binutils/opcodes/i386-opc.h projects/zfsd/head/contrib/binutils/opcodes/i386-opc.tbl projects/zfsd/head/contrib/binutils/opcodes/i386-tbl.h projects/zfsd/head/contrib/bmake/ChangeLog projects/zfsd/head/contrib/bmake/FILES projects/zfsd/head/contrib/bmake/Makefile projects/zfsd/head/contrib/bmake/bmake.1 projects/zfsd/head/contrib/bmake/bmake.cat1 projects/zfsd/head/contrib/bmake/compat.c projects/zfsd/head/contrib/bmake/configure projects/zfsd/head/contrib/bmake/configure.in projects/zfsd/head/contrib/bmake/job.c projects/zfsd/head/contrib/bmake/job.h projects/zfsd/head/contrib/bmake/main.c projects/zfsd/head/contrib/bmake/make.1 projects/zfsd/head/contrib/bmake/make.h projects/zfsd/head/contrib/bmake/meta.c projects/zfsd/head/contrib/bmake/mk/ChangeLog projects/zfsd/head/contrib/bmake/mk/gendirdeps.mk projects/zfsd/head/contrib/bmake/mk/init.mk projects/zfsd/head/contrib/bmake/mk/install-mk projects/zfsd/head/contrib/bmake/mk/lib.mk projects/zfsd/head/contrib/bmake/mk/libs.mk projects/zfsd/head/contrib/bmake/mk/meta2deps.py projects/zfsd/head/contrib/bmake/mk/own.mk projects/zfsd/head/contrib/bmake/mk/prog.mk projects/zfsd/head/contrib/bmake/mk/progs.mk projects/zfsd/head/contrib/bmake/parse.c projects/zfsd/head/contrib/bmake/unit-tests/Makefile.in projects/zfsd/head/contrib/bmake/unit-tests/test.exp projects/zfsd/head/contrib/bmake/var.c projects/zfsd/head/contrib/dialog/CHANGES projects/zfsd/head/contrib/dialog/VERSION projects/zfsd/head/contrib/dialog/aclocal.m4 projects/zfsd/head/contrib/dialog/arrows.c projects/zfsd/head/contrib/dialog/buildlist.c projects/zfsd/head/contrib/dialog/checklist.c projects/zfsd/head/contrib/dialog/config.guess projects/zfsd/head/contrib/dialog/config.sub projects/zfsd/head/contrib/dialog/configure projects/zfsd/head/contrib/dialog/configure.in projects/zfsd/head/contrib/dialog/dialog.1 projects/zfsd/head/contrib/dialog/dialog.3 projects/zfsd/head/contrib/dialog/dialog.c projects/zfsd/head/contrib/dialog/dialog.h projects/zfsd/head/contrib/dialog/formbox.c projects/zfsd/head/contrib/dialog/guage.c projects/zfsd/head/contrib/dialog/inputstr.c projects/zfsd/head/contrib/dialog/makefile.in projects/zfsd/head/contrib/dialog/menubox.c projects/zfsd/head/contrib/dialog/mixedform.c projects/zfsd/head/contrib/dialog/package/debian/changelog projects/zfsd/head/contrib/dialog/package/debian/copyright projects/zfsd/head/contrib/dialog/package/dialog.spec projects/zfsd/head/contrib/dialog/po/lt.po projects/zfsd/head/contrib/dialog/samples/inputbox6-utf8 projects/zfsd/head/contrib/dialog/samples/report-tempfile projects/zfsd/head/contrib/dialog/treeview.c projects/zfsd/head/contrib/dialog/util.c projects/zfsd/head/contrib/gcc/ChangeLog.gcc43 projects/zfsd/head/contrib/gcc/config/arm/ieee754-df.S projects/zfsd/head/contrib/gcc/config/arm/libunwind.S projects/zfsd/head/contrib/gcc/config/arm/unwind-arm.c projects/zfsd/head/contrib/gcc/config/arm/unwind-arm.h projects/zfsd/head/contrib/gcc/config/i386/i386.c projects/zfsd/head/contrib/gcc/config/i386/i386.h projects/zfsd/head/contrib/gcc/config/i386/i386.opt projects/zfsd/head/contrib/gcc/doc/extend.texi projects/zfsd/head/contrib/gcc/doc/invoke.texi projects/zfsd/head/contrib/gcc/opth-gen.awk projects/zfsd/head/contrib/gcclibs/libcpp/expr.c projects/zfsd/head/contrib/gcclibs/libcpp/include/cpplib.h projects/zfsd/head/contrib/ipfilter/BNF projects/zfsd/head/contrib/ipfilter/HISTORY projects/zfsd/head/contrib/ipfilter/Makefile projects/zfsd/head/contrib/ipfilter/NAT.FreeBSD projects/zfsd/head/contrib/ipfilter/ip_fil.c projects/zfsd/head/contrib/ipfilter/ipf.h projects/zfsd/head/contrib/ipfilter/iplang/Makefile projects/zfsd/head/contrib/ipfilter/iplang/iplang.h projects/zfsd/head/contrib/ipfilter/iplang/iplang.tst projects/zfsd/head/contrib/ipfilter/iplang/iplang_l.l projects/zfsd/head/contrib/ipfilter/iplang/iplang_y.y projects/zfsd/head/contrib/ipfilter/ipmon.h projects/zfsd/head/contrib/ipfilter/ipsd/Makefile projects/zfsd/head/contrib/ipfilter/ipsd/ipsd.c projects/zfsd/head/contrib/ipfilter/ipsd/ipsdr.c projects/zfsd/head/contrib/ipfilter/ipsd/linux.h projects/zfsd/head/contrib/ipfilter/ipsd/sbpf.c projects/zfsd/head/contrib/ipfilter/ipsd/sdlpi.c projects/zfsd/head/contrib/ipfilter/ipsd/slinux.c projects/zfsd/head/contrib/ipfilter/ipsd/snit.c projects/zfsd/head/contrib/ipfilter/ipsend/44arp.c projects/zfsd/head/contrib/ipfilter/ipsend/Makefile projects/zfsd/head/contrib/ipfilter/ipsend/arp.c projects/zfsd/head/contrib/ipfilter/ipsend/dlcommon.c projects/zfsd/head/contrib/ipfilter/ipsend/ip.c projects/zfsd/head/contrib/ipfilter/ipsend/ipresend.c projects/zfsd/head/contrib/ipfilter/ipsend/ipsend.5 projects/zfsd/head/contrib/ipfilter/ipsend/ipsend.c projects/zfsd/head/contrib/ipfilter/ipsend/ipsend.h projects/zfsd/head/contrib/ipfilter/ipsend/ipsopt.c projects/zfsd/head/contrib/ipfilter/ipsend/iptest.c projects/zfsd/head/contrib/ipfilter/ipsend/iptests.c projects/zfsd/head/contrib/ipfilter/ipsend/larp.c projects/zfsd/head/contrib/ipfilter/ipsend/linux.h projects/zfsd/head/contrib/ipfilter/ipsend/lsock.c projects/zfsd/head/contrib/ipfilter/ipsend/resend.c projects/zfsd/head/contrib/ipfilter/ipsend/sbpf.c projects/zfsd/head/contrib/ipfilter/ipsend/sdlpi.c projects/zfsd/head/contrib/ipfilter/ipsend/sirix.c projects/zfsd/head/contrib/ipfilter/ipsend/slinux.c projects/zfsd/head/contrib/ipfilter/ipsend/snit.c projects/zfsd/head/contrib/ipfilter/ipsend/sock.c projects/zfsd/head/contrib/ipfilter/ipt.h projects/zfsd/head/contrib/ipfilter/kmem.h projects/zfsd/head/contrib/ipfilter/l4check/Makefile projects/zfsd/head/contrib/ipfilter/l4check/l4check.c projects/zfsd/head/contrib/ipfilter/lib/Makefile projects/zfsd/head/contrib/ipfilter/lib/addicmp.c projects/zfsd/head/contrib/ipfilter/lib/addipopt.c projects/zfsd/head/contrib/ipfilter/lib/alist_free.c projects/zfsd/head/contrib/ipfilter/lib/alist_new.c projects/zfsd/head/contrib/ipfilter/lib/bcopywrap.c projects/zfsd/head/contrib/ipfilter/lib/binprint.c projects/zfsd/head/contrib/ipfilter/lib/buildopts.c projects/zfsd/head/contrib/ipfilter/lib/checkrev.c projects/zfsd/head/contrib/ipfilter/lib/count4bits.c projects/zfsd/head/contrib/ipfilter/lib/count6bits.c projects/zfsd/head/contrib/ipfilter/lib/debug.c projects/zfsd/head/contrib/ipfilter/lib/facpri.c projects/zfsd/head/contrib/ipfilter/lib/facpri.h projects/zfsd/head/contrib/ipfilter/lib/fill6bits.c projects/zfsd/head/contrib/ipfilter/lib/flags.c projects/zfsd/head/contrib/ipfilter/lib/gethost.c projects/zfsd/head/contrib/ipfilter/lib/getifname.c projects/zfsd/head/contrib/ipfilter/lib/getnattype.c projects/zfsd/head/contrib/ipfilter/lib/getport.c projects/zfsd/head/contrib/ipfilter/lib/getportproto.c projects/zfsd/head/contrib/ipfilter/lib/getproto.c projects/zfsd/head/contrib/ipfilter/lib/getsumd.c projects/zfsd/head/contrib/ipfilter/lib/hostname.c projects/zfsd/head/contrib/ipfilter/lib/icmpcode.c projects/zfsd/head/contrib/ipfilter/lib/initparse.c projects/zfsd/head/contrib/ipfilter/lib/ionames.c projects/zfsd/head/contrib/ipfilter/lib/ipf_dotuning.c projects/zfsd/head/contrib/ipfilter/lib/ipft_hx.c projects/zfsd/head/contrib/ipfilter/lib/ipft_pc.c projects/zfsd/head/contrib/ipfilter/lib/ipft_tx.c projects/zfsd/head/contrib/ipfilter/lib/ipoptsec.c projects/zfsd/head/contrib/ipfilter/lib/kmem.c projects/zfsd/head/contrib/ipfilter/lib/kmem.h projects/zfsd/head/contrib/ipfilter/lib/kmemcpywrap.c projects/zfsd/head/contrib/ipfilter/lib/kvatoname.c projects/zfsd/head/contrib/ipfilter/lib/load_file.c projects/zfsd/head/contrib/ipfilter/lib/load_hash.c projects/zfsd/head/contrib/ipfilter/lib/load_hashnode.c projects/zfsd/head/contrib/ipfilter/lib/load_http.c projects/zfsd/head/contrib/ipfilter/lib/load_pool.c projects/zfsd/head/contrib/ipfilter/lib/load_poolnode.c projects/zfsd/head/contrib/ipfilter/lib/load_url.c projects/zfsd/head/contrib/ipfilter/lib/mutex_emul.c projects/zfsd/head/contrib/ipfilter/lib/nametokva.c projects/zfsd/head/contrib/ipfilter/lib/nat_setgroupmap.c projects/zfsd/head/contrib/ipfilter/lib/ntomask.c projects/zfsd/head/contrib/ipfilter/lib/optname.c projects/zfsd/head/contrib/ipfilter/lib/optprint.c projects/zfsd/head/contrib/ipfilter/lib/optprintv6.c projects/zfsd/head/contrib/ipfilter/lib/optvalue.c projects/zfsd/head/contrib/ipfilter/lib/portname.c projects/zfsd/head/contrib/ipfilter/lib/print_toif.c projects/zfsd/head/contrib/ipfilter/lib/printactivenat.c projects/zfsd/head/contrib/ipfilter/lib/printaps.c projects/zfsd/head/contrib/ipfilter/lib/printbuf.c projects/zfsd/head/contrib/ipfilter/lib/printfr.c projects/zfsd/head/contrib/ipfilter/lib/printfraginfo.c projects/zfsd/head/contrib/ipfilter/lib/printhash.c projects/zfsd/head/contrib/ipfilter/lib/printhash_live.c projects/zfsd/head/contrib/ipfilter/lib/printhashdata.c projects/zfsd/head/contrib/ipfilter/lib/printhashnode.c projects/zfsd/head/contrib/ipfilter/lib/printhostmap.c projects/zfsd/head/contrib/ipfilter/lib/printhostmask.c projects/zfsd/head/contrib/ipfilter/lib/printifname.c projects/zfsd/head/contrib/ipfilter/lib/printip.c projects/zfsd/head/contrib/ipfilter/lib/printlog.c projects/zfsd/head/contrib/ipfilter/lib/printmask.c projects/zfsd/head/contrib/ipfilter/lib/printnat.c projects/zfsd/head/contrib/ipfilter/lib/printpacket.c projects/zfsd/head/contrib/ipfilter/lib/printpacket6.c projects/zfsd/head/contrib/ipfilter/lib/printpool.c projects/zfsd/head/contrib/ipfilter/lib/printpool_live.c projects/zfsd/head/contrib/ipfilter/lib/printpooldata.c projects/zfsd/head/contrib/ipfilter/lib/printpoolnode.c projects/zfsd/head/contrib/ipfilter/lib/printportcmp.c projects/zfsd/head/contrib/ipfilter/lib/printproto.c projects/zfsd/head/contrib/ipfilter/lib/printsbuf.c projects/zfsd/head/contrib/ipfilter/lib/printstate.c projects/zfsd/head/contrib/ipfilter/lib/printtqtable.c projects/zfsd/head/contrib/ipfilter/lib/printtunable.c projects/zfsd/head/contrib/ipfilter/lib/remove_hash.c projects/zfsd/head/contrib/ipfilter/lib/remove_hashnode.c projects/zfsd/head/contrib/ipfilter/lib/remove_pool.c projects/zfsd/head/contrib/ipfilter/lib/remove_poolnode.c projects/zfsd/head/contrib/ipfilter/lib/resetlexer.c projects/zfsd/head/contrib/ipfilter/lib/rwlock_emul.c projects/zfsd/head/contrib/ipfilter/lib/tcpflags.c projects/zfsd/head/contrib/ipfilter/lib/tcpoptnames.c projects/zfsd/head/contrib/ipfilter/lib/v6ionames.c projects/zfsd/head/contrib/ipfilter/lib/v6optvalue.c projects/zfsd/head/contrib/ipfilter/lib/var.c projects/zfsd/head/contrib/ipfilter/lib/verbose.c projects/zfsd/head/contrib/ipfilter/man/Makefile projects/zfsd/head/contrib/ipfilter/man/ipf.4 projects/zfsd/head/contrib/ipfilter/man/ipf.5 projects/zfsd/head/contrib/ipfilter/man/ipfilter.4 projects/zfsd/head/contrib/ipfilter/man/ipfilter.4.mandoc projects/zfsd/head/contrib/ipfilter/man/ipfstat.8 projects/zfsd/head/contrib/ipfilter/man/ipftest.1 projects/zfsd/head/contrib/ipfilter/man/ipmon.5 projects/zfsd/head/contrib/ipfilter/man/ipnat.4 projects/zfsd/head/contrib/ipfilter/man/ipnat.5 projects/zfsd/head/contrib/ipfilter/man/ipnat.8 projects/zfsd/head/contrib/ipfilter/man/ippool.5 projects/zfsd/head/contrib/ipfilter/man/ippool.8 projects/zfsd/head/contrib/ipfilter/md5.c projects/zfsd/head/contrib/ipfilter/mkfilters projects/zfsd/head/contrib/ipfilter/mlf_ipl.c projects/zfsd/head/contrib/ipfilter/mlf_rule.c projects/zfsd/head/contrib/ipfilter/mlfk_rule.c projects/zfsd/head/contrib/ipfilter/mlh_rule.c (contents, props changed) projects/zfsd/head/contrib/ipfilter/opts.h projects/zfsd/head/contrib/ipfilter/pcap-ipf.h projects/zfsd/head/contrib/ipfilter/radix_ipf.h projects/zfsd/head/contrib/ipfilter/rules/BASIC_1.FW projects/zfsd/head/contrib/ipfilter/rules/BASIC_2.FW projects/zfsd/head/contrib/ipfilter/rules/firewall projects/zfsd/head/contrib/ipfilter/rules/ipmon.conf projects/zfsd/head/contrib/ipfilter/rules/server projects/zfsd/head/contrib/ipfilter/samples/proxy.c projects/zfsd/head/contrib/ipfilter/samples/relay.c projects/zfsd/head/contrib/ipfilter/snoop.h projects/zfsd/head/contrib/ipfilter/tools/BNF.ipf projects/zfsd/head/contrib/ipfilter/tools/Makefile projects/zfsd/head/contrib/ipfilter/tools/ipf.c projects/zfsd/head/contrib/ipfilter/tools/ipf_y.y projects/zfsd/head/contrib/ipfilter/tools/ipfcomp.c projects/zfsd/head/contrib/ipfilter/tools/ipfs.c projects/zfsd/head/contrib/ipfilter/tools/ipfstat.c projects/zfsd/head/contrib/ipfilter/tools/ipftest.c projects/zfsd/head/contrib/ipfilter/tools/ipmon.c projects/zfsd/head/contrib/ipfilter/tools/ipmon_y.y projects/zfsd/head/contrib/ipfilter/tools/ipnat.c projects/zfsd/head/contrib/ipfilter/tools/ipnat_y.y projects/zfsd/head/contrib/ipfilter/tools/ippool.c projects/zfsd/head/contrib/ipfilter/tools/ippool_y.y projects/zfsd/head/contrib/ipfilter/tools/ipscan_y.y projects/zfsd/head/contrib/ipfilter/tools/ipsyncm.c projects/zfsd/head/contrib/ipfilter/tools/ipsyncs.c projects/zfsd/head/contrib/ipfilter/tools/lex_var.h projects/zfsd/head/contrib/ipfilter/tools/lexer.c projects/zfsd/head/contrib/ipfilter/tools/lexer.h projects/zfsd/head/contrib/ldns/ldns/dnssec_verify.h projects/zfsd/head/contrib/ldns/ldns/util.h projects/zfsd/head/contrib/libc++/include/memory projects/zfsd/head/contrib/libcxxrt/exception.cc projects/zfsd/head/contrib/libcxxrt/libelftc_dem_gnu3.c projects/zfsd/head/contrib/libcxxrt/typeinfo.cc projects/zfsd/head/contrib/libcxxrt/unwind-itanium.h projects/zfsd/head/contrib/libstdc++/include/c_std/std_cmath.h projects/zfsd/head/contrib/llvm/include/llvm/IR/CallingConv.h projects/zfsd/head/contrib/llvm/include/llvm/MC/MCInstPrinter.h projects/zfsd/head/contrib/llvm/lib/AsmParser/LLLexer.cpp projects/zfsd/head/contrib/llvm/lib/AsmParser/LLParser.cpp projects/zfsd/head/contrib/llvm/lib/AsmParser/LLToken.h projects/zfsd/head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp projects/zfsd/head/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp projects/zfsd/head/contrib/llvm/lib/IR/AsmWriter.cpp projects/zfsd/head/contrib/llvm/lib/MC/MCInstPrinter.cpp projects/zfsd/head/contrib/llvm/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp projects/zfsd/head/contrib/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp projects/zfsd/head/contrib/llvm/lib/Target/Hexagon/HexagonISelDAGToDAG.cpp projects/zfsd/head/contrib/llvm/lib/Target/MSP430/MSP430ISelDAGToDAG.cpp projects/zfsd/head/contrib/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp projects/zfsd/head/contrib/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp projects/zfsd/head/contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp projects/zfsd/head/contrib/llvm/lib/Target/R600/AMDILISelDAGToDAG.cpp projects/zfsd/head/contrib/llvm/lib/Target/Sparc/SparcISelDAGToDAG.cpp projects/zfsd/head/contrib/llvm/lib/Target/SystemZ/SystemZISelDAGToDAG.cpp projects/zfsd/head/contrib/llvm/lib/Target/X86/InstPrinter/X86ATTInstPrinter.cpp projects/zfsd/head/contrib/llvm/lib/Target/X86/InstPrinter/X86IntelInstPrinter.cpp projects/zfsd/head/contrib/llvm/lib/Target/X86/X86CallingConv.td projects/zfsd/head/contrib/llvm/lib/Target/X86/X86FastISel.cpp projects/zfsd/head/contrib/llvm/lib/Target/X86/X86FixupLEAs.cpp projects/zfsd/head/contrib/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp projects/zfsd/head/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp projects/zfsd/head/contrib/llvm/lib/Target/X86/X86InstrInfo.cpp projects/zfsd/head/contrib/llvm/lib/Target/X86/X86Subtarget.h projects/zfsd/head/contrib/llvm/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp projects/zfsd/head/contrib/llvm/tools/clang/include/clang-c/Index.h projects/zfsd/head/contrib/llvm/tools/clang/include/clang/AST/Type.h projects/zfsd/head/contrib/llvm/tools/clang/include/clang/Basic/Attr.td projects/zfsd/head/contrib/llvm/tools/clang/include/clang/Basic/Specifiers.h projects/zfsd/head/contrib/llvm/tools/clang/lib/AST/DumpXML.cpp projects/zfsd/head/contrib/llvm/tools/clang/lib/AST/MicrosoftMangle.cpp projects/zfsd/head/contrib/llvm/tools/clang/lib/AST/Type.cpp projects/zfsd/head/contrib/llvm/tools/clang/lib/AST/TypePrinter.cpp projects/zfsd/head/contrib/llvm/tools/clang/lib/Basic/Targets.cpp projects/zfsd/head/contrib/llvm/tools/clang/lib/CodeGen/CGCall.cpp projects/zfsd/head/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp projects/zfsd/head/contrib/llvm/tools/clang/lib/Driver/ToolChains.h projects/zfsd/head/contrib/llvm/tools/clang/lib/Headers/cpuid.h projects/zfsd/head/contrib/llvm/tools/clang/lib/Sema/SemaDeclAttr.cpp projects/zfsd/head/contrib/llvm/tools/clang/lib/Sema/SemaExpr.cpp projects/zfsd/head/contrib/llvm/tools/clang/lib/Sema/SemaInit.cpp projects/zfsd/head/contrib/llvm/tools/clang/lib/Sema/SemaType.cpp projects/zfsd/head/contrib/nvi/LICENSE projects/zfsd/head/contrib/nvi/README projects/zfsd/head/contrib/nvi/catalog/Makefile projects/zfsd/head/contrib/nvi/catalog/README projects/zfsd/head/contrib/nvi/catalog/dump.c projects/zfsd/head/contrib/nvi/catalog/dutch.base (contents, props changed) projects/zfsd/head/contrib/nvi/catalog/french.base (contents, props changed) projects/zfsd/head/contrib/nvi/catalog/german.base (contents, props changed) projects/zfsd/head/contrib/nvi/catalog/german.owner projects/zfsd/head/contrib/nvi/catalog/polish.base (contents, props changed) projects/zfsd/head/contrib/nvi/catalog/ru_RU.KOI8-R.base (contents, props changed) projects/zfsd/head/contrib/nvi/catalog/ru_RU.KOI8-R.owner projects/zfsd/head/contrib/nvi/catalog/spanish.base (contents, props changed) projects/zfsd/head/contrib/nvi/catalog/swedish.base (contents, props changed) projects/zfsd/head/contrib/nvi/catalog/uk_UA.KOI8-U.base (contents, props changed) projects/zfsd/head/contrib/nvi/cl/README.signal projects/zfsd/head/contrib/nvi/cl/cl.h projects/zfsd/head/contrib/nvi/cl/cl_funcs.c projects/zfsd/head/contrib/nvi/cl/cl_main.c projects/zfsd/head/contrib/nvi/cl/cl_read.c projects/zfsd/head/contrib/nvi/cl/cl_screen.c projects/zfsd/head/contrib/nvi/cl/cl_term.c projects/zfsd/head/contrib/nvi/common/args.h projects/zfsd/head/contrib/nvi/common/common.h projects/zfsd/head/contrib/nvi/common/cut.c projects/zfsd/head/contrib/nvi/common/cut.h projects/zfsd/head/contrib/nvi/common/delete.c projects/zfsd/head/contrib/nvi/common/exf.c projects/zfsd/head/contrib/nvi/common/exf.h projects/zfsd/head/contrib/nvi/common/gs.h projects/zfsd/head/contrib/nvi/common/key.c projects/zfsd/head/contrib/nvi/common/key.h projects/zfsd/head/contrib/nvi/common/line.c projects/zfsd/head/contrib/nvi/common/log.c projects/zfsd/head/contrib/nvi/common/main.c projects/zfsd/head/contrib/nvi/common/mark.c projects/zfsd/head/contrib/nvi/common/mark.h projects/zfsd/head/contrib/nvi/common/mem.h projects/zfsd/head/contrib/nvi/common/msg.c projects/zfsd/head/contrib/nvi/common/msg.h projects/zfsd/head/contrib/nvi/common/options.c projects/zfsd/head/contrib/nvi/common/options.h projects/zfsd/head/contrib/nvi/common/options_f.c projects/zfsd/head/contrib/nvi/common/put.c projects/zfsd/head/contrib/nvi/common/recover.c projects/zfsd/head/contrib/nvi/common/screen.c projects/zfsd/head/contrib/nvi/common/screen.h projects/zfsd/head/contrib/nvi/common/search.c projects/zfsd/head/contrib/nvi/common/seq.c projects/zfsd/head/contrib/nvi/common/seq.h projects/zfsd/head/contrib/nvi/common/util.c projects/zfsd/head/contrib/nvi/common/util.h projects/zfsd/head/contrib/nvi/docs/USD.doc/vi.man/vi.1 projects/zfsd/head/contrib/nvi/ex/ex.c projects/zfsd/head/contrib/nvi/ex/ex.h projects/zfsd/head/contrib/nvi/ex/ex_abbrev.c projects/zfsd/head/contrib/nvi/ex/ex_append.c projects/zfsd/head/contrib/nvi/ex/ex_args.c projects/zfsd/head/contrib/nvi/ex/ex_argv.c projects/zfsd/head/contrib/nvi/ex/ex_at.c projects/zfsd/head/contrib/nvi/ex/ex_bang.c projects/zfsd/head/contrib/nvi/ex/ex_cd.c projects/zfsd/head/contrib/nvi/ex/ex_cmd.c projects/zfsd/head/contrib/nvi/ex/ex_cscope.c projects/zfsd/head/contrib/nvi/ex/ex_delete.c projects/zfsd/head/contrib/nvi/ex/ex_display.c projects/zfsd/head/contrib/nvi/ex/ex_edit.c projects/zfsd/head/contrib/nvi/ex/ex_equal.c projects/zfsd/head/contrib/nvi/ex/ex_file.c projects/zfsd/head/contrib/nvi/ex/ex_filter.c projects/zfsd/head/contrib/nvi/ex/ex_global.c projects/zfsd/head/contrib/nvi/ex/ex_init.c projects/zfsd/head/contrib/nvi/ex/ex_join.c projects/zfsd/head/contrib/nvi/ex/ex_map.c projects/zfsd/head/contrib/nvi/ex/ex_mark.c projects/zfsd/head/contrib/nvi/ex/ex_mkexrc.c projects/zfsd/head/contrib/nvi/ex/ex_move.c projects/zfsd/head/contrib/nvi/ex/ex_open.c projects/zfsd/head/contrib/nvi/ex/ex_preserve.c projects/zfsd/head/contrib/nvi/ex/ex_print.c projects/zfsd/head/contrib/nvi/ex/ex_put.c projects/zfsd/head/contrib/nvi/ex/ex_quit.c projects/zfsd/head/contrib/nvi/ex/ex_read.c projects/zfsd/head/contrib/nvi/ex/ex_screen.c projects/zfsd/head/contrib/nvi/ex/ex_script.c projects/zfsd/head/contrib/nvi/ex/ex_set.c projects/zfsd/head/contrib/nvi/ex/ex_shell.c projects/zfsd/head/contrib/nvi/ex/ex_shift.c projects/zfsd/head/contrib/nvi/ex/ex_source.c projects/zfsd/head/contrib/nvi/ex/ex_stop.c projects/zfsd/head/contrib/nvi/ex/ex_subst.c projects/zfsd/head/contrib/nvi/ex/ex_tag.c projects/zfsd/head/contrib/nvi/ex/ex_txt.c projects/zfsd/head/contrib/nvi/ex/ex_undo.c projects/zfsd/head/contrib/nvi/ex/ex_usage.c projects/zfsd/head/contrib/nvi/ex/ex_util.c projects/zfsd/head/contrib/nvi/ex/ex_version.c projects/zfsd/head/contrib/nvi/ex/ex_visual.c projects/zfsd/head/contrib/nvi/ex/ex_write.c projects/zfsd/head/contrib/nvi/ex/ex_yank.c projects/zfsd/head/contrib/nvi/ex/ex_z.c projects/zfsd/head/contrib/nvi/ex/script.h projects/zfsd/head/contrib/nvi/ex/tag.h projects/zfsd/head/contrib/nvi/ex/version.h projects/zfsd/head/contrib/nvi/vi/getc.c projects/zfsd/head/contrib/nvi/vi/v_at.c projects/zfsd/head/contrib/nvi/vi/v_ch.c projects/zfsd/head/contrib/nvi/vi/v_cmd.c projects/zfsd/head/contrib/nvi/vi/v_delete.c projects/zfsd/head/contrib/nvi/vi/v_ex.c projects/zfsd/head/contrib/nvi/vi/v_increment.c projects/zfsd/head/contrib/nvi/vi/v_init.c projects/zfsd/head/contrib/nvi/vi/v_itxt.c projects/zfsd/head/contrib/nvi/vi/v_left.c projects/zfsd/head/contrib/nvi/vi/v_mark.c projects/zfsd/head/contrib/nvi/vi/v_match.c projects/zfsd/head/contrib/nvi/vi/v_paragraph.c projects/zfsd/head/contrib/nvi/vi/v_put.c projects/zfsd/head/contrib/nvi/vi/v_redraw.c projects/zfsd/head/contrib/nvi/vi/v_replace.c projects/zfsd/head/contrib/nvi/vi/v_right.c projects/zfsd/head/contrib/nvi/vi/v_screen.c projects/zfsd/head/contrib/nvi/vi/v_scroll.c projects/zfsd/head/contrib/nvi/vi/v_search.c projects/zfsd/head/contrib/nvi/vi/v_section.c projects/zfsd/head/contrib/nvi/vi/v_sentence.c projects/zfsd/head/contrib/nvi/vi/v_status.c projects/zfsd/head/contrib/nvi/vi/v_txt.c projects/zfsd/head/contrib/nvi/vi/v_ulcase.c projects/zfsd/head/contrib/nvi/vi/v_undo.c projects/zfsd/head/contrib/nvi/vi/v_util.c projects/zfsd/head/contrib/nvi/vi/v_word.c projects/zfsd/head/contrib/nvi/vi/v_xchar.c projects/zfsd/head/contrib/nvi/vi/v_yank.c projects/zfsd/head/contrib/nvi/vi/v_z.c projects/zfsd/head/contrib/nvi/vi/v_zexit.c projects/zfsd/head/contrib/nvi/vi/vi.c projects/zfsd/head/contrib/nvi/vi/vi.h projects/zfsd/head/contrib/nvi/vi/vs_line.c projects/zfsd/head/contrib/nvi/vi/vs_msg.c projects/zfsd/head/contrib/nvi/vi/vs_refresh.c projects/zfsd/head/contrib/nvi/vi/vs_relative.c projects/zfsd/head/contrib/nvi/vi/vs_smap.c projects/zfsd/head/contrib/nvi/vi/vs_split.c projects/zfsd/head/contrib/ofed/libsdp/src/linux/sdp_inet.h projects/zfsd/head/contrib/ofed/management/infiniband-diags/src/sminfo.c projects/zfsd/head/contrib/ofed/management/opensm/opensm/osm_console.c projects/zfsd/head/contrib/ofed/management/opensm/opensm/osm_subnet.c projects/zfsd/head/contrib/openpam/CREDITS projects/zfsd/head/contrib/openpam/HISTORY projects/zfsd/head/contrib/openpam/INSTALL projects/zfsd/head/contrib/openpam/LICENSE projects/zfsd/head/contrib/openpam/Makefile.am projects/zfsd/head/contrib/openpam/Makefile.in projects/zfsd/head/contrib/openpam/README projects/zfsd/head/contrib/openpam/RELNOTES projects/zfsd/head/contrib/openpam/TODO projects/zfsd/head/contrib/openpam/aclocal.m4 projects/zfsd/head/contrib/openpam/autogen.sh projects/zfsd/head/contrib/openpam/bin/Makefile.am projects/zfsd/head/contrib/openpam/bin/Makefile.in projects/zfsd/head/contrib/openpam/bin/openpam_dump_policy/Makefile.am projects/zfsd/head/contrib/openpam/bin/openpam_dump_policy/Makefile.in projects/zfsd/head/contrib/openpam/bin/openpam_dump_policy/openpam_dump_policy.c projects/zfsd/head/contrib/openpam/bin/pamtest/Makefile.am projects/zfsd/head/contrib/openpam/bin/pamtest/Makefile.in projects/zfsd/head/contrib/openpam/bin/pamtest/pamtest.1 projects/zfsd/head/contrib/openpam/bin/pamtest/pamtest.c projects/zfsd/head/contrib/openpam/bin/su/Makefile.am projects/zfsd/head/contrib/openpam/bin/su/Makefile.in projects/zfsd/head/contrib/openpam/bin/su/su.1 projects/zfsd/head/contrib/openpam/bin/su/su.c projects/zfsd/head/contrib/openpam/compile projects/zfsd/head/contrib/openpam/config.guess projects/zfsd/head/contrib/openpam/config.h.in projects/zfsd/head/contrib/openpam/config.sub projects/zfsd/head/contrib/openpam/configure projects/zfsd/head/contrib/openpam/configure.ac projects/zfsd/head/contrib/openpam/depcomp projects/zfsd/head/contrib/openpam/doc/Makefile.am projects/zfsd/head/contrib/openpam/doc/Makefile.in projects/zfsd/head/contrib/openpam/doc/man/Makefile.am projects/zfsd/head/contrib/openpam/doc/man/Makefile.in projects/zfsd/head/contrib/openpam/doc/man/openpam.3 projects/zfsd/head/contrib/openpam/doc/man/openpam.man projects/zfsd/head/contrib/openpam/doc/man/openpam_borrow_cred.3 projects/zfsd/head/contrib/openpam/doc/man/openpam_free_data.3 projects/zfsd/head/contrib/openpam/doc/man/openpam_free_envlist.3 projects/zfsd/head/contrib/openpam/doc/man/openpam_get_feature.3 projects/zfsd/head/contrib/openpam/doc/man/openpam_get_option.3 projects/zfsd/head/contrib/openpam/doc/man/openpam_log.3 projects/zfsd/head/contrib/openpam/doc/man/openpam_nullconv.3 projects/zfsd/head/contrib/openpam/doc/man/openpam_readline.3 projects/zfsd/head/contrib/openpam/doc/man/openpam_readlinev.3 projects/zfsd/head/contrib/openpam/doc/man/openpam_readword.3 projects/zfsd/head/contrib/openpam/doc/man/openpam_restore_cred.3 projects/zfsd/head/contrib/openpam/doc/man/openpam_set_feature.3 projects/zfsd/head/contrib/openpam/doc/man/openpam_set_option.3 projects/zfsd/head/contrib/openpam/doc/man/openpam_straddch.3 projects/zfsd/head/contrib/openpam/doc/man/openpam_subst.3 projects/zfsd/head/contrib/openpam/doc/man/openpam_ttyconv.3 projects/zfsd/head/contrib/openpam/doc/man/pam.3 projects/zfsd/head/contrib/openpam/doc/man/pam.conf.5 projects/zfsd/head/contrib/openpam/doc/man/pam.man projects/zfsd/head/contrib/openpam/doc/man/pam_acct_mgmt.3 projects/zfsd/head/contrib/openpam/doc/man/pam_authenticate.3 projects/zfsd/head/contrib/openpam/doc/man/pam_chauthtok.3 projects/zfsd/head/contrib/openpam/doc/man/pam_close_session.3 projects/zfsd/head/contrib/openpam/doc/man/pam_conv.3 projects/zfsd/head/contrib/openpam/doc/man/pam_end.3 projects/zfsd/head/contrib/openpam/doc/man/pam_error.3 projects/zfsd/head/contrib/openpam/doc/man/pam_get_authtok.3 projects/zfsd/head/contrib/openpam/doc/man/pam_get_data.3 projects/zfsd/head/contrib/openpam/doc/man/pam_get_item.3 projects/zfsd/head/contrib/openpam/doc/man/pam_get_user.3 projects/zfsd/head/contrib/openpam/doc/man/pam_getenv.3 projects/zfsd/head/contrib/openpam/doc/man/pam_getenvlist.3 projects/zfsd/head/contrib/openpam/doc/man/pam_info.3 projects/zfsd/head/contrib/openpam/doc/man/pam_open_session.3 projects/zfsd/head/contrib/openpam/doc/man/pam_prompt.3 projects/zfsd/head/contrib/openpam/doc/man/pam_putenv.3 projects/zfsd/head/contrib/openpam/doc/man/pam_set_data.3 projects/zfsd/head/contrib/openpam/doc/man/pam_set_item.3 projects/zfsd/head/contrib/openpam/doc/man/pam_setcred.3 projects/zfsd/head/contrib/openpam/doc/man/pam_setenv.3 projects/zfsd/head/contrib/openpam/doc/man/pam_sm_acct_mgmt.3 projects/zfsd/head/contrib/openpam/doc/man/pam_sm_authenticate.3 projects/zfsd/head/contrib/openpam/doc/man/pam_sm_chauthtok.3 projects/zfsd/head/contrib/openpam/doc/man/pam_sm_close_session.3 projects/zfsd/head/contrib/openpam/doc/man/pam_sm_open_session.3 projects/zfsd/head/contrib/openpam/doc/man/pam_sm_setcred.3 projects/zfsd/head/contrib/openpam/doc/man/pam_start.3 projects/zfsd/head/contrib/openpam/doc/man/pam_strerror.3 projects/zfsd/head/contrib/openpam/doc/man/pam_verror.3 projects/zfsd/head/contrib/openpam/doc/man/pam_vinfo.3 projects/zfsd/head/contrib/openpam/doc/man/pam_vprompt.3 projects/zfsd/head/contrib/openpam/include/Makefile.am projects/zfsd/head/contrib/openpam/include/Makefile.in projects/zfsd/head/contrib/openpam/include/security/Makefile.am projects/zfsd/head/contrib/openpam/include/security/Makefile.in projects/zfsd/head/contrib/openpam/include/security/openpam.h projects/zfsd/head/contrib/openpam/include/security/openpam_attr.h projects/zfsd/head/contrib/openpam/include/security/openpam_version.h projects/zfsd/head/contrib/openpam/include/security/pam_appl.h projects/zfsd/head/contrib/openpam/include/security/pam_constants.h projects/zfsd/head/contrib/openpam/include/security/pam_modules.h projects/zfsd/head/contrib/openpam/include/security/pam_types.h projects/zfsd/head/contrib/openpam/install-sh projects/zfsd/head/contrib/openpam/misc/gendoc.pl projects/zfsd/head/contrib/openpam/missing projects/zfsd/head/contrib/openpam/modules/Makefile.am projects/zfsd/head/contrib/openpam/modules/Makefile.in projects/zfsd/head/contrib/openpam/modules/pam_deny/Makefile.am projects/zfsd/head/contrib/openpam/modules/pam_deny/Makefile.in projects/zfsd/head/contrib/openpam/modules/pam_deny/pam_deny.c projects/zfsd/head/contrib/openpam/modules/pam_permit/Makefile.am projects/zfsd/head/contrib/openpam/modules/pam_permit/Makefile.in projects/zfsd/head/contrib/openpam/modules/pam_permit/pam_permit.c projects/zfsd/head/contrib/openpam/modules/pam_unix/Makefile.am projects/zfsd/head/contrib/openpam/modules/pam_unix/Makefile.in projects/zfsd/head/contrib/openpam/modules/pam_unix/pam_unix.c projects/zfsd/head/contrib/openpam/pamgdb.in projects/zfsd/head/contrib/openpam/t/Makefile.am projects/zfsd/head/contrib/openpam/t/Makefile.in projects/zfsd/head/contrib/openpam/t/t.h projects/zfsd/head/contrib/openpam/t/t_main.c projects/zfsd/head/contrib/openpam/t/t_openpam_readlinev.c projects/zfsd/head/contrib/openpam/t/t_openpam_readword.c projects/zfsd/head/contrib/pam_modules/pam_passwdqc/pam_passwdqc.c projects/zfsd/head/contrib/sendmail/include/sm/os/sm_os_freebsd.h projects/zfsd/head/contrib/serf/CHANGES projects/zfsd/head/contrib/serf/README projects/zfsd/head/contrib/serf/auth/auth.c projects/zfsd/head/contrib/serf/auth/auth.h projects/zfsd/head/contrib/serf/auth/auth_basic.c projects/zfsd/head/contrib/serf/auth/auth_digest.c projects/zfsd/head/contrib/serf/buckets/aggregate_buckets.c projects/zfsd/head/contrib/serf/buckets/buckets.c projects/zfsd/head/contrib/serf/buckets/dechunk_buckets.c projects/zfsd/head/contrib/serf/buckets/headers_buckets.c projects/zfsd/head/contrib/serf/buckets/limit_buckets.c projects/zfsd/head/contrib/serf/buckets/request_buckets.c projects/zfsd/head/contrib/serf/buckets/response_buckets.c projects/zfsd/head/contrib/serf/buckets/simple_buckets.c projects/zfsd/head/contrib/serf/buckets/ssl_buckets.c projects/zfsd/head/contrib/serf/build/gen_def.py projects/zfsd/head/contrib/serf/context.c projects/zfsd/head/contrib/serf/incoming.c projects/zfsd/head/contrib/serf/outgoing.c projects/zfsd/head/contrib/serf/serf.h projects/zfsd/head/contrib/serf/serf_bucket_types.h projects/zfsd/head/contrib/serf/serf_bucket_util.h projects/zfsd/head/contrib/serf/serf_private.h projects/zfsd/head/contrib/serf/ssltunnel.c projects/zfsd/head/contrib/subversion/CHANGES projects/zfsd/head/contrib/subversion/Makefile.in projects/zfsd/head/contrib/subversion/build-outputs.mk projects/zfsd/head/contrib/subversion/configure projects/zfsd/head/contrib/subversion/configure.ac projects/zfsd/head/contrib/subversion/get-deps.sh projects/zfsd/head/contrib/subversion/subversion/include/private/svn_client_private.h projects/zfsd/head/contrib/subversion/subversion/include/private/svn_io_private.h projects/zfsd/head/contrib/subversion/subversion/include/private/svn_ra_private.h projects/zfsd/head/contrib/subversion/subversion/include/svn_version.h projects/zfsd/head/contrib/subversion/subversion/libsvn_client/client.h projects/zfsd/head/contrib/subversion/subversion/libsvn_client/commit.c projects/zfsd/head/contrib/subversion/subversion/libsvn_client/copy.c projects/zfsd/head/contrib/subversion/subversion/libsvn_client/diff.c projects/zfsd/head/contrib/subversion/subversion/libsvn_client/diff_local.c projects/zfsd/head/contrib/subversion/subversion/libsvn_client/log.c projects/zfsd/head/contrib/subversion/subversion/libsvn_client/merge.c projects/zfsd/head/contrib/subversion/subversion/libsvn_client/mergeinfo.c projects/zfsd/head/contrib/subversion/subversion/libsvn_client/ra.c projects/zfsd/head/contrib/subversion/subversion/libsvn_client/switch.c projects/zfsd/head/contrib/subversion/subversion/libsvn_delta/compat.c projects/zfsd/head/contrib/subversion/subversion/libsvn_fs_base/bdb/env.c projects/zfsd/head/contrib/subversion/subversion/libsvn_fs_base/tree.c projects/zfsd/head/contrib/subversion/subversion/libsvn_fs_fs/fs_fs.c projects/zfsd/head/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h projects/zfsd/head/contrib/subversion/subversion/libsvn_fs_fs/tree.c projects/zfsd/head/contrib/subversion/subversion/libsvn_ra/ra_loader.c projects/zfsd/head/contrib/subversion/subversion/libsvn_ra/util.c projects/zfsd/head/contrib/subversion/subversion/libsvn_ra_serf/blame.c projects/zfsd/head/contrib/subversion/subversion/libsvn_ra_serf/commit.c projects/zfsd/head/contrib/subversion/subversion/libsvn_ra_serf/getdate.c projects/zfsd/head/contrib/subversion/subversion/libsvn_ra_serf/getlocations.c projects/zfsd/head/contrib/subversion/subversion/libsvn_ra_serf/getlocationsegments.c projects/zfsd/head/contrib/subversion/subversion/libsvn_ra_serf/getlocks.c projects/zfsd/head/contrib/subversion/subversion/libsvn_ra_serf/inherited_props.c projects/zfsd/head/contrib/subversion/subversion/libsvn_ra_serf/log.c projects/zfsd/head/contrib/subversion/subversion/libsvn_ra_serf/mergeinfo.c projects/zfsd/head/contrib/subversion/subversion/libsvn_ra_serf/options.c projects/zfsd/head/contrib/subversion/subversion/libsvn_ra_serf/property.c projects/zfsd/head/contrib/subversion/subversion/libsvn_ra_serf/ra_serf.h projects/zfsd/head/contrib/subversion/subversion/libsvn_ra_serf/replay.c projects/zfsd/head/contrib/subversion/subversion/libsvn_ra_serf/serf.c projects/zfsd/head/contrib/subversion/subversion/libsvn_ra_serf/update.c projects/zfsd/head/contrib/subversion/subversion/libsvn_ra_serf/util.c projects/zfsd/head/contrib/subversion/subversion/libsvn_ra_serf/xml.c projects/zfsd/head/contrib/subversion/subversion/libsvn_ra_svn/client.c projects/zfsd/head/contrib/subversion/subversion/libsvn_ra_svn/protocol projects/zfsd/head/contrib/subversion/subversion/libsvn_repos/fs-wrap.c projects/zfsd/head/contrib/subversion/subversion/libsvn_subr/config_file.c projects/zfsd/head/contrib/subversion/subversion/libsvn_subr/gpg_agent.c projects/zfsd/head/contrib/subversion/subversion/libsvn_subr/internal_statements.h projects/zfsd/head/contrib/subversion/subversion/libsvn_subr/io.c projects/zfsd/head/contrib/subversion/subversion/libsvn_subr/named_atomic.c projects/zfsd/head/contrib/subversion/subversion/libsvn_subr/sqlite.c projects/zfsd/head/contrib/subversion/subversion/libsvn_subr/stream.c projects/zfsd/head/contrib/subversion/subversion/libsvn_subr/subst.c projects/zfsd/head/contrib/subversion/subversion/libsvn_subr/utf.c projects/zfsd/head/contrib/subversion/subversion/libsvn_wc/adm_ops.c projects/zfsd/head/contrib/subversion/subversion/libsvn_wc/crop.c projects/zfsd/head/contrib/subversion/subversion/libsvn_wc/externals.c projects/zfsd/head/contrib/subversion/subversion/libsvn_wc/update_editor.c projects/zfsd/head/contrib/subversion/subversion/libsvn_wc/upgrade.c projects/zfsd/head/contrib/subversion/subversion/libsvn_wc/wc-checks.h projects/zfsd/head/contrib/subversion/subversion/libsvn_wc/wc-metadata.h projects/zfsd/head/contrib/subversion/subversion/libsvn_wc/wc-queries.h projects/zfsd/head/contrib/subversion/subversion/libsvn_wc/wc-queries.sql projects/zfsd/head/contrib/subversion/subversion/libsvn_wc/wc_db.c projects/zfsd/head/contrib/subversion/subversion/libsvn_wc/wc_db.h projects/zfsd/head/contrib/subversion/subversion/libsvn_wc/wc_db_update_move.c projects/zfsd/head/contrib/subversion/subversion/libsvn_wc/wc_db_wcroot.c projects/zfsd/head/contrib/subversion/subversion/libsvn_wc/workqueue.c projects/zfsd/head/contrib/subversion/subversion/svn/cl.h projects/zfsd/head/contrib/subversion/subversion/svn/conflict-callbacks.c projects/zfsd/head/contrib/subversion/subversion/svn/file-merge.c projects/zfsd/head/contrib/subversion/subversion/svn/merge-cmd.c projects/zfsd/head/contrib/subversion/subversion/svn/mergeinfo-cmd.c projects/zfsd/head/contrib/subversion/subversion/svn/svn.c projects/zfsd/head/contrib/subversion/subversion/svn/util.c projects/zfsd/head/contrib/subversion/subversion/svnadmin/svnadmin.c projects/zfsd/head/contrib/subversion/subversion/svnlook/svnlook.c projects/zfsd/head/contrib/subversion/subversion/svnserve/serve.c projects/zfsd/head/contrib/subversion/win-tests.py projects/zfsd/head/contrib/tcpdump/tcpdump.c projects/zfsd/head/contrib/unbound/config.h.in projects/zfsd/head/contrib/unbound/configure projects/zfsd/head/contrib/unbound/configure.ac projects/zfsd/head/contrib/unbound/daemon/cachedump.c projects/zfsd/head/contrib/unbound/daemon/remote.c projects/zfsd/head/contrib/unbound/daemon/remote.h projects/zfsd/head/contrib/unbound/daemon/unbound.c projects/zfsd/head/contrib/unbound/daemon/worker.c projects/zfsd/head/contrib/unbound/daemon/worker.h projects/zfsd/head/contrib/unbound/libunbound/context.c projects/zfsd/head/contrib/unbound/libunbound/context.h projects/zfsd/head/contrib/unbound/libunbound/libunbound.c projects/zfsd/head/contrib/unbound/libunbound/libworker.c projects/zfsd/head/contrib/unbound/libunbound/libworker.h projects/zfsd/head/contrib/unbound/libunbound/unbound.h projects/zfsd/head/contrib/unbound/smallapp/unbound-anchor.c projects/zfsd/head/contrib/unbound/smallapp/unbound-control-setup.sh projects/zfsd/head/contrib/unbound/smallapp/worker_cb.c projects/zfsd/head/contrib/unbound/util/config_file.c projects/zfsd/head/contrib/unbound/util/config_file.h projects/zfsd/head/contrib/unbound/util/configlexer.c projects/zfsd/head/contrib/unbound/util/configparser.c projects/zfsd/head/contrib/unbound/util/configparser.h projects/zfsd/head/contrib/unbound/util/fptr_wlist.c projects/zfsd/head/contrib/wpa/src/drivers/driver_wired.c projects/zfsd/head/crypto/openssh/ChangeLog projects/zfsd/head/crypto/openssh/FREEBSD-upgrade projects/zfsd/head/crypto/openssh/README projects/zfsd/head/crypto/openssh/aclocal.m4 projects/zfsd/head/crypto/openssh/addrmatch.c projects/zfsd/head/crypto/openssh/auth-chall.c projects/zfsd/head/crypto/openssh/auth-krb5.c projects/zfsd/head/crypto/openssh/auth-options.c projects/zfsd/head/crypto/openssh/auth-pam.c projects/zfsd/head/crypto/openssh/auth-rsa.c projects/zfsd/head/crypto/openssh/auth.c projects/zfsd/head/crypto/openssh/auth.h projects/zfsd/head/crypto/openssh/auth1.c projects/zfsd/head/crypto/openssh/auth2-chall.c projects/zfsd/head/crypto/openssh/auth2-gss.c projects/zfsd/head/crypto/openssh/auth2-hostbased.c projects/zfsd/head/crypto/openssh/auth2-jpake.c projects/zfsd/head/crypto/openssh/auth2-kbdint.c projects/zfsd/head/crypto/openssh/auth2-passwd.c projects/zfsd/head/crypto/openssh/auth2-pubkey.c projects/zfsd/head/crypto/openssh/auth2.c projects/zfsd/head/crypto/openssh/authfd.c projects/zfsd/head/crypto/openssh/authfile.c projects/zfsd/head/crypto/openssh/bufaux.c projects/zfsd/head/crypto/openssh/bufbn.c projects/zfsd/head/crypto/openssh/bufec.c projects/zfsd/head/crypto/openssh/buffer.c projects/zfsd/head/crypto/openssh/buffer.h projects/zfsd/head/crypto/openssh/canohost.c projects/zfsd/head/crypto/openssh/channels.c projects/zfsd/head/crypto/openssh/channels.h projects/zfsd/head/crypto/openssh/cipher-3des1.c projects/zfsd/head/crypto/openssh/cipher-aes.c projects/zfsd/head/crypto/openssh/cipher-ctr.c projects/zfsd/head/crypto/openssh/cipher.c projects/zfsd/head/crypto/openssh/cipher.h projects/zfsd/head/crypto/openssh/clientloop.c projects/zfsd/head/crypto/openssh/clientloop.h projects/zfsd/head/crypto/openssh/compat.c projects/zfsd/head/crypto/openssh/config.guess projects/zfsd/head/crypto/openssh/config.h projects/zfsd/head/crypto/openssh/config.h.in projects/zfsd/head/crypto/openssh/defines.h projects/zfsd/head/crypto/openssh/dh.c projects/zfsd/head/crypto/openssh/dns.c projects/zfsd/head/crypto/openssh/groupaccess.c projects/zfsd/head/crypto/openssh/gss-genr.c projects/zfsd/head/crypto/openssh/gss-serv-krb5.c projects/zfsd/head/crypto/openssh/gss-serv.c projects/zfsd/head/crypto/openssh/hostfile.c projects/zfsd/head/crypto/openssh/hostfile.h projects/zfsd/head/crypto/openssh/includes.h projects/zfsd/head/crypto/openssh/jpake.c projects/zfsd/head/crypto/openssh/kex.c projects/zfsd/head/crypto/openssh/kex.h projects/zfsd/head/crypto/openssh/kexdhc.c projects/zfsd/head/crypto/openssh/kexdhs.c projects/zfsd/head/crypto/openssh/kexecdh.c projects/zfsd/head/crypto/openssh/kexecdhc.c projects/zfsd/head/crypto/openssh/kexecdhs.c projects/zfsd/head/crypto/openssh/kexgexc.c projects/zfsd/head/crypto/openssh/kexgexs.c projects/zfsd/head/crypto/openssh/key.c projects/zfsd/head/crypto/openssh/key.h projects/zfsd/head/crypto/openssh/krl.c projects/zfsd/head/crypto/openssh/log.c projects/zfsd/head/crypto/openssh/log.h projects/zfsd/head/crypto/openssh/loginrec.c projects/zfsd/head/crypto/openssh/mac.c projects/zfsd/head/crypto/openssh/mac.h projects/zfsd/head/crypto/openssh/match.c projects/zfsd/head/crypto/openssh/misc.c projects/zfsd/head/crypto/openssh/misc.h projects/zfsd/head/crypto/openssh/moduli.c projects/zfsd/head/crypto/openssh/monitor.c projects/zfsd/head/crypto/openssh/monitor_mm.c projects/zfsd/head/crypto/openssh/monitor_wrap.c projects/zfsd/head/crypto/openssh/mux.c projects/zfsd/head/crypto/openssh/myproposal.h projects/zfsd/head/crypto/openssh/openbsd-compat/bsd-cygwin_util.c projects/zfsd/head/crypto/openssh/openbsd-compat/bsd-cygwin_util.h projects/zfsd/head/crypto/openssh/openbsd-compat/bsd-misc.h projects/zfsd/head/crypto/openssh/openbsd-compat/openbsd-compat.h projects/zfsd/head/crypto/openssh/openbsd-compat/port-aix.c projects/zfsd/head/crypto/openssh/openbsd-compat/port-linux.c projects/zfsd/head/crypto/openssh/openbsd-compat/xcrypt.c projects/zfsd/head/crypto/openssh/packet.c projects/zfsd/head/crypto/openssh/packet.h projects/zfsd/head/crypto/openssh/pathnames.h projects/zfsd/head/crypto/openssh/progressmeter.c projects/zfsd/head/crypto/openssh/readconf.c projects/zfsd/head/crypto/openssh/readconf.h projects/zfsd/head/crypto/openssh/readpass.c projects/zfsd/head/crypto/openssh/roaming_client.c projects/zfsd/head/crypto/openssh/roaming_common.c projects/zfsd/head/crypto/openssh/rsa.c projects/zfsd/head/crypto/openssh/sandbox-systrace.c projects/zfsd/head/crypto/openssh/schnorr.c projects/zfsd/head/crypto/openssh/scp.1 projects/zfsd/head/crypto/openssh/scp.c projects/zfsd/head/crypto/openssh/servconf.c projects/zfsd/head/crypto/openssh/servconf.h projects/zfsd/head/crypto/openssh/serverloop.c projects/zfsd/head/crypto/openssh/session.c projects/zfsd/head/crypto/openssh/sftp-client.c projects/zfsd/head/crypto/openssh/sftp-client.h projects/zfsd/head/crypto/openssh/sftp-common.c projects/zfsd/head/crypto/openssh/sftp-glob.c projects/zfsd/head/crypto/openssh/sftp-server.8 projects/zfsd/head/crypto/openssh/sftp-server.c projects/zfsd/head/crypto/openssh/sftp.1 projects/zfsd/head/crypto/openssh/sftp.c projects/zfsd/head/crypto/openssh/ssh-add.c projects/zfsd/head/crypto/openssh/ssh-agent.c projects/zfsd/head/crypto/openssh/ssh-dss.c projects/zfsd/head/crypto/openssh/ssh-ecdsa.c projects/zfsd/head/crypto/openssh/ssh-gss.h projects/zfsd/head/crypto/openssh/ssh-keygen.1 projects/zfsd/head/crypto/openssh/ssh-keygen.c projects/zfsd/head/crypto/openssh/ssh-keyscan.1 projects/zfsd/head/crypto/openssh/ssh-keyscan.c projects/zfsd/head/crypto/openssh/ssh-keysign.8 projects/zfsd/head/crypto/openssh/ssh-keysign.c projects/zfsd/head/crypto/openssh/ssh-pkcs11-client.c projects/zfsd/head/crypto/openssh/ssh-pkcs11-helper.8 projects/zfsd/head/crypto/openssh/ssh-pkcs11-helper.c projects/zfsd/head/crypto/openssh/ssh-pkcs11.c projects/zfsd/head/crypto/openssh/ssh-rsa.c projects/zfsd/head/crypto/openssh/ssh.1 projects/zfsd/head/crypto/openssh/ssh.c projects/zfsd/head/crypto/openssh/ssh_config projects/zfsd/head/crypto/openssh/ssh_config.5 projects/zfsd/head/crypto/openssh/ssh_namespace.h projects/zfsd/head/crypto/openssh/sshconnect.c projects/zfsd/head/crypto/openssh/sshconnect1.c projects/zfsd/head/crypto/openssh/sshconnect2.c projects/zfsd/head/crypto/openssh/sshd.8 projects/zfsd/head/crypto/openssh/sshd.c projects/zfsd/head/crypto/openssh/sshd_config projects/zfsd/head/crypto/openssh/sshd_config.5 projects/zfsd/head/crypto/openssh/sshlogin.c projects/zfsd/head/crypto/openssh/sshlogin.h projects/zfsd/head/crypto/openssh/uidswap.c projects/zfsd/head/crypto/openssh/umac.c projects/zfsd/head/crypto/openssh/umac.h projects/zfsd/head/crypto/openssh/umac128.c projects/zfsd/head/crypto/openssh/uuencode.c projects/zfsd/head/crypto/openssh/version.h projects/zfsd/head/crypto/openssh/xmalloc.c projects/zfsd/head/crypto/openssh/xmalloc.h projects/zfsd/head/crypto/openssl/ssl/s3_cbc.c projects/zfsd/head/etc/Makefile projects/zfsd/head/etc/defaults/periodic.conf projects/zfsd/head/etc/defaults/rc.conf projects/zfsd/head/etc/devd/usb.conf projects/zfsd/head/etc/ftpusers projects/zfsd/head/etc/group projects/zfsd/head/etc/master.passwd projects/zfsd/head/etc/mtree/BSD.include.dist projects/zfsd/head/etc/mtree/BSD.usr.dist projects/zfsd/head/etc/mtree/BSD.var.dist projects/zfsd/head/etc/mtree/Makefile projects/zfsd/head/etc/namedb/named.conf projects/zfsd/head/etc/network.subr projects/zfsd/head/etc/periodic/daily/Makefile projects/zfsd/head/etc/periodic/monthly/Makefile projects/zfsd/head/etc/periodic/security/100.chksetuid projects/zfsd/head/etc/periodic/security/110.neggrpperm projects/zfsd/head/etc/periodic/security/200.chkmounts projects/zfsd/head/etc/periodic/security/300.chkuid0 projects/zfsd/head/etc/periodic/security/400.passwdless projects/zfsd/head/etc/periodic/security/410.logincheck projects/zfsd/head/etc/periodic/security/460.chkportsum projects/zfsd/head/etc/periodic/security/500.ipfwdenied projects/zfsd/head/etc/periodic/security/510.ipfdenied projects/zfsd/head/etc/periodic/security/520.pfdenied projects/zfsd/head/etc/periodic/security/550.ipfwlimit projects/zfsd/head/etc/periodic/security/610.ipf6denied projects/zfsd/head/etc/periodic/security/700.kernelmsg projects/zfsd/head/etc/periodic/security/800.loginfail projects/zfsd/head/etc/periodic/security/900.tcpwrap projects/zfsd/head/etc/periodic/security/security.functions projects/zfsd/head/etc/periodic/weekly/Makefile projects/zfsd/head/etc/portsnap.conf projects/zfsd/head/etc/rc.d/Makefile projects/zfsd/head/etc/rc.d/NETWORKING projects/zfsd/head/etc/rc.d/bsnmpd projects/zfsd/head/etc/rc.d/ipfilter projects/zfsd/head/etc/rc.d/ipfs projects/zfsd/head/etc/rc.d/ipmon projects/zfsd/head/etc/rc.d/jail projects/zfsd/head/etc/rc.d/netif projects/zfsd/head/etc/rc.d/routing projects/zfsd/head/etc/rc.d/savecore projects/zfsd/head/etc/rc.d/sendmail projects/zfsd/head/etc/rc.d/sshd projects/zfsd/head/etc/rc.subr projects/zfsd/head/games/fortune/datfiles/freebsd-tips projects/zfsd/head/gnu/lib/Makefile projects/zfsd/head/gnu/lib/libdialog/dlg_config.h projects/zfsd/head/gnu/lib/libstdc++/Makefile projects/zfsd/head/gnu/lib/libstdc++/config.h projects/zfsd/head/gnu/lib/libsupc++/Makefile projects/zfsd/head/gnu/usr.bin/Makefile projects/zfsd/head/gnu/usr.bin/binutils/Makefile projects/zfsd/head/gnu/usr.bin/cc/Makefile projects/zfsd/head/gnu/usr.bin/cc/include/Makefile projects/zfsd/head/gnu/usr.bin/grep/grep.c projects/zfsd/head/gnu/usr.bin/groff/tmac/mdoc.local projects/zfsd/head/include/Makefile projects/zfsd/head/include/dirent.h projects/zfsd/head/include/iconv.h projects/zfsd/head/include/paths.h projects/zfsd/head/include/stdlib.h projects/zfsd/head/include/unistd.h projects/zfsd/head/kerberos5/Makefile.inc projects/zfsd/head/kerberos5/lib/libheimipcc/Makefile projects/zfsd/head/kerberos5/lib/libheimipcs/Makefile projects/zfsd/head/kerberos5/lib/libkrb5/Makefile projects/zfsd/head/kerberos5/libexec/digest-service/Makefile projects/zfsd/head/kerberos5/libexec/kcm/Makefile projects/zfsd/head/lib/Makefile projects/zfsd/head/lib/clang/Makefile projects/zfsd/head/lib/clang/libllvmmc/Makefile projects/zfsd/head/lib/clang/libllvmsupport/Makefile projects/zfsd/head/lib/clang/libllvmx86disassembler/Makefile projects/zfsd/head/lib/csu/arm/crt1.c projects/zfsd/head/lib/csu/common/notes.h projects/zfsd/head/lib/libarchive/Makefile projects/zfsd/head/lib/libc++/Makefile projects/zfsd/head/lib/libc/Makefile projects/zfsd/head/lib/libc/amd64/sys/setlogin.S projects/zfsd/head/lib/libc/arm/_fpmath.h projects/zfsd/head/lib/libc/arm/arith.h projects/zfsd/head/lib/libc/arm/gen/sigsetjmp.S projects/zfsd/head/lib/libc/arm/softfloat/arm-gcc.h projects/zfsd/head/lib/libc/db/btree/bt_open.c projects/zfsd/head/lib/libc/db/hash/hash.c projects/zfsd/head/lib/libc/db/hash/hash_page.c projects/zfsd/head/lib/libc/gen/Makefile.inc projects/zfsd/head/lib/libc/gen/Symbol.map projects/zfsd/head/lib/libc/gen/closedir.c projects/zfsd/head/lib/libc/gen/directory.3 projects/zfsd/head/lib/libc/gen/errlst.c projects/zfsd/head/lib/libc/gen/fnmatch.c projects/zfsd/head/lib/libc/gen/getlogin.c projects/zfsd/head/lib/libc/gen/lockf.3 projects/zfsd/head/lib/libc/gen/signal.3 projects/zfsd/head/lib/libc/gen/strtofflags.c projects/zfsd/head/lib/libc/gen/sysctl.3 projects/zfsd/head/lib/libc/gen/wordexp.c projects/zfsd/head/lib/libc/gmon/gmon.c projects/zfsd/head/lib/libc/i386/sys/setlogin.S projects/zfsd/head/lib/libc/iconv/Symbol.map projects/zfsd/head/lib/libc/iconv/citrus_iconv.c projects/zfsd/head/lib/libc/iconv/citrus_iconv_local.h projects/zfsd/head/lib/libc/iconv/iconv.c projects/zfsd/head/lib/libc/include/compat.h projects/zfsd/head/lib/libc/include/libc_private.h projects/zfsd/head/lib/libc/net/ether_addr.c projects/zfsd/head/lib/libc/net/eui64.c projects/zfsd/head/lib/libc/net/getaddrinfo.c projects/zfsd/head/lib/libc/net/gethostbyht.c projects/zfsd/head/lib/libc/net/gethostbyname.3 projects/zfsd/head/lib/libc/net/getnetbyht.c projects/zfsd/head/lib/libc/net/getprotoent.c projects/zfsd/head/lib/libc/net/getservent.c projects/zfsd/head/lib/libc/net/hesiod.c projects/zfsd/head/lib/libc/net/if_nametoindex.c projects/zfsd/head/lib/libc/net/name6.c projects/zfsd/head/lib/libc/net/nscachedcli.c projects/zfsd/head/lib/libc/net/nsdispatch.c projects/zfsd/head/lib/libc/net/rcmd.c projects/zfsd/head/lib/libc/net/sctp_sys_calls.c projects/zfsd/head/lib/libc/posix1e/mac.c projects/zfsd/head/lib/libc/resolv/res_init.c projects/zfsd/head/lib/libc/resolv/res_query.c projects/zfsd/head/lib/libc/resolv/res_send.c projects/zfsd/head/lib/libc/stdio/Makefile.inc projects/zfsd/head/lib/libc/stdio/Symbol.map projects/zfsd/head/lib/libc/stdio/flags.c projects/zfsd/head/lib/libc/stdio/mktemp.3 projects/zfsd/head/lib/libc/stdio/mktemp.c projects/zfsd/head/lib/libc/stdio/xprintf_errno.c projects/zfsd/head/lib/libc/stdlib/getenv.c projects/zfsd/head/lib/libc/stdlib/strtonum.3 projects/zfsd/head/lib/libc/stdlib/system.c projects/zfsd/head/lib/libc/string/strerror.c projects/zfsd/head/lib/libc/sys/Makefile.inc projects/zfsd/head/lib/libc/sys/Symbol.map projects/zfsd/head/lib/libc/sys/accept.2 projects/zfsd/head/lib/libc/sys/cap_ioctls_limit.2 projects/zfsd/head/lib/libc/sys/chflags.2 projects/zfsd/head/lib/libc/sys/close.2 projects/zfsd/head/lib/libc/sys/dup.2 projects/zfsd/head/lib/libc/sys/ioctl.2 projects/zfsd/head/lib/libc/sys/kqueue.2 projects/zfsd/head/lib/libc/sys/mmap.2 projects/zfsd/head/lib/libc/sys/pdfork.2 projects/zfsd/head/lib/libc/sys/pselect.2 projects/zfsd/head/lib/libc/sys/ptrace.2 projects/zfsd/head/lib/libc/sys/read.2 projects/zfsd/head/lib/libc/sys/sigaction.2 projects/zfsd/head/lib/libc/sys/sigpending.2 projects/zfsd/head/lib/libc/sys/sigreturn.2 projects/zfsd/head/lib/libc/sys/sigsuspend.2 projects/zfsd/head/lib/libc/sys/sigwait.2 projects/zfsd/head/lib/libc/sys/socketpair.2 projects/zfsd/head/lib/libc/sys/wait.2 projects/zfsd/head/lib/libc/sys/write.2 projects/zfsd/head/lib/libcompiler_rt/Makefile projects/zfsd/head/lib/libedit/readline.c projects/zfsd/head/lib/libelf/libelf_data.c projects/zfsd/head/lib/libfetch/common.c projects/zfsd/head/lib/libfetch/common.h projects/zfsd/head/lib/libfetch/fetch.3 projects/zfsd/head/lib/libfetch/http.c projects/zfsd/head/lib/libgeom/geom_xml2tree.c projects/zfsd/head/lib/libgeom/libgeom.h projects/zfsd/head/lib/libiconv_modules/Makefile.inc projects/zfsd/head/lib/libkiconv/xlat16_iconv.c projects/zfsd/head/lib/libldns/Makefile projects/zfsd/head/lib/libpam/libpam/Makefile projects/zfsd/head/lib/libpam/modules/pam_passwdqc/Makefile projects/zfsd/head/lib/libpam/modules/pam_ssh/Makefile projects/zfsd/head/lib/libproc/proc_sym.c projects/zfsd/head/lib/libprocstat/libprocstat.c projects/zfsd/head/lib/libprocstat/libprocstat.h projects/zfsd/head/lib/libstand/tftp.c projects/zfsd/head/lib/libthread_db/arch/arm/libpthread_md.c projects/zfsd/head/lib/libusb/Makefile projects/zfsd/head/lib/libusb/libusb20_ugen20.c projects/zfsd/head/lib/libutil/expand_number.c projects/zfsd/head/lib/libutil/humanize_number.3 projects/zfsd/head/lib/libutil/humanize_number.c projects/zfsd/head/lib/libutil/login_auth.c projects/zfsd/head/lib/libutil/login_cap.c projects/zfsd/head/lib/libutil/pidfile.c projects/zfsd/head/lib/libutil/quotafile.c projects/zfsd/head/lib/libutil/uucplock.c projects/zfsd/head/lib/libvmmapi/vmmapi.c projects/zfsd/head/lib/libvmmapi/vmmapi.h projects/zfsd/head/lib/msun/Makefile projects/zfsd/head/lib/msun/Symbol.map projects/zfsd/head/lib/msun/src/math.h projects/zfsd/head/lib/msun/src/math_private.h projects/zfsd/head/lib/msun/src/s_erf.c projects/zfsd/head/lib/msun/src/s_erff.c projects/zfsd/head/libexec/rtld-elf/libmap.c projects/zfsd/head/libexec/rtld-elf/libmap.h projects/zfsd/head/libexec/rtld-elf/rtld.c projects/zfsd/head/libexec/rtld-elf/rtld.h projects/zfsd/head/release/Makefile projects/zfsd/head/release/ia64/mkisoimages.sh projects/zfsd/head/release/picobsd/build/picobsd projects/zfsd/head/release/powerpc/mkisoimages.sh projects/zfsd/head/release/release.conf.sample projects/zfsd/head/release/release.sh projects/zfsd/head/release/scripts/mm-mtree.sh projects/zfsd/head/release/sparc64/mkisoimages.sh projects/zfsd/head/sbin/bsdlabel/bsdlabel.8 projects/zfsd/head/sbin/camcontrol/camcontrol.8 projects/zfsd/head/sbin/camcontrol/camcontrol.c projects/zfsd/head/sbin/camcontrol/fwdownload.c projects/zfsd/head/sbin/ccdconfig/ccdconfig.8 projects/zfsd/head/sbin/dhclient/bpf.c projects/zfsd/head/sbin/dhclient/dhclient.c projects/zfsd/head/sbin/etherswitchcfg/etherswitchcfg.8 projects/zfsd/head/sbin/etherswitchcfg/etherswitchcfg.c projects/zfsd/head/sbin/fdisk/fdisk.8 projects/zfsd/head/sbin/fdisk_pc98/fdisk.c projects/zfsd/head/sbin/fsck_ffs/fsck.h projects/zfsd/head/sbin/fsck_ffs/fsck_ffs.8 projects/zfsd/head/sbin/fsck_ffs/fsutil.c projects/zfsd/head/sbin/fsck_ffs/main.c projects/zfsd/head/sbin/gbde/gbde.8 projects/zfsd/head/sbin/geom/class/eli/geli.8 projects/zfsd/head/sbin/geom/class/shsec/gshsec.8 projects/zfsd/head/sbin/geom/class/virstor/gvirstor.8 projects/zfsd/head/sbin/gvinum/gvinum.8 projects/zfsd/head/sbin/hastd/hast.h projects/zfsd/head/sbin/hastd/primary.c projects/zfsd/head/sbin/hastd/secondary.c projects/zfsd/head/sbin/hastd/subr.c projects/zfsd/head/sbin/init/init.c projects/zfsd/head/sbin/ipf/ipf/Makefile projects/zfsd/head/sbin/ipf/ipftest/Makefile projects/zfsd/head/sbin/ipf/libipf/Makefile projects/zfsd/head/sbin/ipfw/ipfw.8 projects/zfsd/head/sbin/iscontrol/auth_subr.c projects/zfsd/head/sbin/iscontrol/config.c projects/zfsd/head/sbin/iscontrol/fsm.c projects/zfsd/head/sbin/iscontrol/iscontrol.8 projects/zfsd/head/sbin/iscontrol/iscontrol.c projects/zfsd/head/sbin/iscontrol/iscsi.conf.5 projects/zfsd/head/sbin/iscontrol/login.c projects/zfsd/head/sbin/iscontrol/misc.c projects/zfsd/head/sbin/iscontrol/pdu.c projects/zfsd/head/sbin/mdconfig/mdconfig.c projects/zfsd/head/sbin/mount/Makefile (contents, props changed) projects/zfsd/head/sbin/mount_msdosfs/mount_msdosfs.8 projects/zfsd/head/sbin/newfs/newfs.8 projects/zfsd/head/sbin/newfs_msdos/newfs_msdos.8 projects/zfsd/head/sbin/newfs_msdos/newfs_msdos.c projects/zfsd/head/sbin/newfs_nandfs/newfs_nandfs.8 projects/zfsd/head/sbin/nvmecontrol/Makefile projects/zfsd/head/sbin/nvmecontrol/devlist.c projects/zfsd/head/sbin/nvmecontrol/identify.c projects/zfsd/head/sbin/nvmecontrol/nvmecontrol.c projects/zfsd/head/sbin/nvmecontrol/perftest.c projects/zfsd/head/sbin/recoverdisk/recoverdisk.1 projects/zfsd/head/sbin/route/Makefile projects/zfsd/head/sbin/route/route.c projects/zfsd/head/sbin/swapon/swapon.c projects/zfsd/head/secure/lib/libssh/Makefile projects/zfsd/head/secure/libexec/sftp-server/Makefile projects/zfsd/head/secure/libexec/ssh-keysign/Makefile projects/zfsd/head/secure/libexec/ssh-pkcs11-helper/Makefile projects/zfsd/head/secure/usr.bin/bdes/bdes.1 projects/zfsd/head/secure/usr.bin/scp/Makefile projects/zfsd/head/secure/usr.bin/sftp/Makefile projects/zfsd/head/secure/usr.bin/ssh-add/Makefile projects/zfsd/head/secure/usr.bin/ssh-agent/Makefile projects/zfsd/head/secure/usr.bin/ssh-keygen/Makefile projects/zfsd/head/secure/usr.bin/ssh-keyscan/Makefile projects/zfsd/head/secure/usr.bin/ssh/Makefile projects/zfsd/head/secure/usr.sbin/sshd/Makefile projects/zfsd/head/share/doc/Makefile projects/zfsd/head/share/examples/bhyve/vmrun.sh projects/zfsd/head/share/examples/kld/Makefile projects/zfsd/head/share/examples/kld/syscall/test/call.c projects/zfsd/head/share/examples/scsi_target/scsi_target.c projects/zfsd/head/share/i18n/csmapper/Makefile projects/zfsd/head/share/i18n/esdb/Makefile projects/zfsd/head/share/man/man4/Makefile projects/zfsd/head/share/man/man4/altera_avgen.4 projects/zfsd/head/share/man/man4/altq.4 projects/zfsd/head/share/man/man4/ath_hal.4 projects/zfsd/head/share/man/man4/bridge.4 projects/zfsd/head/share/man/man4/bxe.4 projects/zfsd/head/share/man/man4/capsicum.4 projects/zfsd/head/share/man/man4/cd.4 projects/zfsd/head/share/man/man4/ciss.4 projects/zfsd/head/share/man/man4/ctl.4 projects/zfsd/head/share/man/man4/ddb.4 projects/zfsd/head/share/man/man4/geom.4 projects/zfsd/head/share/man/man4/geom_linux_lvm.4 projects/zfsd/head/share/man/man4/netgraph.4 projects/zfsd/head/share/man/man4/netmap.4 projects/zfsd/head/share/man/man4/ntb.4 projects/zfsd/head/share/man/man4/psm.4 projects/zfsd/head/share/man/man4/random.4 projects/zfsd/head/share/man/man4/sa.4 projects/zfsd/head/share/man/man4/sysmouse.4 projects/zfsd/head/share/man/man4/udav.4 projects/zfsd/head/share/man/man4/urtwn.4 projects/zfsd/head/share/man/man4/usb_quirk.4 projects/zfsd/head/share/man/man4/vlan.4 projects/zfsd/head/share/man/man4/vtnet.4 projects/zfsd/head/share/man/man5/Makefile projects/zfsd/head/share/man/man5/ext2fs.5 projects/zfsd/head/share/man/man5/fstab.5 projects/zfsd/head/share/man/man5/libmap.conf.5 projects/zfsd/head/share/man/man5/msdosfs.5 projects/zfsd/head/share/man/man5/periodic.conf.5 projects/zfsd/head/share/man/man5/rc.conf.5 projects/zfsd/head/share/man/man5/reiserfs.5 projects/zfsd/head/share/man/man5/src.conf.5 projects/zfsd/head/share/man/man7/release.7 projects/zfsd/head/share/man/man8/picobsd.8 projects/zfsd/head/share/man/man8/rc.8 projects/zfsd/head/share/man/man8/rc.subr.8 projects/zfsd/head/share/man/man9/EVENTHANDLER.9 projects/zfsd/head/share/man/man9/Makefile projects/zfsd/head/share/man/man9/SDT.9 projects/zfsd/head/share/man/man9/VOP_FSYNC.9 projects/zfsd/head/share/man/man9/VOP_GETPAGES.9 projects/zfsd/head/share/man/man9/atomic.9 projects/zfsd/head/share/man/man9/bus_dma.9 projects/zfsd/head/share/man/man9/firmware.9 projects/zfsd/head/share/man/man9/lock.9 projects/zfsd/head/share/man/man9/microuptime.9 projects/zfsd/head/share/man/man9/mutex.9 projects/zfsd/head/share/man/man9/netisr.9 projects/zfsd/head/share/man/man9/pfil.9 projects/zfsd/head/share/man/man9/sleep.9 projects/zfsd/head/share/man/man9/sysctl.9 projects/zfsd/head/share/man/man9/sysctl_add_oid.9 projects/zfsd/head/share/man/man9/timeout.9 projects/zfsd/head/share/man/man9/vm_map_find.9 projects/zfsd/head/share/man/man9/vm_page_alloc.9 projects/zfsd/head/share/man/man9/vm_page_grab.9 projects/zfsd/head/share/man/man9/vnode.9 projects/zfsd/head/share/misc/bsd-family-tree projects/zfsd/head/share/misc/committers-ports.dot projects/zfsd/head/share/misc/committers-src.dot projects/zfsd/head/share/mk/bsd.lib.mk projects/zfsd/head/share/mk/bsd.libnames.mk projects/zfsd/head/share/mk/bsd.own.mk projects/zfsd/head/share/mk/bsd.prog.mk projects/zfsd/head/share/mk/sys.mk projects/zfsd/head/share/monetdef/Makefile projects/zfsd/head/sys/amd64/amd64/apic_vector.S projects/zfsd/head/sys/amd64/amd64/cpu_switch.S projects/zfsd/head/sys/amd64/amd64/db_disasm.c projects/zfsd/head/sys/amd64/amd64/genassym.c projects/zfsd/head/sys/amd64/amd64/identcpu.c projects/zfsd/head/sys/amd64/amd64/initcpu.c projects/zfsd/head/sys/amd64/amd64/machdep.c projects/zfsd/head/sys/amd64/amd64/minidump_machdep.c projects/zfsd/head/sys/amd64/amd64/mp_machdep.c projects/zfsd/head/sys/amd64/amd64/pmap.c projects/zfsd/head/sys/amd64/amd64/sys_machdep.c projects/zfsd/head/sys/amd64/amd64/trap.c projects/zfsd/head/sys/amd64/amd64/vm_machdep.c projects/zfsd/head/sys/amd64/conf/GENERIC projects/zfsd/head/sys/amd64/conf/NOTES projects/zfsd/head/sys/amd64/include/acpica_machdep.h projects/zfsd/head/sys/amd64/include/apicvar.h projects/zfsd/head/sys/amd64/include/asm.h projects/zfsd/head/sys/amd64/include/atomic.h projects/zfsd/head/sys/amd64/include/cpu.h projects/zfsd/head/sys/amd64/include/cpufunc.h projects/zfsd/head/sys/amd64/include/intr_machdep.h projects/zfsd/head/sys/amd64/include/md_var.h projects/zfsd/head/sys/amd64/include/pcpu.h projects/zfsd/head/sys/amd64/include/pmap.h projects/zfsd/head/sys/amd64/include/sf_buf.h projects/zfsd/head/sys/amd64/include/smp.h projects/zfsd/head/sys/amd64/include/vmm.h (contents, props changed) projects/zfsd/head/sys/amd64/include/vmm_dev.h (contents, props changed) projects/zfsd/head/sys/amd64/include/vmm_instruction_emul.h (contents, props changed) projects/zfsd/head/sys/amd64/include/vmparam.h projects/zfsd/head/sys/amd64/include/xen/hypercall.h projects/zfsd/head/sys/amd64/include/xen/xen-os.h projects/zfsd/head/sys/amd64/linux32/linux32_machdep.c projects/zfsd/head/sys/amd64/linux32/linux32_proto.h projects/zfsd/head/sys/amd64/linux32/linux32_syscall.h projects/zfsd/head/sys/amd64/linux32/linux32_syscalls.c projects/zfsd/head/sys/amd64/linux32/linux32_sysent.c projects/zfsd/head/sys/amd64/vmm/amd/amdv.c projects/zfsd/head/sys/amd64/vmm/intel/ept.c projects/zfsd/head/sys/amd64/vmm/intel/ept.h projects/zfsd/head/sys/amd64/vmm/intel/vmcs.c projects/zfsd/head/sys/amd64/vmm/intel/vmcs.h projects/zfsd/head/sys/amd64/vmm/intel/vmx.c projects/zfsd/head/sys/amd64/vmm/intel/vmx.h projects/zfsd/head/sys/amd64/vmm/intel/vmx_genassym.c projects/zfsd/head/sys/amd64/vmm/intel/vmx_support.S projects/zfsd/head/sys/amd64/vmm/intel/vtd.c projects/zfsd/head/sys/amd64/vmm/io/ppt.c projects/zfsd/head/sys/amd64/vmm/io/ppt.h projects/zfsd/head/sys/amd64/vmm/vmm.c projects/zfsd/head/sys/amd64/vmm/vmm_dev.c projects/zfsd/head/sys/amd64/vmm/vmm_instruction_emul.c projects/zfsd/head/sys/amd64/vmm/vmm_mem.c projects/zfsd/head/sys/amd64/vmm/vmm_mem.h projects/zfsd/head/sys/amd64/vmm/vmm_msr.c projects/zfsd/head/sys/amd64/vmm/x86.c projects/zfsd/head/sys/amd64/vmm/x86.h projects/zfsd/head/sys/arm/allwinner/common.c projects/zfsd/head/sys/arm/allwinner/files.a10 projects/zfsd/head/sys/arm/allwinner/timer.c projects/zfsd/head/sys/arm/arm/bus_space_generic.c projects/zfsd/head/sys/arm/arm/busdma_machdep-v6.c projects/zfsd/head/sys/arm/arm/busdma_machdep.c projects/zfsd/head/sys/arm/arm/cpufunc.c projects/zfsd/head/sys/arm/arm/exception.S projects/zfsd/head/sys/arm/arm/genassym.c projects/zfsd/head/sys/arm/arm/gic.c projects/zfsd/head/sys/arm/arm/identcpu.c projects/zfsd/head/sys/arm/arm/irq_dispatch.S projects/zfsd/head/sys/arm/arm/machdep.c projects/zfsd/head/sys/arm/arm/mp_machdep.c projects/zfsd/head/sys/arm/arm/mpcore_timer.c projects/zfsd/head/sys/arm/arm/pl310.c projects/zfsd/head/sys/arm/arm/pmap-v6.c projects/zfsd/head/sys/arm/arm/pmap.c projects/zfsd/head/sys/arm/arm/stdatomic.c projects/zfsd/head/sys/arm/arm/swtch.S projects/zfsd/head/sys/arm/arm/sys_machdep.c projects/zfsd/head/sys/arm/arm/undefined.c projects/zfsd/head/sys/arm/arm/vfp.c projects/zfsd/head/sys/arm/arm/vm_machdep.c projects/zfsd/head/sys/arm/at91/at91.c projects/zfsd/head/sys/arm/broadcom/bcm2835/bcm2835_gpio.c projects/zfsd/head/sys/arm/broadcom/bcm2835/bcm2835_systimer.c projects/zfsd/head/sys/arm/conf/ARMADAXP projects/zfsd/head/sys/arm/conf/ARNDALE projects/zfsd/head/sys/arm/conf/BEAGLEBONE projects/zfsd/head/sys/arm/conf/CUBIEBOARD projects/zfsd/head/sys/arm/conf/EFIKA_MX projects/zfsd/head/sys/arm/conf/PANDABOARD projects/zfsd/head/sys/arm/conf/RPI-B projects/zfsd/head/sys/arm/conf/VERSATILEPB projects/zfsd/head/sys/arm/conf/ZEDBOARD projects/zfsd/head/sys/arm/freescale/imx/console.c projects/zfsd/head/sys/arm/freescale/imx/imx51_ccm.c projects/zfsd/head/sys/arm/freescale/imx/imx51_gpio.c projects/zfsd/head/sys/arm/freescale/imx/imx51_iomux.c projects/zfsd/head/sys/arm/freescale/imx/imx_gpt.c projects/zfsd/head/sys/arm/freescale/imx/imx_gptreg.h projects/zfsd/head/sys/arm/freescale/imx/imx_wdog.c projects/zfsd/head/sys/arm/include/armreg.h projects/zfsd/head/sys/arm/include/asmacros.h projects/zfsd/head/sys/arm/include/atomic.h projects/zfsd/head/sys/arm/include/fp.h projects/zfsd/head/sys/arm/include/frame.h projects/zfsd/head/sys/arm/include/ieee.h projects/zfsd/head/sys/arm/include/kdb.h projects/zfsd/head/sys/arm/include/param.h projects/zfsd/head/sys/arm/include/pcb.h projects/zfsd/head/sys/arm/include/pcpu.h projects/zfsd/head/sys/arm/include/pmap.h projects/zfsd/head/sys/arm/include/pte.h projects/zfsd/head/sys/arm/include/sf_buf.h projects/zfsd/head/sys/arm/include/smp.h projects/zfsd/head/sys/arm/include/vmparam.h projects/zfsd/head/sys/arm/mv/armadaxp/armadaxp_mp.c projects/zfsd/head/sys/arm/s3c2xx0/s3c2xx0_space.c projects/zfsd/head/sys/arm/s3c2xx0/uart_bus_s3c2410.c projects/zfsd/head/sys/arm/s3c2xx0/uart_cpu_s3c2410.c projects/zfsd/head/sys/arm/samsung/exynos/exynos5_machdep.c projects/zfsd/head/sys/arm/ti/am335x/am335x_prcm.c projects/zfsd/head/sys/arm/ti/am335x/files.am335x projects/zfsd/head/sys/arm/ti/files.ti projects/zfsd/head/sys/arm/ti/omap4/omap4_prcm_clks.c projects/zfsd/head/sys/arm/ti/ti_prcm.h projects/zfsd/head/sys/arm/xscale/i80321/i80321_space.c projects/zfsd/head/sys/arm/xscale/i8134x/i81342_space.c projects/zfsd/head/sys/arm/xscale/ixp425/ixp425_pci_space.c projects/zfsd/head/sys/boot/arm/ixp425/boot2/Makefile projects/zfsd/head/sys/boot/arm/uboot/Makefile projects/zfsd/head/sys/boot/common/loader.8 projects/zfsd/head/sys/boot/common/part.c projects/zfsd/head/sys/boot/fdt/dts/am335x.dtsi projects/zfsd/head/sys/boot/fdt/dts/pandaboard.dts projects/zfsd/head/sys/boot/ficl/loader.c projects/zfsd/head/sys/boot/forth/beastie.4th projects/zfsd/head/sys/boot/forth/color.4th projects/zfsd/head/sys/boot/forth/color.4th.8 projects/zfsd/head/sys/boot/forth/loader.conf.5 projects/zfsd/head/sys/boot/forth/loader.rc projects/zfsd/head/sys/boot/forth/menu.4th projects/zfsd/head/sys/boot/forth/menu.4th.8 projects/zfsd/head/sys/boot/forth/menu.rc projects/zfsd/head/sys/boot/forth/version.4th projects/zfsd/head/sys/boot/forth/version.4th.8 projects/zfsd/head/sys/boot/i386/efi/Makefile projects/zfsd/head/sys/boot/i386/libi386/biosacpi.c projects/zfsd/head/sys/boot/pc98/boot2/boot2.c projects/zfsd/head/sys/boot/pc98/libpc98/biosdisk.c projects/zfsd/head/sys/boot/powerpc/boot1.chrp/Makefile projects/zfsd/head/sys/boot/userboot/libstand/Makefile projects/zfsd/head/sys/boot/userboot/test/Makefile projects/zfsd/head/sys/boot/userboot/userboot/Makefile projects/zfsd/head/sys/bsm/audit_kevents.h projects/zfsd/head/sys/bsm/audit_record.h projects/zfsd/head/sys/cam/ata/ata_da.c projects/zfsd/head/sys/cam/cam.h projects/zfsd/head/sys/cam/cam_ccb.h projects/zfsd/head/sys/cam/cam_compat.c projects/zfsd/head/sys/cam/cam_compat.h projects/zfsd/head/sys/cam/cam_debug.h projects/zfsd/head/sys/cam/cam_periph.c projects/zfsd/head/sys/cam/cam_queue.c projects/zfsd/head/sys/cam/cam_queue.h projects/zfsd/head/sys/cam/cam_xpt.c projects/zfsd/head/sys/cam/cam_xpt.h projects/zfsd/head/sys/cam/cam_xpt_internal.h projects/zfsd/head/sys/cam/cam_xpt_periph.h projects/zfsd/head/sys/cam/ctl/ctl.c projects/zfsd/head/sys/cam/ctl/ctl.h projects/zfsd/head/sys/cam/ctl/ctl_backend.h projects/zfsd/head/sys/cam/ctl/ctl_backend_block.c projects/zfsd/head/sys/cam/ctl/ctl_backend_ramdisk.c projects/zfsd/head/sys/cam/ctl/ctl_frontend.h projects/zfsd/head/sys/cam/ctl/ctl_frontend_internal.c projects/zfsd/head/sys/cam/ctl/ctl_io.h projects/zfsd/head/sys/cam/ctl/ctl_ioctl.h projects/zfsd/head/sys/cam/ctl/scsi_ctl.c projects/zfsd/head/sys/cam/scsi/scsi_all.c projects/zfsd/head/sys/cam/scsi/scsi_all.h projects/zfsd/head/sys/cam/scsi/scsi_ch.c projects/zfsd/head/sys/cam/scsi/scsi_da.c projects/zfsd/head/sys/cam/scsi/scsi_da.h projects/zfsd/head/sys/cam/scsi/scsi_enc.c projects/zfsd/head/sys/cam/scsi/scsi_enc_ses.c projects/zfsd/head/sys/cam/scsi/scsi_pass.c projects/zfsd/head/sys/cam/scsi/scsi_sa.c projects/zfsd/head/sys/cam/scsi/scsi_targ_bh.c projects/zfsd/head/sys/cam/scsi/scsi_target.c projects/zfsd/head/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c projects/zfsd/head/sys/cddl/compat/opensolaris/sys/file.h projects/zfsd/head/sys/cddl/compat/opensolaris/sys/kcondvar.h projects/zfsd/head/sys/cddl/compat/opensolaris/sys/kmem.h projects/zfsd/head/sys/cddl/compat/opensolaris/sys/mutex.h projects/zfsd/head/sys/cddl/compat/opensolaris/sys/rwlock.h projects/zfsd/head/sys/cddl/compat/opensolaris/sys/time.h projects/zfsd/head/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c projects/zfsd/head/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h projects/zfsd/head/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_send.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_destroy.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_scan.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_debug.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/sys/ctf_api.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h projects/zfsd/head/sys/cddl/dev/dtrace/amd64/dis_tables.c projects/zfsd/head/sys/cddl/dev/dtrace/amd64/dis_tables.h projects/zfsd/head/sys/cddl/dev/dtrace/dtrace_clone.c projects/zfsd/head/sys/cddl/dev/dtrace/dtrace_load.c projects/zfsd/head/sys/cddl/dev/dtrace/dtrace_unload.c projects/zfsd/head/sys/cddl/dev/dtrace/i386/dis_tables.c projects/zfsd/head/sys/cddl/dev/dtrace/i386/dis_tables.h projects/zfsd/head/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S projects/zfsd/head/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c projects/zfsd/head/sys/cddl/dev/dtrace/powerpc/dtrace_subr.c projects/zfsd/head/sys/cddl/dev/fbt/fbt.c projects/zfsd/head/sys/cddl/dev/fbt/fbt_powerpc.c projects/zfsd/head/sys/cddl/dev/sdt/sdt.c projects/zfsd/head/sys/compat/freebsd32/freebsd32.h projects/zfsd/head/sys/compat/freebsd32/freebsd32_ioctl.c projects/zfsd/head/sys/compat/freebsd32/freebsd32_misc.c projects/zfsd/head/sys/compat/freebsd32/freebsd32_proto.h projects/zfsd/head/sys/compat/freebsd32/freebsd32_signal.h projects/zfsd/head/sys/compat/freebsd32/freebsd32_syscall.h projects/zfsd/head/sys/compat/freebsd32/freebsd32_syscalls.c projects/zfsd/head/sys/compat/freebsd32/freebsd32_sysent.c projects/zfsd/head/sys/compat/freebsd32/freebsd32_systrace_args.c projects/zfsd/head/sys/compat/freebsd32/syscalls.master projects/zfsd/head/sys/compat/linux/linux_dtrace.h projects/zfsd/head/sys/compat/linux/linux_file.c projects/zfsd/head/sys/compat/linux/linux_futex.c projects/zfsd/head/sys/compat/linux/linux_ioctl.c projects/zfsd/head/sys/compat/linux/linux_misc.c projects/zfsd/head/sys/compat/linux/linux_socket.c projects/zfsd/head/sys/compat/linux/linux_uid16.c projects/zfsd/head/sys/compat/ndis/kern_ndis.c projects/zfsd/head/sys/compat/ndis/ndis_var.h projects/zfsd/head/sys/compat/ndis/subr_ntoskrnl.c projects/zfsd/head/sys/compat/svr4/imgact_svr4.c projects/zfsd/head/sys/compat/svr4/svr4_fcntl.c projects/zfsd/head/sys/compat/svr4/svr4_filio.c projects/zfsd/head/sys/compat/svr4/svr4_ioctl.c projects/zfsd/head/sys/compat/svr4/svr4_misc.c projects/zfsd/head/sys/compat/svr4/svr4_stream.c projects/zfsd/head/sys/conf/Makefile.amd64 projects/zfsd/head/sys/conf/NOTES projects/zfsd/head/sys/conf/WITHOUT_SOURCELESS_UCODE projects/zfsd/head/sys/conf/files projects/zfsd/head/sys/conf/files.amd64 projects/zfsd/head/sys/conf/files.arm projects/zfsd/head/sys/conf/files.i386 projects/zfsd/head/sys/conf/files.mips projects/zfsd/head/sys/conf/files.powerpc projects/zfsd/head/sys/conf/kern.post.mk projects/zfsd/head/sys/conf/kern.pre.mk projects/zfsd/head/sys/conf/newvers.sh projects/zfsd/head/sys/conf/options projects/zfsd/head/sys/conf/options.amd64 projects/zfsd/head/sys/conf/options.arm projects/zfsd/head/sys/conf/options.i386 projects/zfsd/head/sys/conf/options.mips projects/zfsd/head/sys/conf/options.powerpc projects/zfsd/head/sys/contrib/dev/acpica/acpica_prep.sh projects/zfsd/head/sys/contrib/dev/acpica/changes.txt (contents, props changed) projects/zfsd/head/sys/contrib/dev/acpica/common/adisasm.c projects/zfsd/head/sys/contrib/dev/acpica/common/adwalk.c projects/zfsd/head/sys/contrib/dev/acpica/common/dmextern.c projects/zfsd/head/sys/contrib/dev/acpica/common/dmtable.c projects/zfsd/head/sys/contrib/dev/acpica/common/getopt.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslcompile.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslglobal.h projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslload.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslmain.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/asloffset.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/asloperands.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/asloptions.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/dtcompile.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/dttemplate.c projects/zfsd/head/sys/contrib/dev/acpica/components/debugger/dbcmds.c projects/zfsd/head/sys/contrib/dev/acpica/components/debugger/dbfileio.c projects/zfsd/head/sys/contrib/dev/acpica/components/debugger/dbinput.c projects/zfsd/head/sys/contrib/dev/acpica/components/debugger/dbnames.c projects/zfsd/head/sys/contrib/dev/acpica/components/events/evgpeutil.c projects/zfsd/head/sys/contrib/dev/acpica/components/events/evmisc.c projects/zfsd/head/sys/contrib/dev/acpica/components/events/evregion.c projects/zfsd/head/sys/contrib/dev/acpica/components/events/evsci.c projects/zfsd/head/sys/contrib/dev/acpica/components/events/evxface.c projects/zfsd/head/sys/contrib/dev/acpica/components/executer/exoparg1.c projects/zfsd/head/sys/contrib/dev/acpica/components/hardware/hwtimer.c projects/zfsd/head/sys/contrib/dev/acpica/components/hardware/hwxface.c projects/zfsd/head/sys/contrib/dev/acpica/components/namespace/nsaccess.c projects/zfsd/head/sys/contrib/dev/acpica/components/namespace/nsdump.c projects/zfsd/head/sys/contrib/dev/acpica/components/namespace/nspredef.c projects/zfsd/head/sys/contrib/dev/acpica/components/namespace/nswalk.c projects/zfsd/head/sys/contrib/dev/acpica/components/namespace/nsxfeval.c projects/zfsd/head/sys/contrib/dev/acpica/components/tables/tbfadt.c projects/zfsd/head/sys/contrib/dev/acpica/components/tables/tbinstal.c projects/zfsd/head/sys/contrib/dev/acpica/components/tables/tbprint.c projects/zfsd/head/sys/contrib/dev/acpica/components/tables/tbxfroot.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utdebug.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utglobal.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utosi.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utxface.c projects/zfsd/head/sys/contrib/dev/acpica/include/acdebug.h projects/zfsd/head/sys/contrib/dev/acpica/include/acdisasm.h projects/zfsd/head/sys/contrib/dev/acpica/include/acevents.h projects/zfsd/head/sys/contrib/dev/acpica/include/acexcep.h projects/zfsd/head/sys/contrib/dev/acpica/include/acglobal.h projects/zfsd/head/sys/contrib/dev/acpica/include/aclocal.h projects/zfsd/head/sys/contrib/dev/acpica/include/acnamesp.h projects/zfsd/head/sys/contrib/dev/acpica/include/acpiosxf.h projects/zfsd/head/sys/contrib/dev/acpica/include/acpixf.h projects/zfsd/head/sys/contrib/dev/acpica/include/actables.h projects/zfsd/head/sys/contrib/dev/acpica/include/actypes.h projects/zfsd/head/sys/contrib/dev/acpica/include/acutils.h projects/zfsd/head/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c projects/zfsd/head/sys/contrib/ipfilter/netinet/fil.c projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_auth.c projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_auth.h projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_compat.h projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_fil.h projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c (contents, props changed) projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_frag.c projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_frag.h projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_htable.c projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_htable.h projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_irc_pxy.c projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_log.c projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_lookup.c projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_lookup.h projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_nat.c projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_nat.h projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_pool.c projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_pool.h projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_proxy.c projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_proxy.h projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c (contents, props changed) projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_rules.c projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_scan.c projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_scan.h projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_state.c projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_state.h projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_sync.c projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_sync.h projects/zfsd/head/sys/contrib/ipfilter/netinet/ipl.h projects/zfsd/head/sys/contrib/ipfilter/netinet/mlfk_ipl.c projects/zfsd/head/sys/contrib/rdma/ib_umem.h projects/zfsd/head/sys/contrib/rdma/krping/krping.c projects/zfsd/head/sys/contrib/rdma/krping/krping.h projects/zfsd/head/sys/contrib/rdma/krping/krping_dev.c projects/zfsd/head/sys/crypto/aesni/aeskeys_amd64.S projects/zfsd/head/sys/crypto/aesni/aesni.c projects/zfsd/head/sys/crypto/aesni/aesni.h projects/zfsd/head/sys/crypto/aesni/aesni_wrap.c projects/zfsd/head/sys/dev/aac/aac_linux.c projects/zfsd/head/sys/dev/aac/aac_pci.c projects/zfsd/head/sys/dev/aac/aacvar.h projects/zfsd/head/sys/dev/aacraid/aacraid_linux.c projects/zfsd/head/sys/dev/aacraid/aacraid_pci.c projects/zfsd/head/sys/dev/acpica/Osd/OsdSynch.c projects/zfsd/head/sys/dev/acpica/acpi_thermal.c projects/zfsd/head/sys/dev/acpica/acpi_timer.c projects/zfsd/head/sys/dev/adb/adb_mouse.c projects/zfsd/head/sys/dev/advansys/adw_pci.c projects/zfsd/head/sys/dev/ae/if_ae.c projects/zfsd/head/sys/dev/ae/if_aereg.h projects/zfsd/head/sys/dev/agp/agp.c projects/zfsd/head/sys/dev/agp/agp_i810.c projects/zfsd/head/sys/dev/ahci/ahci.c projects/zfsd/head/sys/dev/ahci/ahci.h projects/zfsd/head/sys/dev/aic7xxx/ahc_pci.c projects/zfsd/head/sys/dev/aic7xxx/ahd_pci.c projects/zfsd/head/sys/dev/aic7xxx/aic7xxx_pci.c projects/zfsd/head/sys/dev/amdtemp/amdtemp.c projects/zfsd/head/sys/dev/amr/amr_linux.c projects/zfsd/head/sys/dev/amr/amr_pci.c projects/zfsd/head/sys/dev/an/if_an_pci.c projects/zfsd/head/sys/dev/arcmsr/arcmsr.c projects/zfsd/head/sys/dev/asr/asr.c projects/zfsd/head/sys/dev/ata/ata-pci.c projects/zfsd/head/sys/dev/ata/ata-pci.h projects/zfsd/head/sys/dev/ata/chipsets/ata-intel.c projects/zfsd/head/sys/dev/ata/chipsets/ata-promise.c projects/zfsd/head/sys/dev/ath/ath_hal/ar5212/ar5212.h projects/zfsd/head/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c projects/zfsd/head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c projects/zfsd/head/sys/dev/ath/if_ath.c projects/zfsd/head/sys/dev/ath/if_ath_tx.c projects/zfsd/head/sys/dev/atkbdc/psm.c projects/zfsd/head/sys/dev/bce/if_bce.c projects/zfsd/head/sys/dev/bge/if_bge.c projects/zfsd/head/sys/dev/bge/if_bgereg.h projects/zfsd/head/sys/dev/bktr/bktr_core.c projects/zfsd/head/sys/dev/bktr/bktr_os.c projects/zfsd/head/sys/dev/buslogic/bt_pci.c projects/zfsd/head/sys/dev/bwi/bwimac.c projects/zfsd/head/sys/dev/cas/if_cas.c projects/zfsd/head/sys/dev/cfi/cfi_bus_nexus.c projects/zfsd/head/sys/dev/cfi/cfi_core.c projects/zfsd/head/sys/dev/cfi/cfi_dev.c projects/zfsd/head/sys/dev/cfi/cfi_disk.c projects/zfsd/head/sys/dev/cfi/cfi_reg.h projects/zfsd/head/sys/dev/cfi/cfi_var.h projects/zfsd/head/sys/dev/ciss/ciss.c projects/zfsd/head/sys/dev/cpuctl/cpuctl.c projects/zfsd/head/sys/dev/cxgb/cxgb_sge.c projects/zfsd/head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c projects/zfsd/head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c projects/zfsd/head/sys/dev/cxgbe/adapter.h projects/zfsd/head/sys/dev/cxgbe/common/t4_hw.c projects/zfsd/head/sys/dev/cxgbe/common/t4_hw.h projects/zfsd/head/sys/dev/cxgbe/firmware/t5fw_cfg.txt projects/zfsd/head/sys/dev/cxgbe/offload.h projects/zfsd/head/sys/dev/cxgbe/osdep.h projects/zfsd/head/sys/dev/cxgbe/t4_ioctl.h projects/zfsd/head/sys/dev/cxgbe/t4_main.c projects/zfsd/head/sys/dev/cxgbe/t4_sge.c projects/zfsd/head/sys/dev/cxgbe/tom/t4_cpl_io.c projects/zfsd/head/sys/dev/cxgbe/tom/t4_listen.c projects/zfsd/head/sys/dev/cxgbe/tom/t4_tom.c projects/zfsd/head/sys/dev/cxgbe/tom/t4_tom.h projects/zfsd/head/sys/dev/dpt/dpt_pci.c projects/zfsd/head/sys/dev/drm/drm_scatter.c projects/zfsd/head/sys/dev/drm2/drmP.h projects/zfsd/head/sys/dev/drm2/drm_atomic.h projects/zfsd/head/sys/dev/drm2/drm_context.c projects/zfsd/head/sys/dev/drm2/drm_crtc.c projects/zfsd/head/sys/dev/drm2/drm_crtc.h projects/zfsd/head/sys/dev/drm2/drm_crtc_helper.h projects/zfsd/head/sys/dev/drm2/drm_dp_helper.h projects/zfsd/head/sys/dev/drm2/drm_dp_iic_helper.c projects/zfsd/head/sys/dev/drm2/drm_drv.c projects/zfsd/head/sys/dev/drm2/drm_edid.c projects/zfsd/head/sys/dev/drm2/drm_gem.c projects/zfsd/head/sys/dev/drm2/drm_gem_names.c projects/zfsd/head/sys/dev/drm2/drm_ioctl.c projects/zfsd/head/sys/dev/drm2/drm_irq.c projects/zfsd/head/sys/dev/drm2/drm_linux_list.h projects/zfsd/head/sys/dev/drm2/drm_pci.c projects/zfsd/head/sys/dev/drm2/drm_pciids.h projects/zfsd/head/sys/dev/drm2/drm_scatter.c projects/zfsd/head/sys/dev/drm2/drm_sysctl.c projects/zfsd/head/sys/dev/drm2/i915/i915_gem.c projects/zfsd/head/sys/dev/drm2/i915/i915_gem_execbuffer.c projects/zfsd/head/sys/dev/drm2/i915/intel_crt.c projects/zfsd/head/sys/dev/drm2/i915/intel_display.c projects/zfsd/head/sys/dev/drm2/i915/intel_dp.c projects/zfsd/head/sys/dev/drm2/i915/intel_drv.h projects/zfsd/head/sys/dev/drm2/i915/intel_hdmi.c projects/zfsd/head/sys/dev/drm2/i915/intel_lvds.c projects/zfsd/head/sys/dev/drm2/i915/intel_panel.c projects/zfsd/head/sys/dev/drm2/i915/intel_ringbuffer.c projects/zfsd/head/sys/dev/drm2/i915/intel_sdvo.c projects/zfsd/head/sys/dev/drm2/i915/intel_tv.c projects/zfsd/head/sys/dev/drm2/ttm/ttm_bo.c projects/zfsd/head/sys/dev/drm2/ttm/ttm_bo_driver.h projects/zfsd/head/sys/dev/drm2/ttm/ttm_bo_util.c projects/zfsd/head/sys/dev/drm2/ttm/ttm_bo_vm.c projects/zfsd/head/sys/dev/drm2/ttm/ttm_execbuf_util.c projects/zfsd/head/sys/dev/drm2/ttm/ttm_page_alloc.c projects/zfsd/head/sys/dev/drm2/ttm/ttm_tt.c projects/zfsd/head/sys/dev/e1000/e1000_80003es2lan.c projects/zfsd/head/sys/dev/e1000/e1000_80003es2lan.h projects/zfsd/head/sys/dev/e1000/e1000_82571.c projects/zfsd/head/sys/dev/e1000/e1000_82575.c projects/zfsd/head/sys/dev/e1000/e1000_82575.h projects/zfsd/head/sys/dev/e1000/e1000_api.c projects/zfsd/head/sys/dev/e1000/e1000_defines.h projects/zfsd/head/sys/dev/e1000/e1000_hw.h projects/zfsd/head/sys/dev/e1000/e1000_i210.c projects/zfsd/head/sys/dev/e1000/e1000_i210.h projects/zfsd/head/sys/dev/e1000/e1000_ich8lan.c projects/zfsd/head/sys/dev/e1000/e1000_ich8lan.h projects/zfsd/head/sys/dev/e1000/e1000_mac.c projects/zfsd/head/sys/dev/e1000/e1000_osdep.h projects/zfsd/head/sys/dev/e1000/e1000_phy.c projects/zfsd/head/sys/dev/e1000/e1000_phy.h projects/zfsd/head/sys/dev/e1000/e1000_regs.h projects/zfsd/head/sys/dev/e1000/e1000_vf.h projects/zfsd/head/sys/dev/e1000/if_em.c projects/zfsd/head/sys/dev/e1000/if_igb.c projects/zfsd/head/sys/dev/e1000/if_igb.h projects/zfsd/head/sys/dev/e1000/if_lem.c projects/zfsd/head/sys/dev/etherswitch/arswitch/arswitch.c projects/zfsd/head/sys/dev/etherswitch/arswitch/arswitch_7240.c projects/zfsd/head/sys/dev/etherswitch/arswitch/arswitch_8216.c projects/zfsd/head/sys/dev/etherswitch/arswitch/arswitch_8226.c projects/zfsd/head/sys/dev/etherswitch/arswitch/arswitch_8316.c projects/zfsd/head/sys/dev/etherswitch/arswitch/arswitch_phy.c projects/zfsd/head/sys/dev/etherswitch/arswitch/arswitch_reg.c projects/zfsd/head/sys/dev/etherswitch/arswitch/arswitch_reg.h projects/zfsd/head/sys/dev/etherswitch/arswitch/arswitchreg.h projects/zfsd/head/sys/dev/etherswitch/arswitch/arswitchvar.h projects/zfsd/head/sys/dev/etherswitch/etherswitch.h projects/zfsd/head/sys/dev/etherswitch/ip17x/ip175c.c projects/zfsd/head/sys/dev/etherswitch/ip17x/ip175d.c projects/zfsd/head/sys/dev/etherswitch/ip17x/ip17x_vlans.c projects/zfsd/head/sys/dev/etherswitch/rtl8366/rtl8366rb.c projects/zfsd/head/sys/dev/fatm/if_fatm.c projects/zfsd/head/sys/dev/fb/vesa.c projects/zfsd/head/sys/dev/fdc/fdc.c projects/zfsd/head/sys/dev/filemon/filemon.c projects/zfsd/head/sys/dev/filemon/filemon_wrapper.c projects/zfsd/head/sys/dev/firewire/fwdev.c projects/zfsd/head/sys/dev/firewire/fwohci_pci.c projects/zfsd/head/sys/dev/firewire/sbp.c projects/zfsd/head/sys/dev/flash/mx25l.c projects/zfsd/head/sys/dev/fxp/if_fxp.c projects/zfsd/head/sys/dev/glxsb/glxsb.c projects/zfsd/head/sys/dev/gpio/gpiobus.c projects/zfsd/head/sys/dev/gxemul/cons/gxemul_cons.c projects/zfsd/head/sys/dev/gxemul/disk/gxemul_disk.c projects/zfsd/head/sys/dev/gxemul/disk/gxemul_diskreg.h projects/zfsd/head/sys/dev/gxemul/ether/gxreg.h projects/zfsd/head/sys/dev/hatm/if_hatm.c projects/zfsd/head/sys/dev/hatm/if_hatm_intr.c projects/zfsd/head/sys/dev/hifn/hifn7751.c projects/zfsd/head/sys/dev/hpt27xx/hpt27xx_osm_bsd.c projects/zfsd/head/sys/dev/hpt27xx/os_bsd.h projects/zfsd/head/sys/dev/hptiop/hptiop.c projects/zfsd/head/sys/dev/hptiop/hptiop.h projects/zfsd/head/sys/dev/hptmv/entry.c projects/zfsd/head/sys/dev/hptmv/osbsd.h projects/zfsd/head/sys/dev/hptnr/hptnr_osm_bsd.c projects/zfsd/head/sys/dev/hptnr/os_bsd.h projects/zfsd/head/sys/dev/hptrr/hptrr_osm_bsd.c projects/zfsd/head/sys/dev/hptrr/os_bsd.h projects/zfsd/head/sys/dev/hwpmc/hwpmc_core.c projects/zfsd/head/sys/dev/hwpmc/hwpmc_logging.c projects/zfsd/head/sys/dev/hwpmc/hwpmc_mod.c projects/zfsd/head/sys/dev/hwpmc/hwpmc_powerpc.c projects/zfsd/head/sys/dev/hwpmc/pmc_events.h projects/zfsd/head/sys/dev/ichsmb/ichsmb_pci.c projects/zfsd/head/sys/dev/ichwd/ichwd.c projects/zfsd/head/sys/dev/ichwd/ichwd.h projects/zfsd/head/sys/dev/if_ndis/if_ndis.c projects/zfsd/head/sys/dev/iicbus/if_ic.c projects/zfsd/head/sys/dev/iir/iir.c projects/zfsd/head/sys/dev/iir/iir.h projects/zfsd/head/sys/dev/iir/iir_ctrl.c projects/zfsd/head/sys/dev/iir/iir_pci.c projects/zfsd/head/sys/dev/ipmi/ipmi_isa.c projects/zfsd/head/sys/dev/ipmi/ipmi_linux.c projects/zfsd/head/sys/dev/ipmi/ipmivars.h projects/zfsd/head/sys/dev/ips/ips_pci.c projects/zfsd/head/sys/dev/isci/isci.c projects/zfsd/head/sys/dev/isci/isci_io_request.c projects/zfsd/head/sys/dev/isci/isci_sysctl.c projects/zfsd/head/sys/dev/isci/isci_task_request.c projects/zfsd/head/sys/dev/isp/isp_freebsd.c projects/zfsd/head/sys/dev/isp/isp_pci.c projects/zfsd/head/sys/dev/iwn/if_iwn.c projects/zfsd/head/sys/dev/iwn/if_iwnreg.h projects/zfsd/head/sys/dev/iwn/if_iwnvar.h projects/zfsd/head/sys/dev/ixgb/if_ixgb.c projects/zfsd/head/sys/dev/ixgbe/ixgbe.c projects/zfsd/head/sys/dev/ixgbe/ixv.c projects/zfsd/head/sys/dev/jme/if_jme.c projects/zfsd/head/sys/dev/lge/if_lge.c projects/zfsd/head/sys/dev/lmc/if_lmc.c projects/zfsd/head/sys/dev/md/md.c projects/zfsd/head/sys/dev/mfi/mfi_cam.c projects/zfsd/head/sys/dev/mfi/mfi_linux.c projects/zfsd/head/sys/dev/mfi/mfi_pci.c projects/zfsd/head/sys/dev/mfi/mfi_syspd.c projects/zfsd/head/sys/dev/mfi/mfireg.h projects/zfsd/head/sys/dev/mge/if_mge.c projects/zfsd/head/sys/dev/mii/brgphy.c projects/zfsd/head/sys/dev/mii/miidevs projects/zfsd/head/sys/dev/mly/mly.c projects/zfsd/head/sys/dev/mmc/mmc.c projects/zfsd/head/sys/dev/mmc/mmcsd.c projects/zfsd/head/sys/dev/mn/if_mn.c projects/zfsd/head/sys/dev/mps/mps.c projects/zfsd/head/sys/dev/mps/mps_config.c projects/zfsd/head/sys/dev/mps/mps_mapping.c projects/zfsd/head/sys/dev/mps/mps_pci.c projects/zfsd/head/sys/dev/mps/mps_sas.c projects/zfsd/head/sys/dev/mps/mps_sas.h projects/zfsd/head/sys/dev/mps/mps_sas_lsi.c projects/zfsd/head/sys/dev/mps/mps_table.c projects/zfsd/head/sys/dev/mps/mps_user.c projects/zfsd/head/sys/dev/mps/mpsvar.h projects/zfsd/head/sys/dev/mpt/mpt_pci.c projects/zfsd/head/sys/dev/mwl/if_mwl.c projects/zfsd/head/sys/dev/mwl/if_mwl_pci.c projects/zfsd/head/sys/dev/mxge/if_mxge.c projects/zfsd/head/sys/dev/netmap/if_igb_netmap.h projects/zfsd/head/sys/dev/nfe/if_nfe.c projects/zfsd/head/sys/dev/ntb/if_ntb/if_ntb.c projects/zfsd/head/sys/dev/ntb/ntb_hw/ntb_hw.c projects/zfsd/head/sys/dev/ntb/ntb_hw/ntb_hw.h projects/zfsd/head/sys/dev/ntb/ntb_hw/ntb_regs.h projects/zfsd/head/sys/dev/nvd/nvd.c projects/zfsd/head/sys/dev/nvme/nvme.c projects/zfsd/head/sys/dev/nvme/nvme.h projects/zfsd/head/sys/dev/nvme/nvme_ctrlr.c projects/zfsd/head/sys/dev/nvme/nvme_ns.c projects/zfsd/head/sys/dev/nvme/nvme_ns_cmd.c projects/zfsd/head/sys/dev/nvme/nvme_private.h projects/zfsd/head/sys/dev/nvme/nvme_test.c projects/zfsd/head/sys/dev/ofw/ofw_bus_subr.c projects/zfsd/head/sys/dev/ofw/ofw_console.c projects/zfsd/head/sys/dev/ofw/openfirm.c projects/zfsd/head/sys/dev/ofw/openfirm.h projects/zfsd/head/sys/dev/patm/if_patm.c projects/zfsd/head/sys/dev/patm/if_patm_tx.c projects/zfsd/head/sys/dev/pccbb/pccbb_pci.c projects/zfsd/head/sys/dev/pci/fixup_pci.c projects/zfsd/head/sys/dev/pci/pci.c projects/zfsd/head/sys/dev/pci/pci_pci.c projects/zfsd/head/sys/dev/pci/pci_private.h projects/zfsd/head/sys/dev/pci/pcib_private.h projects/zfsd/head/sys/dev/pci/pcivar.h projects/zfsd/head/sys/dev/pci/vga_pci.c projects/zfsd/head/sys/dev/ppbus/if_plip.c projects/zfsd/head/sys/dev/pst/pst-pci.c projects/zfsd/head/sys/dev/qlxgb/qla_hw.c projects/zfsd/head/sys/dev/qlxgbe/ql_misc.c projects/zfsd/head/sys/dev/qlxgbe/ql_os.c projects/zfsd/head/sys/dev/random/harvest.c projects/zfsd/head/sys/dev/random/hash.c projects/zfsd/head/sys/dev/random/hash.h projects/zfsd/head/sys/dev/random/ivy.c projects/zfsd/head/sys/dev/random/nehemiah.c projects/zfsd/head/sys/dev/random/randomdev.c projects/zfsd/head/sys/dev/random/randomdev.h projects/zfsd/head/sys/dev/random/randomdev_soft.c projects/zfsd/head/sys/dev/random/randomdev_soft.h projects/zfsd/head/sys/dev/random/yarrow.c projects/zfsd/head/sys/dev/random/yarrow.h projects/zfsd/head/sys/dev/rndtest/rndtest.c projects/zfsd/head/sys/dev/rp/rp_pci.c projects/zfsd/head/sys/dev/safe/safe.c projects/zfsd/head/sys/dev/scc/scc_bfe.h projects/zfsd/head/sys/dev/scc/scc_bfe_ebus.c projects/zfsd/head/sys/dev/scc/scc_bfe_macio.c projects/zfsd/head/sys/dev/scc/scc_bfe_quicc.c projects/zfsd/head/sys/dev/scc/scc_bfe_sbus.c projects/zfsd/head/sys/dev/scc/scc_core.c projects/zfsd/head/sys/dev/scc/scc_dev_quicc.c projects/zfsd/head/sys/dev/scc/scc_dev_sab82532.c projects/zfsd/head/sys/dev/scc/scc_dev_z8530.c projects/zfsd/head/sys/dev/sdhci/sdhci.c projects/zfsd/head/sys/dev/sdhci/sdhci.h projects/zfsd/head/sys/dev/sfxge/sfxge_rx.c projects/zfsd/head/sys/dev/sound/pci/als4000.c projects/zfsd/head/sys/dev/sound/pci/aureal.c projects/zfsd/head/sys/dev/sound/pci/cmi.c projects/zfsd/head/sys/dev/sound/pci/cs4281.c projects/zfsd/head/sys/dev/sound/pci/csa.c projects/zfsd/head/sys/dev/sound/pci/ds1.c projects/zfsd/head/sys/dev/sound/pci/emu10k1.c projects/zfsd/head/sys/dev/sound/pci/emu10kx.c projects/zfsd/head/sys/dev/sound/pci/envy24.c projects/zfsd/head/sys/dev/sound/pci/envy24ht.c projects/zfsd/head/sys/dev/sound/pci/es137x.c projects/zfsd/head/sys/dev/sound/pci/fm801.c projects/zfsd/head/sys/dev/sound/pci/hdspe.c projects/zfsd/head/sys/dev/sound/pci/maestro.c projects/zfsd/head/sys/dev/sound/pci/maestro3.c projects/zfsd/head/sys/dev/sound/pci/neomagic.c projects/zfsd/head/sys/dev/sound/pci/solo.c projects/zfsd/head/sys/dev/sound/pci/t4dwave.c projects/zfsd/head/sys/dev/sound/pci/via82c686.c projects/zfsd/head/sys/dev/sound/pci/vibes.c projects/zfsd/head/sys/dev/stge/if_stge.c projects/zfsd/head/sys/dev/streams/streams.c projects/zfsd/head/sys/dev/sym/sym_hipd.c projects/zfsd/head/sys/dev/syscons/syscons.c projects/zfsd/head/sys/dev/tdfx/tdfx_linux.c projects/zfsd/head/sys/dev/tdfx/tdfx_pci.c projects/zfsd/head/sys/dev/ti/if_ti.c projects/zfsd/head/sys/dev/twa/tw_osl_freebsd.c projects/zfsd/head/sys/dev/tws/tws.c projects/zfsd/head/sys/dev/tws/tws_cam.c projects/zfsd/head/sys/dev/uart/uart.h projects/zfsd/head/sys/dev/uart/uart_bus_fdt.c projects/zfsd/head/sys/dev/uart/uart_bus_pci.c projects/zfsd/head/sys/dev/uart/uart_core.c projects/zfsd/head/sys/dev/uart/uart_cpu_fdt.c projects/zfsd/head/sys/dev/uart/uart_dev_ns8250.c projects/zfsd/head/sys/dev/ubsec/ubsec.c projects/zfsd/head/sys/dev/usb/controller/dwc_otg.c projects/zfsd/head/sys/dev/usb/controller/ehci.c projects/zfsd/head/sys/dev/usb/controller/ehci_pci.c projects/zfsd/head/sys/dev/usb/controller/musb_otg.c projects/zfsd/head/sys/dev/usb/controller/ohci_pci.c projects/zfsd/head/sys/dev/usb/controller/xhci.c projects/zfsd/head/sys/dev/usb/controller/xhci.h projects/zfsd/head/sys/dev/usb/controller/xhci_pci.c projects/zfsd/head/sys/dev/usb/input/ukbd.c projects/zfsd/head/sys/dev/usb/net/if_ipheth.c projects/zfsd/head/sys/dev/usb/net/if_udav.c projects/zfsd/head/sys/dev/usb/net/if_usie.c projects/zfsd/head/sys/dev/usb/net/uhso.c projects/zfsd/head/sys/dev/usb/serial/uftdi.c projects/zfsd/head/sys/dev/usb/storage/umass.c projects/zfsd/head/sys/dev/usb/usb_compat_linux.c projects/zfsd/head/sys/dev/usb/usb_hub.c projects/zfsd/head/sys/dev/usb/usb_ioctl.h projects/zfsd/head/sys/dev/usb/usb_pf.c projects/zfsd/head/sys/dev/usb/usb_request.c projects/zfsd/head/sys/dev/usb/usbdevs projects/zfsd/head/sys/dev/usb/wlan/if_rumvar.h projects/zfsd/head/sys/dev/usb/wlan/if_run.c projects/zfsd/head/sys/dev/usb/wlan/if_runvar.h projects/zfsd/head/sys/dev/usb/wlan/if_uathvar.h projects/zfsd/head/sys/dev/usb/wlan/if_upgtvar.h projects/zfsd/head/sys/dev/usb/wlan/if_uralvar.h projects/zfsd/head/sys/dev/usb/wlan/if_urtwnreg.h projects/zfsd/head/sys/dev/usb/wlan/if_urtwvar.h projects/zfsd/head/sys/dev/usb/wlan/if_zydreg.h projects/zfsd/head/sys/dev/virtio/balloon/virtio_balloon.c projects/zfsd/head/sys/dev/virtio/network/if_vtnet.c projects/zfsd/head/sys/dev/virtio/network/if_vtnetvar.h projects/zfsd/head/sys/dev/virtio/network/virtio_net.h projects/zfsd/head/sys/dev/virtio/pci/virtio_pci.c projects/zfsd/head/sys/dev/virtio/virtio_if.m projects/zfsd/head/sys/dev/virtio/virtqueue.c projects/zfsd/head/sys/dev/virtio/virtqueue.h projects/zfsd/head/sys/dev/vkbd/vkbd.c projects/zfsd/head/sys/dev/watchdog/watchdog.c projects/zfsd/head/sys/dev/wb/if_wb.c projects/zfsd/head/sys/dev/wi/if_wi.c projects/zfsd/head/sys/dev/wi/if_wi_pci.c projects/zfsd/head/sys/dev/xen/balloon/balloon.c projects/zfsd/head/sys/dev/xen/blkback/blkback.c projects/zfsd/head/sys/dev/xen/blkfront/blkfront.c projects/zfsd/head/sys/dev/xen/blkfront/block.h projects/zfsd/head/sys/dev/xen/console/console.c projects/zfsd/head/sys/dev/xen/console/xencons_ring.c projects/zfsd/head/sys/dev/xen/control/control.c projects/zfsd/head/sys/dev/xen/netback/netback.c projects/zfsd/head/sys/dev/xen/netfront/netfront.c projects/zfsd/head/sys/dev/xen/xenpci/xenpci.c projects/zfsd/head/sys/dev/xen/xenpci/xenpcivar.h projects/zfsd/head/sys/fs/cd9660/cd9660_vfsops.c projects/zfsd/head/sys/fs/cd9660/iso.h projects/zfsd/head/sys/fs/devfs/devfs_rule.c projects/zfsd/head/sys/fs/devfs/devfs_vnops.c projects/zfsd/head/sys/fs/ext2fs/ext2_alloc.c projects/zfsd/head/sys/fs/ext2fs/ext2_balloc.c projects/zfsd/head/sys/fs/ext2fs/ext2_bmap.c projects/zfsd/head/sys/fs/ext2fs/ext2_dinode.h projects/zfsd/head/sys/fs/ext2fs/ext2_extern.h projects/zfsd/head/sys/fs/ext2fs/ext2_hash.c projects/zfsd/head/sys/fs/ext2fs/ext2_htree.c projects/zfsd/head/sys/fs/ext2fs/ext2_inode.c projects/zfsd/head/sys/fs/ext2fs/ext2_inode_cnv.c projects/zfsd/head/sys/fs/ext2fs/ext2_lookup.c projects/zfsd/head/sys/fs/ext2fs/ext2_subr.c projects/zfsd/head/sys/fs/ext2fs/ext2_vfsops.c projects/zfsd/head/sys/fs/ext2fs/ext2_vnops.c projects/zfsd/head/sys/fs/ext2fs/ext2fs.h projects/zfsd/head/sys/fs/ext2fs/inode.h projects/zfsd/head/sys/fs/fdescfs/fdesc_vnops.c projects/zfsd/head/sys/fs/fuse/fuse_internal.h projects/zfsd/head/sys/fs/fuse/fuse_kernel.h projects/zfsd/head/sys/fs/fuse/fuse_vfsops.c projects/zfsd/head/sys/fs/fuse/fuse_vnops.c projects/zfsd/head/sys/fs/msdosfs/msdosfs_denode.c projects/zfsd/head/sys/fs/msdosfs/msdosfs_vnops.c projects/zfsd/head/sys/fs/nfs/nfs.h projects/zfsd/head/sys/fs/nfs/nfs_commonsubs.c projects/zfsd/head/sys/fs/nfs/nfsport.h projects/zfsd/head/sys/fs/nfs/nfsrvcache.h projects/zfsd/head/sys/fs/nfsclient/nfs_clkrpc.c projects/zfsd/head/sys/fs/nfsclient/nfs_clport.c projects/zfsd/head/sys/fs/nfsclient/nfs_clvfsops.c projects/zfsd/head/sys/fs/nfsserver/nfs_nfsdcache.c projects/zfsd/head/sys/fs/nfsserver/nfs_nfsdport.c projects/zfsd/head/sys/fs/nullfs/null_vnops.c projects/zfsd/head/sys/fs/smbfs/smbfs_node.c projects/zfsd/head/sys/fs/smbfs/smbfs_vnops.c projects/zfsd/head/sys/fs/tmpfs/tmpfs.h projects/zfsd/head/sys/fs/tmpfs/tmpfs_subr.c projects/zfsd/head/sys/fs/tmpfs/tmpfs_vfsops.c projects/zfsd/head/sys/fs/tmpfs/tmpfs_vnops.c projects/zfsd/head/sys/gdb/gdb_cons.c projects/zfsd/head/sys/geom/eli/g_eli.c projects/zfsd/head/sys/geom/geom_dev.c projects/zfsd/head/sys/geom/geom_disk.c projects/zfsd/head/sys/geom/geom_int.h projects/zfsd/head/sys/geom/geom_kern.c projects/zfsd/head/sys/geom/geom_pc98.c projects/zfsd/head/sys/geom/geom_subr.c projects/zfsd/head/sys/geom/mirror/g_mirror.c projects/zfsd/head/sys/geom/part/g_part.c projects/zfsd/head/sys/geom/part/g_part_apm.c projects/zfsd/head/sys/geom/part/g_part_gpt.c projects/zfsd/head/sys/geom/part/g_part_ldm.c projects/zfsd/head/sys/geom/part/g_part_pc98.c projects/zfsd/head/sys/geom/raid/g_raid.c projects/zfsd/head/sys/geom/raid/g_raid.h projects/zfsd/head/sys/geom/raid/g_raid_ctl.c projects/zfsd/head/sys/geom/raid/tr_raid5.c projects/zfsd/head/sys/geom/zero/g_zero.c projects/zfsd/head/sys/i386/conf/GENERIC projects/zfsd/head/sys/i386/conf/NOTES projects/zfsd/head/sys/i386/i386/apic_vector.s projects/zfsd/head/sys/i386/i386/genassym.c projects/zfsd/head/sys/i386/i386/identcpu.c projects/zfsd/head/sys/i386/i386/initcpu.c projects/zfsd/head/sys/i386/i386/machdep.c projects/zfsd/head/sys/i386/i386/mp_machdep.c projects/zfsd/head/sys/i386/i386/pmap.c projects/zfsd/head/sys/i386/i386/sys_machdep.c projects/zfsd/head/sys/i386/i386/vm_machdep.c projects/zfsd/head/sys/i386/ibcs2/ibcs2_fcntl.c projects/zfsd/head/sys/i386/ibcs2/ibcs2_ioctl.c projects/zfsd/head/sys/i386/ibcs2/ibcs2_misc.c projects/zfsd/head/sys/i386/ibcs2/ibcs2_sysvec.c projects/zfsd/head/sys/i386/ibcs2/imgact_coff.c projects/zfsd/head/sys/i386/include/acpica_machdep.h projects/zfsd/head/sys/i386/include/apicvar.h projects/zfsd/head/sys/i386/include/asm.h projects/zfsd/head/sys/i386/include/atomic.h projects/zfsd/head/sys/i386/include/cpu.h projects/zfsd/head/sys/i386/include/intr_machdep.h projects/zfsd/head/sys/i386/include/md_var.h projects/zfsd/head/sys/i386/include/pcpu.h projects/zfsd/head/sys/i386/include/pmap.h projects/zfsd/head/sys/i386/include/sf_buf.h projects/zfsd/head/sys/i386/include/smp.h projects/zfsd/head/sys/i386/include/xen/xen-os.h projects/zfsd/head/sys/i386/include/xen/xenfunc.h projects/zfsd/head/sys/i386/include/xen/xenvar.h projects/zfsd/head/sys/i386/isa/npx.c projects/zfsd/head/sys/i386/linux/imgact_linux.c projects/zfsd/head/sys/i386/linux/linux_machdep.c projects/zfsd/head/sys/i386/linux/linux_proto.h projects/zfsd/head/sys/i386/linux/linux_syscall.h projects/zfsd/head/sys/i386/linux/linux_syscalls.c projects/zfsd/head/sys/i386/linux/linux_sysent.c projects/zfsd/head/sys/i386/pci/pci_cfgreg.c projects/zfsd/head/sys/i386/xen/clock.c projects/zfsd/head/sys/i386/xen/exception.s projects/zfsd/head/sys/i386/xen/locore.s projects/zfsd/head/sys/i386/xen/mp_machdep.c projects/zfsd/head/sys/i386/xen/mptable.c projects/zfsd/head/sys/i386/xen/pmap.c projects/zfsd/head/sys/i386/xen/xen_machdep.c projects/zfsd/head/sys/ia64/conf/GENERIC projects/zfsd/head/sys/ia64/ia32/ia32_signal.c projects/zfsd/head/sys/ia64/ia64/mca.c projects/zfsd/head/sys/ia64/ia64/mp_machdep.c projects/zfsd/head/sys/ia64/ia64/pmap.c projects/zfsd/head/sys/ia64/ia64/vm_machdep.c projects/zfsd/head/sys/ia64/include/acpica_machdep.h projects/zfsd/head/sys/ia64/include/sf_buf.h projects/zfsd/head/sys/ia64/pci/pci_cfgreg.c projects/zfsd/head/sys/kern/capabilities.conf projects/zfsd/head/sys/kern/imgact_elf.c projects/zfsd/head/sys/kern/imgact_gzip.c projects/zfsd/head/sys/kern/init_main.c projects/zfsd/head/sys/kern/init_sysent.c projects/zfsd/head/sys/kern/kern_condvar.c projects/zfsd/head/sys/kern/kern_descrip.c projects/zfsd/head/sys/kern/kern_event.c projects/zfsd/head/sys/kern/kern_exec.c projects/zfsd/head/sys/kern/kern_exit.c projects/zfsd/head/sys/kern/kern_fork.c projects/zfsd/head/sys/kern/kern_intr.c projects/zfsd/head/sys/kern/kern_jail.c projects/zfsd/head/sys/kern/kern_kthread.c projects/zfsd/head/sys/kern/kern_ktrace.c projects/zfsd/head/sys/kern/kern_linker.c projects/zfsd/head/sys/kern/kern_lock.c projects/zfsd/head/sys/kern/kern_malloc.c projects/zfsd/head/sys/kern/kern_mbuf.c projects/zfsd/head/sys/kern/kern_mutex.c projects/zfsd/head/sys/kern/kern_ntptime.c projects/zfsd/head/sys/kern/kern_physio.c projects/zfsd/head/sys/kern/kern_poll.c projects/zfsd/head/sys/kern/kern_proc.c projects/zfsd/head/sys/kern/kern_rangelock.c projects/zfsd/head/sys/kern/kern_rmlock.c projects/zfsd/head/sys/kern/kern_rwlock.c projects/zfsd/head/sys/kern/kern_sdt.c projects/zfsd/head/sys/kern/kern_sharedpage.c projects/zfsd/head/sys/kern/kern_sig.c projects/zfsd/head/sys/kern/kern_sx.c projects/zfsd/head/sys/kern/kern_synch.c projects/zfsd/head/sys/kern/kern_sysctl.c projects/zfsd/head/sys/kern/kern_time.c projects/zfsd/head/sys/kern/kern_timeout.c projects/zfsd/head/sys/kern/kern_uuid.c projects/zfsd/head/sys/kern/link_elf.c projects/zfsd/head/sys/kern/link_elf_obj.c projects/zfsd/head/sys/kern/makesyscalls.sh projects/zfsd/head/sys/kern/sched_4bsd.c projects/zfsd/head/sys/kern/sched_ule.c projects/zfsd/head/sys/kern/subr_bus.c projects/zfsd/head/sys/kern/subr_busdma_bufalloc.c projects/zfsd/head/sys/kern/subr_counter.c projects/zfsd/head/sys/kern/subr_mbpool.c projects/zfsd/head/sys/kern/subr_prf.c projects/zfsd/head/sys/kern/subr_sbuf.c projects/zfsd/head/sys/kern/subr_smp.c projects/zfsd/head/sys/kern/subr_taskqueue.c projects/zfsd/head/sys/kern/subr_uio.c projects/zfsd/head/sys/kern/subr_unit.c projects/zfsd/head/sys/kern/subr_vmem.c projects/zfsd/head/sys/kern/subr_witness.c projects/zfsd/head/sys/kern/sys_capability.c projects/zfsd/head/sys/kern/sys_generic.c projects/zfsd/head/sys/kern/sys_pipe.c projects/zfsd/head/sys/kern/sys_procdesc.c projects/zfsd/head/sys/kern/sys_process.c projects/zfsd/head/sys/kern/sys_socket.c projects/zfsd/head/sys/kern/syscalls.c projects/zfsd/head/sys/kern/syscalls.master projects/zfsd/head/sys/kern/systrace_args.c projects/zfsd/head/sys/kern/sysv_shm.c projects/zfsd/head/sys/kern/tty.c projects/zfsd/head/sys/kern/tty_pts.c projects/zfsd/head/sys/kern/uipc_debug.c projects/zfsd/head/sys/kern/uipc_mbuf.c projects/zfsd/head/sys/kern/uipc_mqueue.c projects/zfsd/head/sys/kern/uipc_sem.c projects/zfsd/head/sys/kern/uipc_shm.c projects/zfsd/head/sys/kern/uipc_sockbuf.c projects/zfsd/head/sys/kern/uipc_socket.c projects/zfsd/head/sys/kern/uipc_syscalls.c projects/zfsd/head/sys/kern/uipc_usrreq.c projects/zfsd/head/sys/kern/vfs_acl.c projects/zfsd/head/sys/kern/vfs_aio.c projects/zfsd/head/sys/kern/vfs_bio.c projects/zfsd/head/sys/kern/vfs_cluster.c projects/zfsd/head/sys/kern/vfs_extattr.c projects/zfsd/head/sys/kern/vfs_lookup.c projects/zfsd/head/sys/kern/vfs_mount.c projects/zfsd/head/sys/kern/vfs_mountroot.c projects/zfsd/head/sys/kern/vfs_subr.c projects/zfsd/head/sys/kern/vfs_syscalls.c projects/zfsd/head/sys/kern/vfs_vnops.c projects/zfsd/head/sys/libkern/arm/aeabi_unwind.c projects/zfsd/head/sys/libkern/ashldi3.c projects/zfsd/head/sys/mips/atheros/apb.c projects/zfsd/head/sys/mips/atheros/ar71xx_chip.c projects/zfsd/head/sys/mips/atheros/ar71xx_cpudef.h projects/zfsd/head/sys/mips/atheros/ar71xx_gpio.c projects/zfsd/head/sys/mips/atheros/ar71xx_gpiovar.h projects/zfsd/head/sys/mips/atheros/ar71xx_setup.c projects/zfsd/head/sys/mips/atheros/ar71xx_spi.c projects/zfsd/head/sys/mips/atheros/ar71xxreg.h projects/zfsd/head/sys/mips/atheros/ar724x_chip.c projects/zfsd/head/sys/mips/atheros/ar91xx_chip.c projects/zfsd/head/sys/mips/atheros/ar933x_chip.c projects/zfsd/head/sys/mips/atheros/ar934xreg.h projects/zfsd/head/sys/mips/atheros/files.ar71xx projects/zfsd/head/sys/mips/atheros/if_arge.c projects/zfsd/head/sys/mips/atheros/uart_bus_ar71xx.c projects/zfsd/head/sys/mips/atheros/uart_bus_ar933x.c projects/zfsd/head/sys/mips/atheros/uart_cpu_ar71xx.c projects/zfsd/head/sys/mips/atheros/uart_cpu_ar933x.c projects/zfsd/head/sys/mips/cavium/octeon_rnd.c projects/zfsd/head/sys/mips/cavium/std.octeon1 projects/zfsd/head/sys/mips/conf/DIR-825 projects/zfsd/head/sys/mips/conf/DIR-825.hints projects/zfsd/head/sys/mips/conf/MALTA projects/zfsd/head/sys/mips/conf/MALTA64 projects/zfsd/head/sys/mips/conf/ROUTERSTATION.hints projects/zfsd/head/sys/mips/conf/TP-WN1043ND projects/zfsd/head/sys/mips/gxemul/mpreg.h projects/zfsd/head/sys/mips/include/_stdint.h projects/zfsd/head/sys/mips/include/asm.h projects/zfsd/head/sys/mips/include/cpuregs.h projects/zfsd/head/sys/mips/include/sf_buf.h projects/zfsd/head/sys/mips/malta/files.malta projects/zfsd/head/sys/mips/malta/gt_pci.c projects/zfsd/head/sys/mips/malta/malta_machdep.c projects/zfsd/head/sys/mips/malta/yamon.c projects/zfsd/head/sys/mips/mips/bus_space_generic.c projects/zfsd/head/sys/mips/mips/elf_trampoline.c projects/zfsd/head/sys/mips/mips/mp_machdep.c projects/zfsd/head/sys/mips/mips/pmap.c projects/zfsd/head/sys/mips/mips/support.S projects/zfsd/head/sys/mips/mips/tlb.c projects/zfsd/head/sys/mips/mips/vm_machdep.c projects/zfsd/head/sys/mips/nlm/board.c projects/zfsd/head/sys/mips/nlm/board.h projects/zfsd/head/sys/mips/nlm/board_cpld.c projects/zfsd/head/sys/mips/nlm/dev/net/nae.c projects/zfsd/head/sys/mips/nlm/dev/net/xaui.c projects/zfsd/head/sys/mips/nlm/dev/net/xlpge.c projects/zfsd/head/sys/mips/nlm/dev/net/xlpge.h projects/zfsd/head/sys/mips/nlm/dev/sec/nlmrsa.c projects/zfsd/head/sys/mips/nlm/dev/sec/nlmrsalib.h projects/zfsd/head/sys/mips/nlm/hal/nae.h projects/zfsd/head/sys/mips/nlm/hal/nlm_hal.c projects/zfsd/head/sys/mips/nlm/hal/sys.h projects/zfsd/head/sys/mips/sibyte/sb_zbpci.c projects/zfsd/head/sys/modules/Makefile projects/zfsd/head/sys/modules/aesni/Makefile projects/zfsd/head/sys/modules/bxe/Makefile projects/zfsd/head/sys/modules/cam/Makefile projects/zfsd/head/sys/modules/ctl/Makefile projects/zfsd/head/sys/modules/cxgb/cxgb/Makefile projects/zfsd/head/sys/modules/cxgbe/if_cxgbe/Makefile projects/zfsd/head/sys/modules/cyclic/Makefile projects/zfsd/head/sys/modules/drm2/Makefile projects/zfsd/head/sys/modules/drm2/drm2/Makefile projects/zfsd/head/sys/modules/dtrace/Makefile projects/zfsd/head/sys/modules/dtrace/dtio/Makefile projects/zfsd/head/sys/modules/dtrace/dtmalloc/Makefile projects/zfsd/head/sys/modules/dtrace/dtnfscl/Makefile projects/zfsd/head/sys/modules/dtrace/dtnfsclient/Makefile projects/zfsd/head/sys/modules/dtrace/dtrace/Makefile projects/zfsd/head/sys/modules/dtrace/dtrace_test/Makefile projects/zfsd/head/sys/modules/dtrace/dtraceall/Makefile projects/zfsd/head/sys/modules/dtrace/fasttrap/Makefile projects/zfsd/head/sys/modules/dtrace/fbt/Makefile projects/zfsd/head/sys/modules/dtrace/lockstat/Makefile projects/zfsd/head/sys/modules/dtrace/profile/Makefile projects/zfsd/head/sys/modules/dtrace/prototype/Makefile projects/zfsd/head/sys/modules/dtrace/sdt/Makefile projects/zfsd/head/sys/modules/dtrace/systrace/Makefile projects/zfsd/head/sys/modules/dtrace/systrace_freebsd32/Makefile projects/zfsd/head/sys/modules/dtrace/systrace_linux32/Makefile projects/zfsd/head/sys/modules/ext2fs/Makefile projects/zfsd/head/sys/modules/hwpmc/Makefile projects/zfsd/head/sys/modules/ip6_mroute_mod/Makefile projects/zfsd/head/sys/modules/ipfilter/Makefile projects/zfsd/head/sys/modules/iscsi/Makefile projects/zfsd/head/sys/modules/iwn/Makefile projects/zfsd/head/sys/modules/iwnfw/Makefile projects/zfsd/head/sys/modules/iwnfw/iwn6000g2a/Makefile projects/zfsd/head/sys/modules/linux/Makefile projects/zfsd/head/sys/modules/mlx4/Makefile projects/zfsd/head/sys/modules/mlx4ib/Makefile projects/zfsd/head/sys/modules/nvme/Makefile projects/zfsd/head/sys/modules/opensolaris/Makefile projects/zfsd/head/sys/modules/random/Makefile projects/zfsd/head/sys/modules/rdma/Makefile projects/zfsd/head/sys/modules/send/Makefile projects/zfsd/head/sys/modules/sfxge/Makefile projects/zfsd/head/sys/modules/ti/Makefile projects/zfsd/head/sys/modules/usb/Makefile projects/zfsd/head/sys/modules/virtio/network/Makefile projects/zfsd/head/sys/modules/vmm/Makefile projects/zfsd/head/sys/modules/wi/Makefile projects/zfsd/head/sys/modules/zfs/Makefile projects/zfsd/head/sys/net/ieee8023ad_lacp.c projects/zfsd/head/sys/net/ieee8023ad_lacp.h projects/zfsd/head/sys/net/if.c projects/zfsd/head/sys/net/if.h projects/zfsd/head/sys/net/if_bridge.c projects/zfsd/head/sys/net/if_enc.c projects/zfsd/head/sys/net/if_ethersubr.c projects/zfsd/head/sys/net/if_fddisubr.c projects/zfsd/head/sys/net/if_gif.c projects/zfsd/head/sys/net/if_gre.c projects/zfsd/head/sys/net/if_iso88025subr.c projects/zfsd/head/sys/net/if_lagg.c projects/zfsd/head/sys/net/if_lagg.h projects/zfsd/head/sys/net/if_llatbl.h projects/zfsd/head/sys/net/if_pfsync.h projects/zfsd/head/sys/net/if_spppsubr.c projects/zfsd/head/sys/net/if_tap.c projects/zfsd/head/sys/net/if_tun.c projects/zfsd/head/sys/net/netisr.c projects/zfsd/head/sys/net/pfil.c projects/zfsd/head/sys/net/pfil.h projects/zfsd/head/sys/net/rtsock.c projects/zfsd/head/sys/net80211/ieee80211.c projects/zfsd/head/sys/net80211/ieee80211.h projects/zfsd/head/sys/net80211/ieee80211_action.c projects/zfsd/head/sys/net80211/ieee80211_freebsd.c projects/zfsd/head/sys/net80211/ieee80211_freebsd.h projects/zfsd/head/sys/net80211/ieee80211_hostap.c projects/zfsd/head/sys/net80211/ieee80211_hwmp.c projects/zfsd/head/sys/net80211/ieee80211_input.c projects/zfsd/head/sys/net80211/ieee80211_mesh.c projects/zfsd/head/sys/net80211/ieee80211_node.c projects/zfsd/head/sys/net80211/ieee80211_output.c projects/zfsd/head/sys/net80211/ieee80211_phy.c projects/zfsd/head/sys/net80211/ieee80211_power.c projects/zfsd/head/sys/net80211/ieee80211_proto.c projects/zfsd/head/sys/net80211/ieee80211_proto.h projects/zfsd/head/sys/net80211/ieee80211_scan_sta.c projects/zfsd/head/sys/net80211/ieee80211_superg.c projects/zfsd/head/sys/net80211/ieee80211_tdma.c projects/zfsd/head/sys/net80211/ieee80211_var.h projects/zfsd/head/sys/net80211/ieee80211_wds.c projects/zfsd/head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c projects/zfsd/head/sys/netgraph/netflow/ng_netflow.h projects/zfsd/head/sys/netgraph/ng_iface.c projects/zfsd/head/sys/netgraph/ng_pppoe.c projects/zfsd/head/sys/netgraph/ng_pppoe.h projects/zfsd/head/sys/netinet/icmp_var.h projects/zfsd/head/sys/netinet/if_ether.c projects/zfsd/head/sys/netinet/igmp.c projects/zfsd/head/sys/netinet/igmp_var.h projects/zfsd/head/sys/netinet/in.h projects/zfsd/head/sys/netinet/in_mcast.c projects/zfsd/head/sys/netinet/ip_carp.c projects/zfsd/head/sys/netinet/ip_fastfwd.c projects/zfsd/head/sys/netinet/ip_input.c projects/zfsd/head/sys/netinet/ip_mroute.c projects/zfsd/head/sys/netinet/ip_output.c projects/zfsd/head/sys/netinet/ip_var.h projects/zfsd/head/sys/netinet/pim_var.h projects/zfsd/head/sys/netinet/sctp.h projects/zfsd/head/sys/netinet/sctp_asconf.c projects/zfsd/head/sys/netinet/sctp_auth.c projects/zfsd/head/sys/netinet/sctp_auth.h projects/zfsd/head/sys/netinet/sctp_dtrace_define.h projects/zfsd/head/sys/netinet/sctp_indata.c projects/zfsd/head/sys/netinet/sctp_input.c projects/zfsd/head/sys/netinet/sctp_os_bsd.h projects/zfsd/head/sys/netinet/sctp_output.c projects/zfsd/head/sys/netinet/sctp_pcb.h projects/zfsd/head/sys/netinet/sctp_structs.h projects/zfsd/head/sys/netinet/sctp_timer.c projects/zfsd/head/sys/netinet/sctp_uio.h projects/zfsd/head/sys/netinet/sctp_usrreq.c projects/zfsd/head/sys/netinet/sctputil.c projects/zfsd/head/sys/netinet/tcp_input.c projects/zfsd/head/sys/netinet/tcp_lro.c projects/zfsd/head/sys/netinet/tcp_lro.h projects/zfsd/head/sys/netinet/tcp_output.c projects/zfsd/head/sys/netinet/tcp_subr.c projects/zfsd/head/sys/netinet/tcp_syncache.c projects/zfsd/head/sys/netinet/tcp_syncache.h projects/zfsd/head/sys/netinet/tcp_usrreq.c projects/zfsd/head/sys/netinet/tcp_var.h projects/zfsd/head/sys/netinet/udp_usrreq.c projects/zfsd/head/sys/netinet/udp_var.h projects/zfsd/head/sys/netinet6/frag6.c projects/zfsd/head/sys/netinet6/icmp6.c projects/zfsd/head/sys/netinet6/in6.c projects/zfsd/head/sys/netinet6/in6.h projects/zfsd/head/sys/netinet6/in6_ifattach.c projects/zfsd/head/sys/netinet6/in6_mcast.c projects/zfsd/head/sys/netinet6/ip6_forward.c projects/zfsd/head/sys/netinet6/ip6_id.c projects/zfsd/head/sys/netinet6/ip6_input.c projects/zfsd/head/sys/netinet6/ip6_mroute.c projects/zfsd/head/sys/netinet6/ip6_output.c projects/zfsd/head/sys/netinet6/ip6_var.h projects/zfsd/head/sys/netinet6/mld6.c projects/zfsd/head/sys/netinet6/nd6.c projects/zfsd/head/sys/netinet6/nd6_rtr.c projects/zfsd/head/sys/netinet6/pim6_var.h projects/zfsd/head/sys/netinet6/raw_ip6.c projects/zfsd/head/sys/netinet6/sctp6_usrreq.c projects/zfsd/head/sys/netinet6/send.c projects/zfsd/head/sys/netinet6/udp6_usrreq.c projects/zfsd/head/sys/netipsec/ipsec.h projects/zfsd/head/sys/netipsec/key_var.h projects/zfsd/head/sys/netnatm/natm.c projects/zfsd/head/sys/netpfil/ipfw/ip_dummynet.c projects/zfsd/head/sys/netpfil/ipfw/ip_fw2.c projects/zfsd/head/sys/netpfil/ipfw/ip_fw_log.c projects/zfsd/head/sys/netpfil/ipfw/ip_fw_nat.c projects/zfsd/head/sys/netpfil/ipfw/ip_fw_private.h projects/zfsd/head/sys/netpfil/pf/if_pfsync.c projects/zfsd/head/sys/netpfil/pf/pf.c projects/zfsd/head/sys/netpfil/pf/pf_lb.c projects/zfsd/head/sys/netsmb/smb_dev.c projects/zfsd/head/sys/nfs/bootp_subr.c projects/zfsd/head/sys/nfsserver/nfs_srvkrpc.c projects/zfsd/head/sys/nlm/nlm_prot_impl.c projects/zfsd/head/sys/ofed/drivers/infiniband/core/addr.c projects/zfsd/head/sys/ofed/drivers/infiniband/core/cma.c projects/zfsd/head/sys/ofed/drivers/infiniband/core/core_priv.h projects/zfsd/head/sys/ofed/drivers/infiniband/core/device.c projects/zfsd/head/sys/ofed/drivers/infiniband/core/sa_query.c projects/zfsd/head/sys/ofed/drivers/infiniband/core/sysfs.c projects/zfsd/head/sys/ofed/drivers/infiniband/core/ucm.c projects/zfsd/head/sys/ofed/drivers/infiniband/core/umem.c projects/zfsd/head/sys/ofed/drivers/infiniband/core/uverbs_cmd.c projects/zfsd/head/sys/ofed/drivers/infiniband/core/uverbs_main.c projects/zfsd/head/sys/ofed/drivers/infiniband/core/verbs.c projects/zfsd/head/sys/ofed/drivers/infiniband/hw/mlx4/Kconfig projects/zfsd/head/sys/ofed/drivers/infiniband/hw/mlx4/Makefile projects/zfsd/head/sys/ofed/drivers/infiniband/hw/mlx4/ah.c projects/zfsd/head/sys/ofed/drivers/infiniband/hw/mlx4/cq.c projects/zfsd/head/sys/ofed/drivers/infiniband/hw/mlx4/mad.c projects/zfsd/head/sys/ofed/drivers/infiniband/hw/mlx4/main.c projects/zfsd/head/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_ib.h projects/zfsd/head/sys/ofed/drivers/infiniband/hw/mlx4/mr.c projects/zfsd/head/sys/ofed/drivers/infiniband/hw/mlx4/qp.c projects/zfsd/head/sys/ofed/drivers/infiniband/hw/mlx4/srq.c projects/zfsd/head/sys/ofed/drivers/infiniband/hw/mlx4/user.h projects/zfsd/head/sys/ofed/drivers/infiniband/hw/mlx4/wc.c projects/zfsd/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_cmd.c projects/zfsd/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c projects/zfsd/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_memfree.c projects/zfsd/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c projects/zfsd/head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h projects/zfsd/head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/Makefile projects/zfsd/head/sys/ofed/drivers/net/mlx4/alloc.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/catas.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/cmd.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/cq.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/en_cq.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/en_frag.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/en_main.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/en_netdev.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/en_port.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/en_port.h projects/zfsd/head/sys/ofed/drivers/net/mlx4/en_rx.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/en_tx.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/eq.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/fw.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/fw.h projects/zfsd/head/sys/ofed/drivers/net/mlx4/icm.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/icm.h projects/zfsd/head/sys/ofed/drivers/net/mlx4/intf.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/main.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/mcg.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/mlx4.h projects/zfsd/head/sys/ofed/drivers/net/mlx4/mlx4_en.h projects/zfsd/head/sys/ofed/drivers/net/mlx4/mr.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/pd.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/port.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/profile.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/qp.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/reset.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/sense.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/srq.c projects/zfsd/head/sys/ofed/include/asm/atomic.h projects/zfsd/head/sys/ofed/include/asm/byteorder.h projects/zfsd/head/sys/ofed/include/linux/bitops.h projects/zfsd/head/sys/ofed/include/linux/compat.h projects/zfsd/head/sys/ofed/include/linux/device.h projects/zfsd/head/sys/ofed/include/linux/dma-mapping.h projects/zfsd/head/sys/ofed/include/linux/file.h projects/zfsd/head/sys/ofed/include/linux/gfp.h projects/zfsd/head/sys/ofed/include/linux/idr.h projects/zfsd/head/sys/ofed/include/linux/if_ether.h projects/zfsd/head/sys/ofed/include/linux/in6.h projects/zfsd/head/sys/ofed/include/linux/kernel.h projects/zfsd/head/sys/ofed/include/linux/linux_compat.c projects/zfsd/head/sys/ofed/include/linux/list.h projects/zfsd/head/sys/ofed/include/linux/log2.h projects/zfsd/head/sys/ofed/include/linux/mlx4/cmd.h projects/zfsd/head/sys/ofed/include/linux/mlx4/cq.h projects/zfsd/head/sys/ofed/include/linux/mlx4/device.h projects/zfsd/head/sys/ofed/include/linux/mlx4/driver.h projects/zfsd/head/sys/ofed/include/linux/mlx4/qp.h projects/zfsd/head/sys/ofed/include/linux/mlx4/srq.h projects/zfsd/head/sys/ofed/include/linux/module.h projects/zfsd/head/sys/ofed/include/linux/moduleparam.h projects/zfsd/head/sys/ofed/include/linux/net.h projects/zfsd/head/sys/ofed/include/linux/page.h projects/zfsd/head/sys/ofed/include/linux/pci.h projects/zfsd/head/sys/ofed/include/linux/sysfs.h projects/zfsd/head/sys/ofed/include/linux/types.h projects/zfsd/head/sys/ofed/include/linux/workqueue.h projects/zfsd/head/sys/ofed/include/rdma/ib_cm.h projects/zfsd/head/sys/ofed/include/rdma/ib_mad.h projects/zfsd/head/sys/ofed/include/rdma/ib_sa.h projects/zfsd/head/sys/ofed/include/rdma/ib_umem.h projects/zfsd/head/sys/ofed/include/rdma/ib_user_verbs.h projects/zfsd/head/sys/ofed/include/rdma/ib_verbs.h projects/zfsd/head/sys/ofed/include/rdma/sdp_socket.h projects/zfsd/head/sys/opencrypto/cryptodev.c projects/zfsd/head/sys/pc98/conf/GENERIC projects/zfsd/head/sys/pc98/pc98/machdep.c projects/zfsd/head/sys/pci/ncr.c projects/zfsd/head/sys/powerpc/aim/mmu_oea.c projects/zfsd/head/sys/powerpc/aim/mmu_oea64.c projects/zfsd/head/sys/powerpc/aim/mmu_oea64.h projects/zfsd/head/sys/powerpc/aim/nexus.c projects/zfsd/head/sys/powerpc/aim/trap.c projects/zfsd/head/sys/powerpc/aim/vm_machdep.c projects/zfsd/head/sys/powerpc/booke/pmap.c projects/zfsd/head/sys/powerpc/booke/vm_machdep.c projects/zfsd/head/sys/powerpc/conf/DEFAULTS projects/zfsd/head/sys/powerpc/conf/GENERIC projects/zfsd/head/sys/powerpc/conf/GENERIC64 projects/zfsd/head/sys/powerpc/include/_stdint.h projects/zfsd/head/sys/powerpc/include/frame.h projects/zfsd/head/sys/powerpc/include/ofw_machdep.h projects/zfsd/head/sys/powerpc/include/param.h projects/zfsd/head/sys/powerpc/include/platform.h projects/zfsd/head/sys/powerpc/include/pmc_mdep.h projects/zfsd/head/sys/powerpc/include/proc.h projects/zfsd/head/sys/powerpc/include/pte.h projects/zfsd/head/sys/powerpc/include/sf_buf.h projects/zfsd/head/sys/powerpc/include/spr.h projects/zfsd/head/sys/powerpc/ofw/ofw_cpu.c projects/zfsd/head/sys/powerpc/ofw/ofw_machdep.c projects/zfsd/head/sys/powerpc/ofw/ofw_pcibus.c projects/zfsd/head/sys/powerpc/ofw/ofw_real.c projects/zfsd/head/sys/powerpc/ofw/ofw_syscons.c projects/zfsd/head/sys/powerpc/ofw/ofw_syscons.h projects/zfsd/head/sys/powerpc/ofw/rtas.c projects/zfsd/head/sys/powerpc/powermac/atibl.c projects/zfsd/head/sys/powerpc/powermac/kiic.c projects/zfsd/head/sys/powerpc/powermac/macio.c projects/zfsd/head/sys/powerpc/powermac/maciovar.h projects/zfsd/head/sys/powerpc/powermac/nvbl.c projects/zfsd/head/sys/powerpc/powermac/platform_powermac.c projects/zfsd/head/sys/powerpc/powerpc/busdma_machdep.c projects/zfsd/head/sys/powerpc/powerpc/cpu.c projects/zfsd/head/sys/powerpc/powerpc/intr_machdep.c projects/zfsd/head/sys/powerpc/powerpc/mmu_if.m projects/zfsd/head/sys/powerpc/powerpc/mp_machdep.c projects/zfsd/head/sys/powerpc/powerpc/platform.c projects/zfsd/head/sys/powerpc/powerpc/platform_if.m projects/zfsd/head/sys/powerpc/powerpc/pmap_dispatch.c projects/zfsd/head/sys/powerpc/ps3/ps3cdrom.c projects/zfsd/head/sys/rpc/clnt_dg.c projects/zfsd/head/sys/security/audit/audit.h projects/zfsd/head/sys/security/audit/audit_arg.c projects/zfsd/head/sys/security/audit/audit_bsm.c projects/zfsd/head/sys/security/audit/audit_bsm_klib.c projects/zfsd/head/sys/security/audit/audit_pipe.c projects/zfsd/head/sys/security/audit/audit_private.h projects/zfsd/head/sys/security/audit/bsm_token.c projects/zfsd/head/sys/security/mac/mac_framework.c projects/zfsd/head/sys/security/mac/mac_framework.h projects/zfsd/head/sys/security/mac/mac_internal.h projects/zfsd/head/sys/security/mac/mac_policy.h projects/zfsd/head/sys/security/mac/mac_posix_shm.c projects/zfsd/head/sys/security/mac/mac_syscalls.c projects/zfsd/head/sys/security/mac/mac_vfs.c projects/zfsd/head/sys/security/mac_biba/mac_biba.c projects/zfsd/head/sys/security/mac_mls/mac_mls.c projects/zfsd/head/sys/security/mac_stub/mac_stub.c projects/zfsd/head/sys/security/mac_test/mac_test.c projects/zfsd/head/sys/sparc64/conf/GENERIC projects/zfsd/head/sys/sparc64/include/atomic.h projects/zfsd/head/sys/sparc64/include/pmap.h projects/zfsd/head/sys/sparc64/include/proc.h projects/zfsd/head/sys/sparc64/include/sf_buf.h projects/zfsd/head/sys/sparc64/sparc64/bus_machdep.c projects/zfsd/head/sys/sparc64/sparc64/genassym.c projects/zfsd/head/sys/sparc64/sparc64/mem.c projects/zfsd/head/sys/sparc64/sparc64/mp_machdep.c projects/zfsd/head/sys/sparc64/sparc64/pmap.c projects/zfsd/head/sys/sparc64/sparc64/sys_machdep.c projects/zfsd/head/sys/sparc64/sparc64/vm_machdep.c projects/zfsd/head/sys/sys/_types.h projects/zfsd/head/sys/sys/bitset.h projects/zfsd/head/sys/sys/buf.h projects/zfsd/head/sys/sys/callout.h projects/zfsd/head/sys/sys/capability.h projects/zfsd/head/sys/sys/conf.h projects/zfsd/head/sys/sys/cpuset.h projects/zfsd/head/sys/sys/diskpc98.h projects/zfsd/head/sys/sys/elf_common.h projects/zfsd/head/sys/sys/event.h projects/zfsd/head/sys/sys/eventhandler.h projects/zfsd/head/sys/sys/eventvar.h projects/zfsd/head/sys/sys/fcntl.h projects/zfsd/head/sys/sys/file.h projects/zfsd/head/sys/sys/filedesc.h projects/zfsd/head/sys/sys/jail.h projects/zfsd/head/sys/sys/kernel.h projects/zfsd/head/sys/sys/ktrace.h projects/zfsd/head/sys/sys/libkern.h projects/zfsd/head/sys/sys/linker.h projects/zfsd/head/sys/sys/lock.h projects/zfsd/head/sys/sys/lockmgr.h projects/zfsd/head/sys/sys/mbpool.h projects/zfsd/head/sys/sys/mbuf.h projects/zfsd/head/sys/sys/mman.h projects/zfsd/head/sys/sys/mount.h projects/zfsd/head/sys/sys/mouse.h projects/zfsd/head/sys/sys/namei.h projects/zfsd/head/sys/sys/param.h projects/zfsd/head/sys/sys/pmckern.h projects/zfsd/head/sys/sys/priv.h projects/zfsd/head/sys/sys/proc.h projects/zfsd/head/sys/sys/procdesc.h projects/zfsd/head/sys/sys/random.h projects/zfsd/head/sys/sys/rangelock.h projects/zfsd/head/sys/sys/sched.h projects/zfsd/head/sys/sys/sdt.h projects/zfsd/head/sys/sys/sf_buf.h projects/zfsd/head/sys/sys/smp.h projects/zfsd/head/sys/sys/sockbuf.h projects/zfsd/head/sys/sys/socket.h projects/zfsd/head/sys/sys/socketvar.h projects/zfsd/head/sys/sys/stat.h projects/zfsd/head/sys/sys/stdatomic.h projects/zfsd/head/sys/sys/syscall.h projects/zfsd/head/sys/sys/syscall.mk projects/zfsd/head/sys/sys/syscallsubr.h projects/zfsd/head/sys/sys/sysctl.h projects/zfsd/head/sys/sys/sysproto.h projects/zfsd/head/sys/sys/systm.h projects/zfsd/head/sys/sys/time.h projects/zfsd/head/sys/sys/timetc.h projects/zfsd/head/sys/sys/types.h projects/zfsd/head/sys/sys/uio.h projects/zfsd/head/sys/sys/user.h projects/zfsd/head/sys/sys/uuid.h projects/zfsd/head/sys/sys/vmmeter.h projects/zfsd/head/sys/sys/wait.h projects/zfsd/head/sys/ufs/ffs/ffs_alloc.c projects/zfsd/head/sys/ufs/ffs/ffs_softdep.c projects/zfsd/head/sys/ufs/ufs/ufs_dirhash.c projects/zfsd/head/sys/ufs/ufs/ufs_vnops.c projects/zfsd/head/sys/vm/_vm_radix.h projects/zfsd/head/sys/vm/device_pager.c projects/zfsd/head/sys/vm/memguard.c projects/zfsd/head/sys/vm/memguard.h projects/zfsd/head/sys/vm/phys_pager.c projects/zfsd/head/sys/vm/pmap.h projects/zfsd/head/sys/vm/sg_pager.c projects/zfsd/head/sys/vm/swap_pager.c projects/zfsd/head/sys/vm/uma_core.c projects/zfsd/head/sys/vm/uma_int.h projects/zfsd/head/sys/vm/vm.h projects/zfsd/head/sys/vm/vm_extern.h projects/zfsd/head/sys/vm/vm_fault.c projects/zfsd/head/sys/vm/vm_glue.c projects/zfsd/head/sys/vm/vm_init.c projects/zfsd/head/sys/vm/vm_kern.c projects/zfsd/head/sys/vm/vm_kern.h projects/zfsd/head/sys/vm/vm_map.c projects/zfsd/head/sys/vm/vm_map.h projects/zfsd/head/sys/vm/vm_mmap.c projects/zfsd/head/sys/vm/vm_object.c projects/zfsd/head/sys/vm/vm_object.h projects/zfsd/head/sys/vm/vm_page.c projects/zfsd/head/sys/vm/vm_page.h projects/zfsd/head/sys/vm/vm_pageout.c projects/zfsd/head/sys/vm/vm_param.h projects/zfsd/head/sys/vm/vm_phys.c projects/zfsd/head/sys/vm/vm_phys.h projects/zfsd/head/sys/vm/vm_radix.c projects/zfsd/head/sys/vm/vm_radix.h projects/zfsd/head/sys/vm/vm_reserv.c projects/zfsd/head/sys/vm/vm_zeroidle.c projects/zfsd/head/sys/vm/vnode_pager.c projects/zfsd/head/sys/x86/acpica/acpi_wakeup.c projects/zfsd/head/sys/x86/acpica/madt.c projects/zfsd/head/sys/x86/acpica/srat.c projects/zfsd/head/sys/x86/include/segments.h projects/zfsd/head/sys/x86/include/specialreg.h projects/zfsd/head/sys/x86/include/stdarg.h projects/zfsd/head/sys/x86/isa/atpic.c projects/zfsd/head/sys/x86/isa/clock.c projects/zfsd/head/sys/x86/x86/busdma_machdep.c projects/zfsd/head/sys/x86/x86/intr_machdep.c projects/zfsd/head/sys/x86/x86/io_apic.c projects/zfsd/head/sys/x86/x86/local_apic.c projects/zfsd/head/sys/xen/evtchn.h projects/zfsd/head/sys/xen/evtchn/evtchn_dev.c projects/zfsd/head/sys/xen/features.c projects/zfsd/head/sys/xen/gnttab.c projects/zfsd/head/sys/xen/gnttab.h projects/zfsd/head/sys/xen/hvm.h projects/zfsd/head/sys/xen/interface/event_channel.h projects/zfsd/head/sys/xen/xen_intr.h projects/zfsd/head/sys/xen/xenbus/xenbus.c projects/zfsd/head/sys/xen/xenbus/xenbus_if.m projects/zfsd/head/sys/xen/xenbus/xenbusb_front.c projects/zfsd/head/sys/xen/xenbus/xenbusvar.h projects/zfsd/head/sys/xen/xenstore/xenstore.c projects/zfsd/head/sys/xen/xenstore/xenstore_dev.c projects/zfsd/head/sys/xen/xenstore/xenstorevar.h projects/zfsd/head/tools/build/mk/OptionalObsoleteFiles.inc projects/zfsd/head/tools/build/options/WITHOUT_BINUTILS projects/zfsd/head/tools/build/options/WITHOUT_GCC projects/zfsd/head/tools/build/options/WITHOUT_LDNS projects/zfsd/head/tools/build/options/makeman projects/zfsd/head/tools/make_libdeps.sh projects/zfsd/head/tools/regression/aio/aiop/aiop.c projects/zfsd/head/tools/regression/aio/aiotest/aiotest.c projects/zfsd/head/tools/regression/file/dup/dup.c projects/zfsd/head/tools/regression/lib/libc/gen/test-fnmatch.c projects/zfsd/head/tools/regression/lib/libc/gen/test-fpclassify.c projects/zfsd/head/tools/regression/lib/libc/gen/test-ftw.c projects/zfsd/head/tools/regression/lib/libc/gen/test-wordexp.c projects/zfsd/head/tools/regression/lib/libc/stdio/Makefile projects/zfsd/head/tools/regression/lib/libc/stdio/test-fmemopen.t projects/zfsd/head/tools/regression/lib/libc/stdio/test-open_memstream.t projects/zfsd/head/tools/regression/lib/libc/stdio/test-open_wmemstream.t projects/zfsd/head/tools/regression/lib/libutil/Makefile projects/zfsd/head/tools/regression/sockets/sendfile/sendfile.c projects/zfsd/head/tools/test/posixshm/shm_test.c projects/zfsd/head/tools/tools/README projects/zfsd/head/tools/tools/bootparttest/bootparttest.c projects/zfsd/head/tools/tools/bus_autoconf/bus_load_file.c projects/zfsd/head/tools/tools/crypto/ipsecstats.c projects/zfsd/head/tools/tools/cxgbetool/cxgbetool.c projects/zfsd/head/tools/tools/ifinfo/ifinfo.c projects/zfsd/head/tools/tools/net80211/wlanstats/Makefile projects/zfsd/head/tools/tools/sysbuild/sysbuild.sh projects/zfsd/head/tools/tools/sysdoc/sysdoc.sh projects/zfsd/head/tools/tools/sysdoc/tunables.mdoc projects/zfsd/head/tools/tools/zfsboottest/Makefile projects/zfsd/head/usr.bin/Makefile projects/zfsd/head/usr.bin/bmake/Makefile projects/zfsd/head/usr.bin/bmake/config.h projects/zfsd/head/usr.bin/bmake/unit-tests/Makefile projects/zfsd/head/usr.bin/brandelf/brandelf.1 projects/zfsd/head/usr.bin/calendar/Makefile (contents, props changed) projects/zfsd/head/usr.bin/calendar/calendar.1 (contents, props changed) projects/zfsd/head/usr.bin/calendar/calendar.h (contents, props changed) projects/zfsd/head/usr.bin/calendar/calendars/calendar.dutch projects/zfsd/head/usr.bin/calendar/calendars/calendar.freebsd projects/zfsd/head/usr.bin/calendar/io.c (contents, props changed) projects/zfsd/head/usr.bin/calendar/pathnames.h (contents, props changed) projects/zfsd/head/usr.bin/clang/Makefile projects/zfsd/head/usr.bin/dtc/dtc.1 projects/zfsd/head/usr.bin/dtc/dtc.cc projects/zfsd/head/usr.bin/dtc/fdt.cc projects/zfsd/head/usr.bin/dtc/fdt.hh projects/zfsd/head/usr.bin/dtc/input_buffer.cc projects/zfsd/head/usr.bin/fetch/fetch.1 projects/zfsd/head/usr.bin/fetch/fetch.c projects/zfsd/head/usr.bin/find/function.c projects/zfsd/head/usr.bin/grep/regex/tre-fastmatch.c projects/zfsd/head/usr.bin/host/Makefile projects/zfsd/head/usr.bin/kdump/kdump.c projects/zfsd/head/usr.bin/kdump/mksubr projects/zfsd/head/usr.bin/ldd/ldd.c projects/zfsd/head/usr.bin/netstat/inet6.c projects/zfsd/head/usr.bin/netstat/ipsec.c projects/zfsd/head/usr.bin/patch/Makefile projects/zfsd/head/usr.bin/patch/patch.c projects/zfsd/head/usr.bin/patch/pch.c projects/zfsd/head/usr.bin/patch/util.c projects/zfsd/head/usr.bin/procstat/procstat.1 projects/zfsd/head/usr.bin/procstat/procstat_files.c projects/zfsd/head/usr.bin/rwho/rwho.c projects/zfsd/head/usr.bin/script/script.1 projects/zfsd/head/usr.bin/su/su.1 projects/zfsd/head/usr.bin/su/su.c projects/zfsd/head/usr.bin/svn/lib/libapr/apr.h projects/zfsd/head/usr.bin/svn/lib/libapr/apr_private.h projects/zfsd/head/usr.bin/svn/lib/libapr_util/Makefile projects/zfsd/head/usr.bin/svn/lib/libapr_util/apu.h projects/zfsd/head/usr.bin/svn/lib/libserf/Makefile projects/zfsd/head/usr.bin/svn/svn_private_config.h projects/zfsd/head/usr.bin/truss/syscall.h projects/zfsd/head/usr.bin/truss/syscalls.c projects/zfsd/head/usr.bin/uniq/uniq.c projects/zfsd/head/usr.bin/vi/Makefile projects/zfsd/head/usr.bin/vi/config.h projects/zfsd/head/usr.bin/vi/pathnames.h projects/zfsd/head/usr.sbin/Makefile projects/zfsd/head/usr.sbin/arp/arp.c projects/zfsd/head/usr.sbin/bhyve/Makefile projects/zfsd/head/usr.sbin/bhyve/acpi.c projects/zfsd/head/usr.sbin/bhyve/bhyverun.c projects/zfsd/head/usr.sbin/bhyve/bhyverun.h projects/zfsd/head/usr.sbin/bhyve/dbgport.h projects/zfsd/head/usr.sbin/bhyve/ioapic.c projects/zfsd/head/usr.sbin/bhyve/mevent.c projects/zfsd/head/usr.sbin/bhyve/mevent.h projects/zfsd/head/usr.sbin/bhyve/mevent_test.c projects/zfsd/head/usr.sbin/bhyve/pci_emul.c projects/zfsd/head/usr.sbin/bhyve/pci_virtio_block.c projects/zfsd/head/usr.sbin/bhyve/pci_virtio_net.c projects/zfsd/head/usr.sbin/bhyve/pit_8254.c projects/zfsd/head/usr.sbin/bhyve/rtc.c projects/zfsd/head/usr.sbin/bhyve/virtio.h projects/zfsd/head/usr.sbin/bhyvectl/Makefile projects/zfsd/head/usr.sbin/bhyvectl/bhyvectl.c projects/zfsd/head/usr.sbin/bhyveload/Makefile projects/zfsd/head/usr.sbin/bhyveload/bhyveload.8 projects/zfsd/head/usr.sbin/bhyveload/bhyveload.c projects/zfsd/head/usr.sbin/boot0cfg/boot0cfg.8 projects/zfsd/head/usr.sbin/boot98cfg/boot98cfg.c projects/zfsd/head/usr.sbin/bsdconfig/bsdconfig projects/zfsd/head/usr.sbin/bsdconfig/console/ttys projects/zfsd/head/usr.sbin/bsdconfig/examples/Makefile projects/zfsd/head/usr.sbin/bsdconfig/include/messages.subr projects/zfsd/head/usr.sbin/bsdconfig/mouse/enable projects/zfsd/head/usr.sbin/bsdconfig/networking/devices projects/zfsd/head/usr.sbin/bsdconfig/networking/share/device.subr projects/zfsd/head/usr.sbin/bsdconfig/networking/share/hostname.subr projects/zfsd/head/usr.sbin/bsdconfig/networking/share/ipaddr.subr projects/zfsd/head/usr.sbin/bsdconfig/networking/share/media.subr projects/zfsd/head/usr.sbin/bsdconfig/networking/share/netmask.subr projects/zfsd/head/usr.sbin/bsdconfig/networking/share/resolv.subr projects/zfsd/head/usr.sbin/bsdconfig/networking/share/routing.subr projects/zfsd/head/usr.sbin/bsdconfig/password/share/password.subr projects/zfsd/head/usr.sbin/bsdconfig/security/kern_securelevel projects/zfsd/head/usr.sbin/bsdconfig/security/security projects/zfsd/head/usr.sbin/bsdconfig/share/common.subr projects/zfsd/head/usr.sbin/bsdconfig/share/device.subr projects/zfsd/head/usr.sbin/bsdconfig/share/dialog.subr projects/zfsd/head/usr.sbin/bsdconfig/share/media/any.subr projects/zfsd/head/usr.sbin/bsdconfig/share/media/cdrom.subr projects/zfsd/head/usr.sbin/bsdconfig/share/media/common.subr projects/zfsd/head/usr.sbin/bsdconfig/share/media/dos.subr projects/zfsd/head/usr.sbin/bsdconfig/share/media/floppy.subr projects/zfsd/head/usr.sbin/bsdconfig/share/media/ftp.subr projects/zfsd/head/usr.sbin/bsdconfig/share/media/http.subr projects/zfsd/head/usr.sbin/bsdconfig/share/media/nfs.subr projects/zfsd/head/usr.sbin/bsdconfig/share/media/options.subr projects/zfsd/head/usr.sbin/bsdconfig/share/media/tcpip.subr projects/zfsd/head/usr.sbin/bsdconfig/share/media/ufs.subr projects/zfsd/head/usr.sbin/bsdconfig/share/media/usb.subr projects/zfsd/head/usr.sbin/bsdconfig/share/mustberoot.subr projects/zfsd/head/usr.sbin/bsdconfig/share/packages/packages.subr projects/zfsd/head/usr.sbin/bsdconfig/startup/misc projects/zfsd/head/usr.sbin/bsdconfig/startup/rcconf projects/zfsd/head/usr.sbin/bsdconfig/startup/rcdelete projects/zfsd/head/usr.sbin/bsdconfig/startup/rcvar projects/zfsd/head/usr.sbin/bsdconfig/startup/share/rcconf.subr projects/zfsd/head/usr.sbin/bsdconfig/startup/share/rcedit.subr projects/zfsd/head/usr.sbin/bsdconfig/timezone/timezone projects/zfsd/head/usr.sbin/bsdconfig/usermgmt/groupdel projects/zfsd/head/usr.sbin/bsdconfig/usermgmt/groupedit projects/zfsd/head/usr.sbin/bsdconfig/usermgmt/groupinput projects/zfsd/head/usr.sbin/bsdconfig/usermgmt/share/group_input.subr projects/zfsd/head/usr.sbin/bsdconfig/usermgmt/share/user_input.subr projects/zfsd/head/usr.sbin/bsdconfig/usermgmt/userdel projects/zfsd/head/usr.sbin/bsdconfig/usermgmt/useredit projects/zfsd/head/usr.sbin/bsdconfig/usermgmt/userinput projects/zfsd/head/usr.sbin/bsdconfig/usermgmt/usermgmt projects/zfsd/head/usr.sbin/bsdinstall/partedit/gpart_ops.c projects/zfsd/head/usr.sbin/bsdinstall/partedit/partedit_powerpc.c projects/zfsd/head/usr.sbin/bsdinstall/scripts/mirrorselect projects/zfsd/head/usr.sbin/crashinfo/crashinfo.sh projects/zfsd/head/usr.sbin/ctladm/ctladm.8 projects/zfsd/head/usr.sbin/ctladm/ctladm.c projects/zfsd/head/usr.sbin/daemon/daemon.8 projects/zfsd/head/usr.sbin/daemon/daemon.c projects/zfsd/head/usr.sbin/gpioctl/gpioctl.8 projects/zfsd/head/usr.sbin/gpioctl/gpioctl.c projects/zfsd/head/usr.sbin/jail/jail.8 projects/zfsd/head/usr.sbin/jail/jail.c projects/zfsd/head/usr.sbin/kldxref/kldxref.c projects/zfsd/head/usr.sbin/makefs/cd9660.c projects/zfsd/head/usr.sbin/makefs/cd9660/iso9660_rrip.c projects/zfsd/head/usr.sbin/makefs/ffs/ufs_bswap.h projects/zfsd/head/usr.sbin/makefs/makefs.8 projects/zfsd/head/usr.sbin/makefs/makefs.c projects/zfsd/head/usr.sbin/mergemaster/mergemaster.sh projects/zfsd/head/usr.sbin/mfiutil/mfi_drive.c projects/zfsd/head/usr.sbin/mfiutil/mfiutil.8 projects/zfsd/head/usr.sbin/mfiutil/mfiutil.c projects/zfsd/head/usr.sbin/mtree/create.c projects/zfsd/head/usr.sbin/ndp/ndp.c projects/zfsd/head/usr.sbin/ntp/config.h projects/zfsd/head/usr.sbin/ntp/libparse/Makefile projects/zfsd/head/usr.sbin/pciconf/cap.c projects/zfsd/head/usr.sbin/periodic/periodic.sh projects/zfsd/head/usr.sbin/pkg/config.c projects/zfsd/head/usr.sbin/pkg/elf_tables.h projects/zfsd/head/usr.sbin/pkg_install/add/main.c projects/zfsd/head/usr.sbin/rtadvctl/rtadvctl.c projects/zfsd/head/usr.sbin/rtadvd/config.c projects/zfsd/head/usr.sbin/rtadvd/if.c projects/zfsd/head/usr.sbin/rtadvd/rrenum.c projects/zfsd/head/usr.sbin/rtadvd/rtadvd.c projects/zfsd/head/usr.sbin/rtadvd/rtadvd.h projects/zfsd/head/usr.sbin/rtadvd/timer.c projects/zfsd/head/usr.sbin/rtadvd/timer.h projects/zfsd/head/usr.sbin/rtadvd/timer_subr.c projects/zfsd/head/usr.sbin/rtadvd/timer_subr.h projects/zfsd/head/usr.sbin/rtsold/dump.c projects/zfsd/head/usr.sbin/rtsold/if.c projects/zfsd/head/usr.sbin/rtsold/probe.c projects/zfsd/head/usr.sbin/rtsold/rtsock.c projects/zfsd/head/usr.sbin/rtsold/rtsol.c projects/zfsd/head/usr.sbin/rtsold/rtsold.c projects/zfsd/head/usr.sbin/rtsold/rtsold.h projects/zfsd/head/usr.sbin/rwhod/rwhod.c projects/zfsd/head/usr.sbin/setfib/setfib.1 projects/zfsd/head/usr.sbin/watch/watch.c projects/zfsd/head/usr.sbin/watchdogd/watchdogd.8 projects/zfsd/head/usr.sbin/watchdogd/watchdogd.c Directory Properties: projects/zfsd/head/ (props changed) projects/zfsd/head/cddl/ (props changed) projects/zfsd/head/cddl/contrib/opensolaris/ (props changed) projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/ (props changed) projects/zfsd/head/cddl/contrib/opensolaris/cmd/zfs/ (props changed) projects/zfsd/head/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/zfsd/head/contrib/apr/ (props changed) projects/zfsd/head/contrib/apr-util/ (props changed) projects/zfsd/head/contrib/binutils/ (props changed) projects/zfsd/head/contrib/bmake/ (props changed) projects/zfsd/head/contrib/dialog/ (props changed) projects/zfsd/head/contrib/gcc/ (props changed) projects/zfsd/head/contrib/ipfilter/ (props changed) projects/zfsd/head/contrib/ldns/ (props changed) projects/zfsd/head/contrib/libc++/ (props changed) projects/zfsd/head/contrib/libcxxrt/ (props changed) projects/zfsd/head/contrib/libstdc++/ (props changed) projects/zfsd/head/contrib/llvm/ (props changed) projects/zfsd/head/contrib/llvm/tools/clang/ (props changed) projects/zfsd/head/contrib/nvi/ (props changed) projects/zfsd/head/contrib/openbsm/ (props changed) projects/zfsd/head/contrib/openpam/ (props changed) projects/zfsd/head/contrib/sendmail/ (props changed) projects/zfsd/head/contrib/serf/ (props changed) projects/zfsd/head/contrib/subversion/ (props changed) projects/zfsd/head/contrib/tcpdump/ (props changed) projects/zfsd/head/contrib/unbound/ (props changed) projects/zfsd/head/contrib/unbound/validator/val_secalgo.c (props changed) projects/zfsd/head/contrib/unbound/validator/val_secalgo.h (props changed) projects/zfsd/head/contrib/wpa/ (props changed) projects/zfsd/head/crypto/openssh/ (props changed) projects/zfsd/head/crypto/openssl/ (props changed) projects/zfsd/head/gnu/lib/ (props changed) projects/zfsd/head/gnu/usr.bin/binutils/ (props changed) projects/zfsd/head/lib/libc/ (props changed) projects/zfsd/head/lib/libutil/ (props changed) projects/zfsd/head/lib/libvmmapi/ (props changed) projects/zfsd/head/sbin/ (props changed) projects/zfsd/head/sbin/ipfw/ (props changed) projects/zfsd/head/share/man/man4/ (props changed) projects/zfsd/head/sys/ (props changed) projects/zfsd/head/sys/amd64/include/xen/ (props changed) projects/zfsd/head/sys/amd64/vmm/ (props changed) projects/zfsd/head/sys/boot/ (props changed) projects/zfsd/head/sys/boot/i386/efi/ (props changed) projects/zfsd/head/sys/boot/powerpc/boot1.chrp/ (props changed) projects/zfsd/head/sys/cddl/contrib/opensolaris/ (props changed) projects/zfsd/head/sys/conf/ (props changed) projects/zfsd/head/sys/contrib/dev/acpica/ (props changed) projects/zfsd/head/sys/contrib/dev/acpica/common/ (props changed) projects/zfsd/head/sys/contrib/dev/acpica/compiler/ (props changed) projects/zfsd/head/sys/contrib/dev/acpica/components/debugger/ (props changed) projects/zfsd/head/sys/contrib/dev/acpica/components/disassembler/ (props changed) projects/zfsd/head/sys/contrib/dev/acpica/components/dispatcher/ (props changed) projects/zfsd/head/sys/contrib/dev/acpica/components/events/ (props changed) projects/zfsd/head/sys/contrib/dev/acpica/components/executer/ (props changed) projects/zfsd/head/sys/contrib/dev/acpica/components/hardware/ (props changed) projects/zfsd/head/sys/contrib/dev/acpica/components/namespace/ (props changed) projects/zfsd/head/sys/contrib/dev/acpica/components/parser/ (props changed) projects/zfsd/head/sys/contrib/dev/acpica/components/resources/ (props changed) projects/zfsd/head/sys/contrib/dev/acpica/components/tables/ (props changed) projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/ (props changed) projects/zfsd/head/sys/contrib/dev/acpica/include/ (props changed) projects/zfsd/head/sys/contrib/dev/acpica/os_specific/ (props changed) projects/zfsd/head/sys/contrib/ipfilter/ (props changed) projects/zfsd/head/sys/dev/usb/serial/uark.c (props changed) projects/zfsd/head/sys/modules/vmm/ (props changed) projects/zfsd/head/usr.bin/calendar/ (props changed) projects/zfsd/head/usr.bin/procstat/ (props changed) projects/zfsd/head/usr.sbin/bhyve/ (props changed) projects/zfsd/head/usr.sbin/bhyvectl/ (props changed) projects/zfsd/head/usr.sbin/bhyveload/ (props changed) projects/zfsd/head/usr.sbin/jail/ (props changed) projects/zfsd/head/usr.sbin/rtadvctl/ (props changed) projects/zfsd/head/usr.sbin/rtadvd/ (props changed) projects/zfsd/head/usr.sbin/rtsold/ (props changed) Modified: projects/zfsd/head/LOCKS ============================================================================== --- projects/zfsd/head/LOCKS Thu Oct 10 21:14:49 2013 (r256300) +++ projects/zfsd/head/LOCKS Thu Oct 10 21:46:43 2013 (r256301) @@ -12,3 +12,7 @@ releng/5.* Requires Security Officer app releng/6.* Requires Security Officer approval. releng/7.* Requires Security Officer approval. releng/8.* Requires Security Officer approval. +head/sys/dev/random Requires Security Officer approval. +head/sys/libkern/arc4random.c Requires Security Officer approval. +stable/*/sys/dev/random Requires Security Officer approval. +stable/*/sys/libkern/arc4random.c Requires Security Officer approval. Modified: projects/zfsd/head/MAINTAINERS ============================================================================== --- projects/zfsd/head/MAINTAINERS Thu Oct 10 21:14:49 2013 (r256300) +++ projects/zfsd/head/MAINTAINERS Thu Oct 10 21:46:43 2013 (r256301) @@ -128,3 +128,6 @@ sysdoc trhodes Pre-commit review prefe sh(1) jilles Pre-commit review requested. This also applies to kill(1), printf(1) and test(1) which are compiled in as builtins. +nvme(4) jimharris Pre-commit review requested. +nvd(4) jimharris Pre-commit review requested. +nvmecontrol(8) jimharris Pre-commit review requested. Modified: projects/zfsd/head/Makefile ============================================================================== --- projects/zfsd/head/Makefile Thu Oct 10 21:14:49 2013 (r256300) +++ projects/zfsd/head/Makefile Thu Oct 10 21:46:43 2013 (r256301) @@ -130,11 +130,34 @@ _MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH .error MAKEOBJDIRPREFIX can only be set in environment, not as a global\ (in make.conf(5)) or command-line variable. .endif -MAKEPATH= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE} -BINMAKE= \ - `if [ -x ${MAKEPATH}/make ]; then echo ${MAKEPATH}/make; else echo ${MAKE}; fi` \ + +# We often need to use the tree's version of make to build it. +# Choices add to complexity though. +# We cannot blindly use a make which may not be the one we want +# so be exlicit - until all choice is removed. +.if !defined(WITHOUT_BMAKE) +WANT_MAKE= bmake +.else +WANT_MAKE= fmake +.endif +MYMAKE= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE}/${WANT_MAKE} +.if defined(.PARSEDIR) +HAVE_MAKE= bmake +.else +HAVE_MAKE= fmake +.endif +.if exists(${MYMAKE}) +SUB_MAKE:= ${MYMAKE} -m ${.CURDIR}/share/mk +.elif ${WANT_MAKE} != ${HAVE_MAKE} || ${WANT_MAKE} != "bmake" +# It may not exist yet but we may cause it to. +# In the case of fmake, upgrade_checks may cause a newer version to be built. +SUB_MAKE= `test -x ${MYMAKE} && echo ${MYMAKE} || echo ${MAKE}` \ -m ${.CURDIR}/share/mk -_MAKE= PATH=${PATH} ${BINMAKE} -f Makefile.inc1 TARGET=${_TARGET} TARGET_ARCH=${_TARGET_ARCH} +.else +SUB_MAKE= ${MAKE} -m ${.CURDIR}/share/mk +.endif + +_MAKE= PATH=${PATH} ${SUB_MAKE} -f Makefile.inc1 TARGET=${_TARGET} TARGET_ARCH=${_TARGET_ARCH} # Guess machine architecture from machine type, and vice versa. .if !defined(TARGET_ARCH) && defined(TARGET) @@ -219,6 +242,7 @@ cleanworld: # skip this for -n to avoid changing previous behavior of # 'make -n buildworld' etc. ${TGTS}: .MAKE +tinderbox toolchains kernel-toolchains: .MAKE .endif ${TGTS}: @@ -291,11 +315,13 @@ kernel: buildkernel installkernel # Perform a few tests to determine if the installed tools are adequate # for building the world. # +# Note: if we ever need to care about the version of bmake, simply testing +# MAKE_VERSION against a required version should suffice. +# upgrade_checks: -.if !defined(.PARSEDIR) -.if !defined(WITHOUT_BMAKE) - (cd ${.CURDIR} && ${MAKE} bmake) -.else +.if ${HAVE_MAKE} != ${WANT_MAKE} + @(cd ${.CURDIR} && ${MAKE} ${WANT_MAKE:S,^f,,}) +.elif ${WANT_MAKE} == "fmake" @if ! (cd ${.CURDIR}/tools/build/make_check && \ PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \ PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \ @@ -303,20 +329,19 @@ upgrade_checks: (cd ${.CURDIR} && ${MAKE} make); \ fi .endif -.endif # # Upgrade make(1) to the current version using the installed # headers, libraries and tools. Also, allow the location of # the system bsdmake-like utility to be overridden. # -MMAKEENV= MAKEOBJDIRPREFIX=${MAKEPATH} \ +MMAKEENV= MAKEOBJDIRPREFIX=${MYMAKE:H} \ DESTDIR= \ INSTALL="sh ${.CURDIR}/tools/install.sh" MMAKE= ${MMAKEENV} ${MAKE} \ -D_UPGRADING \ -DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \ - -DNO_CPU_CFLAGS -DNO_WERROR + -DNO_CPU_CFLAGS -DNO_WERROR DESTDIR= PROGNAME=${MYMAKE:T} make bmake: .PHONY @echo @@ -327,16 +352,18 @@ make bmake: .PHONY ${MMAKE} obj && \ ${MMAKE} depend && \ ${MMAKE} all && \ - ${MMAKE} install DESTDIR=${MAKEPATH} BINDIR= + ${MMAKE} install DESTDIR=${MYMAKE:H} BINDIR= + +tinderbox toolchains kernel-toolchains: upgrade_checks tinderbox: - @cd ${.CURDIR} && ${MAKE} DOING_TINDERBOX=YES universe + @cd ${.CURDIR} && ${SUB_MAKE} DOING_TINDERBOX=YES universe toolchains: - @cd ${.CURDIR} && ${MAKE} UNIVERSE_TARGET=toolchain universe + @cd ${.CURDIR} && ${SUB_MAKE} UNIVERSE_TARGET=toolchain universe kernel-toolchains: - @cd ${.CURDIR} && ${MAKE} UNIVERSE_TARGET=kernel-toolchain universe + @cd ${.CURDIR} && ${SUB_MAKE} UNIVERSE_TARGET=kernel-toolchain universe # # universe @@ -347,7 +374,7 @@ kernel-toolchains: # .if make(universe) || make(universe_kernels) || make(tinderbox) || make(targets) TARGETS?=amd64 arm i386 ia64 mips pc98 powerpc sparc64 -TARGET_ARCHES_arm?= arm armeb armv6 armv6eb +TARGET_ARCHES_arm?= arm armeb armv6 TARGET_ARCHES_mips?= mipsel mips mips64el mips64 mipsn32 TARGET_ARCHES_powerpc?= powerpc powerpc64 TARGET_ARCHES_pc98?= i386 @@ -377,7 +404,8 @@ MAKEFAIL=tee -a ${FAILFILE} MAKEFAIL=cat .endif -universe: universe_prologue upgrade_checks +universe_prologue: upgrade_checks +universe: universe_prologue universe_prologue: @echo "--------------------------------------------------------------" @echo ">>> make universe started on ${STARTTIME}" @@ -387,17 +415,17 @@ universe_prologue: .endif .for target in ${TARGETS} universe: universe_${target} -.ORDER: universe_prologue upgrade_checks universe_${target} universe_epilogue +universe_epilogue: universe_${target} universe_${target}: universe_${target}_prologue -universe_${target}_prologue: +universe_${target}_prologue: universe_prologue @echo ">> ${target} started on `LC_ALL=C date`" .if !defined(MAKE_JUST_KERNELS) .for target_arch in ${TARGET_ARCHES_${target}} universe_${target}: universe_${target}_${target_arch} -universe_${target}_${target_arch}: universe_${target}_prologue +universe_${target}_${target_arch}: universe_${target}_prologue .MAKE @echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} started on `LC_ALL=C date`" @(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \ - ${MAKE} ${JFLAG} ${UNIVERSE_TARGET} \ + ${SUB_MAKE} ${JFLAG} ${UNIVERSE_TARGET} \ TARGET=${target} \ TARGET_ARCH=${target_arch} \ > _.${target}.${target_arch}.${UNIVERSE_TARGET} 2>&1 || \ @@ -415,14 +443,14 @@ universe_${target}_kernels: universe_${t .endfor .endif universe_${target}: universe_${target}_kernels -universe_${target}_kernels: universe_${target}_prologue +universe_${target}_kernels: universe_${target}_prologue .MAKE .if exists(${KERNSRCDIR}/${target}/conf/NOTES) @(cd ${KERNSRCDIR}/${target}/conf && env __MAKE_CONF=/dev/null \ - ${MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \ + ${SUB_MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \ (echo "${target} 'make LINT' failed," \ "check _.${target}.makeLINT for details"| ${MAKEFAIL})) .endif - @cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} TARGET=${target} \ + @cd ${.CURDIR} && ${SUB_MAKE} ${.MAKEFLAGS} TARGET=${target} \ universe_kernels .endif @echo ">> ${target} completed on `LC_ALL=C date`" @@ -443,9 +471,9 @@ TARGET_ARCH_${kernel}!= cd ${KERNSRCDIR} .error "Target architecture for ${TARGET}/conf/${kernel} unknown. config(8) likely too old." .endif universe_kernconfs: universe_kernconf_${TARGET}_${kernel} -universe_kernconf_${TARGET}_${kernel}: +universe_kernconf_${TARGET}_${kernel}: .MAKE @(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \ - ${MAKE} ${JFLAG} buildkernel \ + ${SUB_MAKE} ${JFLAG} buildkernel \ TARGET=${TARGET} \ TARGET_ARCH=${TARGET_ARCH_${kernel}} \ KERNCONF=${kernel} \ @@ -470,3 +498,11 @@ universe_epilogue: buildLINT: ${MAKE} -C ${.CURDIR}/sys/${_TARGET}/conf LINT + +.if defined(.PARSEDIR) +.if make(universe) +# we do not want a failure of one branch abort all. +MAKE_JOB_ERROR_TOKEN= no +.export MAKE_JOB_ERROR_TOKEN +.endif +.endif Modified: projects/zfsd/head/Makefile.inc1 ============================================================================== --- projects/zfsd/head/Makefile.inc1 Thu Oct 10 21:14:49 2013 (r256300) +++ projects/zfsd/head/Makefile.inc1 Thu Oct 10 21:46:43 2013 (r256301) @@ -132,7 +132,7 @@ VERSION!= uname -srp VERSION+= ${OSRELDATE} .endif -KNOWN_ARCHES?= amd64 arm armeb/arm armv6/arm armv6eb/arm i386 i386/pc98 ia64 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64 +KNOWN_ARCHES?= amd64 arm armeb/arm armv6/arm i386 i386/pc98 ia64 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64 .if ${TARGET} == ${TARGET_ARCH} _t= ${TARGET} .else @@ -265,7 +265,7 @@ WMAKEENV= ${CROSSENV} \ PATH=${TMPPATH} # make hierarchy -HMAKE= PATH=${TMPPATH} ${MAKE} LOCAL_MTREE=${LOCAL_MTREE} +HMAKE= PATH=${TMPPATH} ${MAKE} LOCAL_MTREE=${LOCAL_MTREE:Q} .if defined(NO_ROOT) HMAKE+= PATH=${TMPPATH} METALOG=${METALOG} -DNO_ROOT .endif @@ -382,6 +382,7 @@ LIB32WMAKEENV+= MAKEOBJDIRPREFIX=${OBJTR PATH=${TMPPATH} \ LIBDIR=/usr/lib32 \ SHLIBDIR=/usr/lib32 \ + LIBPRIVATEDIR=/usr/lib32/private \ COMPILER_TYPE=${WMAKE_COMPILER_TYPE} LIB32WMAKEFLAGS+= \ CC="${XCC} ${LIB32FLAGS}" \ @@ -394,7 +395,7 @@ LIB32WMAKEFLAGS+= \ -DNO_LINT LIB32WMAKE= ${LIB32WMAKEENV} ${MAKE} ${LIB32WMAKEFLAGS} \ - -DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_INFO -DWITHOUT_HTML + -DWITHOUT_MAN -DWITHOUT_INFO -DWITHOUT_HTML LIB32IMAKE= ${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} -DNO_INCS \ ${IMAKE_INSTALL} .endif @@ -484,10 +485,6 @@ _worldtmp: mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \ -p ${WORLDTMP}/usr/lib >/dev/null .endif -.if ${MK_BIND_LIBS} != "no" - mtree -deU -f ${.CURDIR}/etc/mtree/BIND.include.dist \ - -p ${WORLDTMP}/usr/include >/dev/null -.endif .for _mtree in ${LOCAL_MTREE} mtree -deU -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null .endfor @@ -675,8 +672,9 @@ kernel-toolchain: ${TOOLCHAIN_TGTS:N_inc # # Checks to be sure system is ready for installworld/installkernel. # -installcheck: -installcheck_UGID: +installcheck: _installcheck_world _installcheck_kernel +_installcheck_world: +_installcheck_kernel: # # Require DESTDIR to be set if installing for a different architecture or @@ -685,8 +683,9 @@ installcheck_UGID: .if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${TARGET} != ${MACHINE} || \ defined(DB_FROM_SRC) .if !make(distributeworld) -installcheck: installcheck_DESTDIR -installcheck_DESTDIR: +_installcheck_world: __installcheck_DESTDIR +_installcheck_kernel: __installcheck_DESTDIR +__installcheck_DESTDIR: .if !defined(DESTDIR) || empty(DESTDIR) @echo "ERROR: Please set DESTDIR!"; \ false @@ -708,7 +707,12 @@ CHECK_GIDS+= smmsp CHECK_UIDS+= proxy CHECK_GIDS+= proxy authpf .endif -installcheck_UGID: +.if ${MK_UNBOUND} != "no" +CHECK_UIDS+= unbound +CHECK_GIDS+= unbound +.endif +_installcheck_world: __installcheck_UGID +__installcheck_UGID: .for uid in ${CHECK_UIDS} @if ! `id -u ${uid} >/dev/null 2>&1`; then \ echo "ERROR: Required ${uid} user is missing, see /usr/src/UPDATING."; \ @@ -763,7 +767,7 @@ EXTRA_DISTRIBUTIONS+= lib32 MTREE_MAGIC?= mtree 2.0 -distributeworld installworld: installcheck installcheck_UGID +distributeworld installworld: _installcheck_world mkdir -p ${INSTALLTMP} progs=$$(for prog in ${ITOOLS}; do \ if progpath=`which $$prog`; then \ @@ -814,7 +818,7 @@ distributeworld installworld: installche cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \ METALOG=${METALOG} ${IMAKE_INSTALL} ${IMAKE_MTREE} \ DISTBASE=/base DESTDIR=${DESTDIR}/${DISTDIR}/base \ - LOCAL_MTREE=${LOCAL_MTREE} distrib-dirs + LOCAL_MTREE=${LOCAL_MTREE:Q} distrib-dirs .endif ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \ ${IMAKEENV} rm -rf ${INSTALLTMP} @@ -833,6 +837,18 @@ distributeworld installworld: installche awk 'BEGIN { print "#${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}\//, "./"); print } }' > \ ${DESTDIR}/${DISTDIR}/${dist}.meta .endfor +.if ${MK_DEBUG_FILES} != "no" +. for dist in base ${EXTRA_DISTRIBUTIONS} + @# For each file that exists in this dist, print the corresponding + @# line from the METALOG. This relies on the fact that + @# a line containing only the filename will sort immediatly before + @# the relevant mtree line. + cd ${DESTDIR}/${DISTDIR}; \ + find ./${dist}/usr/lib/debug | sort -u ${METALOG} - | \ + awk 'BEGIN { print "#${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}\//, "./"); print } }' > \ + ${DESTDIR}/${DISTDIR}/${dist}.debug.meta +. endfor +.endif .endif .endif @@ -841,13 +857,29 @@ packageworld: .if defined(NO_ROOT) ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz \ + --exclude usr/lib/debug \ @${DESTDIR}/${DISTDIR}/${dist}.meta .else ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz . + tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz \ + --exclude usr/lib/debug . .endif .endfor +.if ${MK_DEBUG_FILES} != "no" +. for dist in base ${EXTRA_DISTRIBUTIONS} +. if defined(NO_ROOT) + ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ + tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.debug.txz \ + @${DESTDIR}/${DISTDIR}/${dist}.debug.meta +. else + ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ + tar cvJfL ${DESTDIR}/${DISTDIR}/${dist}.debug.txz \ + usr/lib/debug +. endif +. endfor +.endif + # # reinstall # @@ -860,7 +892,7 @@ reinstall: @echo ">>> Making hierarchy" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 \ - LOCAL_MTREE=${LOCAL_MTREE} hierarchy + LOCAL_MTREE=${LOCAL_MTREE:Q} hierarchy @echo @echo "--------------------------------------------------------------" @echo ">>> Installing everything" @@ -1013,7 +1045,7 @@ buildkernel: # Install the kernel defined by INSTALLKERNEL # installkernel installkernel.debug \ -reinstallkernel reinstallkernel.debug: installcheck +reinstallkernel reinstallkernel.debug: _installcheck_kernel .if empty(INSTALLKERNEL) @echo "ERROR: No kernel \"${KERNCONF}\" to install."; \ false @@ -1053,9 +1085,11 @@ distributekernel distributekernel.debug: KERNEL=${INSTKERNNAME}.${_kernel} \ DESTDIR=${INSTALL_DDIR}/kernel.${_kernel} \ ${.TARGET:S/distributekernel/install/} +.if defined(NO_ROOT) sed -e 's|^./kernel|.|' \ ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta > \ ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta +.endif .endfor packagekernel: @@ -1303,7 +1337,8 @@ build-tools: .MAKE usr.bin/awk \ lib/libmagic \ usr.bin/mkesdb_static \ - usr.bin/mkcsmapper_static + usr.bin/mkcsmapper_static \ + usr.bin/vi/catalog ${_+_}@${ECHODIR} "===> ${_tool} (obj,build-tools)"; \ cd ${.CURDIR}/${_tool} && \ ${MAKE} DIRPRFX=${_tool}/ obj && \ @@ -1440,8 +1475,8 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 ${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \ ${_cddl_lib_libzfs_core} \ lib/libutil ${_lib_libypclnt} lib/libz lib/msun \ - ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ - ${_secure_lib_libssl} + ${_secure_lib_libcrypto} ${_lib_libldns} \ + ${_secure_lib_libssh} ${_secure_lib_libssl} .if ${MK_ATF} != "no" _lib_atf_libatf_c= lib/atf/libatf-c @@ -1477,9 +1512,16 @@ cddl/lib/libzfs_core__L: cddl/lib/libnvp _secure_lib_libcrypto= secure/lib/libcrypto _secure_lib_libssl= secure/lib/libssl lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L +.if ${MK_LDNS} != "no" +_lib_libldns= lib/libldns +lib/libldns__L: secure/lib/libcrypto__L +.endif .if ${MK_OPENSSH} != "no" _secure_lib_libssh= secure/lib/libssh secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L +.if ${MK_LDNS} != "no" +secure/lib/libssh__L: lib/libldns__L +.endif .if ${MK_KERBEROS_SUPPORT} != "no" secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \ kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \ @@ -1696,7 +1738,7 @@ check-old-libs: delete-old-dirs: @echo ">>> Removing old directories" @${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ - -V OLD_DIRS | xargs -n1 | \ + -V OLD_DIRS | xargs -n1 | sort -r | \ while read dir; do \ if [ -d "${DESTDIR}/$${dir}" ]; then \ rmdir -v "${DESTDIR}/$${dir}" || true; \ Modified: projects/zfsd/head/ObsoleteFiles.inc ============================================================================== --- projects/zfsd/head/ObsoleteFiles.inc Thu Oct 10 21:14:49 2013 (r256300) +++ projects/zfsd/head/ObsoleteFiles.inc Thu Oct 10 21:46:43 2013 (r256301) @@ -38,6 +38,265 @@ # xargs -n1 | sort | uniq -d; # done +# 20131009: freebsd-version moved from /libexec to /bin +OLD_FILES+=/libexec/freebsd-version +# 20131001: ar and ranlib from binutils not used +OLD_FILES+=usr/bin/gnu-ar +OLD_FILES+=usr/bin/gnu-ranlib +OLD_FILES+=usr/share/man/man1/gnu-ar.1.gz +OLD_FILES+=usr/share/man/man1/gnu-ranlib.1.gz +# 20130930: BIND removed from base +OLD_FILES+=etc/namedb +OLD_FILES+=etc/periodic/daily/470.status-named +OLD_FILES+=usr/bin/dig +OLD_FILES+=usr/bin/nslookup +OLD_FILES+=usr/bin/nsupdate +OLD_DIRS+=usr/include/lwres +OLD_FILES+=usr/include/lwres/context.h +OLD_FILES+=usr/include/lwres/int.h +OLD_FILES+=usr/include/lwres/ipv6.h +OLD_FILES+=usr/include/lwres/lang.h +OLD_FILES+=usr/include/lwres/list.h +OLD_FILES+=usr/include/lwres/lwbuffer.h +OLD_FILES+=usr/include/lwres/lwpacket.h +OLD_FILES+=usr/include/lwres/lwres.h +OLD_FILES+=usr/include/lwres/net.h +OLD_FILES+=usr/include/lwres/netdb.h +OLD_FILES+=usr/include/lwres/platform.h +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_FILES+=usr/lib/liblwres_p.a +OLD_FILES+=usr/sbin/arpaname +OLD_FILES+=usr/sbin/ddns-confgen +OLD_FILES+=usr/sbin/dnssec-dsfromkey +OLD_FILES+=usr/sbin/dnssec-keyfromlabel +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/genrandom +OLD_FILES+=usr/sbin/isc-hmac-fixup +OLD_FILES+=usr/sbin/lwresd +OLD_FILES+=usr/sbin/named +OLD_FILES+=usr/sbin/named-checkconf +OLD_FILES+=usr/sbin/named-checkzone +OLD_FILES+=usr/sbin/named-compilezone +OLD_FILES+=usr/sbin/named-journalprint +OLD_FILES+=usr/sbin/named.reconfig +OLD_FILES+=usr/sbin/named.reload +OLD_FILES+=usr/sbin/nsec3hash +OLD_FILES+=usr/sbin/rndc +OLD_FILES+=usr/sbin/rndc-confgen +OLD_DIRS+=usr/share/doc/bind9 +OLD_FILES+=usr/share/doc/bind9/CHANGES +OLD_FILES+=usr/share/doc/bind9/COPYRIGHT +OLD_FILES+=usr/share/doc/bind9/FAQ +OLD_FILES+=usr/share/doc/bind9/HISTORY +OLD_FILES+=usr/share/doc/bind9/README +OLD_DIRS+=usr/share/doc/bind9/arm +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch01.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch02.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch03.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch04.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch05.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch06.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch07.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch08.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch09.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch10.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.pdf +OLD_FILES+=usr/share/doc/bind9/arm/man.arpaname.html +OLD_FILES+=usr/share/doc/bind9/arm/man.ddns-confgen.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dig.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-dsfromkey.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-keyfromlabel.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-keygen.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-revoke.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-settime.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-signzone.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-verify.html +OLD_FILES+=usr/share/doc/bind9/arm/man.genrandom.html +OLD_FILES+=usr/share/doc/bind9/arm/man.host.html +OLD_FILES+=usr/share/doc/bind9/arm/man.isc-hmac-fixup.html +OLD_FILES+=usr/share/doc/bind9/arm/man.named-checkconf.html +OLD_FILES+=usr/share/doc/bind9/arm/man.named-checkzone.html +OLD_FILES+=usr/share/doc/bind9/arm/man.named-journalprint.html +OLD_FILES+=usr/share/doc/bind9/arm/man.named.html +OLD_FILES+=usr/share/doc/bind9/arm/man.nsec3hash.html +OLD_FILES+=usr/share/doc/bind9/arm/man.nsupdate.html +OLD_FILES+=usr/share/doc/bind9/arm/man.rndc-confgen.html +OLD_FILES+=usr/share/doc/bind9/arm/man.rndc.conf.html +OLD_FILES+=usr/share/doc/bind9/arm/man.rndc.html +OLD_DIRS+=usr/share/doc/bind9/misc +OLD_FILES+=usr/share/doc/bind9/misc/dnssec +OLD_FILES+=usr/share/doc/bind9/misc/format-options.pl +OLD_FILES+=usr/share/doc/bind9/misc/ipv6 +OLD_FILES+=usr/share/doc/bind9/misc/migration +OLD_FILES+=usr/share/doc/bind9/misc/migration-4to9 +OLD_FILES+=usr/share/doc/bind9/misc/options +OLD_FILES+=usr/share/doc/bind9/misc/rfc-compliance +OLD_FILES+=usr/share/doc/bind9/misc/roadmap +OLD_FILES+=usr/share/doc/bind9/misc/sdb +OLD_FILES+=usr/share/doc/bind9/misc/sort-options.pl +OLD_FILES+=usr/share/man/man1/arpaname.1.gz +OLD_FILES+=usr/share/man/man1/dig.1.gz +OLD_FILES+=usr/share/man/man1/nslookup.1.gz +OLD_FILES+=usr/share/man/man1/nsupdate.1.gz +OLD_FILES+=usr/share/man/man3/lwres.3.gz +OLD_FILES+=usr/share/man/man3/lwres_addr_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_add.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_back.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_clear.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_first.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_forward.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_getmem.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint16.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint32.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint8.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_init.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_invalidate.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_putmem.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint16.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint32.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint8.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_subtract.3.gz +OLD_FILES+=usr/share/man/man3/lwres_conf_clear.3.gz +OLD_FILES+=usr/share/man/man3/lwres_conf_get.3.gz +OLD_FILES+=usr/share/man/man3/lwres_conf_init.3.gz +OLD_FILES+=usr/share/man/man3/lwres_conf_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_conf_print.3.gz +OLD_FILES+=usr/share/man/man3/lwres_config.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_allocmem.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_create.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_destroy.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_freemem.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_initserial.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_nextserial.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_sendrecv.3.gz +OLD_FILES+=usr/share/man/man3/lwres_endhostent.3.gz +OLD_FILES+=usr/share/man/man3/lwres_endhostent_r.3.gz +OLD_FILES+=usr/share/man/man3/lwres_freeaddrinfo.3.gz +OLD_FILES+=usr/share/man/man3/lwres_freehostent.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabn.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gai_strerror.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getaddrinfo.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getaddrsbyname.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostbyaddr.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostbyaddr_r.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostbyname.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostbyname2.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostbyname_r.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostent.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostent_r.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getipnode.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getipnodebyaddr.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getipnodebyname.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getnamebyaddr.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getnameinfo.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getrrsetbyname.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnba.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_herror.3.gz +OLD_FILES+=usr/share/man/man3/lwres_hstrerror.3.gz +OLD_FILES+=usr/share/man/man3/lwres_inetntop.3.gz +OLD_FILES+=usr/share/man/man3/lwres_lwpacket_parseheader.3.gz +OLD_FILES+=usr/share/man/man3/lwres_lwpacket_renderheader.3.gz +OLD_FILES+=usr/share/man/man3/lwres_net_ntop.3.gz +OLD_FILES+=usr/share/man/man3/lwres_noop.3.gz +OLD_FILES+=usr/share/man/man3/lwres_nooprequest_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_nooprequest_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_nooprequest_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_noopresponse_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_noopresponse_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_noopresponse_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_packet.3.gz +OLD_FILES+=usr/share/man/man3/lwres_resutil.3.gz +OLD_FILES+=usr/share/man/man3/lwres_sethostent.3.gz +OLD_FILES+=usr/share/man/man3/lwres_sethostent_r.3.gz +OLD_FILES+=usr/share/man/man3/lwres_string_parse.3.gz +OLD_FILES+=usr/share/man/man5/named.conf.5.gz +OLD_FILES+=usr/share/man/man5/rndc.conf.5.gz +OLD_FILES+=usr/share/man/man8/ddns-confgen.8.gz +OLD_FILES+=usr/share/man/man8/dnssec-dsfromkey.8.gz +OLD_FILES+=usr/share/man/man8/dnssec-keyfromlabel.8.gz +OLD_FILES+=usr/share/man/man8/dnssec-keygen.8.gz +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/genrandom.8.gz +OLD_FILES+=usr/share/man/man8/isc-hmac-fixup.8.gz +OLD_FILES+=usr/share/man/man8/lwresd.8.gz +OLD_FILES+=usr/share/man/man8/named-checkconf.8.gz +OLD_FILES+=usr/share/man/man8/named-checkzone.8.gz +OLD_FILES+=usr/share/man/man8/named-compilezone.8.gz +OLD_FILES+=usr/share/man/man8/named-journalprint.8.gz +OLD_FILES+=usr/share/man/man8/named.8.gz +OLD_FILES+=usr/share/man/man8/named.reconfig.8.gz +OLD_FILES+=usr/share/man/man8/named.reload.8.gz +OLD_FILES+=usr/share/man/man8/nsec3hash.8.gz +OLD_FILES+=usr/share/man/man8/rndc-confgen.8.gz +OLD_FILES+=usr/share/man/man8/rndc.8.gz +OLD_DIRS+=var/named/dev +OLD_DIRS+=var/named/etc +OLD_DIRS+=var/named/etc/namedb +OLD_FILES+=var/named/etc/namedb/PROTO.localhost-v6.rev +OLD_FILES+=var/named/etc/namedb/PROTO.localhost.rev +OLD_DIRS+=var/named/etc/namedb/dynamic +OLD_FILES+=var/named/etc/namedb/make-localhost +OLD_DIRS+=var/named/etc/namedb/master +OLD_FILES+=var/named/etc/namedb/master/empty.db +OLD_FILES+=var/named/etc/namedb/master/localhost-forward.db +OLD_FILES+=var/named/etc/namedb/master/localhost-reverse.db +#OLD_FILES+=var/named/etc/namedb/named.conf # intentionally left out +OLD_FILES+=var/named/etc/namedb/named.root +OLD_DIRS+=var/named/etc/namedb/slave +OLD_DIRS+=var/named/var +OLD_DIRS+=var/named/var/dump +OLD_DIRS+=var/named/var/log +OLD_DIRS+=var/named/var/run +OLD_DIRS+=var/named/var/run/named +OLD_DIRS+=var/named/var/stats +OLD_DIRS+=var/run/named +# 20130908: libssh becomes private +OLD_FILES+=usr/lib/libssh.a +OLD_FILES+=usr/lib/libssh.so +OLD_LIBS+=usr/lib/libssh.so.5 +OLD_FILES+=usr/lib/libssh_p.a +OLD_FILES+=usr/lib32/libssh.a +OLD_FILES+=usr/lib32/libssh.so +OLD_LIBS+=usr/lib32/libssh.so.5 +OLD_FILES+=usr/lib32/libssh_p.a +# 20130903: gnupatch is no more +OLD_FILES+=usr/bin/gnupatch +OLD_FILES+=usr/share/man/man1/gnupatch.1.gz +# 20130829: bsdpatch is patch unconditionally +OLD_FILES+=usr/bin/bsdpatch +OLD_FILES+=usr/share/man/man1/bsdpatch.1.gz +# 20130822: bind 9.9.3-P2 import +OLD_LIBS+=usr/lib/liblwres.so.80 +# 20130814: vm_page_busy(9) +OLD_FILES+=usr/share/man/man9/vm_page_flash.9.gz +OLD_FILES+=usr/share/man/man9/vm_page_io.9.gz +OLD_FILES+=usr/share/man/man9/vm_page_io_finish.9.gz +OLD_FILES+=usr/share/man/man9/vm_page_io_start.9.gz +OLD_FILES+=usr/share/man/man9/vm_page_wakeup.9.gz # 20130710: libkvm version bump OLD_LIBS+=lib/libkvm.so.5 OLD_LIBS+=usr/lib32/libkvm.so.5 @@ -114,6 +373,7 @@ OLD_FILES+=usr/include/clang/3.2/xmmintr OLD_FILES+=usr/include/clang/3.2/xopintrin.h OLD_DIRS+=usr/include/clang/3.2 # 20130404: legacy ATA stack removed +OLD_FILES+=etc/periodic/daily/405.status-ata-raid OLD_FILES+=rescue/atacontrol OLD_FILES+=sbin/atacontrol OLD_FILES+=usr/share/man/man8/atacontrol.8.gz Modified: projects/zfsd/head/UPDATING ============================================================================== --- projects/zfsd/head/UPDATING Thu Oct 10 21:14:49 2013 (r256300) +++ projects/zfsd/head/UPDATING Thu Oct 10 21:46:43 2013 (r256301) @@ -31,6 +31,118 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20131010: + The rc.d/jail script has been updated to support jail(8) + configuration file. The "jail__*" rc.conf(5) variables + for per-jail configuration are automatically converted to + /var/run/jail..conf before the jail(8) utility is invoked. + This is transparently backward compatible. See below about some + incompatibilities and rc.conf(5) manual page for more details. + + These variables are now deprecated in favor of jail(8) configuration + file. One can use "rc.d/jail config " command to generate + a jail(8) configuration file in /var/run/jail..conf without + running the jail(8) utility. The default pathname of the + configuration file is /etc/jail.conf and can be specified by + using $jail_conf or $jail__conf variables. + + Please note that jail_devfs_ruleset accepts an integer at + this moment. Please consider to rewrite the ruleset name + with an integer. + +20130930: + BIND has been removed from the base system. If all you need + is a local resolver, simply enable and start the local_unbound + service instead. Otherwise, several versions of BIND are + available in the ports tree. + +20130916: + With the addition of unbound(8), a new unbound user is now + required during installworld. "mergemaster -p" can be used to + add the user prior to installworld, as documented in the handbook. + +20130911: + OpenSSH is now built with DNSSEC support, and will by default + silently trust signed SSHFP records. This can be controlled with + the VerifyHostKeyDNS client configuration setting. DNSSEC support + can be disabled entirely with the WITHOUT_LDNS option in src.conf. + +20130906: + The GNU Compiler Collection and C++ standard library (libstdc++) + are no longer built by default on platforms where clang is the system + compiler. You can enable them with the WITH_GCC and WITH_GNUCXX + options in src.conf. + +20130905: + The PROCDESC kernel option is now part of the GENERIC kernel + configuration and is required for the rwhod(8) to work. + If you are using custom kernel configuration, you should include + 'options PROCDESC'. + +20130905: + The API and ABI related to the Capsicum framework was modified + in backward incompatible way. The userland libraries and programs + have to be recompiled to work with the new kernel. This includes the + following libraries and programs, but the whole buildworld is + advised: libc, libprocstat, dhclient, tcpdump, hastd, hastctl, + kdump, procstat, rwho, rwhod, uniq. + +20130903: + AES-NI intrinsic support has been added to gcc. The AES-NI module + has been updated to use this support. A new gcc is required to build + the aesni module on both i386 and amd64. + +20130821: + The PADLOCK_RNG and RDRAND_RNG kernel options are now devices. + Thus "device padlock_rng" and "device rdrand_rng" should be + used instead of "options PADLOCK_RNG" & "options RDRAND_RNG". + +20130813: + WITH_ICONV has been split into two feature sets. WITH_ICONV now + enables just the iconv* functionality and is now on by default. + WITH_LIBICONV_COMPAT enables the libiconv api and link time + compatability. Set WITHOUT_ICONV to build the old way. + If you have been using WITH_ICONV before, you will very likely + need to turn on WITH_LIBICONV_COMPAT. + +20130806: + INVARIANTS option now enables DEBUG for code with OpenSolaris and + Illumos origin, including ZFS. If you have INVARIANTS in your + kernel configuration, then there is no need to set DEBUG or ZFS_DEBUG + explicitly. + DEBUG used to enable witness(9) tracking of OpenSolaris (mostly ZFS) + locks if WITNESS option was set. Because that generated a lot of + witness(9) reports and all of them were believed to be false + positives, this is no longer done. New option OPENSOLARIS_WITNESS + can be used to achieve the previous behavior. + +20130806: + Timer values in IPv6 data structures now use time_uptime instead + of time_second. Although this is not a user-visible functional + change, userland utilities which directly use them---ndp(8), + rtadvd(8), and rtsold(8) in the base system---need to be updated + to r253970 or later. + +20130802: + find -delete can now delete the pathnames given as arguments, + instead of only files found below them or if the pathname did + not contain any slashes. Formerly, the following error message + would result: + + find: -delete: : relative path potentially not safe + + Deleting the pathnames given as arguments can be prevented + without error messages using -mindepth 1 or by changing + directory and passing "." as argument to find. This works in the + old as well as the new version of find. + +20130726: + Behavior of devfs rules path matching has been changed. + Pattern is now always matched against fully qualified devfs + path and slash characters must be explicitly matched by + slashes in pattern (FNM_PATHNAME). Rulesets involving devfs + subdirectories must be reviewed. + 20130716: The default ARM ABI has changed to the ARM EABI. The old ABI is incompatible with the ARM EABI and all programs and modules will @@ -207,8 +319,8 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 20121201: With the addition of auditdistd(8), a new auditdistd user is now - depended on during installworld. "mergemaster -p" can be used to add - the user prior to installworld, as documented in the handbook. + required during installworld. "mergemaster -p" can be used to + add the user prior to installworld, as documented in the handbook. 20121117: The sin6_scope_id member variable in struct sockaddr_in6 is now @@ -294,9 +406,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 20120913: The random(4) support for the VIA hardware random number generator (`PADLOCK') is no longer enabled unconditionally. - Add the PADLOCK_RNG option in the custom kernel config if + Add the padlock_rng device in the custom kernel config if needed. The GENERIC kernels on i386 and amd64 do include the - option, so the change only affects the custom kernel + device, so the change only affects the custom kernel configurations. 20120908: Modified: projects/zfsd/head/bin/Makefile ============================================================================== --- projects/zfsd/head/bin/Makefile Thu Oct 10 21:14:49 2013 (r256300) +++ projects/zfsd/head/bin/Makefile Thu Oct 10 21:46:43 2013 (r256301) @@ -15,6 +15,7 @@ SUBDIR= cat \ echo \ ed \ expr \ + freebsd-version \ getfacl \ hostname \ kenv \ Modified: projects/zfsd/head/bin/chflags/chflags.1 ============================================================================== --- projects/zfsd/head/bin/chflags/chflags.1 Thu Oct 10 21:14:49 2013 (r256300) +++ projects/zfsd/head/bin/chflags/chflags.1 Thu Oct 10 21:46:43 2013 (r256301) @@ -32,7 +32,7 @@ .\" @(#)chflags.1 8.4 (Berkeley) 5/2/95 .\" $FreeBSD$ .\" -.Dd March 3, 2006 +.Dd April 8, 2013 .Dt CHFLAGS 1 .Os .Sh NAME @@ -101,20 +101,36 @@ The following keywords are currently def .Bl -tag -offset indent -width ".Cm opaque" .It Cm arch , archived set the archived flag (super-user only) -.It Cm opaque -set the opaque flag (owner or super-user only) .It Cm nodump set the nodump flag (owner or super-user only) +.It Cm opaque +set the opaque flag (owner or super-user only) .It Cm sappnd , sappend set the system append-only flag (super-user only) .It Cm schg , schange , simmutable set the system immutable flag (super-user only) +.It Cm snapshot +set the snapshot flag (filesystems do not allow changing this flag) .It Cm sunlnk , sunlink set the system undeletable flag (super-user only) .It Cm uappnd , uappend set the user append-only flag (owner or super-user only) +.It Cm uarch , uarchive +set the archive flag (owner or super-user only) .It Cm uchg , uchange , uimmutable set the user immutable flag (owner or super-user only) +.It Cm uhidden , hidden +set the hidden file attribute (owner or super-user only) +.It Cm uoffline , offline +set the offline file attribute (owner or super-user only) +.It Cm urdonly , rdonly , readonly +set the DOS, Windows and CIFS readonly flag (owner or super-user only) +.It Cm usparse , sparse +set the sparse file attribute (owner or super-user only) +.It Cm usystem , system +set the DOS, Windows and CIFS system flag (owner or super-user only) +.It Cm ureparse , reparse +set the Windows reparse point file attribute (owner or super-user only) .It Cm uunlnk , uunlink set the user undeletable flag (owner or super-user only) .El Modified: projects/zfsd/head/bin/dd/dd.1 ============================================================================== --- projects/zfsd/head/bin/dd/dd.1 Thu Oct 10 21:14:49 2013 (r256300) +++ projects/zfsd/head/bin/dd/dd.1 Thu Oct 10 21:46:43 2013 (r256301) @@ -32,7 +32,7 @@ .\" @(#)dd.1 8.2 (Berkeley) 1/13/94 .\" $FreeBSD$ .\" -.Dd January 23, 2009 +.Dd October 1, 2013 .Dt DD 1 .Os .Sh NAME @@ -378,12 +378,12 @@ will exit. .Sh EXAMPLES Check that a disk drive contains no bad blocks: .Pp -.Dl "dd if=/dev/ad0 of=/dev/null bs=1m" +.Dl "dd if=/dev/ada0 of=/dev/null bs=1m" .Pp Do a refresh of a disk drive, in order to prevent presently recoverable read errors from progressing into unrecoverable read errors: .Pp -.Dl "dd if=/dev/ad0 of=/dev/ad0 bs=1m" +.Dl "dd if=/dev/ada0 of=/dev/ada0 bs=1m" .Pp Remove parity bit from a file: .Pp Modified: projects/zfsd/head/bin/ls/ls.1 ============================================================================== --- projects/zfsd/head/bin/ls/ls.1 Thu Oct 10 21:14:49 2013 (r256300) +++ projects/zfsd/head/bin/ls/ls.1 Thu Oct 10 21:46:43 2013 (r256301) @@ -232,6 +232,9 @@ output. Include the file flags in a long .Pq Fl l output. +See +.Xr chflags 1 +for a list of file flags and their meanings. .It Fl p Write a slash .Pq Ql / Modified: projects/zfsd/head/bin/pkill/pkill.1 ============================================================================== --- projects/zfsd/head/bin/pkill/pkill.1 Thu Oct 10 21:14:49 2013 (r256300) +++ projects/zfsd/head/bin/pkill/pkill.1 Thu Oct 10 21:46:43 2013 (r256301) @@ -29,7 +29,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd February 11, 2010 +.Dd August 9, 2013 .Dt PKILL 1 .Os .Sh NAME @@ -44,6 +44,7 @@ .Op Fl N Ar system .Op Fl P Ar ppid .Op Fl U Ar uid +.Op Fl c Ar class .Op Fl d Ar delim .Op Fl g Ar pgrp .Op Fl j Ar jid @@ -60,6 +61,7 @@ .Op Fl N Ar system .Op Fl P Ar ppid .Op Fl U Ar uid +.Op Fl c Ar class .Op Fl g Ar pgrp .Op Fl j Ar jid .Op Fl s Ar sid @@ -130,6 +132,9 @@ or process and all of its ancestors are excluded (unless .Fl v is used). +.It Fl c Ar class +Restrict matches to processes running with specified login class +.Ar class . .It Fl f Match against full argument lists. *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Fri Oct 11 05:09:24 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 864EB5AF; Fri, 11 Oct 2013 05:09:24 +0000 (UTC) (envelope-from cherry@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 744AC2649; Fri, 11 Oct 2013 05:09:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9B59Om7017396; Fri, 11 Oct 2013 05:09:24 GMT (envelope-from cherry@svn.freebsd.org) Received: (from cherry@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9B59OBl017395; Fri, 11 Oct 2013 05:09:24 GMT (envelope-from cherry@svn.freebsd.org) Message-Id: <201310110509.r9B59OBl017395@svn.freebsd.org> From: "Cherry G. Mathew" Date: Fri, 11 Oct 2013 05:09:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256307 - projects/amd64_xen_pv/sys/amd64/xen X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Oct 2013 05:09:24 -0000 Author: cherry Date: Fri Oct 11 05:09:23 2013 New Revision: 256307 URL: http://svnweb.freebsd.org/changeset/base/256307 Log: Load machine address into cr3, not the pseudo-physical one Approved by: gibbs(implicit) Modified: projects/amd64_xen_pv/sys/amd64/xen/mm.c Modified: projects/amd64_xen_pv/sys/amd64/xen/mm.c ============================================================================== --- projects/amd64_xen_pv/sys/amd64/xen/mm.c Fri Oct 11 04:50:27 2013 (r256306) +++ projects/amd64_xen_pv/sys/amd64/xen/mm.c Fri Oct 11 05:09:23 2013 (r256307) @@ -164,7 +164,7 @@ xen_invlpg(vm_offset_t va) inline void xen_load_cr3(u_long val) { - xen_pt_switch(xpmap_ptom(val)); + xen_pt_switch(val); } void From owner-svn-src-projects@FreeBSD.ORG Fri Oct 11 07:22:29 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 6746CF86; Fri, 11 Oct 2013 07:22:29 +0000 (UTC) (envelope-from cherry@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 50BA82D44; Fri, 11 Oct 2013 07:22:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9B7MTtQ087003; Fri, 11 Oct 2013 07:22:29 GMT (envelope-from cherry@svn.freebsd.org) Received: (from cherry@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9B7MRIH086960; Fri, 11 Oct 2013 07:22:27 GMT (envelope-from cherry@svn.freebsd.org) Message-Id: <201310110722.r9B7MRIH086960@svn.freebsd.org> From: "Cherry G. Mathew" Date: Fri, 11 Oct 2013 07:22:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256310 - in projects/amd64_xen_pv: . bin bin/dd bin/freebsd-version bin/pkill cddl/contrib/opensolaris/cmd/dtrace cddl/contrib/opensolaris/cmd/zfs cddl/lib/libdtrace contrib/bind9 cont... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Oct 2013 07:22:29 -0000 Author: cherry Date: Fri Oct 11 07:22:26 2013 New Revision: 256310 URL: http://svnweb.freebsd.org/changeset/base/256310 Log: MFC @ r256307 Approved by: gibbs(implicit) Added: projects/amd64_xen_pv/bin/freebsd-version/ - copied from r256307, head/bin/freebsd-version/ projects/amd64_xen_pv/share/man/man9/VOP_ADVISE.9 - copied unchanged from r256307, head/share/man/man9/VOP_ADVISE.9 projects/amd64_xen_pv/share/man/man9/VOP_ALLOCATE.9 - copied unchanged from r256307, head/share/man/man9/VOP_ALLOCATE.9 projects/amd64_xen_pv/sys/modules/ibcore/ - copied from r256307, head/sys/modules/ibcore/ projects/amd64_xen_pv/sys/modules/ipoib/ - copied from r256307, head/sys/modules/ipoib/ projects/amd64_xen_pv/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c - copied unchanged from r256307, head/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c projects/amd64_xen_pv/sys/ofed/drivers/infiniband/hw/mlx4/cm.c - copied unchanged from r256307, head/sys/ofed/drivers/infiniband/hw/mlx4/cm.c projects/amd64_xen_pv/sys/ofed/drivers/infiniband/hw/mlx4/mcg.c - copied unchanged from r256307, head/sys/ofed/drivers/infiniband/hw/mlx4/mcg.c projects/amd64_xen_pv/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c - copied unchanged from r256307, head/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c projects/amd64_xen_pv/sys/ofed/drivers/net/mlx4/resource_tracker.c - copied unchanged from r256307, head/sys/ofed/drivers/net/mlx4/resource_tracker.c projects/amd64_xen_pv/sys/ofed/drivers/net/mlx4/sys_tune.c - copied unchanged from r256307, head/sys/ofed/drivers/net/mlx4/sys_tune.c projects/amd64_xen_pv/sys/ofed/include/linux/atomic.h - copied unchanged from r256307, head/sys/ofed/include/linux/atomic.h projects/amd64_xen_pv/sys/ofed/include/linux/clocksource.h - copied unchanged from r256307, head/sys/ofed/include/linux/clocksource.h projects/amd64_xen_pv/sys/ofed/include/rdma/ib_pma.h - copied unchanged from r256307, head/sys/ofed/include/rdma/ib_pma.h projects/amd64_xen_pv/sys/powerpc/pseries/phyp_vscsi.c - copied unchanged from r256307, head/sys/powerpc/pseries/phyp_vscsi.c projects/amd64_xen_pv/tools/regression/lib/libutil/test-humanize_number.c - copied unchanged from r256307, head/tools/regression/lib/libutil/test-humanize_number.c projects/amd64_xen_pv/tools/regression/lib/libutil/test-humanize_number.t - copied unchanged from r256307, head/tools/regression/lib/libutil/test-humanize_number.t projects/amd64_xen_pv/usr.sbin/bhyve/ahci.h - copied unchanged from r256307, head/usr.sbin/bhyve/ahci.h projects/amd64_xen_pv/usr.sbin/bhyve/block_if.c - copied unchanged from r256307, head/usr.sbin/bhyve/block_if.c projects/amd64_xen_pv/usr.sbin/bhyve/block_if.h - copied unchanged from r256307, head/usr.sbin/bhyve/block_if.h projects/amd64_xen_pv/usr.sbin/bhyve/pci_ahci.c - copied unchanged from r256307, head/usr.sbin/bhyve/pci_ahci.c Deleted: projects/amd64_xen_pv/contrib/bind9/ projects/amd64_xen_pv/contrib/dialog/samples/copifuncs/ projects/amd64_xen_pv/contrib/dialog/samples/install/ projects/amd64_xen_pv/etc/mtree/BIND.chroot.dist projects/amd64_xen_pv/etc/mtree/BIND.include.dist projects/amd64_xen_pv/gnu/usr.bin/binutils/ar/Makefile projects/amd64_xen_pv/gnu/usr.bin/binutils/ar/ar.1 projects/amd64_xen_pv/gnu/usr.bin/binutils/ranlib/Makefile projects/amd64_xen_pv/gnu/usr.bin/binutils/ranlib/ranlib.1 projects/amd64_xen_pv/lib/bind/ projects/amd64_xen_pv/share/doc/bind9/ projects/amd64_xen_pv/sys/kern/uipc_cow.c projects/amd64_xen_pv/tools/build/options/WITHOUT_BIND_DNSSEC projects/amd64_xen_pv/tools/build/options/WITHOUT_BIND_ETC projects/amd64_xen_pv/tools/build/options/WITHOUT_BIND_LIBS_LWRES projects/amd64_xen_pv/tools/build/options/WITHOUT_BIND_MTREE projects/amd64_xen_pv/tools/build/options/WITHOUT_BIND_NAMED projects/amd64_xen_pv/tools/build/options/WITHOUT_BIND_UTILS projects/amd64_xen_pv/tools/build/options/WITH_BIND projects/amd64_xen_pv/tools/build/options/WITH_BIND_IDN projects/amd64_xen_pv/tools/build/options/WITH_BIND_LARGE_FILE projects/amd64_xen_pv/tools/build/options/WITH_BIND_LIBS projects/amd64_xen_pv/tools/build/options/WITH_BIND_SIGCHASE projects/amd64_xen_pv/tools/build/options/WITH_BIND_XML projects/amd64_xen_pv/usr.bin/dig/ projects/amd64_xen_pv/usr.bin/nslookup/ projects/amd64_xen_pv/usr.bin/nsupdate/ projects/amd64_xen_pv/usr.sbin/arpaname/ projects/amd64_xen_pv/usr.sbin/ddns-confgen/ projects/amd64_xen_pv/usr.sbin/dnssec-dsfromkey/ projects/amd64_xen_pv/usr.sbin/dnssec-keyfromlabel/ projects/amd64_xen_pv/usr.sbin/dnssec-keygen/ projects/amd64_xen_pv/usr.sbin/dnssec-revoke/ projects/amd64_xen_pv/usr.sbin/dnssec-settime/ projects/amd64_xen_pv/usr.sbin/dnssec-signzone/ projects/amd64_xen_pv/usr.sbin/dnssec-verify/ projects/amd64_xen_pv/usr.sbin/genrandom/ projects/amd64_xen_pv/usr.sbin/isc-hmac-fixup/ projects/amd64_xen_pv/usr.sbin/named/ projects/amd64_xen_pv/usr.sbin/named-checkconf/ projects/amd64_xen_pv/usr.sbin/named-checkzone/ projects/amd64_xen_pv/usr.sbin/named-journalprint/ projects/amd64_xen_pv/usr.sbin/nsec3hash/ projects/amd64_xen_pv/usr.sbin/rndc/ projects/amd64_xen_pv/usr.sbin/rndc-confgen/ Modified: projects/amd64_xen_pv/Makefile.inc1 projects/amd64_xen_pv/ObsoleteFiles.inc projects/amd64_xen_pv/UPDATING projects/amd64_xen_pv/bin/Makefile projects/amd64_xen_pv/bin/dd/dd.1 projects/amd64_xen_pv/bin/pkill/pkill.c projects/amd64_xen_pv/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 projects/amd64_xen_pv/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c projects/amd64_xen_pv/cddl/lib/libdtrace/tcp.d projects/amd64_xen_pv/contrib/binutils/bfd/elflink.c projects/amd64_xen_pv/contrib/binutils/bfd/elfxx-mips.c projects/amd64_xen_pv/contrib/binutils/binutils/readelf.c projects/amd64_xen_pv/contrib/binutils/include/elf/common.h projects/amd64_xen_pv/contrib/binutils/opcodes/i386-dis.c projects/amd64_xen_pv/contrib/binutils/opcodes/i386-opc.h projects/amd64_xen_pv/contrib/binutils/opcodes/i386-opc.tbl projects/amd64_xen_pv/contrib/binutils/opcodes/i386-tbl.h projects/amd64_xen_pv/contrib/bmake/make.1 projects/amd64_xen_pv/contrib/libc++/include/memory projects/amd64_xen_pv/contrib/llvm/include/llvm/IR/CallingConv.h projects/amd64_xen_pv/contrib/llvm/lib/AsmParser/LLLexer.cpp projects/amd64_xen_pv/contrib/llvm/lib/AsmParser/LLParser.cpp projects/amd64_xen_pv/contrib/llvm/lib/AsmParser/LLToken.h projects/amd64_xen_pv/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp projects/amd64_xen_pv/contrib/llvm/lib/IR/AsmWriter.cpp projects/amd64_xen_pv/contrib/llvm/lib/Target/X86/X86CallingConv.td projects/amd64_xen_pv/contrib/llvm/lib/Target/X86/X86FastISel.cpp projects/amd64_xen_pv/contrib/llvm/lib/Target/X86/X86FixupLEAs.cpp projects/amd64_xen_pv/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp projects/amd64_xen_pv/contrib/llvm/lib/Target/X86/X86InstrInfo.cpp projects/amd64_xen_pv/contrib/llvm/lib/Target/X86/X86Subtarget.h projects/amd64_xen_pv/contrib/llvm/tools/clang/include/clang-c/Index.h projects/amd64_xen_pv/contrib/llvm/tools/clang/include/clang/AST/Type.h projects/amd64_xen_pv/contrib/llvm/tools/clang/include/clang/Basic/Attr.td projects/amd64_xen_pv/contrib/llvm/tools/clang/include/clang/Basic/Specifiers.h projects/amd64_xen_pv/contrib/llvm/tools/clang/lib/AST/DumpXML.cpp projects/amd64_xen_pv/contrib/llvm/tools/clang/lib/AST/MicrosoftMangle.cpp projects/amd64_xen_pv/contrib/llvm/tools/clang/lib/AST/Type.cpp projects/amd64_xen_pv/contrib/llvm/tools/clang/lib/AST/TypePrinter.cpp projects/amd64_xen_pv/contrib/llvm/tools/clang/lib/Basic/Targets.cpp projects/amd64_xen_pv/contrib/llvm/tools/clang/lib/CodeGen/CGCall.cpp projects/amd64_xen_pv/contrib/llvm/tools/clang/lib/Sema/SemaDeclAttr.cpp projects/amd64_xen_pv/contrib/llvm/tools/clang/lib/Sema/SemaType.cpp projects/amd64_xen_pv/etc/Makefile projects/amd64_xen_pv/etc/defaults/periodic.conf projects/amd64_xen_pv/etc/defaults/rc.conf projects/amd64_xen_pv/etc/ftpusers projects/amd64_xen_pv/etc/mtree/BSD.include.dist projects/amd64_xen_pv/etc/mtree/BSD.var.dist projects/amd64_xen_pv/etc/mtree/Makefile projects/amd64_xen_pv/etc/network.subr projects/amd64_xen_pv/etc/periodic/daily/Makefile projects/amd64_xen_pv/etc/portsnap.conf projects/amd64_xen_pv/etc/rc.d/Makefile projects/amd64_xen_pv/etc/rc.d/jail projects/amd64_xen_pv/etc/rc.d/netif projects/amd64_xen_pv/etc/rc.d/sshd projects/amd64_xen_pv/etc/rc.subr projects/amd64_xen_pv/games/fortune/datfiles/freebsd-tips projects/amd64_xen_pv/gnu/usr.bin/binutils/Makefile projects/amd64_xen_pv/gnu/usr.bin/cc/cc_tools/freebsd-native.h projects/amd64_xen_pv/gnu/usr.bin/groff/tmac/mdoc.local projects/amd64_xen_pv/include/Makefile projects/amd64_xen_pv/include/mk-osreldate.sh projects/amd64_xen_pv/lib/Makefile projects/amd64_xen_pv/lib/clang/clang.build.mk projects/amd64_xen_pv/lib/csu/arm/crt1.c projects/amd64_xen_pv/lib/csu/common/notes.h projects/amd64_xen_pv/lib/libarchive/Makefile projects/amd64_xen_pv/lib/libc/sys/accept.2 projects/amd64_xen_pv/lib/libedit/readline.c projects/amd64_xen_pv/lib/libprocstat/libprocstat.c projects/amd64_xen_pv/lib/libstand/tftp.c projects/amd64_xen_pv/lib/libutil/humanize_number.3 projects/amd64_xen_pv/lib/libutil/humanize_number.c projects/amd64_xen_pv/lib/libvmmapi/vmmapi.c projects/amd64_xen_pv/lib/libvmmapi/vmmapi.h projects/amd64_xen_pv/libexec/rtld-elf/rtld.c projects/amd64_xen_pv/libexec/rtld-elf/rtld.h projects/amd64_xen_pv/release/Makefile projects/amd64_xen_pv/release/release.sh projects/amd64_xen_pv/sbin/bsdlabel/bsdlabel.8 projects/amd64_xen_pv/sbin/camcontrol/camcontrol.c projects/amd64_xen_pv/sbin/camcontrol/fwdownload.c projects/amd64_xen_pv/sbin/ccdconfig/ccdconfig.8 projects/amd64_xen_pv/sbin/fdisk/fdisk.8 projects/amd64_xen_pv/sbin/gbde/gbde.8 projects/amd64_xen_pv/sbin/geom/class/eli/geli.8 projects/amd64_xen_pv/sbin/geom/class/shsec/gshsec.8 projects/amd64_xen_pv/sbin/geom/class/virstor/gvirstor.8 projects/amd64_xen_pv/sbin/gvinum/gvinum.8 projects/amd64_xen_pv/sbin/iscontrol/iscsi.conf.5 projects/amd64_xen_pv/sbin/mount_msdosfs/mount_msdosfs.8 projects/amd64_xen_pv/sbin/newfs/newfs.8 projects/amd64_xen_pv/sbin/newfs_msdos/newfs_msdos.8 projects/amd64_xen_pv/sbin/newfs_nandfs/newfs_nandfs.8 projects/amd64_xen_pv/sbin/nvmecontrol/perftest.c projects/amd64_xen_pv/sbin/recoverdisk/recoverdisk.1 projects/amd64_xen_pv/sbin/route/route.c projects/amd64_xen_pv/share/doc/Makefile projects/amd64_xen_pv/share/examples/bhyve/vmrun.sh projects/amd64_xen_pv/share/man/man4/altera_avgen.4 projects/amd64_xen_pv/share/man/man4/ddb.4 projects/amd64_xen_pv/share/man/man4/geom_linux_lvm.4 projects/amd64_xen_pv/share/man/man4/rsu.4 projects/amd64_xen_pv/share/man/man4/urtwn.4 projects/amd64_xen_pv/share/man/man5/ext2fs.5 projects/amd64_xen_pv/share/man/man5/msdosfs.5 projects/amd64_xen_pv/share/man/man5/rc.conf.5 projects/amd64_xen_pv/share/man/man5/reiserfs.5 projects/amd64_xen_pv/share/man/man5/src.conf.5 projects/amd64_xen_pv/share/man/man8/picobsd.8 projects/amd64_xen_pv/share/man/man9/Makefile projects/amd64_xen_pv/share/man/man9/VOP_FSYNC.9 projects/amd64_xen_pv/share/man/man9/firmware.9 projects/amd64_xen_pv/share/man/man9/lock.9 projects/amd64_xen_pv/share/man/man9/vm_page_grab.9 projects/amd64_xen_pv/share/man/man9/vnode.9 projects/amd64_xen_pv/share/misc/bsd-family-tree projects/amd64_xen_pv/share/misc/committers-src.dot projects/amd64_xen_pv/share/mk/bsd.libnames.mk projects/amd64_xen_pv/share/mk/bsd.own.mk projects/amd64_xen_pv/sys/amd64/amd64/machdep.c projects/amd64_xen_pv/sys/amd64/amd64/pmap.c projects/amd64_xen_pv/sys/amd64/amd64/trap.c projects/amd64_xen_pv/sys/amd64/conf/NOTES projects/amd64_xen_pv/sys/amd64/include/pcpu.h projects/amd64_xen_pv/sys/amd64/include/pmap.h projects/amd64_xen_pv/sys/amd64/include/vmm.h (contents, props changed) projects/amd64_xen_pv/sys/amd64/include/vmm_dev.h (contents, props changed) projects/amd64_xen_pv/sys/amd64/include/vmm_instruction_emul.h (contents, props changed) projects/amd64_xen_pv/sys/amd64/vmm/amd/amdv.c projects/amd64_xen_pv/sys/amd64/vmm/intel/ept.c projects/amd64_xen_pv/sys/amd64/vmm/intel/ept.h projects/amd64_xen_pv/sys/amd64/vmm/intel/vmcs.c projects/amd64_xen_pv/sys/amd64/vmm/intel/vmcs.h projects/amd64_xen_pv/sys/amd64/vmm/intel/vmx.c projects/amd64_xen_pv/sys/amd64/vmm/intel/vmx.h projects/amd64_xen_pv/sys/amd64/vmm/intel/vmx_genassym.c projects/amd64_xen_pv/sys/amd64/vmm/intel/vmx_support.S projects/amd64_xen_pv/sys/amd64/vmm/io/ppt.c projects/amd64_xen_pv/sys/amd64/vmm/io/ppt.h projects/amd64_xen_pv/sys/amd64/vmm/vmm.c projects/amd64_xen_pv/sys/amd64/vmm/vmm_dev.c projects/amd64_xen_pv/sys/amd64/vmm/vmm_instruction_emul.c projects/amd64_xen_pv/sys/amd64/vmm/vmm_mem.c projects/amd64_xen_pv/sys/amd64/vmm/vmm_mem.h projects/amd64_xen_pv/sys/amd64/vmm/vmm_msr.c projects/amd64_xen_pv/sys/arm/s3c2xx0/uart_bus_s3c2410.c projects/amd64_xen_pv/sys/arm/s3c2xx0/uart_cpu_s3c2410.c projects/amd64_xen_pv/sys/arm/samsung/exynos/exynos5_machdep.c projects/amd64_xen_pv/sys/arm/versatile/versatile_pci.c projects/amd64_xen_pv/sys/boot/arm/ixp425/boot2/Makefile projects/amd64_xen_pv/sys/boot/common/loader.8 projects/amd64_xen_pv/sys/boot/i386/btx/btx/btx.S projects/amd64_xen_pv/sys/boot/i386/efi/Makefile projects/amd64_xen_pv/sys/boot/powerpc/boot1.chrp/Makefile projects/amd64_xen_pv/sys/boot/userboot/libstand/Makefile projects/amd64_xen_pv/sys/boot/userboot/test/Makefile projects/amd64_xen_pv/sys/boot/userboot/userboot/Makefile projects/amd64_xen_pv/sys/cam/cam_ccb.h projects/amd64_xen_pv/sys/cam/cam_compat.h projects/amd64_xen_pv/sys/cam/cam_xpt.c projects/amd64_xen_pv/sys/cam/ctl/ctl_frontend_iscsi.c projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c projects/amd64_xen_pv/sys/cddl/dev/dtrace/dtrace_load.c projects/amd64_xen_pv/sys/cddl/dev/dtrace/dtrace_unload.c projects/amd64_xen_pv/sys/compat/freebsd32/freebsd32.h projects/amd64_xen_pv/sys/compat/linux/linux_futex.c projects/amd64_xen_pv/sys/compat/linux/linux_uid16.c projects/amd64_xen_pv/sys/conf/files projects/amd64_xen_pv/sys/conf/files.powerpc projects/amd64_xen_pv/sys/conf/newvers.sh projects/amd64_xen_pv/sys/conf/options.mips projects/amd64_xen_pv/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c projects/amd64_xen_pv/sys/contrib/ipfilter/netinet/ip_tftp_pxy.c projects/amd64_xen_pv/sys/contrib/rdma/ib_umem.h projects/amd64_xen_pv/sys/dev/adb/adb_mouse.c projects/amd64_xen_pv/sys/dev/ata/ata-all.c projects/amd64_xen_pv/sys/dev/ata/ata-card.c projects/amd64_xen_pv/sys/dev/ath/ath_hal/ar5212/ar5212.h projects/amd64_xen_pv/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c projects/amd64_xen_pv/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c projects/amd64_xen_pv/sys/dev/bxe/bxe.c projects/amd64_xen_pv/sys/dev/bxe/bxe_stats.c projects/amd64_xen_pv/sys/dev/bxe/ecore_sp.h projects/amd64_xen_pv/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c projects/amd64_xen_pv/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c projects/amd64_xen_pv/sys/dev/cxgbe/t4_main.c projects/amd64_xen_pv/sys/dev/cxgbe/t4_sge.c projects/amd64_xen_pv/sys/dev/e1000/e1000_80003es2lan.c projects/amd64_xen_pv/sys/dev/e1000/e1000_80003es2lan.h projects/amd64_xen_pv/sys/dev/e1000/e1000_82571.c projects/amd64_xen_pv/sys/dev/e1000/e1000_82575.c projects/amd64_xen_pv/sys/dev/e1000/e1000_82575.h projects/amd64_xen_pv/sys/dev/e1000/e1000_api.c projects/amd64_xen_pv/sys/dev/e1000/e1000_defines.h projects/amd64_xen_pv/sys/dev/e1000/e1000_hw.h projects/amd64_xen_pv/sys/dev/e1000/e1000_i210.c projects/amd64_xen_pv/sys/dev/e1000/e1000_i210.h projects/amd64_xen_pv/sys/dev/e1000/e1000_ich8lan.c projects/amd64_xen_pv/sys/dev/e1000/e1000_ich8lan.h projects/amd64_xen_pv/sys/dev/e1000/e1000_mac.c projects/amd64_xen_pv/sys/dev/e1000/e1000_osdep.h projects/amd64_xen_pv/sys/dev/e1000/e1000_phy.c projects/amd64_xen_pv/sys/dev/e1000/e1000_phy.h projects/amd64_xen_pv/sys/dev/e1000/e1000_regs.h projects/amd64_xen_pv/sys/dev/e1000/e1000_vf.h projects/amd64_xen_pv/sys/dev/e1000/if_igb.c projects/amd64_xen_pv/sys/dev/e1000/if_igb.h projects/amd64_xen_pv/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c projects/amd64_xen_pv/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c projects/amd64_xen_pv/sys/dev/hyperv/storvsc/hv_vstorage.h projects/amd64_xen_pv/sys/dev/hyperv/vmbus/hv_channel.c projects/amd64_xen_pv/sys/dev/hyperv/vmbus/hv_hv.c projects/amd64_xen_pv/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c projects/amd64_xen_pv/sys/dev/hyperv/vmbus/hv_vmbus_priv.h projects/amd64_xen_pv/sys/dev/isci/isci.c projects/amd64_xen_pv/sys/dev/isci/isci_io_request.c projects/amd64_xen_pv/sys/dev/isci/isci_sysctl.c projects/amd64_xen_pv/sys/dev/isci/isci_task_request.c projects/amd64_xen_pv/sys/dev/iscsi/icl.c projects/amd64_xen_pv/sys/dev/iscsi/iscsi.c projects/amd64_xen_pv/sys/dev/ixgbe/ixgbe.c projects/amd64_xen_pv/sys/dev/mfi/mfi_pci.c projects/amd64_xen_pv/sys/dev/netmap/if_igb_netmap.h projects/amd64_xen_pv/sys/dev/nfe/if_nfe.c projects/amd64_xen_pv/sys/dev/nvd/nvd.c projects/amd64_xen_pv/sys/dev/nvme/nvme.c projects/amd64_xen_pv/sys/dev/nvme/nvme.h projects/amd64_xen_pv/sys/dev/nvme/nvme_ctrlr.c projects/amd64_xen_pv/sys/dev/nvme/nvme_ns.c projects/amd64_xen_pv/sys/dev/nvme/nvme_private.h projects/amd64_xen_pv/sys/dev/nvme/nvme_test.c projects/amd64_xen_pv/sys/dev/random/ivy.c projects/amd64_xen_pv/sys/dev/virtio/network/if_vtnet.c projects/amd64_xen_pv/sys/dev/xen/control/control.c projects/amd64_xen_pv/sys/dev/xen/timer/timer.c projects/amd64_xen_pv/sys/fs/cd9660/cd9660_vfsops.c projects/amd64_xen_pv/sys/i386/conf/NOTES projects/amd64_xen_pv/sys/i386/ibcs2/ibcs2_sysvec.c projects/amd64_xen_pv/sys/i386/include/pcpu.h projects/amd64_xen_pv/sys/i386/include/xen/xen-os.h projects/amd64_xen_pv/sys/i386/xen/mp_machdep.c projects/amd64_xen_pv/sys/kern/kern_descrip.c projects/amd64_xen_pv/sys/kern/kern_event.c projects/amd64_xen_pv/sys/kern/kern_lock.c projects/amd64_xen_pv/sys/kern/kern_malloc.c projects/amd64_xen_pv/sys/kern/kern_mbuf.c projects/amd64_xen_pv/sys/kern/kern_timeout.c projects/amd64_xen_pv/sys/kern/uipc_sockbuf.c projects/amd64_xen_pv/sys/kern/vfs_bio.c projects/amd64_xen_pv/sys/kern/vfs_mount.c projects/amd64_xen_pv/sys/kern/vfs_subr.c projects/amd64_xen_pv/sys/libkern/arm/aeabi_unwind.c projects/amd64_xen_pv/sys/libkern/ashldi3.c projects/amd64_xen_pv/sys/mips/atheros/apb.c projects/amd64_xen_pv/sys/mips/atheros/ar71xxreg.h projects/amd64_xen_pv/sys/mips/atheros/ar934xreg.h projects/amd64_xen_pv/sys/mips/conf/AR934X_BASE projects/amd64_xen_pv/sys/mips/conf/MALTA projects/amd64_xen_pv/sys/mips/include/asm.h projects/amd64_xen_pv/sys/mips/include/cpuregs.h projects/amd64_xen_pv/sys/mips/mips/bus_space_generic.c projects/amd64_xen_pv/sys/mips/mips/elf_trampoline.c projects/amd64_xen_pv/sys/mips/mips/tlb.c projects/amd64_xen_pv/sys/mips/nlm/dev/sec/nlmrsa.c projects/amd64_xen_pv/sys/mips/nlm/dev/sec/nlmrsalib.h projects/amd64_xen_pv/sys/modules/Makefile projects/amd64_xen_pv/sys/modules/hyperv/netvsc/Makefile projects/amd64_xen_pv/sys/modules/hyperv/stordisengage/Makefile projects/amd64_xen_pv/sys/modules/hyperv/storvsc/Makefile projects/amd64_xen_pv/sys/modules/hyperv/utilities/Makefile projects/amd64_xen_pv/sys/modules/hyperv/vmbus/Makefile projects/amd64_xen_pv/sys/modules/mlx4/Makefile projects/amd64_xen_pv/sys/modules/mlx4ib/Makefile projects/amd64_xen_pv/sys/modules/sfxge/Makefile projects/amd64_xen_pv/sys/net/if.h projects/amd64_xen_pv/sys/net/if_enc.c projects/amd64_xen_pv/sys/net/if_ethersubr.c projects/amd64_xen_pv/sys/net/if_lagg.c projects/amd64_xen_pv/sys/net/if_tap.c projects/amd64_xen_pv/sys/net/if_tun.c projects/amd64_xen_pv/sys/net80211/ieee80211_freebsd.c projects/amd64_xen_pv/sys/netinet/in_kdtrace.c projects/amd64_xen_pv/sys/netinet/tcp_input.c projects/amd64_xen_pv/sys/netinet6/in6_ifattach.c projects/amd64_xen_pv/sys/netinet6/ip6_mroute.c projects/amd64_xen_pv/sys/netpfil/ipfw/ip_fw_log.c projects/amd64_xen_pv/sys/ofed/drivers/infiniband/core/addr.c projects/amd64_xen_pv/sys/ofed/drivers/infiniband/core/cma.c projects/amd64_xen_pv/sys/ofed/drivers/infiniband/core/core_priv.h projects/amd64_xen_pv/sys/ofed/drivers/infiniband/core/device.c projects/amd64_xen_pv/sys/ofed/drivers/infiniband/core/sa_query.c projects/amd64_xen_pv/sys/ofed/drivers/infiniband/core/sysfs.c projects/amd64_xen_pv/sys/ofed/drivers/infiniband/core/ucm.c projects/amd64_xen_pv/sys/ofed/drivers/infiniband/core/umem.c projects/amd64_xen_pv/sys/ofed/drivers/infiniband/core/uverbs_cmd.c projects/amd64_xen_pv/sys/ofed/drivers/infiniband/core/uverbs_main.c projects/amd64_xen_pv/sys/ofed/drivers/infiniband/core/verbs.c projects/amd64_xen_pv/sys/ofed/drivers/infiniband/hw/mlx4/Kconfig projects/amd64_xen_pv/sys/ofed/drivers/infiniband/hw/mlx4/Makefile projects/amd64_xen_pv/sys/ofed/drivers/infiniband/hw/mlx4/ah.c projects/amd64_xen_pv/sys/ofed/drivers/infiniband/hw/mlx4/cq.c projects/amd64_xen_pv/sys/ofed/drivers/infiniband/hw/mlx4/mad.c projects/amd64_xen_pv/sys/ofed/drivers/infiniband/hw/mlx4/main.c projects/amd64_xen_pv/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_ib.h projects/amd64_xen_pv/sys/ofed/drivers/infiniband/hw/mlx4/mr.c projects/amd64_xen_pv/sys/ofed/drivers/infiniband/hw/mlx4/qp.c projects/amd64_xen_pv/sys/ofed/drivers/infiniband/hw/mlx4/srq.c projects/amd64_xen_pv/sys/ofed/drivers/infiniband/hw/mlx4/user.h projects/amd64_xen_pv/sys/ofed/drivers/infiniband/hw/mlx4/wc.c projects/amd64_xen_pv/sys/ofed/drivers/infiniband/hw/mthca/mthca_cmd.c projects/amd64_xen_pv/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c projects/amd64_xen_pv/sys/ofed/drivers/infiniband/hw/mthca/mthca_memfree.c projects/amd64_xen_pv/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c projects/amd64_xen_pv/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h projects/amd64_xen_pv/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c projects/amd64_xen_pv/sys/ofed/drivers/net/mlx4/Makefile projects/amd64_xen_pv/sys/ofed/drivers/net/mlx4/alloc.c projects/amd64_xen_pv/sys/ofed/drivers/net/mlx4/catas.c projects/amd64_xen_pv/sys/ofed/drivers/net/mlx4/cmd.c projects/amd64_xen_pv/sys/ofed/drivers/net/mlx4/cq.c projects/amd64_xen_pv/sys/ofed/drivers/net/mlx4/en_cq.c projects/amd64_xen_pv/sys/ofed/drivers/net/mlx4/en_main.c projects/amd64_xen_pv/sys/ofed/drivers/net/mlx4/en_netdev.c projects/amd64_xen_pv/sys/ofed/drivers/net/mlx4/en_port.c projects/amd64_xen_pv/sys/ofed/drivers/net/mlx4/en_port.h projects/amd64_xen_pv/sys/ofed/drivers/net/mlx4/en_rx.c projects/amd64_xen_pv/sys/ofed/drivers/net/mlx4/en_tx.c projects/amd64_xen_pv/sys/ofed/drivers/net/mlx4/eq.c projects/amd64_xen_pv/sys/ofed/drivers/net/mlx4/fw.c projects/amd64_xen_pv/sys/ofed/drivers/net/mlx4/fw.h projects/amd64_xen_pv/sys/ofed/drivers/net/mlx4/icm.c projects/amd64_xen_pv/sys/ofed/drivers/net/mlx4/icm.h projects/amd64_xen_pv/sys/ofed/drivers/net/mlx4/intf.c projects/amd64_xen_pv/sys/ofed/drivers/net/mlx4/main.c projects/amd64_xen_pv/sys/ofed/drivers/net/mlx4/mcg.c projects/amd64_xen_pv/sys/ofed/drivers/net/mlx4/mlx4.h projects/amd64_xen_pv/sys/ofed/drivers/net/mlx4/mlx4_en.h projects/amd64_xen_pv/sys/ofed/drivers/net/mlx4/mr.c projects/amd64_xen_pv/sys/ofed/drivers/net/mlx4/pd.c projects/amd64_xen_pv/sys/ofed/drivers/net/mlx4/port.c projects/amd64_xen_pv/sys/ofed/drivers/net/mlx4/profile.c projects/amd64_xen_pv/sys/ofed/drivers/net/mlx4/qp.c projects/amd64_xen_pv/sys/ofed/drivers/net/mlx4/reset.c projects/amd64_xen_pv/sys/ofed/drivers/net/mlx4/sense.c projects/amd64_xen_pv/sys/ofed/drivers/net/mlx4/srq.c projects/amd64_xen_pv/sys/ofed/include/asm/atomic.h projects/amd64_xen_pv/sys/ofed/include/asm/byteorder.h projects/amd64_xen_pv/sys/ofed/include/linux/bitops.h projects/amd64_xen_pv/sys/ofed/include/linux/compat.h projects/amd64_xen_pv/sys/ofed/include/linux/device.h projects/amd64_xen_pv/sys/ofed/include/linux/dma-mapping.h projects/amd64_xen_pv/sys/ofed/include/linux/gfp.h projects/amd64_xen_pv/sys/ofed/include/linux/idr.h projects/amd64_xen_pv/sys/ofed/include/linux/if_ether.h projects/amd64_xen_pv/sys/ofed/include/linux/in6.h projects/amd64_xen_pv/sys/ofed/include/linux/kernel.h projects/amd64_xen_pv/sys/ofed/include/linux/linux_compat.c projects/amd64_xen_pv/sys/ofed/include/linux/list.h projects/amd64_xen_pv/sys/ofed/include/linux/log2.h projects/amd64_xen_pv/sys/ofed/include/linux/mlx4/cmd.h projects/amd64_xen_pv/sys/ofed/include/linux/mlx4/cq.h projects/amd64_xen_pv/sys/ofed/include/linux/mlx4/device.h projects/amd64_xen_pv/sys/ofed/include/linux/mlx4/driver.h projects/amd64_xen_pv/sys/ofed/include/linux/mlx4/qp.h projects/amd64_xen_pv/sys/ofed/include/linux/mlx4/srq.h projects/amd64_xen_pv/sys/ofed/include/linux/moduleparam.h projects/amd64_xen_pv/sys/ofed/include/linux/pci.h projects/amd64_xen_pv/sys/ofed/include/linux/sysfs.h projects/amd64_xen_pv/sys/ofed/include/linux/types.h projects/amd64_xen_pv/sys/ofed/include/linux/workqueue.h projects/amd64_xen_pv/sys/ofed/include/rdma/ib_cm.h projects/amd64_xen_pv/sys/ofed/include/rdma/ib_mad.h projects/amd64_xen_pv/sys/ofed/include/rdma/ib_sa.h projects/amd64_xen_pv/sys/ofed/include/rdma/ib_umem.h projects/amd64_xen_pv/sys/ofed/include/rdma/ib_user_verbs.h projects/amd64_xen_pv/sys/ofed/include/rdma/ib_verbs.h projects/amd64_xen_pv/sys/powerpc/include/ofw_machdep.h projects/amd64_xen_pv/sys/powerpc/include/proc.h projects/amd64_xen_pv/sys/powerpc/ofw/ofw_machdep.c projects/amd64_xen_pv/sys/powerpc/ofw/ofw_syscons.c projects/amd64_xen_pv/sys/powerpc/ofw/ofw_syscons.h projects/amd64_xen_pv/sys/powerpc/powermac/platform_powermac.c projects/amd64_xen_pv/sys/powerpc/powerpc/mmu_if.m projects/amd64_xen_pv/sys/powerpc/ps3/ps3cdrom.c projects/amd64_xen_pv/sys/powerpc/pseries/mmu_phyp.c projects/amd64_xen_pv/sys/powerpc/pseries/phyp_console.c projects/amd64_xen_pv/sys/powerpc/pseries/platform_chrp.c projects/amd64_xen_pv/sys/powerpc/pseries/vdevice.c projects/amd64_xen_pv/sys/security/mac/mac_framework.c projects/amd64_xen_pv/sys/security/mac/mac_internal.h projects/amd64_xen_pv/sys/security/mac/mac_posix_shm.c projects/amd64_xen_pv/sys/security/mac/mac_vfs.c projects/amd64_xen_pv/sys/sparc64/include/proc.h projects/amd64_xen_pv/sys/sys/elf_common.h projects/amd64_xen_pv/sys/sys/lockmgr.h projects/amd64_xen_pv/sys/sys/param.h projects/amd64_xen_pv/sys/sys/sockbuf.h projects/amd64_xen_pv/sys/vm/vm_phys.c projects/amd64_xen_pv/sys/x86/acpica/madt.c projects/amd64_xen_pv/sys/x86/include/stdarg.h projects/amd64_xen_pv/sys/x86/xen/hvm.c projects/amd64_xen_pv/sys/x86/xen/mptable.c (contents, props changed) projects/amd64_xen_pv/sys/x86/xen/xen_intr.c projects/amd64_xen_pv/tools/build/mk/OptionalObsoleteFiles.inc projects/amd64_xen_pv/tools/build/options/WITHOUT_BINUTILS projects/amd64_xen_pv/tools/build/options/makeman projects/amd64_xen_pv/tools/regression/lib/libutil/Makefile projects/amd64_xen_pv/usr.bin/Makefile projects/amd64_xen_pv/usr.bin/calendar/calendar.1 projects/amd64_xen_pv/usr.bin/calendar/calendars/calendar.dutch projects/amd64_xen_pv/usr.bin/host/Makefile projects/amd64_xen_pv/usr.bin/kdump/kdump.c projects/amd64_xen_pv/usr.bin/patch/patch.c projects/amd64_xen_pv/usr.bin/patch/util.c projects/amd64_xen_pv/usr.bin/svn/lib/libapr/apr_private.h projects/amd64_xen_pv/usr.bin/svn/svn_private_config.h projects/amd64_xen_pv/usr.sbin/Makefile projects/amd64_xen_pv/usr.sbin/bhyve/Makefile projects/amd64_xen_pv/usr.sbin/bhyve/bhyverun.c projects/amd64_xen_pv/usr.sbin/bhyve/bhyverun.h projects/amd64_xen_pv/usr.sbin/bhyve/dbgport.h projects/amd64_xen_pv/usr.sbin/bhyve/pci_emul.c projects/amd64_xen_pv/usr.sbin/bhyve/pci_virtio_block.c projects/amd64_xen_pv/usr.sbin/bhyve/pit_8254.c projects/amd64_xen_pv/usr.sbin/bhyve/rtc.c projects/amd64_xen_pv/usr.sbin/bhyvectl/Makefile projects/amd64_xen_pv/usr.sbin/bhyvectl/bhyvectl.c projects/amd64_xen_pv/usr.sbin/bhyveload/Makefile projects/amd64_xen_pv/usr.sbin/bhyveload/bhyveload.8 projects/amd64_xen_pv/usr.sbin/bhyveload/bhyveload.c projects/amd64_xen_pv/usr.sbin/boot0cfg/boot0cfg.8 projects/amd64_xen_pv/usr.sbin/bsdconfig/bsdconfig projects/amd64_xen_pv/usr.sbin/bsdconfig/console/ttys projects/amd64_xen_pv/usr.sbin/bsdconfig/mouse/enable projects/amd64_xen_pv/usr.sbin/bsdconfig/networking/devices projects/amd64_xen_pv/usr.sbin/bsdconfig/networking/share/device.subr projects/amd64_xen_pv/usr.sbin/bsdconfig/networking/share/hostname.subr projects/amd64_xen_pv/usr.sbin/bsdconfig/networking/share/ipaddr.subr projects/amd64_xen_pv/usr.sbin/bsdconfig/networking/share/media.subr projects/amd64_xen_pv/usr.sbin/bsdconfig/networking/share/netmask.subr projects/amd64_xen_pv/usr.sbin/bsdconfig/networking/share/resolv.subr projects/amd64_xen_pv/usr.sbin/bsdconfig/networking/share/routing.subr projects/amd64_xen_pv/usr.sbin/bsdconfig/password/share/password.subr projects/amd64_xen_pv/usr.sbin/bsdconfig/security/kern_securelevel projects/amd64_xen_pv/usr.sbin/bsdconfig/security/security projects/amd64_xen_pv/usr.sbin/bsdconfig/share/common.subr projects/amd64_xen_pv/usr.sbin/bsdconfig/share/device.subr projects/amd64_xen_pv/usr.sbin/bsdconfig/share/dialog.subr projects/amd64_xen_pv/usr.sbin/bsdconfig/share/media/any.subr projects/amd64_xen_pv/usr.sbin/bsdconfig/share/media/cdrom.subr projects/amd64_xen_pv/usr.sbin/bsdconfig/share/media/common.subr projects/amd64_xen_pv/usr.sbin/bsdconfig/share/media/dos.subr projects/amd64_xen_pv/usr.sbin/bsdconfig/share/media/floppy.subr projects/amd64_xen_pv/usr.sbin/bsdconfig/share/media/ftp.subr projects/amd64_xen_pv/usr.sbin/bsdconfig/share/media/http.subr projects/amd64_xen_pv/usr.sbin/bsdconfig/share/media/nfs.subr projects/amd64_xen_pv/usr.sbin/bsdconfig/share/media/options.subr projects/amd64_xen_pv/usr.sbin/bsdconfig/share/media/tcpip.subr projects/amd64_xen_pv/usr.sbin/bsdconfig/share/media/ufs.subr projects/amd64_xen_pv/usr.sbin/bsdconfig/share/media/usb.subr projects/amd64_xen_pv/usr.sbin/bsdconfig/share/mustberoot.subr projects/amd64_xen_pv/usr.sbin/bsdconfig/share/packages/packages.subr projects/amd64_xen_pv/usr.sbin/bsdconfig/startup/misc projects/amd64_xen_pv/usr.sbin/bsdconfig/startup/rcconf projects/amd64_xen_pv/usr.sbin/bsdconfig/startup/rcdelete projects/amd64_xen_pv/usr.sbin/bsdconfig/startup/rcvar projects/amd64_xen_pv/usr.sbin/bsdconfig/startup/share/rcconf.subr projects/amd64_xen_pv/usr.sbin/bsdconfig/startup/share/rcedit.subr projects/amd64_xen_pv/usr.sbin/bsdconfig/timezone/timezone projects/amd64_xen_pv/usr.sbin/bsdconfig/usermgmt/groupdel projects/amd64_xen_pv/usr.sbin/bsdconfig/usermgmt/groupedit projects/amd64_xen_pv/usr.sbin/bsdconfig/usermgmt/groupinput projects/amd64_xen_pv/usr.sbin/bsdconfig/usermgmt/share/group_input.subr projects/amd64_xen_pv/usr.sbin/bsdconfig/usermgmt/share/user_input.subr projects/amd64_xen_pv/usr.sbin/bsdconfig/usermgmt/userdel projects/amd64_xen_pv/usr.sbin/bsdconfig/usermgmt/useredit projects/amd64_xen_pv/usr.sbin/bsdconfig/usermgmt/userinput projects/amd64_xen_pv/usr.sbin/bsdconfig/usermgmt/usermgmt projects/amd64_xen_pv/usr.sbin/bsdinstall/scripts/mirrorselect projects/amd64_xen_pv/usr.sbin/ctladm/ctladm.c projects/amd64_xen_pv/usr.sbin/ctld/kernel.c projects/amd64_xen_pv/usr.sbin/ctld/login.c projects/amd64_xen_pv/usr.sbin/iscsid/discovery.c projects/amd64_xen_pv/usr.sbin/jail/jail.c projects/amd64_xen_pv/usr.sbin/kldxref/kldxref.c projects/amd64_xen_pv/usr.sbin/ntp/config.h projects/amd64_xen_pv/usr.sbin/ntp/libparse/Makefile Directory Properties: projects/amd64_xen_pv/ (props changed) projects/amd64_xen_pv/cddl/ (props changed) projects/amd64_xen_pv/cddl/contrib/opensolaris/ (props changed) projects/amd64_xen_pv/cddl/contrib/opensolaris/cmd/zfs/ (props changed) projects/amd64_xen_pv/contrib/binutils/ (props changed) projects/amd64_xen_pv/contrib/bmake/ (props changed) projects/amd64_xen_pv/contrib/dialog/ (props changed) projects/amd64_xen_pv/contrib/libc++/ (props changed) projects/amd64_xen_pv/contrib/llvm/ (props changed) projects/amd64_xen_pv/contrib/llvm/tools/clang/ (props changed) projects/amd64_xen_pv/gnu/usr.bin/binutils/ (props changed) projects/amd64_xen_pv/gnu/usr.bin/cc/cc_tools/ (props changed) projects/amd64_xen_pv/lib/libc/ (props changed) projects/amd64_xen_pv/lib/libutil/ (props changed) projects/amd64_xen_pv/lib/libvmmapi/ (props changed) projects/amd64_xen_pv/sbin/ (props changed) projects/amd64_xen_pv/share/man/man4/ (props changed) projects/amd64_xen_pv/sys/ (props changed) projects/amd64_xen_pv/sys/amd64/vmm/ (props changed) projects/amd64_xen_pv/sys/boot/ (props changed) projects/amd64_xen_pv/sys/boot/i386/efi/ (props changed) projects/amd64_xen_pv/sys/boot/powerpc/boot1.chrp/ (props changed) projects/amd64_xen_pv/sys/cddl/contrib/opensolaris/ (props changed) projects/amd64_xen_pv/sys/conf/ (props changed) projects/amd64_xen_pv/sys/contrib/ipfilter/ (props changed) projects/amd64_xen_pv/sys/dev/hyperv/ (props changed) projects/amd64_xen_pv/sys/modules/hyperv/ (props changed) projects/amd64_xen_pv/usr.bin/calendar/ (props changed) projects/amd64_xen_pv/usr.sbin/bhyve/ (props changed) projects/amd64_xen_pv/usr.sbin/bhyvectl/ (props changed) projects/amd64_xen_pv/usr.sbin/bhyveload/ (props changed) projects/amd64_xen_pv/usr.sbin/jail/ (props changed) Modified: projects/amd64_xen_pv/Makefile.inc1 ============================================================================== --- projects/amd64_xen_pv/Makefile.inc1 Fri Oct 11 06:51:56 2013 (r256309) +++ projects/amd64_xen_pv/Makefile.inc1 Fri Oct 11 07:22:26 2013 (r256310) @@ -329,7 +329,7 @@ TARGET_ABI= gnueabi .else TARGET_ABI= unknown .endif -TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.0 +TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0 XFLAGS+= -target ${TARGET_TRIPLE} .endif .endif @@ -395,7 +395,7 @@ LIB32WMAKEFLAGS+= \ -DNO_LINT LIB32WMAKE= ${LIB32WMAKEENV} ${MAKE} ${LIB32WMAKEFLAGS} \ - -DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_INFO -DWITHOUT_HTML + -DWITHOUT_MAN -DWITHOUT_INFO -DWITHOUT_HTML LIB32IMAKE= ${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} -DNO_INCS \ ${IMAKE_INSTALL} .endif @@ -485,10 +485,6 @@ _worldtmp: mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \ -p ${WORLDTMP}/usr/lib >/dev/null .endif -.if ${MK_BIND_LIBS} != "no" - mtree -deU -f ${.CURDIR}/etc/mtree/BIND.include.dist \ - -p ${WORLDTMP}/usr/include >/dev/null -.endif .for _mtree in ${LOCAL_MTREE} mtree -deU -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null .endfor @@ -1742,7 +1738,7 @@ check-old-libs: delete-old-dirs: @echo ">>> Removing old directories" @${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ - -V OLD_DIRS | xargs -n1 | \ + -V OLD_DIRS | xargs -n1 | sort -r | \ while read dir; do \ if [ -d "${DESTDIR}/$${dir}" ]; then \ rmdir -v "${DESTDIR}/$${dir}" || true; \ Modified: projects/amd64_xen_pv/ObsoleteFiles.inc ============================================================================== --- projects/amd64_xen_pv/ObsoleteFiles.inc Fri Oct 11 06:51:56 2013 (r256309) +++ projects/amd64_xen_pv/ObsoleteFiles.inc Fri Oct 11 07:22:26 2013 (r256310) @@ -38,6 +38,242 @@ # xargs -n1 | sort | uniq -d; # done +# 20131009: freebsd-version moved from /libexec to /bin +OLD_FILES+=/libexec/freebsd-version +# 20131001: ar and ranlib from binutils not used +OLD_FILES+=usr/bin/gnu-ar +OLD_FILES+=usr/bin/gnu-ranlib +OLD_FILES+=usr/share/man/man1/gnu-ar.1.gz +OLD_FILES+=usr/share/man/man1/gnu-ranlib.1.gz +# 20130930: BIND removed from base +OLD_FILES+=etc/namedb +OLD_FILES+=etc/periodic/daily/470.status-named +OLD_FILES+=usr/bin/dig +OLD_FILES+=usr/bin/nslookup +OLD_FILES+=usr/bin/nsupdate +OLD_DIRS+=usr/include/lwres +OLD_FILES+=usr/include/lwres/context.h +OLD_FILES+=usr/include/lwres/int.h +OLD_FILES+=usr/include/lwres/ipv6.h +OLD_FILES+=usr/include/lwres/lang.h +OLD_FILES+=usr/include/lwres/list.h +OLD_FILES+=usr/include/lwres/lwbuffer.h +OLD_FILES+=usr/include/lwres/lwpacket.h +OLD_FILES+=usr/include/lwres/lwres.h +OLD_FILES+=usr/include/lwres/net.h +OLD_FILES+=usr/include/lwres/netdb.h +OLD_FILES+=usr/include/lwres/platform.h +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_FILES+=usr/lib/liblwres_p.a +OLD_FILES+=usr/sbin/arpaname +OLD_FILES+=usr/sbin/ddns-confgen +OLD_FILES+=usr/sbin/dnssec-dsfromkey +OLD_FILES+=usr/sbin/dnssec-keyfromlabel +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/genrandom +OLD_FILES+=usr/sbin/isc-hmac-fixup +OLD_FILES+=usr/sbin/lwresd +OLD_FILES+=usr/sbin/named +OLD_FILES+=usr/sbin/named-checkconf +OLD_FILES+=usr/sbin/named-checkzone +OLD_FILES+=usr/sbin/named-compilezone +OLD_FILES+=usr/sbin/named-journalprint +OLD_FILES+=usr/sbin/named.reconfig +OLD_FILES+=usr/sbin/named.reload +OLD_FILES+=usr/sbin/nsec3hash +OLD_FILES+=usr/sbin/rndc +OLD_FILES+=usr/sbin/rndc-confgen +OLD_DIRS+=usr/share/doc/bind9 +OLD_FILES+=usr/share/doc/bind9/CHANGES +OLD_FILES+=usr/share/doc/bind9/COPYRIGHT +OLD_FILES+=usr/share/doc/bind9/FAQ +OLD_FILES+=usr/share/doc/bind9/HISTORY +OLD_FILES+=usr/share/doc/bind9/README +OLD_DIRS+=usr/share/doc/bind9/arm +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch01.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch02.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch03.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch04.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch05.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch06.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch07.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch08.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch09.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch10.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.pdf +OLD_FILES+=usr/share/doc/bind9/arm/man.arpaname.html +OLD_FILES+=usr/share/doc/bind9/arm/man.ddns-confgen.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dig.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-dsfromkey.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-keyfromlabel.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-keygen.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-revoke.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-settime.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-signzone.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-verify.html +OLD_FILES+=usr/share/doc/bind9/arm/man.genrandom.html +OLD_FILES+=usr/share/doc/bind9/arm/man.host.html +OLD_FILES+=usr/share/doc/bind9/arm/man.isc-hmac-fixup.html +OLD_FILES+=usr/share/doc/bind9/arm/man.named-checkconf.html +OLD_FILES+=usr/share/doc/bind9/arm/man.named-checkzone.html +OLD_FILES+=usr/share/doc/bind9/arm/man.named-journalprint.html +OLD_FILES+=usr/share/doc/bind9/arm/man.named.html +OLD_FILES+=usr/share/doc/bind9/arm/man.nsec3hash.html +OLD_FILES+=usr/share/doc/bind9/arm/man.nsupdate.html +OLD_FILES+=usr/share/doc/bind9/arm/man.rndc-confgen.html +OLD_FILES+=usr/share/doc/bind9/arm/man.rndc.conf.html +OLD_FILES+=usr/share/doc/bind9/arm/man.rndc.html +OLD_DIRS+=usr/share/doc/bind9/misc +OLD_FILES+=usr/share/doc/bind9/misc/dnssec +OLD_FILES+=usr/share/doc/bind9/misc/format-options.pl +OLD_FILES+=usr/share/doc/bind9/misc/ipv6 +OLD_FILES+=usr/share/doc/bind9/misc/migration +OLD_FILES+=usr/share/doc/bind9/misc/migration-4to9 +OLD_FILES+=usr/share/doc/bind9/misc/options +OLD_FILES+=usr/share/doc/bind9/misc/rfc-compliance +OLD_FILES+=usr/share/doc/bind9/misc/roadmap +OLD_FILES+=usr/share/doc/bind9/misc/sdb +OLD_FILES+=usr/share/doc/bind9/misc/sort-options.pl +OLD_FILES+=usr/share/man/man1/arpaname.1.gz +OLD_FILES+=usr/share/man/man1/dig.1.gz +OLD_FILES+=usr/share/man/man1/nslookup.1.gz +OLD_FILES+=usr/share/man/man1/nsupdate.1.gz +OLD_FILES+=usr/share/man/man3/lwres.3.gz +OLD_FILES+=usr/share/man/man3/lwres_addr_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_add.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_back.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_clear.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_first.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_forward.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_getmem.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint16.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint32.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint8.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_init.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_invalidate.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_putmem.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint16.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint32.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint8.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_subtract.3.gz +OLD_FILES+=usr/share/man/man3/lwres_conf_clear.3.gz +OLD_FILES+=usr/share/man/man3/lwres_conf_get.3.gz +OLD_FILES+=usr/share/man/man3/lwres_conf_init.3.gz +OLD_FILES+=usr/share/man/man3/lwres_conf_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_conf_print.3.gz +OLD_FILES+=usr/share/man/man3/lwres_config.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_allocmem.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_create.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_destroy.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_freemem.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_initserial.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_nextserial.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_sendrecv.3.gz +OLD_FILES+=usr/share/man/man3/lwres_endhostent.3.gz +OLD_FILES+=usr/share/man/man3/lwres_endhostent_r.3.gz +OLD_FILES+=usr/share/man/man3/lwres_freeaddrinfo.3.gz +OLD_FILES+=usr/share/man/man3/lwres_freehostent.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabn.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gai_strerror.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getaddrinfo.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getaddrsbyname.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostbyaddr.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostbyaddr_r.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostbyname.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostbyname2.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostbyname_r.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostent.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostent_r.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getipnode.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getipnodebyaddr.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getipnodebyname.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getnamebyaddr.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getnameinfo.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getrrsetbyname.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnba.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_herror.3.gz +OLD_FILES+=usr/share/man/man3/lwres_hstrerror.3.gz +OLD_FILES+=usr/share/man/man3/lwres_inetntop.3.gz +OLD_FILES+=usr/share/man/man3/lwres_lwpacket_parseheader.3.gz +OLD_FILES+=usr/share/man/man3/lwres_lwpacket_renderheader.3.gz +OLD_FILES+=usr/share/man/man3/lwres_net_ntop.3.gz +OLD_FILES+=usr/share/man/man3/lwres_noop.3.gz +OLD_FILES+=usr/share/man/man3/lwres_nooprequest_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_nooprequest_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_nooprequest_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_noopresponse_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_noopresponse_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_noopresponse_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_packet.3.gz +OLD_FILES+=usr/share/man/man3/lwres_resutil.3.gz +OLD_FILES+=usr/share/man/man3/lwres_sethostent.3.gz +OLD_FILES+=usr/share/man/man3/lwres_sethostent_r.3.gz +OLD_FILES+=usr/share/man/man3/lwres_string_parse.3.gz +OLD_FILES+=usr/share/man/man5/named.conf.5.gz +OLD_FILES+=usr/share/man/man5/rndc.conf.5.gz +OLD_FILES+=usr/share/man/man8/ddns-confgen.8.gz +OLD_FILES+=usr/share/man/man8/dnssec-dsfromkey.8.gz +OLD_FILES+=usr/share/man/man8/dnssec-keyfromlabel.8.gz +OLD_FILES+=usr/share/man/man8/dnssec-keygen.8.gz +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/genrandom.8.gz +OLD_FILES+=usr/share/man/man8/isc-hmac-fixup.8.gz +OLD_FILES+=usr/share/man/man8/lwresd.8.gz +OLD_FILES+=usr/share/man/man8/named-checkconf.8.gz +OLD_FILES+=usr/share/man/man8/named-checkzone.8.gz +OLD_FILES+=usr/share/man/man8/named-compilezone.8.gz +OLD_FILES+=usr/share/man/man8/named-journalprint.8.gz +OLD_FILES+=usr/share/man/man8/named.8.gz +OLD_FILES+=usr/share/man/man8/named.reconfig.8.gz +OLD_FILES+=usr/share/man/man8/named.reload.8.gz +OLD_FILES+=usr/share/man/man8/nsec3hash.8.gz +OLD_FILES+=usr/share/man/man8/rndc-confgen.8.gz +OLD_FILES+=usr/share/man/man8/rndc.8.gz +OLD_DIRS+=var/named/dev +OLD_DIRS+=var/named/etc +OLD_DIRS+=var/named/etc/namedb +OLD_FILES+=var/named/etc/namedb/PROTO.localhost-v6.rev +OLD_FILES+=var/named/etc/namedb/PROTO.localhost.rev +OLD_DIRS+=var/named/etc/namedb/dynamic +OLD_FILES+=var/named/etc/namedb/make-localhost +OLD_DIRS+=var/named/etc/namedb/master +OLD_FILES+=var/named/etc/namedb/master/empty.db +OLD_FILES+=var/named/etc/namedb/master/localhost-forward.db +OLD_FILES+=var/named/etc/namedb/master/localhost-reverse.db +#OLD_FILES+=var/named/etc/namedb/named.conf # intentionally left out +OLD_FILES+=var/named/etc/namedb/named.root +OLD_DIRS+=var/named/etc/namedb/slave +OLD_DIRS+=var/named/var +OLD_DIRS+=var/named/var/dump +OLD_DIRS+=var/named/var/log +OLD_DIRS+=var/named/var/run +OLD_DIRS+=var/named/var/run/named +OLD_DIRS+=var/named/var/stats +OLD_DIRS+=var/run/named # 20130908: libssh becomes private OLD_FILES+=usr/lib/libssh.a OLD_FILES+=usr/lib/libssh.so Modified: projects/amd64_xen_pv/UPDATING ============================================================================== --- projects/amd64_xen_pv/UPDATING Fri Oct 11 06:51:56 2013 (r256309) +++ projects/amd64_xen_pv/UPDATING Fri Oct 11 07:22:26 2013 (r256310) @@ -16,8 +16,8 @@ from older versions of FreeBSD, try WITH head, and then rebuild without this option. The bootstrap process from older version of current is a bit fragile. -NOTE TO PEOPLE WHO THINK THAT FreeBSD 10.x IS SLOW: - FreeBSD 10.x has many debugging features turned on, in both the kernel +NOTE TO PEOPLE WHO THINK THAT FreeBSD 11.x IS SLOW: + FreeBSD 11.x has many debugging features turned on, in both the kernel and userland. These features attempt to detect incorrect use of system primitives, and encourage loud failure through extra sanity checking and fail stop semantics. They also substantially impact @@ -31,6 +31,31 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20131010: + The rc.d/jail script has been updated to support jail(8) + configuration file. The "jail__*" rc.conf(5) variables + for per-jail configuration are automatically converted to + /var/run/jail..conf before the jail(8) utility is invoked. + This is transparently backward compatible. See below about some + incompatibilities and rc.conf(5) manual page for more details. + + These variables are now deprecated in favor of jail(8) configuration + file. One can use "rc.d/jail config " command to generate + a jail(8) configuration file in /var/run/jail..conf without + running the jail(8) utility. The default pathname of the + configuration file is /etc/jail.conf and can be specified by + using $jail_conf or $jail__conf variables. + + Please note that jail_devfs_ruleset accepts an integer at + this moment. Please consider to rewrite the ruleset name + with an integer. + +20130930: + BIND has been removed from the base system. If all you need + is a local resolver, simply enable and start the local_unbound + service instead. Otherwise, several versions of BIND are + available in the ports tree. + 20130916: With the addition of unbound(8), a new unbound user is now required during installworld. "mergemaster -p" can be used to @@ -67,19 +92,6 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 has been updated to use this support. A new gcc is required to build the aesni module on both i386 and amd64. -20130827: - Thomas Dickey (vendor author thereof) reports that dialog(1) since - 2011/10/18 has a bug in handling --hline. Testers and I noticed the - --hline is not ignored but displayed as a NULL string, regardless of - value. This will cause confusion in some bsdconfig dialogs where the - --hline is used to inform users which keybindings to use. This will - likewise affect any other persons relying on --hline. It also looks - rather strange seeing "[]" at the bottom of dialog(1) widgets when - passing --hline "anything". Thomas said he will have a look in a few - weeks. NOTE: The "[]" brackets appear with the left-edge where it - would normally appear given the width of text to display, but the - displayed text is not there (part of the bug). - 20130821: The PADLOCK_RNG and RDRAND_RNG kernel options are now devices. Thus "device padlock_rng" and "device rdrand_rng" should be Modified: projects/amd64_xen_pv/bin/Makefile ============================================================================== --- projects/amd64_xen_pv/bin/Makefile Fri Oct 11 06:51:56 2013 (r256309) +++ projects/amd64_xen_pv/bin/Makefile Fri Oct 11 07:22:26 2013 (r256310) @@ -15,6 +15,7 @@ SUBDIR= cat \ echo \ ed \ expr \ + freebsd-version \ getfacl \ hostname \ kenv \ Modified: projects/amd64_xen_pv/bin/dd/dd.1 ============================================================================== --- projects/amd64_xen_pv/bin/dd/dd.1 Fri Oct 11 06:51:56 2013 (r256309) +++ projects/amd64_xen_pv/bin/dd/dd.1 Fri Oct 11 07:22:26 2013 (r256310) @@ -32,7 +32,7 @@ .\" @(#)dd.1 8.2 (Berkeley) 1/13/94 .\" $FreeBSD$ .\" -.Dd January 23, 2009 +.Dd October 1, 2013 .Dt DD 1 .Os .Sh NAME @@ -378,12 +378,12 @@ will exit. .Sh EXAMPLES Check that a disk drive contains no bad blocks: .Pp -.Dl "dd if=/dev/ad0 of=/dev/null bs=1m" +.Dl "dd if=/dev/ada0 of=/dev/null bs=1m" .Pp Do a refresh of a disk drive, in order to prevent presently recoverable read errors from progressing into unrecoverable read errors: .Pp -.Dl "dd if=/dev/ad0 of=/dev/ad0 bs=1m" +.Dl "dd if=/dev/ada0 of=/dev/ada0 bs=1m" .Pp Remove parity bit from a file: .Pp Modified: projects/amd64_xen_pv/bin/pkill/pkill.c ============================================================================== --- projects/amd64_xen_pv/bin/pkill/pkill.c Fri Oct 11 06:51:56 2013 (r256309) +++ projects/amd64_xen_pv/bin/pkill/pkill.c Fri Oct 11 07:22:26 2013 (r256310) @@ -481,7 +481,6 @@ main(int argc, char **argv) * We skip P_SYSTEM processes to match ps(1) output. */ if ((kp->ki_flag & P_SYSTEM) == 0 && - kp->ki_loginclass != NULL && strcmp(kp->ki_loginclass, li->li_name) == 0) break; } Modified: projects/amd64_xen_pv/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 ============================================================================== --- projects/amd64_xen_pv/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 Fri Oct 11 06:51:56 2013 (r256309) +++ projects/amd64_xen_pv/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 Fri Oct 11 07:22:26 2013 (r256310) @@ -2,7 +2,7 @@ .\" CDDL HEADER START .\" .\" The contents of this file are subject to the terms of the -.\" Common Development and Distribution License (the "License"). +.\" Common Development and Distribution License (the "License"). .\" You may not use this file except in compliance with the License. .\" .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE @@ -18,653 +18,660 @@ .\" .\" CDDL HEADER END .\" Copyright (c) 2006, Sun Microsystems, Inc. All Rights Reserved. -.TH dtrace 1M "5 Sep 2006" "SunOS 5.11" "System Administration Commands" -.SH NAME -dtrace \- DTrace dynamic tracing compiler and tracing utility -.SH SYNOPSIS -.LP -.nf -\fBdtrace\fR [\fB-32\fR | \fB-64\fR] [\fB-aACeFGHhlqSvVwZ\fR] [\fB-b\fR \fIbufsz\fR] [\fB-c\fR \fIcmd\fR] - [\fB-D\fR \fIname\fR [\fI=value\fR]] [\fB-I\fR \fIpath\fR] [\fB-L\fR \fIpath\fR] [\fB-o\fR \fIoutput\fR] - [\fB-s\fR \fIscript\fR] [\fB-U\fR \fIname\fR] [\fB-x\fR \fIarg\fR [\fI=val\fR]] - [\fB-X\fR a | c | s | t] [\fB-p\fR \fIpid\fR] - [\fB-P\fR \fIprovider\fR [[\fIpredicate\fR] \fIaction\fR]] - [\fB-m\fR [\fIprovider:\fR] \fImodule\fR [[\fIpredicate\fR] \fIaction\fR]] - [\fB-f\fR [[\fIprovider:\fR] \fImodule:\fR] \fIfunction\fR [[\fIpredicate\fR] \fIaction\fR]] - [\fB-n\fR [[[\fIprovider:\fR] \fImodule:\fR] \fIfunction:\fR] \fIname\fR [[\fIpredicate\fR] \fIaction\fR]] - [\fB-i\fR \fIprobe-id\fR [[\fIpredicate\fR] \fIaction\fR]] -.fi - -.SH DESCRIPTION -.sp -.LP -DTrace is a comprehensive dynamic tracing framework for the Solaris Operating System. DTrace provides a powerful infrastructure that permits administrators, developers, and service personnel to concisely answer arbitrary questions about the behavior of the operating system and user programs. -.sp -.LP -The \fISolaris Dynamic Tracing Guide\fR describes how to use DTrace to observe, debug, and tune system behavior. Refer to this book for a detailed description of DTrace features, including the bundled DTrace observability -tools, instrumentation providers, and the D programming language. -.sp -.LP -The \fBdtrace\fR command provides a generic interface to the essential services provided by the DTrace facility, including: -.RS +4 -.TP -.ie t \(bu -.el o +.\" +.\" $FreeBSD$ +.\" +.Dd October 5, 2013 +.Dt DTRACE 1 +.Os +.Sh NAME +.Nm dtrace +.Nd dynamic tracing compiler and tracing utility +.Sh SYNOPSIS +.Nm +.Op Fl 32 | Fl 64 +.Op Fl aACeFGhHlqSvVwZ +.Op Fl b Ar bufsz +.Op Fl c Ar cmd +.Op Fl D Ar name Op Ns = Ns value +.Op Fl I Ar path +.Op Fl L Ar path +.Op Fl o Ar output +.Op Fl s Ar script +.Op Fl U Ar name +.Op Fl x Ar arg Op Ns = Ns value +.Op Fl X Cm a | c | s | t +.Op Fl p Ar pid +.Op Fl P Ar provider Oo Oo Ar predicate Oc Ar action Oc +.Op Fl m Oo Ar provider : Oc Ar module Oo Oo Ar predicate Oc Ar action Oc +.Op Fl f Oo Oo Ar provider : Oc Ar module : Oc Ar function Oo Oo Ar predicate \ + Oc Ar action Oc +.Op Fl n Oo Oo Oo Ar provider : Oc Ar module : Oc Ar function : Oc Ar name \ + Oo Oo Ar predicate Oc Ar action Oc +.Op Fl i Ar probe-id Oo Oo Ar predicate Oc Ar action Oc +.Sh DESCRIPTION +DTrace is a comprehensive dynamic tracing framework ported from Solaris. +DTrace provides a powerful infrastructure that permits administrators, +developers, and service personnel to concisely answer arbitrary questions about +the behavior of the operating system and user programs. +.Pp +The +.Nm +command provides a generic interface to the essential services provided by the +DTrace facility, including: +.Bl -bullet -offset indent +.It Options that list the set of probes and providers currently published by DTrace -.RE -.RS +4 -.TP -.ie t \(bu -.el o -Options that enable probes directly using any of the probe description specifiers (provider, module, function, name) -.RE -.RS +4 -.TP -.ie t \(bu -.el o -Options that run the D compiler and compile one or more D program files or programs written directly on the command line -.RE -.RS +4 -.TP -.ie t \(bu -.el o +.It +Options that enable probes directly using any of the probe description +specifiers (provider, module, function, name) +.It +Options that run the D compiler and compile one or more D program files or +programs written directly on the command line +.It Options that generate anonymous tracing programs -.RE -.RS +4 -.TP -.ie t \(bu -.el o +.It Options that generate program stability reports -.RE -.RS +4 -.TP -.ie t \(bu -.el o -Options that modify DTrace tracing and buffering behavior and enable additional D compiler features -.RE -.sp -.LP -You can use \fBdtrace\fR to create D scripts by using it in a \fB#!\fR declaration to create an interpreter file. You can also use \fBdtrace\fR to attempt to compile D programs and determine their properties without actually enabling tracing using the \fB-e\fR option. See \fBOPTIONS\fR. See the \fISolaris Dynamic Tracing Guide\fR for detailed examples of how to use the \fBdtrace\fR utility to perform these tasks. -.SH OPTIONS -.sp -.LP -The arguments accepted by the \fB-P\fR, \fB-m\fR, \fB-f\fR, \fB-n\fR, and \fB-i\fR options can include an optional D language \fIpredicate\fR enclosed in slashes \fB//\fR and optional D language \fIaction\fR statement list enclosed in braces \fB{}\fR. D program code specified on the command line must be appropriately quoted to avoid intepretation of meta-characters by the shell. -.sp -.LP +.It +Options that modify DTrace tracing and buffering behavior and enable +additional D compiler features +.El +.Pp +You can use +.Nm +to create D scripts by using it in a shebang declaration to create an +interpreter file. +You can also use +.Nm +to attempt to compile D programs and determine their properties without +actually enabling traces using the +.Fl e +option. +.Sh OPTIONS +The arguments accepted by the +.Fl P , +.Fl m , +.Fl f , +.Fl n , +and +.Fl i +options can include an optional D language +.Ar predicate +enclosed in slashes and an optional D language +.Ar action +statement list enclosed in braces. +D program code specified on the command line must be appropriately quoted to +avoid interpretation of meta-characters by the shell. +.Pp The following options are supported: -.sp -.ne 2 -.mk -.na -\fB\fB-32\fR | \fB-64\fR\fR -.ad -.sp .6 -.RS 4n -The D compiler produces programs using the native data model of the operating system kernel. You can use the \fBisainfo\fR \fB-b\fR command to determine the current operating system data model. If the \fB-32\fR option is specified, \fBdtrace\fR forces -the D compiler to compile a D program using the 32-bit data model. If the \fB-64\fR option is specified, \fBdtrace\fR forces the D compiler to compile a D program using the 64-bit data model. These options are typically not required as \fBdtrace\fR selects the -native data model as the default. The data model affects the sizes of integer types and other language properties. D programs compiled for either data model can be executed on both 32-bit and 64-bit kernels. The \fB-32\fR and \fB-64\fR options also determine the ELF file format -(ELF32 or ELF64) produced by the \fB-G\fR option. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-a\fR\fR -.ad -.sp .6 -.RS 4n -Claim anonymous tracing state and display the traced data. You can combine the \fB-a\fR option with the \fB-e\fR option to force \fBdtrace\fR to exit immediately after consuming the anonymous tracing state rather than continuing to wait for new -data. See the \fISolaris Dynamic Tracing Guide\fR for more information about anonymous tracing. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-A\fR\fR -.ad -.sp .6 -.RS 4n -Generate \fBdriver.conf\fR(4) directives for anonymous tracing. This option constructs a set of \fBdtrace\fR(7D) configuration file directives to enable the specified probes for anonymous tracing and then exits. By default, \fBdtrace\fR attempts to store the directives to the file \fB/kernel/drv/dtrace.conf\fR. You can modify this behavior if you use the \fB-o\fR option to specify an alternate output file. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-b\fR \fIbufsz\fR\fR -.ad -.sp .6 -.RS 4n -Set principal trace buffer size (\fIbufsz\fR). The trace buffer size can include any of the size suffixes \fBk\fR, \fBm\fR, \fBg\fR, or \fBt\fR. If the buffer space cannot be allocated, \fBdtrace\fR attempts -to reduce the buffer size or exit depending on the setting of the \fBbufresize\fR property. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-c\fR \fIcmd\fR\fR -.ad -.sp .6 -.RS 4n -Run the specified command \fIcmd\fR and exit upon its completion. If more than one \fB-c\fR option is present on the command line, \fBdtrace\fR exits when all commands have exited, reporting the exit status for each child process as it -terminates. The process-ID of the first command is made available to any D programs specified on the command line or using the \fB-s\fR option through the \fB$target\fR macro variable. Refer to the \fISolaris Dynamic Tracing Guide\fR for more information -on macro variables. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-C\fR\fR -.ad -.sp .6 -.RS 4n -Run the C preprocessor \fBcpp\fR(1) over D programs before compiling them. You can pass options to the C preprocessor using the \fB-D\fR, \fB-U\fR, \fB-I\fR, and \fB-H\fR options. You can select the degree of C standard conformance if you use the \fB-X\fR option. For a description of the set of tokens defined by the D compiler when invoking the C preprocessor, see \fB-X\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-D\fR \fIname\fR \fB[=\fR\fIvalue\fR\fB]\fR\fR -.ad -.sp .6 -.RS 4n -Define \fIname\fR when invoking \fBcpp\fR(1) (enabled using the \fB-C\fR option). If you specify the equals sign (\fB=\fR) -and additional \fIvalue\fR, the name is assigned the corresponding value. This option passes the \fB-D\fR option to each \fBcpp\fR invocation. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-e\fR\fR -.ad -.sp .6 -.RS 4n -Exit after compiling any requests and consuming anonymous tracing state (\fB-a\fR option) but prior to enabling any probes. You can combine this option with the \fB-a\fR option to print anonymous tracing data and exit. You can also combine this option with D -compiler options. This combination verifies that the programs compile without actually executing them and enabling the corresponding instrumentation. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-f\fR\fB[[\fR\fIprovider\fR\fB:]\fR\fImodule\fR\fB:]\fR\fIfunction\fR\fB[[\fR\fIpredicate\fR\fB]\fR\fIaction\fR\fB]]\fR\fR -.ad -.sp .6 -.RS 4n -Specify function name to trace or list (\fB-l\fR option). The corresponding argument can include any of the probe description forms \fIprovider:module:function\fR, \fImodule:function\fR, or \fIfunction\fR. -Unspecified probe description fields are left blank and match any probes regardless of the values in those fields. If no qualifiers other than \fIfunction\fR are specified in the description, all probes with the corresponding \fIfunction\fR are matched. -The \fB-f\fR argument can be suffixed with an optional D probe clause. You can specify more than one \fB-f\fR option on the command line at a time. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-F\fR\fR -.ad -.sp .6 -.RS 4n -Coalesce trace output by identifying function entry and return. Function entry probe reports are indented and their output is prefixed with \fB->\fR. Function return probe reports are unindented and their output is prefixed with \fB<-\fR\&. System call -entry probe reports are indented and their output is prefixed with \fB=>\fR. System call return probe reports are unindented and their output is prefixed with \fB<=\fR\&. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-G\fR\fR -.ad -.sp .6 -.RS 4n -Generate an ELF file containing an embedded DTrace program. The DTrace probes specified in the program are saved inside of a relocatable ELF object which can be linked into another program. If the \fB-o\fR option is present, the ELF file is saved using the pathname specified -as the argument for this operand. If the \fB-o\fR option is not present and the DTrace program is contained with a file whose name is \fB\fIfilename\fR.d\fR, then the ELF file is saved using the name \fB\fIfilename\fR.o\fR. -Otherwise the ELF file is saved using the name \fBd.out\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-H\fR\fR -.ad -.sp .6 -.RS 4n -Print the pathnames of included files when invoking \fBcpp\fR(1) (enabled using the \fB-C\fR option). This option passes the \fB-H\fR option -to each \fBcpp\fR invocation, causing it to display the list of pathnames, one for each line, to \fBstderr\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-h\fR\fR -.ad -.sp .6 -.RS 4n -Generate a header file containing macros that correspond to probes in the specified provider definitions. This option should be used to generate a header file that is included by other source files for later use with the \fB-G\fR option. If the \fB-o\fR option -is present, the header file is saved using the pathname specified as the argument for that option. If the \fB-o\fR option is not present and the DTrace program is contained with a file whose name is \fIfilename\fR\fB\&.d\fR, then the header file is saved -using the name \fIfilename\fR\fB\&.h\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-i\fR \fIprobe-id\fR\fB[[\fR\fIpredicate\fR] \fIaction\fR\fB]\fR\fR -.ad -.sp .6 -.RS 4n -Specify probe identifier (\fIprobe-id\fR) to trace or list (\fB-l\fR option). You can specify probe IDs using decimal integers as shown by \fBdtrace\fR \fB-l\fR. The \fB-i\fR argument can be suffixed with an optional -D probe clause. You can specify more than one \fB-i\fR option at a time. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-I\fR \fIpath\fR\fR -.ad -.sp .6 -.RS 4n -Add the specified directory \fIpath\fR to the search path for \fB#include\fR files when invoking \fBcpp\fR(1) (enabled -using the \fB-C\fR option). This option passes the \fB-I\fR option to each \fBcpp\fR invocation. The specified \fIpath\fR is inserted into the search path ahead of the default directory list. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-L\fR \fIpath\fR\fR -.ad -.sp .6 -.RS 4n -Add the specified directory \fIpath\fR to the search path for DTrace libraries. DTrace libraries are used to contain common definitions that can be used when writing D programs. The specified \fIpath\fR is added after the default library -search path. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-l\fR\fR -.ad -.sp .6 -.RS 4n -List probes instead of enabling them. If the \fB-l\fR option is specified, \fBdtrace\fR produces a report of the probes matching the descriptions given using the \fB-P\fR, \fB-m\fR, \fB-f\fR, \fB-n\fR, \fB-i\fR, -and \fB-s\fR options. If none of these options are specified, this option lists all probes. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-m\fR [[\fIprovider:\fR] \fImodule:\fR [[\fIpredicate\fR] \fIaction\fR]]\fR -.ad -.sp .6 -.RS 4n -Specify module name to trace or list (\fB-l\fR option). The corresponding argument can include any of the probe description forms \fIprovider:module\fR or \fImodule\fR. Unspecified probe description fields are left blank and match -any probes regardless of the values in those fields. If no qualifiers other than \fImodule\fR are specified in the description, all probes with a corresponding \fImodule\fR are matched. The \fB-m\fR argument can be suffixed with an optional D -probe clause. More than one \fB-m\fR option can be specified on the command line at a time. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-n\fR [[[\fIprovider:\fR] \fImodule:\fR] \fIfunction:\fR] \fIname\fR [[\fIpredicate\fR] \fIaction\fR]\fR -.ad -.sp .6 -.RS 4n -Specify probe name to trace or list (\fB-l\fR option). The corresponding argument can include any of the probe description forms \fIprovider:module:function:name\fR, \fImodule:function:name\fR, \fIfunction:name\fR, -or \fIname\fR. Unspecified probe description fields are left blank and match any probes regardless of the values in those fields. If no qualifiers other than \fIname\fR are specified in the description, all probes with a corresponding \fIname\fR are -matched. The \fB-n\fR argument can be suffixed with an optional D probe clause. More than one \fB-n\fR option can be specified on the command line at a time. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-o\fR \fIoutput\fR\fR -.ad -.sp .6 -.RS 4n -Specify the \fIoutput\fR file for the \fB-A\fR , \fB-G\fR, and \fB-l\fR options, or for the traced data itself. If the \fB-A\fR option is present and \fB-o\fR is not present, the default output file is \fB/kernel/drv/dtrace.conf\fR. If the \fB-G\fR option is present and the \fB-s\fR option's argument is of the form \fB\fIfilename\fR.d\fR and \fB-o\fR is not present, the default output file is \fB\fIfilename\fR.o\fR. -Otherwise the default output file is \fBd.out\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-p\fR \fIpid\fR\fR -.ad -.sp .6 -.RS 4n -Grab the specified process-ID \fIpid\fR, cache its symbol tables, and exit upon its completion. If more than one \fB-p\fR option is present on the command line, \fBdtrace\fR exits when all commands have exited, reporting the exit status -for each process as it terminates. The first process-ID is made available to any D programs specified on the command line or using the \fB-s\fR option through the \fB$target\fR macro variable. Refer to the \fISolaris Dynamic Tracing Guide\fR for -more information on macro variables. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-P\fR \fIprovider\fR \fB[[\fR\fIpredicate\fR\fB]\fR \fIaction\fR]\fR -.ad -.sp .6 -.RS 4n -Specify provider name to trace or list (\fB-l\fR option). The remaining probe description fields module, function, and name are left blank and match any probes regardless of the values in those fields. The \fB-P\fR argument can be suffixed with an optional D -probe clause. You can specify more than one \fB-P\fR option on the command line at a time. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-q\fR\fR -.ad -.sp .6 -.RS 4n -Set quiet mode. \fBdtrace\fR suppresses messages such as the number of probes matched by the specified options and D programs and does not print column headers, the CPU ID, the probe ID, or insert newlines into the output. Only data traced and formatted by D program -statements such as \fBtrace()\fR and \fBprintf()\fR is displayed to \fBstdout\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-s\fR\fR -.ad -.sp .6 -.RS 4n -Compile the specified D program source file. If the \fB-e\fR option is present, the program is compiled but instrumentation is not enabled. If the \fB-l\fR option is present, the program is compiled and the set of probes matched by it is listed, but instrumentation -is not enabled. If none of \fB-e\fR, \fB-l\fR, \fB-G\fR, or \fB-A\fR are present, the instrumentation specified by the D program is enabled and tracing begins. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-S\fR\fR -.ad -.sp .6 -.RS 4n -Show D compiler intermediate code. The D compiler produces a report of the intermediate code generated for each D program to \fBstderr\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-U\fR \fIname\fR\fR -.ad -.sp .6 -.RS 4n -Undefine the specified \fIname\fR when invoking \fBcpp\fR(1) (enabled using the \fB-C\fR option). This option passes the \fB-U\fR option to each \fBcpp\fR invocation. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-v\fR\fR -.ad -.sp .6 -.RS 4n -Set verbose mode. If the \fB-v\fR option is specified, \fBdtrace\fR produces a program stability report showing the minimum interface stability and dependency level for the specified D programs. DTrace stability levels are explained in further detail in the \fISolaris Dynamic Tracing Guide\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-V\fR\fR -.ad -.sp .6 -.RS 4n -Report the highest D programming interface version supported by \fBdtrace\fR. The version information is printed to \fBstdout\fR and the \fBdtrace\fR command exits. Refer to the \fISolaris Dynamic Tracing Guide\fR for -more information about DTrace versioning features. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-w\fR\fR -.ad -.sp .6 -.RS 4n -Permit destructive actions in D programs specified using the \fB-s\fR, \fB-P\fR, \fB-m\fR, \fB-f\fR, \fB-n\fR, or \fB-i\fR options. If the \fB-w\fR option is not specified, \fBdtrace\fR does not -permit the compilation or enabling of a D program that contains destructive actions. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-x\fR \fIarg\fR [\fI=val\fR]\fR -.ad -.sp .6 -.RS 4n -Enable or modify a DTrace runtime option or D compiler option. The list of options is found in the \fISolaris Dynamic Tracing Guide\fR. Boolean options are enabled by specifying their name. Options with values are set by separating the option name and -value with an equals sign (\fB=\fR). -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-X\fR \fBa | c | s | t\fR\fR -.ad -.sp .6 -.RS 4n -Specify the degree of conformance to the ISO C standard that should be selected when invoking \fBcpp\fR(1) (enabled using the \fB-C\fR option). -The \fB-X\fR option argument affects the value and presence of the \fB__STDC__\fR macro depending upon the value of the argument letter. -.sp -The \fB-X\fR option supports the following arguments: -.sp -.ne 2 -.mk -.na -\fB\fBa\fR\fR -.ad -.RS 5n -.rt -Default. ISO C plus K&R compatibility extensions, with semantic changes required by ISO C. This is the default mode if \fB-X\fR is not specified. The predefined macro \fB__STDC__\fR has a value of 0 when \fBcpp\fR is invoked in conjunction -with the \fB-Xa\fR option. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fBc\fR\fR -.ad -.RS 5n -.rt -Conformance. Strictly conformant ISO C, without K&R C compatibility extensions. The predefined macro \fB__STDC__\fR has a value of 1 when \fBcpp\fR is invoked in conjunction with the \fB-Xc\fR option. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fBs\fR\fR -.ad -.RS 5n -.rt -K&R C only. The macro \fB__STDC__\fR is not defined when \fBcpp\fR is invoked in conjunction with the \fB-Xs\fR option. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fBt\fR\fR -.ad -.RS 5n -.rt -Transition. ISO C plus K&R C compatibility extensions, without semantic changes required by ISO C. The predefined macro \fB__STDC__\fR has a value of 0 when \fBcpp\fR is invoked in conjunction with the \fB-Xt\fR option. -.RE - -As the \fB-X\fR option only affects how the D compiler invokes the C preprocessor, the \fB-Xa\fR and \fB-Xt\fR options are equivalent from the perspective of D and both are provided only to ease re-use of settings from a C build environment. -.sp -Regardless of the \fB-X\fR mode, the following additional C preprocessor definitions are always specified and valid in all modes: -.RS +4 -.TP -.ie t \(bu -.el o -\fB__sun\fR -.RE -.RS +4 -.TP -.ie t \(bu *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Fri Oct 11 20:53:26 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 29D30C8F; Fri, 11 Oct 2013 20:53:26 +0000 (UTC) (envelope-from markm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 10D8F2351; Fri, 11 Oct 2013 20:53:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9BKrPAA008136; Fri, 11 Oct 2013 20:53:25 GMT (envelope-from markm@svn.freebsd.org) Received: (from markm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9BKrPGt008135; Fri, 11 Oct 2013 20:53:25 GMT (envelope-from markm@svn.freebsd.org) Message-Id: <201310112053.r9BKrPGt008135@svn.freebsd.org> From: Mark Murray Date: Fri, 11 Oct 2013 20:53:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256346 - projects/random_number_generator/sys/dev/random X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Oct 2013 20:53:26 -0000 Author: markm Date: Fri Oct 11 20:53:25 2013 New Revision: 256346 URL: http://svnweb.freebsd.org/changeset/base/256346 Log: Fix for i386. Modified: projects/random_number_generator/sys/dev/random/nehemiah.c Modified: projects/random_number_generator/sys/dev/random/nehemiah.c ============================================================================== --- projects/random_number_generator/sys/dev/random/nehemiah.c Fri Oct 11 20:52:42 2013 (r256345) +++ projects/random_number_generator/sys/dev/random/nehemiah.c Fri Oct 11 20:53:25 2013 (r256346) @@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include From owner-svn-src-projects@FreeBSD.ORG Fri Oct 11 21:24:34 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 9C63E5ED; Fri, 11 Oct 2013 21:24:34 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6EAD22525; Fri, 11 Oct 2013 21:24:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9BLOYUL024333; Fri, 11 Oct 2013 21:24:34 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9BLOXn4024328; Fri, 11 Oct 2013 21:24:33 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310112124.r9BLOXn4024328@svn.freebsd.org> From: Alan Somers Date: Fri, 11 Oct 2013 21:24:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256349 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Oct 2013 21:24:34 -0000 Author: asomers Date: Fri Oct 11 21:24:33 2013 New Revision: 256349 URL: http://svnweb.freebsd.org/changeset/base/256349 Log: Miscellaneous bug fixes in zfsd * Created a new abstract Reader class that provides a common interface to read from both file descriptors and std:istreams, implemented as separate derived classes FDReader and IstreamReader. Changed EventBuffer to get its input from a Reader. Changed CaseFile::DeSerializeFile to open case files as ifstreams instead of as file descriptors. * Eliminated ZFSDaemon::ConnectToDevd's call to set the socket to nonblocking mode. Instead, use an API that never attempts to read more data than is available. EventBuffer::Fill() no longer ignore EAGAIN, which shouldn't happen now that the socket blocks. * Fix two file leaks * Fix file leak in CaseFile::Serialize(): open() without close() * Fix potential file leak in DeSerializeFile(): The exception handler for ZfsdException did not close the open case file. This code path was probably not exercised. * Fix four memory leaks * CaseFile::DeSerialize() was freeing its dirent structure when it had entries, but not when the directory was empty * zfsd did not purge case files on exit. This isn't really a problem because the memory won't leak until the program quits, but it clutters valgrind's output. * ZfsDaemon::RescanSystem() wasn't deleting newly created events after processing them. * DeSerializeFile(): an ifstream was closed() instead of deleted. * Miscellaneous style changes. Submitted by: asomers Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc projects/zfsd/head/cddl/sbin/zfsd/zfsd.h Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Fri Oct 11 21:23:44 2013 (r256348) +++ projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Fri Oct 11 21:24:33 2013 (r256349) @@ -40,6 +40,7 @@ */ #include #include +#include #include #include #include @@ -53,6 +54,7 @@ /*============================ Namespace Control =============================*/ using std::auto_ptr; using std::hex; +using std::ifstream; using std::stringstream; using std::setfill; using std::setw; @@ -116,8 +118,12 @@ CaseFile::DeSerialize() int numCaseFiles(scandir(s_caseFilePath.c_str(), &caseFiles, DeSerializeSelector, /*compar*/NULL)); - if (numCaseFiles == 0 || numCaseFiles == -1) + if (numCaseFiles == -1) return; + if (numCaseFiles == 0) { + free(caseFiles); + return; + } for (int i = 0; i < numCaseFiles; i++) { @@ -472,7 +478,7 @@ CaseFile::DeSerializeFile(const char *fi string evString; CaseFile *existingCaseFile(NULL); CaseFile *caseFile(NULL); - int fd(-1); + ifstream *caseStream(NULL); try { uintmax_t poolGUID; @@ -519,28 +525,30 @@ CaseFile::DeSerializeFile(const char *fi */ caseFile = new CaseFile(Vdev(zpl.front(), vdevConf)); } - - fd = open(fullName.c_str(), O_RDONLY); - if (fd == -1) { + + caseStream = new ifstream(fullName.c_str()); + if ( (caseStream == NULL) || (! *caseStream) ) { throw ZfsdException("CaseFile::DeSerialize: Unable to " "read %s.\n", fileName); return; } + IstreamReader caseReader(caseStream); /* Re-load EventData */ - EventBuffer eventBuffer(fd); + EventBuffer eventBuffer(caseReader); while (eventBuffer.ExtractEvent(evString)) { DevCtlEvent *event(DevCtlEvent::CreateEvent(evString)); if (event != NULL) caseFile->m_events.push_back(event); } - close(fd); + delete caseStream; } catch (const ParseException &exp) { exp.Log(evString); if (caseFile != existingCaseFile) delete caseFile; - close(fd); + if (caseStream) + delete caseStream; /* * Since we can't parse the file, unlink it so we don't @@ -552,6 +560,8 @@ CaseFile::DeSerializeFile(const char *fi zfsException.Log(); if (caseFile != existingCaseFile) delete caseFile; + if (caseStream) + delete caseStream; } } @@ -632,6 +642,7 @@ CaseFile::Serialize() write(fd, eventString.c_str(), eventString.length()); } + close(fd); } void Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Fri Oct 11 21:23:44 2013 (r256348) +++ projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Fri Oct 11 21:24:33 2013 (r256349) @@ -43,6 +43,7 @@ #include #include +#include #include #include #include @@ -86,6 +87,32 @@ const char g_devdSock[] = "/var/ru int g_debug = 0; libzfs_handle_t *g_zfsHandle; +/*-------------------------------- FDReader -------------------------------*/ +//- FDReader Public Methods ---------------------------------------------------- +size_t +FDReader::in_avail() const +{ + int bytes; + if (ioctl(m_fd, FIONREAD, &bytes)) { + syslog(LOG_ERR, "ioctl FIONREAD: %s", strerror(errno)); + return (0); + } + return (bytes); +} + + +/*-------------------------------- IstreamReader ---------------------------*/ +//- IstreamReader Public Methods ---------------------------------------------- +ssize_t +IstreamReader::read(char* buf, size_t count) +{ + m_stream->read(buf, count); + if (m_stream->fail()) + return (-1); + return (m_stream->gcount()); +} + + /*-------------------------------- EventBuffer -------------------------------*/ //- EventBuffer Static Data ---------------------------------------------------- /** @@ -104,8 +131,8 @@ const char EventBuffer::s_eventEndTokens const char EventBuffer::s_keyPairSepTokens[] = " \t\n"; //- EventBuffer Public Methods ------------------------------------------------- -EventBuffer::EventBuffer(int fd) - : m_fd(fd), +EventBuffer::EventBuffer(Reader& reader) + : m_reader(reader), m_validLen(0), m_parsedLen(0), m_nextEventOffset(0), @@ -187,7 +214,8 @@ EventBuffer::ExtractEvent(string &eventS bool EventBuffer::Fill() { - ssize_t result; + size_t avail; + ssize_t consumed(0); /* Compact the buffer. */ if (m_nextEventOffset != 0) { @@ -199,19 +227,26 @@ EventBuffer::Fill() } /* Fill any empty space. */ - result = read(m_fd, m_buf + m_validLen, MAX_READ_SIZE - m_validLen); - if (result == -1) { - if (errno == EINTR || errno == EAGAIN) { - return (false); - } else { - err(1, "Read from devd socket failed"); + avail = m_reader.in_avail(); + if (avail) { + size_t want; + + want = std::min(avail, MAX_READ_SIZE - m_validLen); + consumed = m_reader.read(m_buf + m_validLen, want); + if (consumed == -1) { + if (errno == EINTR) { + return (false); + } else { + err(1, "EventBuffer::Fill(): Read failed"); + } } } - m_validLen += result; + + m_validLen += consumed; /* Guarantee our buffer is always NUL terminated. */ m_buf[m_validLen] = '\0'; - return (result > 0); + return (consumed > 0); } /*--------------------------------- ZfsDaemon --------------------------------*/ @@ -220,6 +255,7 @@ bool ZfsDaemon::s_logCaseFil bool ZfsDaemon::s_terminateEventLoop; char ZfsDaemon::s_pidFilePath[] = "/var/run/zfsd.pid"; pidfh *ZfsDaemon::s_pidFH; +FDReader* ZfsDaemon::s_reader; int ZfsDaemon::s_devdSockFD = -1; int ZfsDaemon::s_signalPipeFD[2]; bool ZfsDaemon::s_systemRescanRequested(false); @@ -306,6 +342,7 @@ ZfsDaemon::Init() void ZfsDaemon::Fini() { + PurgeCaseFiles(); ClosePIDFile(); } @@ -387,10 +424,9 @@ ZfsDaemon::ConnectToDevd() return (false); } - /* Don't block on reads. */ - if (fcntl(s_devdSockFD, F_SETFL, O_NONBLOCK) == -1) - err(1, "Unable to enable nonblocking behavior on devd socket"); + /* Connect the stream to the file descriptor */ + s_reader = new FDReader(s_devdSockFD); syslog(LOG_INFO, "Connection to devd successful"); return (true); } @@ -398,7 +434,10 @@ ZfsDaemon::ConnectToDevd() void ZfsDaemon::DisconnectFromDevd() { + delete s_reader; + s_reader = NULL; close(s_devdSockFD); + s_devdSockFD = -1; } void @@ -448,8 +487,8 @@ ZfsDaemon::FlushEvents() { char discardBuf[256]; - while (read(s_devdSockFD, discardBuf, sizeof(discardBuf)) > 0) - ; + while (s_reader->in_avail()) + s_reader->read(discardBuf, sizeof(discardBuf)); } bool @@ -528,6 +567,7 @@ ZfsDaemon::RescanSystem() event = DevCtlEvent::CreateEvent(evString); if (event != NULL) event->Process(); + delete event; } } } @@ -561,7 +601,7 @@ ZfsDaemon::DetectMissedEvents() void ZfsDaemon::EventLoop() { - EventBuffer eventBuffer(s_devdSockFD); + EventBuffer eventBuffer(*s_reader); while (s_terminateEventLoop == false) { struct pollfd fds[2]; Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/zfsd.h Fri Oct 11 21:23:44 2013 (r256348) +++ projects/zfsd/head/cddl/sbin/zfsd/zfsd.h Fri Oct 11 21:24:33 2013 (r256349) @@ -42,6 +42,7 @@ #define _ZFSD_H_ #include +#include #include #include #include @@ -57,6 +58,7 @@ using std::auto_ptr; using std::map; using std::pair; +using std::istream; using std::string; /*================================ Global Data ===============================*/ @@ -74,21 +76,131 @@ typedef int LeafIterFunc(zpool_handle_t #define NUM_ELEMENTS(x) (sizeof(x) / sizeof(*x)) /*============================= Class Definitions ============================*/ + +/*-------------------------------- Reader -------------------------------*/ +/** + * \brief A class that presents a common interface to both file descriptors and + * istreams . + * + * Standard C++ provides no way to create an iostream from a file descriptor or + * a FILE. The GNU, Apache, HPUX, and Solaris C++ libraries all provide + * non-standard ways to construct such a stream using similar semantics, but + * LLVM does not. Therefore this class is needed to ensure that zfsd can + * compile under LLVM. This class supports only the functionality needed by + * ZFSD; it does not implement the iostream API. + */ +class Reader +{ +public: + /** + * \brief Return the number of bytes immediately available for reading + */ + virtual size_t in_avail() const = 0; + + /** + * \brief Reads up to count bytes + * + * Whether this call blocks depends on the underlying input source. + * On error, -1 is returned, and errno will be set by the underlying + * source. + * + * \param buf Destination for the data + * \param count Maximum amount of data to read + * \returns Amount of data that was actually read + */ + virtual ssize_t read(char* buf, size_t count) = 0; +}; + + +/*-------------------------------- FDReader -------------------------------*/ +/** + * \brief Specialization of Reader that uses a file descriptor + */ +class FDReader : public Reader +{ +public: + /** + * \brief Constructor + * + * \param fd An open file descriptor. It will not be garbage + * collected by the destructor. + */ + FDReader(int fd); + + virtual size_t in_avail() const; + + virtual ssize_t read(char* buf, size_t count); + +protected: + /** Copy of the underlying file descriptor */ + int m_fd; +}; + +//- FDReader Inline Public Methods ----------------------------------------- +inline FDReader::FDReader(int fd) + : m_fd(fd) +{ +} + +inline ssize_t +FDReader::read(char* buf, size_t count) +{ + return (::read(m_fd, buf, count)); +} + + +/*-------------------------------- IstreamReader------------------------------*/ +/** + * \brief Specialization of Reader that uses a std::istream + */ +class IstreamReader : public Reader +{ +public: + /** + * Constructor + * + * \param stream Pointer to an open istream. It will not be + * garbage collected by the destructor. + */ + IstreamReader(istream* stream); + + virtual size_t in_avail() const; + + virtual ssize_t read(char* buf, size_t count); + +protected: + /** Copy of the underlying stream */ + istream* m_stream; +}; + +//- IstreamReader Inline Public Methods ---------------------------------------- +inline IstreamReader::IstreamReader(istream* stream) + : m_stream(stream) +{ +} + +inline size_t +IstreamReader::in_avail() const +{ + return (m_stream->rdbuf()->in_avail()); +} + + /*-------------------------------- EventBuffer -------------------------------*/ /** - * \brief Class buffering event data from Devd and splitting it - * into individual event strings. + * \brief Class buffering event data from Devd or a similar source and + * splitting it into individual event strings. * - * Users of this class initialize it with the file descriptor associated - * with the unix domain socket connection with devd. The lifetime of - * an EventBuffer instance should match that of the file descriptor passed - * to it. This is required as data from partially received events is - * retained in the EventBuffer in order to allow reconstruction of these - * events across multiple reads of the Devd file descriptor. + * Users of this class initialize it with a Reader associated with the unix + * domain socket connection with devd or a compatible source. The lifetime of + * an EventBuffer instance should match that of the Reader passed to it. This + * is required as data from partially received events is retained in the + * EventBuffer in order to allow reconstruction of these events across multiple + * reads of the stream. * - * Once the program determines that the Devd file descriptor is ready - * for reading, the EventBuffer::ExtractEvent() should be called in a - * loop until the method returns false. + * Once the program determines that the Reader is ready for reading, the + * EventBuffer::ExtractEvent() should be called in a loop until the method + * returns false. */ class EventBuffer { @@ -96,9 +208,9 @@ public: /** * Constructor * - * \param fd The file descriptor on which to buffer/parse event data. + * \param reader The data source on which to buffer/parse event data. */ - EventBuffer(int fd); + EventBuffer(Reader& reader); /** * Pull a single event string out of the event buffer. @@ -163,8 +275,8 @@ private: /** Temporary space for event data during our parsing. */ char m_buf[EVENT_BUFSIZE]; - /** Copy of the file descriptor linked to devd's domain socket. */ - int m_fd; + /** Reference to the reader linked to devd's domain socket. */ + Reader& m_reader; /** Valid bytes in m_buf. */ size_t m_validLen; @@ -362,6 +474,11 @@ private: static int s_devdSockFD; /** + * Reader object used by the EventBuffer + */ + static FDReader* s_reader; + + /** * Pipe file descriptors used to close races with our * signal handlers. */ From owner-svn-src-projects@FreeBSD.ORG Fri Oct 11 21:41:07 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id DF66FBCE; Fri, 11 Oct 2013 21:41:07 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CBB90261F; Fri, 11 Oct 2013 21:41:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9BLf7cK033455; Fri, 11 Oct 2013 21:41:07 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9BLf7vE033454; Fri, 11 Oct 2013 21:41:07 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310112141.r9BLf7vE033454@svn.freebsd.org> From: Alan Somers Date: Fri, 11 Oct 2013 21:41:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256351 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Oct 2013 21:41:07 -0000 Author: asomers Date: Fri Oct 11 21:41:07 2013 New Revision: 256351 URL: http://svnweb.freebsd.org/changeset/base/256351 Log: cddl/sbin/zfsd/callout.cc Restore the doxygen file header that was accidentally left out of rev 224922. No functional changes. Submitted by: gibbs Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Modified: projects/zfsd/head/cddl/sbin/zfsd/callout.cc Modified: projects/zfsd/head/cddl/sbin/zfsd/callout.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/callout.cc Fri Oct 11 21:30:27 2013 (r256350) +++ projects/zfsd/head/cddl/sbin/zfsd/callout.cc Fri Oct 11 21:41:07 2013 (r256351) @@ -30,6 +30,13 @@ * Authors: Justin T. Gibbs (Spectra Logic Corporation) */ +/** + * \file callout.cc + * + * \brief Implementation of the Callout class - multi-client + * timer services built on top of the POSIX interval timer. + */ + #include #include From owner-svn-src-projects@FreeBSD.ORG Fri Oct 11 21:50:06 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 17DB0F53; Fri, 11 Oct 2013 21:50:06 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0425E2685; Fri, 11 Oct 2013 21:50:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9BLo5vU036377; Fri, 11 Oct 2013 21:50:05 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9BLo4aT036366; Fri, 11 Oct 2013 21:50:04 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310112150.r9BLo4aT036366@svn.freebsd.org> From: Alan Somers Date: Fri, 11 Oct 2013 21:50:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256353 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Oct 2013 21:50:06 -0000 Author: asomers Date: Fri Oct 11 21:50:04 2013 New Revision: 256353 URL: http://svnweb.freebsd.org/changeset/base/256353 Log: Fix a bug in zfsd whereby it won't degrade or fault a drive if the devd socket gets HUPed after the drive's last error. The key was to not discard case files when the socket gets HUPed, because doing so drops their callouts. * When calling CaseFile::PurgeAll (such as happens after the DevD socket gets HUPed), serialize case files before purging them. That way, they can be read back in after the connection to devd is restored and proessing may continue. * Added Callout::TimeRemaining to calculate how much time until any given callout expires. * When registering callouts, compute the timeout value based on the event's timestamp, not the present time. * In CaseFile::Serialize, serialize both m_events and m_tentativeEvents. Tentative events will be prefixed with "tentative " in the serialized file. * In DeSerializeFile, push tentative events and regular events into the corresponding m_events or m_tentativeEvents, as appropriate. * ExtractEvents will timestamp each incoming event with a timestamp=seconds_since_epoch nvpair, if not already present. Added a DevCtlEvent::getTimestamp method to read it. * style: in ZfsDaemon::EventLoop changed fds->XXX to fds[0]. to emphase that fds is an array. * A few minor typo fixes in comments. Submitted by: asomers Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Modified: projects/zfsd/head/cddl/sbin/zfsd/callout.cc projects/zfsd/head/cddl/sbin/zfsd/callout.h projects/zfsd/head/cddl/sbin/zfsd/case_file.cc projects/zfsd/head/cddl/sbin/zfsd/case_file.h projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.h projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Modified: projects/zfsd/head/cddl/sbin/zfsd/callout.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/callout.cc Fri Oct 11 21:47:17 2013 (r256352) +++ projects/zfsd/head/cddl/sbin/zfsd/callout.cc Fri Oct 11 21:50:04 2013 (r256353) @@ -167,3 +167,37 @@ Callout::ExpireCallouts() setitimer(ITIMER_REAL, &timerval, NULL); } } + +timeval +Callout::TimeRemaining() const +{ + /* + * Outline: Add the m_interval for each callout in s_activeCallouts + * ahead of this, except for the first callout. Add to that the result + * of getitimer (That's because the first callout stores its original + * interval setting while the timer is ticking). + */ + itimerval timervalToAlarm; + timeval timeToExpiry; + std::list::iterator it; + + if (! IsPending() ) { + timeToExpiry.tv_sec = INT_MAX; + timeToExpiry.tv_usec = 999999; /*maximum normalized value*/ + return (timeToExpiry); + } + + timerclear(&timeToExpiry); + getitimer(ITIMER_REAL, &timervalToAlarm); + timeval& timeToAlarm = timervalToAlarm.it_value; + timeradd(&timeToExpiry, &timeToAlarm, &timeToExpiry); + + it =s_activeCallouts.begin(); + it++; /*skip the first callout in the list*/ + for (; it != s_activeCallouts.end(); it++) { + timeradd(&timeToExpiry, &(*it)->m_interval, &timeToExpiry); + if ((*it) == this) + break; + } + return (timeToExpiry); +} Modified: projects/zfsd/head/cddl/sbin/zfsd/callout.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/callout.h Fri Oct 11 21:47:17 2013 (r256352) +++ projects/zfsd/head/cddl/sbin/zfsd/callout.h Fri Oct 11 21:50:04 2013 (r256353) @@ -117,6 +117,17 @@ public: */ bool Reset(const timeval &interval, CalloutFunc_t *func, void *arg); + /** + * \brief Calculate the remaining time until this Callout's timer + * expires. + * + * The return value will be slightly greater than the actual time to + * expiry. + * + * If the callout is not pending, returns INT_MAX. + */ + timeval TimeRemaining() const; + private: /** * All active callouts sorted by expiration time. The callout Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Fri Oct 11 21:47:17 2013 (r256352) +++ projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Fri Oct 11 21:50:04 2013 (r256353) @@ -144,9 +144,17 @@ CaseFile::LogAll() void CaseFile::PurgeAll() { - /* CaseFiles remove themselves from this list on destruction. */ - while (s_activeCases.size() != 0) - delete s_activeCases.front(); + /* + * Serialize casefiles before deleting them so that they can be reread + * and revalidated during BuildCaseFiles. + * CaseFiles remove themselves from this list on destruction. + */ + while (s_activeCases.size() != 0) { + CaseFile *casefile = s_activeCases.front(); + casefile->Serialize(); + delete casefile; + } + } //- CaseFile Public Methods ---------------------------------------------------- @@ -388,9 +396,7 @@ CaseFile::ReEvaluate(const ZfsEvent &eve || event.Value("class") == "ereport.fs.zfs.checksum") { m_tentativeEvents.push_front(event.DeepCopy()); - if (!m_tentativeTimer.IsPending()) - m_tentativeTimer.Reset(s_removeGracePeriod, - OnGracePeriodEnded, this); + RegisterCallout(event); consumed = true; } @@ -399,6 +405,33 @@ CaseFile::ReEvaluate(const ZfsEvent &eve return (consumed || closed); } + +void +CaseFile::RegisterCallout(const DevCtlEvent &event) +{ + timeval now, countdown, elapsed, timestamp, zero, remaining; + gettimeofday(&now, 0); + timestamp = event.GetTimestamp(); + timersub(&now, ×tamp, &elapsed); + timersub(&s_removeGracePeriod, &elapsed, &countdown); + /* + * If countdown is <= zero, Reset the timer to the + * smallest positive time value instead + */ + timerclear(&zero); + if (timercmp(&countdown, &zero, <=)) { + timerclear(&countdown); + countdown.tv_usec = 1; + } + + remaining = m_tentativeTimer.TimeRemaining(); + + if (!m_tentativeTimer.IsPending() + || timercmp(&countdown, &remaining, <)) + m_tentativeTimer.Reset(countdown, OnGracePeriodEnded, this); +} + + bool CaseFile::CloseIfSolved() { @@ -478,7 +511,6 @@ CaseFile::DeSerializeFile(const char *fi string evString; CaseFile *existingCaseFile(NULL); CaseFile *caseFile(NULL); - ifstream *caseStream(NULL); try { uintmax_t poolGUID; @@ -511,8 +543,8 @@ CaseFile::DeSerializeFile(const char *fi .Find(vdevGUID)) == NULL) { /* * Either the pool no longer exists - * of this vdev is no longer a member of - * the pool. + * or this vdev is no longer a member of + * the pool. */ unlink(fullName.c_str()); return; @@ -526,29 +558,58 @@ CaseFile::DeSerializeFile(const char *fi caseFile = new CaseFile(Vdev(zpl.front(), vdevConf)); } - caseStream = new ifstream(fullName.c_str()); - if ( (caseStream == NULL) || (! *caseStream) ) { + ifstream caseStream(fullName.c_str()); + if (! caseStream) { throw ZfsdException("CaseFile::DeSerialize: Unable to " "read %s.\n", fileName); return; } - IstreamReader caseReader(caseStream); + stringstream fakeDevdSocket(stringstream::in + | stringstream::out); + IstreamReader caseReader(&fakeDevdSocket); /* Re-load EventData */ EventBuffer eventBuffer(caseReader); - while (eventBuffer.ExtractEvent(evString)) { - DevCtlEvent *event(DevCtlEvent::CreateEvent(evString)); - if (event != NULL) - caseFile->m_events.push_back(event); + caseStream >> std::noskipws >> std::ws; + while (!caseStream.eof()) { + /* + * Outline: + * read the beginning of a line and check it for + * "tentative". If found, discard "tentative". + * Shove into fakeDevdSocket. + * call ExtractEvent + * continue + */ + DevCtlEventList* destEvents; + string tentFlag("tentative "); + string line; + std::stringbuf lineBuf; + caseStream.get(lineBuf); + caseStream.ignore(); /*discard the newline character*/ + line = lineBuf.str(); + if (line.compare(0, tentFlag.size(), tentFlag) == 0) { + line.erase(0, tentFlag.size()); + destEvents = &caseFile->m_tentativeEvents; + } else { + destEvents = &caseFile->m_events; + } + fakeDevdSocket << line; + fakeDevdSocket << '\n'; + while (eventBuffer.ExtractEvent(evString)) { + DevCtlEvent *event(DevCtlEvent::CreateEvent( + evString)); + if (event != NULL) { + destEvents->push_back(event); + caseFile->RegisterCallout(*event); + } + } } - delete caseStream; + } catch (const ParseException &exp) { exp.Log(evString); if (caseFile != existingCaseFile) delete caseFile; - if (caseStream) - delete caseStream; /* * Since we can't parse the file, unlink it so we don't @@ -560,8 +621,6 @@ CaseFile::DeSerializeFile(const char *fi zfsException.Log(); if (caseFile != existingCaseFile) delete caseFile; - if (caseStream) - delete caseStream; } } @@ -614,6 +673,24 @@ CaseFile::PurgeTentativeEvents() m_tentativeEvents.clear(); } + +void +CaseFile::SerializeEvList(const DevCtlEventList events, int fd, + const char* prefix) const +{ + if (events.empty()) + return; + for (DevCtlEventList::const_iterator curEvent = events.begin(); + curEvent != events.end(); curEvent++) { + const string &eventString((*curEvent)->GetEventString()); + + if (prefix) + write(fd, prefix, strlen(prefix)); + write(fd, eventString.c_str(), eventString.length()); + } +} + + void CaseFile::Serialize() { @@ -625,7 +702,7 @@ CaseFile::Serialize() << "_vdev_" << VdevGUIDString() << ".case"; - if (m_events.empty()) { + if (m_events.empty() && m_tentativeEvents.empty()) { unlink(saveFile.str().c_str()); return; } @@ -636,12 +713,8 @@ CaseFile::Serialize() saveFile.str().c_str()); return; } - for (DevCtlEventList::const_iterator curEvent = m_events.begin(); - curEvent != m_events.end(); curEvent++) { - const string &eventString((*curEvent)->GetEventString()); - - write(fd, eventString.c_str(), eventString.length()); - } + SerializeEvList(m_events, fd); + SerializeEvList(m_tentativeEvents, fd, "tentative "); close(fd); } Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/case_file.h Fri Oct 11 21:47:17 2013 (r256352) +++ projects/zfsd/head/cddl/sbin/zfsd/case_file.h Fri Oct 11 21:50:04 2013 (r256353) @@ -171,7 +171,12 @@ public: bool ReEvaluate(const ZfsEvent &event); /** - * \breif Close a case if it is no longer relevant. + * \brief Register an itimer callout for the given event, if necessary + */ + void RegisterCallout(const DevCtlEvent &event); + + /** + * \brief Close a case if it is no longer relevant. * * This method deals with cases tracking soft errors. Soft errors * will be discarded should a remove event occur within a short period @@ -210,12 +215,12 @@ protected: static int DeSerializeSelector(const struct dirent *dirEntry); /** - * \brief Given the name of a file containing a serialized CaseFile - * object, create/update an in-core CaseFile object + * \brief Given the name of a file containing serialized events from a + * CaseFile object, create/update an in-core CaseFile object * representing the serialized data. * - * \param fileName The name of a file containing a serialized - * CaseFile object. + * \param fileName The name of a file containing serialized events + * from a CaseFile object. */ static void DeSerializeFile(const char *fileName); @@ -248,6 +253,15 @@ protected: */ void Serialize(); + /** + * \brief Serializes the supplied event list and writes it to fd + * + * \param prefix If not NULL, this prefix will be prepended to + * every event in the file. + */ + void SerializeEvList(const DevCtlEventList events, int fd, + const char* prefix=NULL) const; + /** * \brief Unconditionally close a CaseFile. */ Modified: projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc Fri Oct 11 21:47:17 2013 (r256352) +++ projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc Fri Oct 11 21:50:04 2013 (r256353) @@ -250,6 +250,23 @@ DevCtlEvent::Process() const { } +timeval +DevCtlEvent::GetTimestamp() const +{ + timeval tv_timestamp; + struct tm tm_timestamp; + + if ( ! Contains("timestamp") ) { + throw ZfsdException("Event contains no timestamp: %s", + m_eventString.c_str()); + } + strptime(Value(string("timestamp")).c_str(), "%s", &tm_timestamp); + tv_timestamp.tv_sec = mktime(&tm_timestamp); + tv_timestamp.tv_usec = 0; + return (tv_timestamp); +} + + //- DevCtlEvent Protected Methods ---------------------------------------------- DevCtlEvent::DevCtlEvent(Type type, NVPairMap &map, const string &eventString) : m_type(type), Modified: projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.h Fri Oct 11 21:47:17 2013 (r256352) +++ projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.h Fri Oct 11 21:50:04 2013 (r256353) @@ -158,7 +158,7 @@ typedef map NVPairMap; * * All name => value data for events can be accessed via the Contains() * and Value() methods. name => value pairs for data not explicitly - * recieved as a a name => value pair are synthesized during parsing. For + * recieved as a name => value pair are synthesized during parsing. For * example, ATTACH and DETACH events have "device-name" and "parent" * name => value pairs added. */ @@ -276,6 +276,11 @@ public: */ virtual void Process() const; + /** + * Get the time that the event was created + */ + timeval GetTimestamp() const; + protected: /** Table entries used to map a type to a user friendly string. */ struct EventTypeRecord @@ -353,7 +358,8 @@ private: /** * Ingest event data from the supplied string. * - * \param eventString The string of devd event data to parse. + * \param[in] eventString The string of devd event data to parse. + * \param[out] nvpairs Returns the parsed data */ static void ParseEventString(Type type, const string &eventString, NVPairMap &nvpairs); Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Fri Oct 11 21:47:17 2013 (r256352) +++ projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Fri Oct 11 21:50:04 2013 (r256353) @@ -143,6 +143,11 @@ EventBuffer::EventBuffer(Reader& reader) bool EventBuffer::ExtractEvent(string &eventString) { + stringstream tsField; + timeval now; + + gettimeofday(&now, NULL); + tsField << " timestamp=" << now.tv_sec; while (UnParsed() > 0 || Fill()) { @@ -160,7 +165,7 @@ EventBuffer::ExtractEvent(string &eventS size_t eventLen(strcspn(nextEvent, s_eventEndTokens)); if (!m_synchronized) { - /* Discard data until an end token is read. */ + /* Discard data until an end token is read. */ if (nextEvent[eventLen] != '\0') m_synchronized = true; m_nextEventOffset += eventLen; @@ -205,6 +210,17 @@ EventBuffer::ExtractEvent(string &eventS "Truncated %d characters from event.", eventLen - fieldEnd); } + + /* + * Add a timestamp as the final field of the event if it is + * not already present. + */ + if ( eventString.find("timestamp=") == string::npos) { + eventString.insert( + eventString.find_last_not_of('\n') + 1, + tsField.str()); + } + return (true); } return (false); @@ -653,13 +669,13 @@ ZfsDaemon::EventLoop() RescanSystem(); } - if ((fds->revents & POLLERR) != 0) { + if ((fds[0].revents & POLLERR) != 0) { /* Try reconnecting. */ syslog(LOG_INFO, "Error on socket. Disconnecting."); break; } - if ((fds->revents & POLLHUP) != 0) { + if ((fds[0].revents & POLLHUP) != 0) { /* Try reconnecting. */ syslog(LOG_INFO, "Hup on socket. Disconnecting."); break; From owner-svn-src-projects@FreeBSD.ORG Fri Oct 11 21:55:14 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D2BD4241; Fri, 11 Oct 2013 21:55:14 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A428B26D9; Fri, 11 Oct 2013 21:55:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9BLtEQ5039628; Fri, 11 Oct 2013 21:55:14 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9BLtDX0039618; Fri, 11 Oct 2013 21:55:13 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310112155.r9BLtDX0039618@svn.freebsd.org> From: Alan Somers Date: Fri, 11 Oct 2013 21:55:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256354 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Oct 2013 21:55:15 -0000 Author: asomers Date: Fri Oct 11 21:55:12 2013 New Revision: 256354 URL: http://svnweb.freebsd.org/changeset/base/256354 Log: cddl/sbin/zfsd/callout.cc: cddl/sbin/zfsd/callout.h: cddl/sbin/zfsd/case_file.cc: cddl/sbin/zfsd/case_file.h: cddl/sbin/zfsd/dev_ctl_event.h: cddl/sbin/zfsd/zfsd.cc: cddl/sbin/zfsd/zfsd.h: Style and spelling in comments fixes. No functional changes. Submitted by: gibbs Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Modified: projects/zfsd/head/cddl/sbin/zfsd/callout.cc projects/zfsd/head/cddl/sbin/zfsd/callout.h projects/zfsd/head/cddl/sbin/zfsd/case_file.cc projects/zfsd/head/cddl/sbin/zfsd/case_file.h projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.h projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc projects/zfsd/head/cddl/sbin/zfsd/zfsd.h Modified: projects/zfsd/head/cddl/sbin/zfsd/callout.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/callout.cc Fri Oct 11 21:50:04 2013 (r256353) +++ projects/zfsd/head/cddl/sbin/zfsd/callout.cc Fri Oct 11 21:55:12 2013 (r256354) @@ -181,7 +181,7 @@ Callout::TimeRemaining() const timeval timeToExpiry; std::list::iterator it; - if (! IsPending() ) { + if (!IsPending()) { timeToExpiry.tv_sec = INT_MAX; timeToExpiry.tv_usec = 999999; /*maximum normalized value*/ return (timeToExpiry); Modified: projects/zfsd/head/cddl/sbin/zfsd/callout.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/callout.h Fri Oct 11 21:50:04 2013 (r256353) +++ projects/zfsd/head/cddl/sbin/zfsd/callout.h Fri Oct 11 21:55:12 2013 (r256354) @@ -84,7 +84,7 @@ public: Callout(); /** - * returns true if callout has not been stopped, + * Returns true if callout has not been stopped, * or deactivated since the last time the callout was * reset. */ @@ -105,7 +105,7 @@ public: * * \param interval Timeval indicating the time which must elapse * before this callout fires. - * \param func Pointer to the callback funtion + * \param func Pointer to the callback funtion * \param arg Argument pointer to pass to callback function * * \return Cancelation status. @@ -119,7 +119,7 @@ public: /** * \brief Calculate the remaining time until this Callout's timer - * expires. + * expires. * * The return value will be slightly greater than the actual time to * expiry. Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Fri Oct 11 21:50:04 2013 (r256353) +++ projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Fri Oct 11 21:55:12 2013 (r256354) @@ -220,7 +220,7 @@ CaseFile::ReEvaluate(const string &devPa * use a newly inserted spare to replace a degraded * or faulted device. */ - return (false); + return (/*consumed*/false); } if (vdev != NULL @@ -255,17 +255,17 @@ CaseFile::ReEvaluate(const string &devPa PoolGUIDString().c_str(), VdevGUIDString().c_str(), zpool_state_to_name(VdevState(), VDEV_AUX_NONE)); - return (false); + return (/*consumed*/false); } if (PhysicalPath().empty()) { syslog(LOG_INFO, - "CaseFile(%s:%s:%s): No vdev physical path information. " + "CaseFile(%s:%s:%s): No physical path information. " "Ignoring device insertion.\n", PoolGUIDString().c_str(), VdevGUIDString().c_str(), zpool_state_to_name(VdevState(), VDEV_AUX_NONE)); - return (false); + return (/*consumed*/false); } if (physPath != PhysicalPath()) { @@ -275,7 +275,7 @@ CaseFile::ReEvaluate(const string &devPa PoolGUIDString().c_str(), VdevGUIDString().c_str(), zpool_state_to_name(VdevState(), VDEV_AUX_NONE)); - return (false); + return (/*consumed*/false); } /* Write a label on the newly inserted disk. */ @@ -315,7 +315,7 @@ CaseFile::ReEvaluate(const string &devPa zpool_get_name(pool), VdevGUIDString().c_str()); nvlist_free(newvd); nvlist_free(nvroot); - return (1); + return (/*consumed*/true); } /* Data was copied when added to the root vdev. */ @@ -405,11 +405,11 @@ CaseFile::ReEvaluate(const ZfsEvent &eve return (consumed || closed); } - void CaseFile::RegisterCallout(const DevCtlEvent &event) -{ +{ timeval now, countdown, elapsed, timestamp, zero, remaining; + gettimeofday(&now, 0); timestamp = event.GetTimestamp(); timersub(&now, ×tamp, &elapsed); @@ -427,7 +427,7 @@ CaseFile::RegisterCallout(const DevCtlEv remaining = m_tentativeTimer.TimeRemaining(); if (!m_tentativeTimer.IsPending() - || timercmp(&countdown, &remaining, <)) + || timercmp(&countdown, &remaining, <)) m_tentativeTimer.Reset(countdown, OnGracePeriodEnded, this); } @@ -559,13 +559,12 @@ CaseFile::DeSerializeFile(const char *fi } ifstream caseStream(fullName.c_str()); - if (! caseStream) { + if (!caseStream) { throw ZfsdException("CaseFile::DeSerialize: Unable to " - "read %s.\n", fileName); + "read %s.\n", fileName); return; } - stringstream fakeDevdSocket(stringstream::in - | stringstream::out); + stringstream fakeDevdSocket(stringstream::in|stringstream::out); IstreamReader caseReader(&fakeDevdSocket); /* Re-load EventData */ @@ -604,7 +603,6 @@ CaseFile::DeSerializeFile(const char *fi } } } - } catch (const ParseException &exp) { exp.Log(evString); @@ -673,7 +671,6 @@ CaseFile::PurgeTentativeEvents() m_tentativeEvents.clear(); } - void CaseFile::SerializeEvList(const DevCtlEventList events, int fd, const char* prefix) const Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/case_file.h Fri Oct 11 21:50:04 2013 (r256353) +++ projects/zfsd/head/cddl/sbin/zfsd/case_file.h Fri Oct 11 21:55:12 2013 (r256354) @@ -210,13 +210,14 @@ protected: * * \param dirEntry Directory entry for the file to filter. * - * \return Non-zero for a file to include in the selection, otherwise 0. + * \return Non-zero for a file to include in the selection, + * otherwise 0. */ static int DeSerializeSelector(const struct dirent *dirEntry); /** * \brief Given the name of a file containing serialized events from a - * CaseFile object, create/update an in-core CaseFile object + * CaseFile object, create/update an in-core CaseFile object * representing the serialized data. * * \param fileName The name of a file containing serialized events @@ -253,14 +254,14 @@ protected: */ void Serialize(); - /** + /** * \brief Serializes the supplied event list and writes it to fd * - * \param prefix If not NULL, this prefix will be prepended to - * every event in the file. + * \param prefix If not NULL, this prefix will be prepended to + * every event in the file. */ void SerializeEvList(const DevCtlEventList events, int fd, - const char* prefix=NULL) const; + const char* prefix=NULL) const; /** * \brief Unconditionally close a CaseFile. @@ -309,9 +310,9 @@ protected: uint64_t m_poolGUID; uint64_t m_vdevGUID; vdev_state m_vdevState; - string m_poolGUIDString; - string m_vdevGUIDString; - string m_vdevPhysPath; + string m_poolGUIDString; + string m_vdevGUIDString; + string m_vdevPhysPath; /** * \brief Callout activated when a grace period Modified: projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.h Fri Oct 11 21:50:04 2013 (r256353) +++ projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.h Fri Oct 11 21:55:12 2013 (r256354) @@ -95,7 +95,7 @@ public: * Accessor * * \return The offset into the event string where this exception - * occurred. + * occurred. */ size_t GetOffset() const; @@ -158,7 +158,7 @@ typedef map NVPairMap; * * All name => value data for events can be accessed via the Contains() * and Value() methods. name => value pairs for data not explicitly - * recieved as a name => value pair are synthesized during parsing. For + * received as a name => value pair are synthesized during parsing. For * example, ATTACH and DETACH events have "device-name" and "parent" * name => value pairs added. */ @@ -219,7 +219,7 @@ public: * associated value. * * \return A const reference to the string representing the - * value associated with key. + * value associated with key. * * \note For key's with no registered value, the empty string * is returned. @@ -265,7 +265,7 @@ public: * Create and return a fully independent clone * of this event. */ - virtual DevCtlEvent *DeepCopy() const = 0; + virtual DevCtlEvent *DeepCopy() const = 0; /** Destructor */ virtual ~DevCtlEvent(); @@ -358,8 +358,8 @@ private: /** * Ingest event data from the supplied string. * - * \param[in] eventString The string of devd event data to parse. - * \param[out] nvpairs Returns the parsed data + * \param[in] eventString The string of devd event data to parse. + * \param[out] nvpairs Returns the parsed data */ static void ParseEventString(Type type, const string &eventString, NVPairMap &nvpairs); @@ -470,11 +470,11 @@ public: * Interpret and perform any actions necessary to * consume the event. */ - virtual void Process() const; + virtual void Process() const; - const string &PoolName() const; - uint64_t PoolGUID() const; - uint64_t VdevGUID() const; + const string &PoolName() const; + uint64_t PoolGUID() const; + uint64_t VdevGUID() const; protected: /** Constructor */ @@ -483,7 +483,7 @@ protected: /** Deep copy constructor. */ ZfsEvent(const ZfsEvent &src); - void ProcessPoolEvent() const; + void ProcessPoolEvent() const; uint64_t m_poolGUID; uint64_t m_vdevGUID; Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Fri Oct 11 21:50:04 2013 (r256353) +++ projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Fri Oct 11 21:55:12 2013 (r256354) @@ -215,10 +215,10 @@ EventBuffer::ExtractEvent(string &eventS * Add a timestamp as the final field of the event if it is * not already present. */ - if ( eventString.find("timestamp=") == string::npos) { - eventString.insert( - eventString.find_last_not_of('\n') + 1, - tsField.str()); + if (eventString.find("timestamp=") == string::npos) { + size_t eventEnd(eventString.find_last_not_of('\n') + 1); + + eventString.insert(eventEnd, tsField.str()); } return (true); Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/zfsd.h Fri Oct 11 21:50:04 2013 (r256353) +++ projects/zfsd/head/cddl/sbin/zfsd/zfsd.h Fri Oct 11 21:55:12 2013 (r256354) @@ -79,15 +79,14 @@ typedef int LeafIterFunc(zpool_handle_t /*-------------------------------- Reader -------------------------------*/ /** - * \brief A class that presents a common interface to both file descriptors and - * istreams . + * \brief A class that presents a common interface to both file descriptors + * and istreams. * * Standard C++ provides no way to create an iostream from a file descriptor or * a FILE. The GNU, Apache, HPUX, and Solaris C++ libraries all provide * non-standard ways to construct such a stream using similar semantics, but - * LLVM does not. Therefore this class is needed to ensure that zfsd can - * compile under LLVM. This class supports only the functionality needed by - * ZFSD; it does not implement the iostream API. + * FreeBSD's C++ library does not. This class supports only the functionality + * needed by ZFSD; it does not implement the iostream API. */ class Reader { @@ -104,9 +103,9 @@ public: * On error, -1 is returned, and errno will be set by the underlying * source. * - * \param buf Destination for the data - * \param count Maximum amount of data to read - * \returns Amount of data that was actually read + * \param buf Destination for the data + * \param count Maximum amount of data to read + * \returns Amount of data that was actually read */ virtual ssize_t read(char* buf, size_t count) = 0; }; @@ -122,12 +121,12 @@ public: /** * \brief Constructor * - * \param fd An open file descriptor. It will not be garbage - * collected by the destructor. + * \param fd An open file descriptor. It will not be garbage + * collected by the destructor. */ FDReader(int fd); - virtual size_t in_avail() const; + virtual size_t in_avail() const; virtual ssize_t read(char* buf, size_t count); @@ -137,8 +136,9 @@ protected: }; //- FDReader Inline Public Methods ----------------------------------------- -inline FDReader::FDReader(int fd) - : m_fd(fd) +inline +FDReader::FDReader(int fd) + : m_fd(fd) { } @@ -148,7 +148,6 @@ FDReader::read(char* buf, size_t count) return (::read(m_fd, buf, count)); } - /*-------------------------------- IstreamReader------------------------------*/ /** * \brief Specialization of Reader that uses a std::istream @@ -159,8 +158,8 @@ public: /** * Constructor * - * \param stream Pointer to an open istream. It will not be - * garbage collected by the destructor. + * \param stream Pointer to an open istream. It will not be + * garbage collected by the destructor. */ IstreamReader(istream* stream); @@ -170,12 +169,13 @@ public: protected: /** Copy of the underlying stream */ - istream* m_stream; + istream *m_stream; }; //- IstreamReader Inline Public Methods ---------------------------------------- -inline IstreamReader::IstreamReader(istream* stream) - : m_stream(stream) +inline +IstreamReader::IstreamReader(istream* stream) + : m_stream(stream) { } @@ -189,7 +189,7 @@ IstreamReader::in_avail() const /*-------------------------------- EventBuffer -------------------------------*/ /** * \brief Class buffering event data from Devd or a similar source and - * splitting it into individual event strings. + * splitting it into individual event strings. * * Users of this class initialize it with a Reader associated with the unix * domain socket connection with devd or a compatible source. The lifetime of @@ -276,7 +276,7 @@ private: char m_buf[EVENT_BUFSIZE]; /** Reference to the reader linked to devd's domain socket. */ - Reader& m_reader; + Reader& m_reader; /** Valid bytes in m_buf. */ size_t m_validLen; From owner-svn-src-projects@FreeBSD.ORG Fri Oct 11 22:00:55 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 434555B1; Fri, 11 Oct 2013 22:00:55 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 312842740; Fri, 11 Oct 2013 22:00:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9BM0tNj044163; Fri, 11 Oct 2013 22:00:55 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9BM0tN2044162; Fri, 11 Oct 2013 22:00:55 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310112200.r9BM0tN2044162@svn.freebsd.org> From: Alan Somers Date: Fri, 11 Oct 2013 22:00:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256355 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Oct 2013 22:00:55 -0000 Author: asomers Date: Fri Oct 11 22:00:54 2013 New Revision: 256355 URL: http://svnweb.freebsd.org/changeset/base/256355 Log: Modify the parsing of device control attach and detach events to tolerate the timestamp key<=>value pair added to all events in changeset 256353. cddl/sbin/zfsd/dev_ctl_event.cc: o In DevCtlEvent::ParseEventString(), remove code that verified that attach and detach events contained no trailing key<=>value pairs after the "parent" field. o Fix whitespace/style error in an if statement. Submitted by: gibbs Approved by: ken (mentor) Sponsored By: Spectra Logic Corporation Modified: projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc Modified: projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc Fri Oct 11 21:55:12 2013 (r256354) +++ projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc Fri Oct 11 22:00:54 2013 (r256355) @@ -256,7 +256,7 @@ DevCtlEvent::GetTimestamp() const timeval tv_timestamp; struct tm tm_timestamp; - if ( ! Contains("timestamp") ) { + if (!Contains("timestamp")) { throw ZfsdException("Event contains no timestamp: %s", m_eventString.c_str()); } @@ -320,17 +320,6 @@ DevCtlEvent::ParseEventString(DevCtlEven start += 4; end = eventString.find_first_of(" \t\n", start); nvpairs["parent"] = eventString.substr(start, end); - if (end == string::npos) - break; - - /* - * The parent field should terminate the event with the - * exception of trailing whitespace. - */ - end = eventString.find_first_not_of(" \t\n", end); - if (end != string::npos) - throw ParseException(ParseException::INVALID_FORMAT, - end); break; case NOTIFY: break; From owner-svn-src-projects@FreeBSD.ORG Fri Oct 11 22:19:47 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 7FAF5A4D; Fri, 11 Oct 2013 22:19:47 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5C677281E; Fri, 11 Oct 2013 22:19:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9BMJlCi051579; Fri, 11 Oct 2013 22:19:47 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9BMJksP051570; Fri, 11 Oct 2013 22:19:46 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310112219.r9BMJksP051570@svn.freebsd.org> From: Alan Somers Date: Fri, 11 Oct 2013 22:19:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256356 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Oct 2013 22:19:47 -0000 Author: asomers Date: Fri Oct 11 22:19:45 2013 New Revision: 256356 URL: http://svnweb.freebsd.org/changeset/base/256356 Log: General cleanup to facilitate unit testing. The unit tests will be committed separately. cddl/sbin/zfsd/zfsd.cc cddl/sbin/zfsd/zfsd_main.cc cddl/sbin/zfsd/Makefile Split main() into a separate file. cddl/sbin/zfsd/callout.cc cddl/sbin/zfsd/zfsd_exception.h cddl/sbin/zfsd/zfsd_exception.cc Removed dead code and de-inlined functions. Submitted by: alans Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Added: projects/zfsd/head/cddl/sbin/zfsd/zfsd_main.cc Modified: projects/zfsd/head/cddl/sbin/zfsd/Makefile projects/zfsd/head/cddl/sbin/zfsd/callout.cc projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc projects/zfsd/head/cddl/sbin/zfsd/zfsd_exception.cc projects/zfsd/head/cddl/sbin/zfsd/zfsd_exception.h Modified: projects/zfsd/head/cddl/sbin/zfsd/Makefile ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/Makefile Fri Oct 11 22:00:54 2013 (r256355) +++ projects/zfsd/head/cddl/sbin/zfsd/Makefile Fri Oct 11 22:19:45 2013 (r256356) @@ -8,7 +8,8 @@ SRCS= callout.cc \ vdev_iterator.cc \ zfsd.cc \ zfsd_exception.cc \ - zpool_list.cc + zpool_list.cc \ + zfsd_main.cc NO_MAN= YES Modified: projects/zfsd/head/cddl/sbin/zfsd/callout.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/callout.cc Fri Oct 11 22:00:54 2013 (r256355) +++ projects/zfsd/head/cddl/sbin/zfsd/callout.cc Fri Oct 11 22:19:45 2013 (r256356) @@ -53,7 +53,7 @@ Callout::Init() signal(SIGALRM, Callout::AlarmSignalHandler); } -inline bool +bool Callout::Stop() { if (!IsPending()) Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Fri Oct 11 22:00:54 2013 (r256355) +++ projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Fri Oct 11 22:19:45 2013 (r256356) @@ -61,7 +61,6 @@ #include #include #include -#include #include #include @@ -683,33 +682,4 @@ ZfsDaemon::EventLoop() } } -/*=============================== Program Main ===============================*/ -static void -usage() -{ - fprintf(stderr, "usage: %s [-d]\n", getprogname()); - exit(1); -} - -/** - * Program entry point. - */ -int -main(int argc, char **argv) -{ - int ch; - while ((ch = getopt(argc, argv, "d")) != -1) { - switch (ch) { - case 'd': - g_debug++; - break; - default: - usage(); - } - } - - ZfsDaemon::Run(); - - return (0); -} Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd_exception.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/zfsd_exception.cc Fri Oct 11 22:00:54 2013 (r256355) +++ projects/zfsd/head/cddl/sbin/zfsd/zfsd_exception.cc Fri Oct 11 22:19:45 2013 (r256356) @@ -93,32 +93,6 @@ ZfsdException::ZfsdException(nvlist_t *p va_end(ap); } -inline -ZfsdException::ZfsdException(zpool_handle_t *pool, nvlist_t *vdevConfig, - const char *fmt, ...) - : m_poolConfig(zpool_get_config(pool, NULL)), - m_vdevConfig(vdevConfig) -{ - va_list ap; - - va_start(ap, fmt); - FormatLog(fmt, ap); - va_end(ap); -} - -inline -ZfsdException::ZfsdException(nvlist_t *poolConfig, nvlist_t *vdevConfig, - const char *fmt, ...) - : m_poolConfig(poolConfig), - m_vdevConfig(vdevConfig) -{ - va_list ap; - - va_start(ap, fmt); - FormatLog(fmt, ap); - va_end(ap); -} - void ZfsdException::Log() const { Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd_exception.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/zfsd_exception.h Fri Oct 11 22:00:54 2013 (r256355) +++ projects/zfsd/head/cddl/sbin/zfsd/zfsd_exception.h Fri Oct 11 22:19:45 2013 (r256356) @@ -93,42 +93,6 @@ public: ZfsdException(nvlist_t *poolConfig, const char *, ...); /** - * \brief ZfsdException constructor allowing arbitrary string - * data to be reported and associated with the configuration - * data for a single vdev and its parent pool. - * - * \param pool Pool handle describing the pool to which this - * exception is associated. - * \param vdevConfig A name/value list describing the vdev - * to which this exception is associated. - * \param fmt Printf-like string format specifier. - * - * Instantiation with this method is used to report errors - * associated with a vdev when both the vdev's config and - * its pool membership are available. - */ - ZfsdException(zpool_handle_t *pool, nvlist_t *vdevConfig, - const char *fmt, ...); - - /** - * \brief ZfsdException constructor allowing arbitrary string - * data to be reported and associated with the configuration - * data for a single vdev and its parent pool. - * - * \param poolConfig Pool configuration describing the pool to - * which this exception is associated. - * \param vdevConfig A name/value list describing the vdev - * to which this exception is associated. - * \param fmt Printf-like string format specifier. - * - * Instantiation with this method is used to report errors - * associated with a vdev when both the vdev's config and - * its pool membership are available. - */ - ZfsdException(nvlist_t *poolConfig, nvlist_t *vdevConfig, - const char *fmt, ...); - - /** * \brief Augment/Modify a ZfsdException's string data. */ std::string& GetString(); Added: projects/zfsd/head/cddl/sbin/zfsd/zfsd_main.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/zfsd/head/cddl/sbin/zfsd/zfsd_main.cc Fri Oct 11 22:19:45 2013 (r256356) @@ -0,0 +1,76 @@ +/*- + * Copyright (c) 2011 Spectra Logic Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer, + * without modification. + * 2. Redistributions in binary form must reproduce at minimum a disclaimer + * substantially similar to the "NO WARRANTY" disclaimer below + * ("Disclaimer") and any redistribution must be conditioned upon + * including a substantially similar Disclaimer requirement for further + * binary redistribution. + * + * NO WARRANTY + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGES. + * + * Authors: Alan Somers (Spectra Logic Corporation) + */ + +/** + * \file zfsd_main.cc + * + * main function for the ZFS Daemon. Separated to facilitate testing. + * + */ + +#include +#include +#include + +#include "zfsd.h" + + +/*=============================== Program Main ===============================*/ +static void +usage() +{ + fprintf(stderr, "usage: %s [-d]\n", getprogname()); + exit(1); +} + +/** + * Program entry point. + */ +int +main(int argc, char **argv) +{ + int ch; + + while ((ch = getopt(argc, argv, "d")) != -1) { + switch (ch) { + case 'd': + g_debug++; + break; + default: + usage(); + } + } + + ZfsDaemon::Run(); + + return (0); +} From owner-svn-src-projects@FreeBSD.ORG Fri Oct 11 22:44:17 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id CF07E17B; Fri, 11 Oct 2013 22:44:17 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id ACFEA294F; Fri, 11 Oct 2013 22:44:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9BMiHgr064993; Fri, 11 Oct 2013 22:44:17 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9BMiFrs064972; Fri, 11 Oct 2013 22:44:15 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310112244.r9BMiFrs064972@svn.freebsd.org> From: Alan Somers Date: Fri, 11 Oct 2013 22:44:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256357 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Oct 2013 22:44:17 -0000 Author: asomers Date: Fri Oct 11 22:44:15 2013 New Revision: 256357 URL: http://svnweb.freebsd.org/changeset/base/256357 Log: zfsd will now try to activate a spare, if one is available, when a resource dissapears. Other functionality, such as detaching the spare when the original device returns, is TBD. cddl/sbin/zfsd/vdev_iterator.h cddl/sbin/zfsd/vdev_iterator.cc cddl/sbin/zfsd/zpool_list.cc cddl/sbin/zfsd/dev_ctl_event.h cddl/sbin/zfsd/case_file.h cddl/sbin/zfsd/case_file.cc cddl/sbin/zfsd/vdev.h cddl/sbin/zfsd/vdev.cc Created a new Guid class that can have a None value. Modified the Vdev class to be able to represent available spares, which do not have pool or vdev guids. cddl/sbin/zfsd/case_file.h cddl/sbin/zfsd/case_file.cc Abstract device replacement into the CaseFile::Replace method, which is used by both ActivateSpare and replace by physical path. Try to active a hotspare whenever a vdev dissappears. Submitted by: asomers Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc projects/zfsd/head/cddl/sbin/zfsd/case_file.h projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.h projects/zfsd/head/cddl/sbin/zfsd/vdev.cc projects/zfsd/head/cddl/sbin/zfsd/vdev.h projects/zfsd/head/cddl/sbin/zfsd/vdev_iterator.cc projects/zfsd/head/cddl/sbin/zfsd/vdev_iterator.h projects/zfsd/head/cddl/sbin/zfsd/zpool_list.cc Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Fri Oct 11 22:19:45 2013 (r256356) +++ projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Fri Oct 11 22:44:15 2013 (r256357) @@ -66,8 +66,9 @@ const string CaseFile::s_caseFilePath = const timeval CaseFile::s_removeGracePeriod = { 60 /*sec*/, 0 /*usec*/}; //- CaseFile Static Public Methods --------------------------------------------- + CaseFile * -CaseFile::Find(uint64_t poolGUID, uint64_t vdevGUID) +CaseFile::Find(Guid poolGUID, Guid vdevGUID) { for (CaseFileList::iterator curCase = s_activeCases.begin(); curCase != s_activeCases.end(); curCase++) { @@ -163,16 +164,17 @@ CaseFile::RefreshVdevState() { ZpoolList zpl(ZpoolList::ZpoolByGUID, &m_poolGUID); if (zpl.empty()) { - syslog(LOG_INFO, - "CaseFile::RefreshVdevState: Unknown pool for " - "Vdev(%ju,%ju).\n", - m_poolGUID, m_vdevGUID); - return (false); + stringstream msg; + msg << "CaseFile::RefreshVdevState: Unknown pool for Vdev("; + msg << m_poolGUID << "," << m_vdevGUID << ")."; + syslog(LOG_INFO, msg.str().c_str()); + return (false); } zpool_handle_t *casePool(zpl.front()); nvlist_t *vdevConfig = VdevIterator(casePool).Find(VdevGUID()); if (vdevConfig == NULL) { + stringstream msg; syslog(LOG_INFO, "CaseFile::RefreshVdevState: Unknown Vdev(%s,%s).\n", PoolGUIDString().c_str(), PoolGUIDString().c_str()); @@ -288,55 +290,7 @@ CaseFile::ReEvaluate(const string &devPa return (/*consumed*/false); } - /* - * Build a root vdev/leaf vdev configuration suitable for - * zpool_vdev_attach. Only enough data for the kernel to find - * the device (i.e. type and disk device node path) are needed. - */ - nvlist_t *nvroot(NULL); - nvlist_t *newvd(NULL); - if (nvlist_alloc(&nvroot, NV_UNIQUE_NAME, 0) != 0 - || nvlist_alloc(&newvd, NV_UNIQUE_NAME, 0) != 0) { - syslog(LOG_ERR, "Replace vdev(%s/%s) by physical path: " - "Unable to allocate configuration data.\n", - zpool_get_name(pool), VdevGUIDString().c_str()); - if (nvroot != NULL) - nvlist_free(nvroot); - return (/*consumed*/false); - } - - if (nvlist_add_string(newvd, ZPOOL_CONFIG_TYPE, VDEV_TYPE_DISK) != 0 - || nvlist_add_string(newvd, ZPOOL_CONFIG_PATH, devPath.c_str()) != 0 - || nvlist_add_string(nvroot, ZPOOL_CONFIG_TYPE, VDEV_TYPE_ROOT) != 0 - || nvlist_add_nvlist_array(nvroot, ZPOOL_CONFIG_CHILDREN, - &newvd, 1) != 0) { - syslog(LOG_ERR, "Replace vdev(%s/%s) by physical path: " - "Unable to initialize configuration data.\n", - zpool_get_name(pool), VdevGUIDString().c_str()); - nvlist_free(newvd); - nvlist_free(nvroot); - return (/*consumed*/true); - } - - /* Data was copied when added to the root vdev. */ - nvlist_free(newvd); - - if (zpool_vdev_attach(pool, VdevGUIDString().c_str(), - devPath.c_str(), nvroot, - /*replace*/B_TRUE) != 0) { - syslog(LOG_ERR, - "Replace vdev(%s/%s) by physical path(attach): %s: %s\n", - zpool_get_name(pool), VdevGUIDString().c_str(), - libzfs_error_action(g_zfsHandle), - libzfs_error_description(g_zfsHandle)); - } else { - syslog(LOG_INFO, "Replacing vdev(%s/%s) with %s\n", - zpool_get_name(pool), VdevGUIDString().c_str(), - devPath.c_str()); - } - nvlist_free(nvroot); - - return (true); + return (Replace(VDEV_TYPE_DISK, devPath.c_str())); } bool @@ -385,6 +339,9 @@ CaseFile::ReEvaluate(const ZfsEvent &eve */ PurgeTentativeEvents(); + /* Try to activate spares if they are available */ + ActivateSpare(); + /* * Rescan the drives in the system to see if a recent * drive arrival can be used to solve this case. @@ -405,6 +362,83 @@ CaseFile::ReEvaluate(const ZfsEvent &eve return (consumed || closed); } + +bool +CaseFile::ActivateSpare() { + nvlist_t *config, *nvroot; + nvlist_t **spares; + zpool_handle_t *zhp; + char *devPath, *vdev_type; + const char* poolname; + unsigned nspares, i; + + ZpoolList zpl(ZpoolList::ZpoolByGUID, &m_poolGUID); + if (zpl.empty()) { + syslog(LOG_ERR, "CaseFile::Replace: could not find pool for " + "pool_guid %ju", (uint64_t)m_poolGUID); + return (false); + } + zhp = zpl.front(); + poolname = zpool_get_name(zhp); + config = zpool_get_config(zhp, NULL); + if (config == NULL) { + syslog(LOG_ERR, + "ActivateSpare: Could not find pool config for pool %s", + poolname); + return (false); + } + if (nvlist_lookup_nvlist(config, ZPOOL_CONFIG_VDEV_TREE, &nvroot) != 0){ + syslog(LOG_ERR, + "ActivateSpare: Could not find vdev tree for pool %s", + poolname); + return (false); + } + nspares = 0; + nvlist_lookup_nvlist_array(nvroot, ZPOOL_CONFIG_SPARES, &spares, + &nspares); + if (nspares == 0) { + /* The pool has no spares configured */ + return (false); + } + for (i = 0; i < nspares; i++) { + vdev_stat_t *vs; + unsigned nstats; + + if (nvlist_lookup_uint64_array(spares[i], + ZPOOL_CONFIG_VDEV_STATS, (uint64_t**)&vs, &nstats) != 0) { + syslog(LOG_ERR, "ActivateSpare: Could not find vdev " + "stats for pool %s, spare %d", + poolname, i); + return (false); + } + + if ( (vs->vs_aux != VDEV_AUX_SPARED) + && (vs->vs_state == VDEV_STATE_HEALTHY)) { + /* We found a usable spare */ + break; + } + } + + if (i == nspares) { + /* No available spares were found */ + return (false); + } + + if (nvlist_lookup_string(spares[i], ZPOOL_CONFIG_PATH, &devPath) != 0){ + syslog(LOG_ERR, "ActivateSpare: Cannot determine the path of " + "pool %s, spare %d", poolname, i); + return (false); + } + + if (nvlist_lookup_string(spares[i], ZPOOL_CONFIG_TYPE, &vdev_type)!= 0){ + syslog(LOG_ERR, "ActivateSpare: Cannot determine the vdev type " + "of pool %s, spare %d", poolname, i); + return (false); + } + + return (Replace(vdev_type, devPath)); +} + void CaseFile::RegisterCallout(const DevCtlEvent &event) { @@ -519,7 +553,7 @@ CaseFile::DeSerializeFile(const char *fi sscanf(fileName, "pool_%ju_vdev_%ju.case", &poolGUID, &vdevGUID); - existingCaseFile = Find(poolGUID, vdevGUID); + existingCaseFile = Find(Guid(poolGUID), Guid(vdevGUID)); if (existingCaseFile != NULL) { /* * If the vdev is already degraded or faulted, @@ -756,7 +790,7 @@ CaseFile::OnGracePeriodEnded() } /* Degrade the vdev and close the case. */ - if (zpool_vdev_degrade(zpl.front(), m_vdevGUID, + if (zpool_vdev_degrade(zpl.front(), (uint64_t)m_vdevGUID, VDEV_AUX_ERR_EXCEEDED) == 0) { Close(); return; @@ -764,3 +798,69 @@ CaseFile::OnGracePeriodEnded() } Serialize(); } + +bool +CaseFile::Replace(const char* vdev_type, const char* path) { + nvlist_t *nvroot, *newvd; + zpool_handle_t *zhp; + const char* poolname; + + /* Figure out what pool we're working on */ + ZpoolList zpl(ZpoolList::ZpoolByGUID, &m_poolGUID); + if (zpl.empty()) { + syslog(LOG_ERR, "CaseFile::Replace: could not find pool for " + "pool_guid %ju", (uint64_t)m_poolGUID); + return (false); + } + zhp = zpl.front(); + poolname = zpool_get_name(zhp); + + /* + * Build a root vdev/leaf vdev configuration suitable for + * zpool_vdev_attach. Only enough data for the kernel to find + * the device (i.e. type and disk device node path) are needed. + */ + nvroot = NULL; + newvd = NULL; + + if (nvlist_alloc(&nvroot, NV_UNIQUE_NAME, 0) != 0 + || nvlist_alloc(&newvd, NV_UNIQUE_NAME, 0) != 0) { + syslog(LOG_ERR, "Replace vdev(%s/%s) by physical path: " + "Unable to allocate configuration data.\n", + poolname, VdevGUIDString().c_str()); + if (nvroot != NULL) + nvlist_free(nvroot); + return (false); + } + if (nvlist_add_string(newvd, ZPOOL_CONFIG_TYPE, vdev_type) != 0 + || nvlist_add_string(newvd, ZPOOL_CONFIG_PATH, path) != 0 + || nvlist_add_string(nvroot, ZPOOL_CONFIG_TYPE, VDEV_TYPE_ROOT) != 0 + || nvlist_add_nvlist_array(nvroot, ZPOOL_CONFIG_CHILDREN, + &newvd, 1) != 0) { + syslog(LOG_ERR, "Replace vdev(%s/%s) by physical path: " + "Unable to initialize configuration data.\n", + poolname, VdevGUIDString().c_str()); + nvlist_free(newvd); + nvlist_free(nvroot); + return (true); + } + + /* Data was copied when added to the root vdev. */ + nvlist_free(newvd); + + if (zpool_vdev_attach(zhp, VdevGUIDString().c_str(), + path, nvroot, /*replace*/B_TRUE) != 0) { + syslog(LOG_ERR, + "Replace vdev(%s/%s) by physical path(attach): %s: %s\n", + poolname, VdevGUIDString().c_str(), + libzfs_error_action(g_zfsHandle), + libzfs_error_description(g_zfsHandle)); + } else { + syslog(LOG_INFO, "Replacing vdev(%s/%s) with %s\n", + poolname, VdevGUIDString().c_str(), + path); + } + nvlist_free(nvroot); + + return (true); +} Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/case_file.h Fri Oct 11 22:19:45 2013 (r256356) +++ projects/zfsd/head/cddl/sbin/zfsd/case_file.h Fri Oct 11 22:44:15 2013 (r256357) @@ -95,7 +95,7 @@ public: * \return If found, a pointer to a valid CaseFile object. * Otherwise NULL. */ - static CaseFile *Find(uint64_t poolGUID, uint64_t vdevGUID); + static CaseFile *Find(Guid poolGUID, Guid vdevGUID); /** * \brief Find a CaseFile object by a vdev's current/last known @@ -137,8 +137,8 @@ public: */ static void PurgeAll(); - uint64_t PoolGUID() const; - uint64_t VdevGUID() const; + Guid PoolGUID() const; + Guid VdevGUID() const; vdev_state VdevState() const; const string &PoolGUIDString() const; const string &VdevGUIDString() const; @@ -279,6 +279,30 @@ protected: void OnGracePeriodEnded(); /** + * \brief Attempt to activate a spare on this case's pool. + * + * Call this whenever a pool becomes degraded. It will look for any + * spare devices and activate one to replace the casefile's vdev. It + * will _not_ close the casefile; that should only happen when the + * missing drive is replaced or the user promotes the spare. + * + * \return True if a spare was activated + */ + bool ActivateSpare(); + + /** + * \brief replace a pool's vdev with another + * + * \param vdev_type The type of the new vdev. Usually either + * VDEV_TYPE_DISK or VDEV_TYPE_FILE + * \param path The file system path to the new vdev + * + * \return true iff the replacement was successful + * + */ + bool Replace(const char* vdev_type, const char* path); + + /** * \brief All CaseFiles being tracked by ZFSD. */ static CaseFileList s_activeCases; @@ -307,8 +331,8 @@ protected: */ DevCtlEventList m_tentativeEvents; - uint64_t m_poolGUID; - uint64_t m_vdevGUID; + Guid m_poolGUID; + Guid m_vdevGUID; vdev_state m_vdevState; string m_poolGUIDString; string m_vdevGUIDString; @@ -320,13 +344,13 @@ protected: Callout m_tentativeTimer; }; -inline uint64_t +inline Guid CaseFile::PoolGUID() const { return (m_poolGUID); } -inline uint64_t +inline Guid CaseFile::VdevGUID() const { return (m_vdevGUID); Modified: projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc Fri Oct 11 22:19:45 2013 (r256356) +++ projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc Fri Oct 11 22:44:15 2013 (r256357) @@ -163,8 +163,11 @@ DevCtlEvent::CreateEvent(const string &e EventFactoryKey key(type, nvpairs["system"]); EventFactoryRegistry::iterator foundMethod(s_factoryRegistry.find(key)); - if (foundMethod == s_factoryRegistry.end()) + if (foundMethod == s_factoryRegistry.end()) { + syslog(LOG_INFO, "DevCtlEvent::CreateEvent: unhandled event %s", + eventString.c_str()); return (NULL); + } return ((foundMethod->second)(type, nvpairs, eventString)); } @@ -633,11 +636,13 @@ ZfsEvent::Process() const } /* Skip events that can't be handled. */ - uint64_t poolGUID(PoolGUID()); + Guid poolGUID(PoolGUID()); /* If there are no replicas for a pool, then it's not manageable. */ if (Value("class").find("fs.zfs.vdev.no_replicas") == 0) { - syslog(LOG_INFO, "No replicas available for pool %ju" - ", ignoring\n", (uintmax_t)poolGUID); + stringstream msg; + msg << "No replicas available for pool " << poolGUID; + msg << ", ignoring"; + syslog(LOG_INFO, msg.str().c_str()); return; } @@ -647,21 +652,25 @@ ZfsEvent::Process() const */ ZpoolList zpl(ZpoolList::ZpoolByGUID, &poolGUID); if (zpl.empty()) { + stringstream msg; bool queued = ZfsDaemon::SaveEvent(*this); int priority = queued ? LOG_INFO : LOG_ERR; - syslog(priority, - "ZfsEvent::Process: Event for unknown pool %ju %s", - (uintmax_t)poolGUID, queued ? "queued" : "dropped"); + msg << "ZfsEvent::Process: Event for unknown pool "; + msg << poolGUID << " "; + msg << (queued ? "queued" : "dropped"); + syslog(priority, msg.str().c_str()); return; } nvlist_t *vdevConfig = VdevIterator(zpl.front()).Find(VdevGUID()); if (vdevConfig == NULL) { + stringstream msg; bool queued = ZfsDaemon::SaveEvent(*this); int priority = queued ? LOG_INFO : LOG_ERR; - syslog(priority, - "ZfsEvent::Process: Event for unknown vdev %ju %s", - (uintmax_t)poolGUID, queued ? "queued" : "dropped"); + msg << "ZfsEvent::Process: Event for unknown vdev "; + msg << VdevGUID() << " "; + msg << (queued ? "queued" : "dropped"); + syslog(priority, msg.str().c_str()); return; } @@ -679,8 +688,18 @@ ZfsEvent::ZfsEvent(DevCtlEvent::Type typ * These are zero on conversion failure as will happen if * Value returns the empty string. */ - m_poolGUID = (uint64_t)strtoumax(Value("pool_guid").c_str(), NULL, 0); - m_vdevGUID = (uint64_t)strtoumax(Value("vdev_guid").c_str(), NULL, 0); + if (Contains("pool_guid")) { + m_poolGUID = (uint64_t)strtoumax(Value("pool_guid").c_str(), + NULL, 0); + } + else + m_poolGUID = Guid(); + if (Contains("vdev_guid")) { + m_vdevGUID = (uint64_t)strtoumax(Value("vdev_guid").c_str(), + NULL, 0); + } + else + m_vdevGUID = Guid(); } ZfsEvent::ZfsEvent(const ZfsEvent &src) Modified: projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.h Fri Oct 11 22:19:45 2013 (r256356) +++ projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.h Fri Oct 11 22:44:15 2013 (r256357) @@ -49,6 +49,8 @@ #include #include +#include "vdev.h" + /*============================ Namespace Control =============================*/ using std::map; using std::pair; @@ -473,8 +475,8 @@ public: virtual void Process() const; const string &PoolName() const; - uint64_t PoolGUID() const; - uint64_t VdevGUID() const; + Guid PoolGUID() const; + Guid VdevGUID() const; protected: /** Constructor */ @@ -485,8 +487,8 @@ protected: void ProcessPoolEvent() const; - uint64_t m_poolGUID; - uint64_t m_vdevGUID; + Guid m_poolGUID; + Guid m_vdevGUID; }; //- ZfsEvent Inline Public Methods -------------------------------------------- @@ -497,13 +499,13 @@ ZfsEvent::PoolName() const return (Value("subsystem")); } -inline uint64_t +inline Guid ZfsEvent::PoolGUID() const { return (m_poolGUID); } -inline uint64_t +inline Guid ZfsEvent::VdevGUID() const { return (m_vdevGUID); Modified: projects/zfsd/head/cddl/sbin/zfsd/vdev.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/vdev.cc Fri Oct 11 22:19:45 2013 (r256356) +++ projects/zfsd/head/cddl/sbin/zfsd/vdev.cc Fri Oct 11 22:44:15 2013 (r256357) @@ -50,51 +50,76 @@ __FBSDID("$FreeBSD$"); using std::stringstream; /*=========================== Class Implementations ==========================*/ +/*----------------------------------- Guid -----------------------------------*/ +std::ostream& operator<< (std::ostream& out, Guid g){ + if (g.isValid()) + out << (uint64_t) g; + else + out << "None"; + return (out); +} + + /*----------------------------------- Vdev -----------------------------------*/ Vdev::Vdev(zpool_handle_t *pool, nvlist_t *config) : m_poolConfig(zpool_get_config(pool, NULL)), m_config(config) { + uint64_t raw_guid; if (nvlist_lookup_uint64(m_poolConfig, ZPOOL_CONFIG_POOL_GUID, - &m_poolGUID) != 0) + &raw_guid) != 0) throw ZfsdException("Unable to extract pool GUID " "from pool handle."); + m_poolGUID = raw_guid; - if (nvlist_lookup_uint64(m_config, ZPOOL_CONFIG_GUID, &m_vdevGUID) != 0) + if (nvlist_lookup_uint64(m_config, ZPOOL_CONFIG_GUID, &raw_guid) != 0) throw ZfsdException("Unable to extract vdev GUID " "from vdev config data."); + m_vdevGUID = raw_guid; } Vdev::Vdev(nvlist_t *poolConfig, nvlist_t *config) : m_poolConfig(poolConfig), m_config(config) { + uint64_t raw_guid; if (nvlist_lookup_uint64(m_poolConfig, ZPOOL_CONFIG_POOL_GUID, - &m_poolGUID) != 0) + &raw_guid) != 0) throw ZfsdException("Unable to extract pool GUID " "from pool handle."); + m_poolGUID = raw_guid; - if (nvlist_lookup_uint64(m_config, ZPOOL_CONFIG_GUID, &m_vdevGUID) != 0) + if (nvlist_lookup_uint64(m_config, ZPOOL_CONFIG_GUID, &raw_guid) != 0) throw ZfsdException("Unable to extract vdev GUID " "from vdev config data."); + m_vdevGUID = raw_guid; } Vdev::Vdev(nvlist_t *labelConfig) : m_poolConfig(labelConfig) { + uint64_t raw_guid; if (nvlist_lookup_uint64(labelConfig, ZPOOL_CONFIG_POOL_GUID, - &m_poolGUID) != 0) - throw ZfsdException("Unable to extract pool GUID " - "from vdev label data."); + &raw_guid) != 0) + m_vdevGUID = Guid(); + else + m_poolGUID = raw_guid; if (nvlist_lookup_uint64(labelConfig, ZPOOL_CONFIG_GUID, - &m_vdevGUID) != 0) + &raw_guid) != 0) throw ZfsdException("Unable to extract vdev GUID " "from vdev label data."); - m_config = VdevIterator(labelConfig).Find(m_vdevGUID); - if (m_config == NULL) - throw ZfsdException("Unable to find vdev config " - "within vdev label data."); + m_vdevGUID = raw_guid; + + try { + m_config = VdevIterator(labelConfig).Find(m_vdevGUID); + } catch (const ZfsdException &exp) { + /* + * When reading a spare's label, it is normal not to find + * a list of vdevs + */ + m_config = NULL; + } } vdev_state @@ -103,6 +128,18 @@ Vdev::State() const vdev_stat_t *vs; uint_t vsc; + if (m_config == NULL) { + /* + * If we couldn't find the list of vdevs, that normally means + * that this is an available hotspare. In that case, we will + * presume it to be healthy. Even if this spare had formerly + * been in use, been degraded, and been replaced, the act of + * replacement wipes the degraded bit from the label. So we + * have no choice but to presume that it is healthy. + */ + return (VDEV_STATE_HEALTHY); + } + if (nvlist_lookup_uint64_array(m_config, ZPOOL_CONFIG_VDEV_STATS, (uint64_t **)&vs, &vsc) == 0) return (static_cast(vs->vs_state)); @@ -136,7 +173,8 @@ Vdev::Path() const { char *path(NULL); - if (nvlist_lookup_string(m_config, ZPOOL_CONFIG_PATH, &path) == 0) + if ((m_config != NULL) + && (nvlist_lookup_string(m_config, ZPOOL_CONFIG_PATH, &path) == 0)) return (path); return (""); @@ -147,7 +185,8 @@ Vdev::PhysicalPath() const { char *path(NULL); - if (nvlist_lookup_string(m_config, ZPOOL_CONFIG_PHYS_PATH, &path) == 0) + if ((m_config != NULL) && (nvlist_lookup_string(m_config, + ZPOOL_CONFIG_PHYS_PATH, &path) == 0)) return (path); return (""); Modified: projects/zfsd/head/cddl/sbin/zfsd/vdev.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/vdev.h Fri Oct 11 22:19:45 2013 (r256356) +++ projects/zfsd/head/cddl/sbin/zfsd/vdev.h Fri Oct 11 22:44:15 2013 (r256357) @@ -40,11 +40,63 @@ #ifndef _VDEV_H_ #define _VDEV_H_ +#include #include #include #include + +/** + * \brief Object that represents guids. + * + * It can generally be manipulated as a uint64_t, but with a special value + * "None" that does not equal any valid guid. + * + * As of this writing, spa_generate_guid() in spa_misc.c explicitly refuses to + * return a guid of 0. So this class uses 0 as a flag value for "None". In the + * future, if 0 is allowed to be a valid guid, the implementation of this class + * must change. + */ +class Guid +{ +public: + /* Constructors */ + Guid(uint64_t guid) : m_GUID(guid) {}; + Guid() { m_GUID = NONE_FLAG; }; + + /* Assignment */ + Guid& operator=(const uint64_t& other) { + m_GUID = other; + return (*this); + }; + + /* Test the validity of this guid. */ + bool isValid() const { return ((bool)m_GUID); }; + + /* Comparison to other Guid operators */ + bool operator==(const Guid& other) const { + return (m_GUID == other.m_GUID); + }; + bool operator!=(const Guid& other) const { + return (m_GUID != other.m_GUID); + }; + + /* Integer conversion operators */ + operator uint64_t() const { return (m_GUID); }; + operator bool() const { return (m_GUID != NONE_FLAG); }; + +protected: + const static uint64_t NONE_FLAG = 0; + /* The stored value. 0 is a flag for "None" */ + uint64_t m_GUID; +}; + + +/** Convert the GUID into its string representation */ +std::ostream& operator<< (std::ostream& out, Guid g); + + /** * \brief Wrapper class for a vdev's name/value configuration list * simplifying access to commonly used vdev attributes. @@ -93,8 +145,8 @@ public: */ Vdev(nvlist_t *vdevConfig); - uint64_t GUID() const; - uint64_t PoolGUID() const; + Guid GUID() const; + Guid PoolGUID() const; vdev_state State() const; std::string Path() const; std::string PhysicalPath() const; @@ -103,19 +155,19 @@ public: nvlist_t *Config() const; private: - uint64_t m_poolGUID; - uint64_t m_vdevGUID; + Guid m_poolGUID; + Guid m_vdevGUID; nvlist_t *m_poolConfig; nvlist_t *m_config; }; -inline uint64_t +inline Guid Vdev::PoolGUID() const { return (m_poolGUID); } -inline uint64_t +inline Guid Vdev::GUID() const { return (m_vdevGUID); Modified: projects/zfsd/head/cddl/sbin/zfsd/vdev_iterator.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/vdev_iterator.cc Fri Oct 11 22:19:45 2013 (r256356) +++ projects/zfsd/head/cddl/sbin/zfsd/vdev_iterator.cc Fri Oct 11 22:44:15 2013 (r256357) @@ -126,7 +126,7 @@ VdevIterator::Each(VdevCallback_t *callB } nvlist_t * -VdevIterator::Find(uint64_t vdevGUID) +VdevIterator::Find(Guid vdevGUID) { nvlist_t *vdevConfig; Modified: projects/zfsd/head/cddl/sbin/zfsd/vdev_iterator.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/vdev_iterator.h Fri Oct 11 22:19:45 2013 (r256356) +++ projects/zfsd/head/cddl/sbin/zfsd/vdev_iterator.h Fri Oct 11 22:44:15 2013 (r256357) @@ -97,7 +97,7 @@ public: * Upon return, the VdevIterator's cursor points to the vdev just * past the returned vdev or end() if no matching vdev is found. */ - nvlist_t *Find(uint64_t vdevGUID); + nvlist_t *Find(Guid vdevGUID); /** * \brief Perform the specified operation on each leaf member of Modified: projects/zfsd/head/cddl/sbin/zfsd/zpool_list.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/zpool_list.cc Fri Oct 11 22:19:45 2013 (r256356) +++ projects/zfsd/head/cddl/sbin/zfsd/zpool_list.cc Fri Oct 11 22:44:15 2013 (r256357) @@ -35,6 +35,7 @@ * * Implementation of the ZpoolList class. */ +#include "vdev.h" #include "zpool_list.h" #include "zfsd.h" @@ -50,13 +51,13 @@ bool ZpoolList::ZpoolByGUID(zpool_handle_t *pool, nvlist_t *poolConfig, void *cbArg) { - uint64_t *desiredPoolGUID(static_cast(cbArg)); + Guid *desiredPoolGUID(static_cast(cbArg)); uint64_t poolGUID; /* We are only intested in the pool that matches our pool GUID. */ return (nvlist_lookup_uint64(poolConfig, ZPOOL_CONFIG_POOL_GUID, &poolGUID) == 0 - && poolGUID == *desiredPoolGUID); + && poolGUID == (uint64_t)*desiredPoolGUID); } bool From owner-svn-src-projects@FreeBSD.ORG Fri Oct 11 22:54:03 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id C4E9D2E1; Fri, 11 Oct 2013 22:54:03 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B273A29B0; Fri, 11 Oct 2013 22:54:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9BMs3qa070427; Fri, 11 Oct 2013 22:54:03 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9BMs34K070422; Fri, 11 Oct 2013 22:54:03 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310112254.r9BMs34K070422@svn.freebsd.org> From: Alan Somers Date: Fri, 11 Oct 2013 22:54:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256358 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Oct 2013 22:54:03 -0000 Author: asomers Date: Fri Oct 11 22:54:02 2013 New Revision: 256358 URL: http://svnweb.freebsd.org/changeset/base/256358 Log: Miscellaneous bug fixes in zfsd. cddl/sbin/zfsd/zfsd.cc Properly handle POLLHUP, POLLER, and EINTR on the devd socket. Ignore POLLHUP led to zfsd spinning the cpu. cddl/sbin/zfsd/case_file.cc: cddl/sbin/zfsd/dev_ctl_event.cc: Use a constant format string so that syslog() cannot be confused by random '%' characters in the string we are logging. Fixes a warning with Clang. cddl/sbin/zfsd/zfsd.cc: In EventBuffer::ExtractEvent(), add a missing argument to one syslog() invocation and specify that an integer is a size_t in another. Fixes warnings in Clang. Submitted by: asomers, gibbs Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Fri Oct 11 22:44:15 2013 (r256357) +++ projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Fri Oct 11 22:54:02 2013 (r256358) @@ -167,7 +167,7 @@ CaseFile::RefreshVdevState() stringstream msg; msg << "CaseFile::RefreshVdevState: Unknown pool for Vdev("; msg << m_poolGUID << "," << m_vdevGUID << ")."; - syslog(LOG_INFO, msg.str().c_str()); + syslog(LOG_INFO, "%s", msg.str().c_str()); return (false); } Modified: projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc Fri Oct 11 22:44:15 2013 (r256357) +++ projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc Fri Oct 11 22:54:02 2013 (r256358) @@ -642,7 +642,7 @@ ZfsEvent::Process() const stringstream msg; msg << "No replicas available for pool " << poolGUID; msg << ", ignoring"; - syslog(LOG_INFO, msg.str().c_str()); + syslog(LOG_INFO, "%s", msg.str().c_str()); return; } @@ -658,7 +658,7 @@ ZfsEvent::Process() const msg << "ZfsEvent::Process: Event for unknown pool "; msg << poolGUID << " "; msg << (queued ? "queued" : "dropped"); - syslog(priority, msg.str().c_str()); + syslog(priority, "%s", msg.str().c_str()); return; } @@ -670,7 +670,7 @@ ZfsEvent::Process() const msg << "ZfsEvent::Process: Event for unknown vdev "; msg << VdevGUID() << " "; msg << (queued ? "queued" : "dropped"); - syslog(priority, msg.str().c_str()); + syslog(priority, "%s", msg.str().c_str()); return; } Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Fri Oct 11 22:44:15 2013 (r256357) +++ projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Fri Oct 11 22:54:02 2013 (r256358) @@ -181,7 +181,8 @@ EventBuffer::ExtractEvent(string &eventS continue; } syslog(LOG_WARNING, - "Event exceeds event size limit of %d bytes."); + "Event exceeds event size limit of %d bytes.", + MAX_EVENT_SIZE); } else { /* * Include the normal terminator in the extracted @@ -206,7 +207,7 @@ EventBuffer::ExtractEvent(string &eventS m_synchronized = false; syslog(LOG_WARNING, - "Truncated %d characters from event.", + "Truncated %zd characters from event.", eventLen - fieldEnd); } @@ -512,10 +513,31 @@ ZfsDaemon::EventsPending() struct pollfd fds[1]; int result; - fds->fd = s_devdSockFD; - fds->events = POLLIN; - fds->revents = 0; - result = poll(fds, NUM_ELEMENTS(fds), /*timeout*/0); + do { + fds->fd = s_devdSockFD; + fds->events = POLLIN; + fds->revents = 0; + result = poll(fds, NUM_ELEMENTS(fds), /*timeout*/0); + } while ( (result == -1) && (errno == EINTR) ) ; + + if (result == -1) { + /* Unexpected error; try reconnecting the socket */ + throw ZfsdException( + "ZfsdDaemon::EventsPending(): Unexpected error from poll()"); + } + + if ((fds->revents & POLLHUP) != 0) { + /* The other end hung up the socket. Throw an exception + * so ZfsDaemon will try to reconnect + */ + throw ZfsdException("ZfsDaemon::EventsPending(): Got POLLHUP"); + } + + if ((fds->revents & POLLERR) != 0) { + /* Try reconnecting. */ + throw ZfsdException( + "ZfsdDaemon:EventsPending(): Got POLLERR. Reconnecting."); + } return ((fds->revents & POLLIN) != 0); } From owner-svn-src-projects@FreeBSD.ORG Fri Oct 11 23:02:47 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 15C62532; Fri, 11 Oct 2013 23:02:47 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 040302A0E; Fri, 11 Oct 2013 23:02:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9BN2k6N075186; Fri, 11 Oct 2013 23:02:46 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9BN2klu075184; Fri, 11 Oct 2013 23:02:46 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310112302.r9BN2klu075184@svn.freebsd.org> From: Alan Somers Date: Fri, 11 Oct 2013 23:02:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256359 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Oct 2013 23:02:47 -0000 Author: asomers Date: Fri Oct 11 23:02:46 2013 New Revision: 256359 URL: http://svnweb.freebsd.org/changeset/base/256359 Log: Zfsd will now activate a spare when it gets added to an already degraded pool. cddl/sbin/zfsd/case_file.cc * Keep a casefile for a removed drive open if it can't be immediately resolved by activating a spare. * Add a log message when degrading vdevs. cddl/sbin/zfsd/dev_ctl_event.cc * Fix replaying log messages in response to a config sync event. The event's name is different under FreeBSD than under Illumos. * Fix two printf formatting bugs in the log messages of EventBuffer::ExtractEvent(). Submitted by: asomers Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Fri Oct 11 22:54:02 2013 (r256358) +++ projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Fri Oct 11 23:02:46 2013 (r256359) @@ -331,6 +331,7 @@ CaseFile::ReEvaluate(const ZfsEvent &eve } if (event.Value("class") == "resource.fs.zfs.removed") { + bool spare_activated; /* * Discard any tentative I/O error events for @@ -340,7 +341,7 @@ CaseFile::ReEvaluate(const ZfsEvent &eve PurgeTentativeEvents(); /* Try to activate spares if they are available */ - ActivateSpare(); + spare_activated = ActivateSpare(); /* * Rescan the drives in the system to see if a recent @@ -348,7 +349,13 @@ CaseFile::ReEvaluate(const ZfsEvent &eve */ ZfsDaemon::RequestSystemRescan(); - consumed = true; + /* + * Consume the event if we successfully activated a spare. + * Otherwise, leave it in the unconsumed events list so that the + * future addition of a spare to this pool might be able to + * close the case + */ + consumed = spare_activated; } else if (event.Value("class") == "ereport.fs.zfs.io" || event.Value("class") == "ereport.fs.zfs.checksum") { @@ -792,9 +799,17 @@ CaseFile::OnGracePeriodEnded() /* Degrade the vdev and close the case. */ if (zpool_vdev_degrade(zpl.front(), (uint64_t)m_vdevGUID, VDEV_AUX_ERR_EXCEEDED) == 0) { + syslog(LOG_INFO, "Degrading vdev(%s/%s)", + PoolGUIDString().c_str(), VdevGUIDString().c_str()); Close(); return; } + else { + syslog(LOG_ERR, "Degrade vdev(%s/%s): %s: %s\n", + PoolGUIDString().c_str(), VdevGUIDString().c_str(), + libzfs_error_action(g_zfsHandle), + libzfs_error_description(g_zfsHandle)); + } } Serialize(); } Modified: projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc Fri Oct 11 22:54:02 2013 (r256358) +++ projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc Fri Oct 11 23:02:46 2013 (r256359) @@ -612,7 +612,7 @@ ZfsEvent::Process() const } /* On config syncs, replay any queued events first. */ - if (Value("type").find("ESC_ZFS_config_sync") == 0) + if (Value("type").find("misc.fs.zfs.config_sync") == 0) ZfsDaemon::ReplayUnconsumedEvents(); Log(LOG_INFO); @@ -676,7 +676,17 @@ ZfsEvent::Process() const Vdev vdev(zpl.front(), vdevConfig); caseFile = &CaseFile::Create(vdev); - caseFile->ReEvaluate(*this); + if ( caseFile->ReEvaluate(*this) == false) { + stringstream msg; + bool queued = ZfsDaemon::SaveEvent(*this); + int priority = queued ? LOG_INFO : LOG_ERR; + msg << "ZfsEvent::Process: Unconsumed event for vdev("; + msg << zpool_get_name(zpl.front()) << ","; + msg << vdev.GUID() << ") "; + msg << (queued ? "queued" : "dropped"); + syslog(priority, msg.str().c_str()); + return; + } } //- ZfsEvent Protected Methods ------------------------------------------------- From owner-svn-src-projects@FreeBSD.ORG Fri Oct 11 23:11:35 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 065806A2; Fri, 11 Oct 2013 23:11:35 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E728D2A62; Fri, 11 Oct 2013 23:11:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9BNBYLd080099; Fri, 11 Oct 2013 23:11:34 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9BNBX6Y080090; Fri, 11 Oct 2013 23:11:33 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310112311.r9BNBX6Y080090@svn.freebsd.org> From: Alan Somers Date: Fri, 11 Oct 2013 23:11:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256360 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Oct 2013 23:11:35 -0000 Author: asomers Date: Fri Oct 11 23:11:33 2013 New Revision: 256360 URL: http://svnweb.freebsd.org/changeset/base/256360 Log: Style, organization, and syntax improvements to zfsd. cddl/sbin/zfsd/guid.cc: cddl/sbin/zfsd/guid.h: cddl/sbin/zfsd/vdev.h: cddl/sbin/zfsd/vdev.cc: cddl/sbin/zfsd/Makefile: o Since GUIDs pertain to more than just vdevs, move its implementation out into its own file. No functional changes. cddl/sbin/zfsd/case_file.cc: cddl/sbin/zfsd/zfsd.cc: cddl/sbin/zfsd/dev_ctl_event.cc: o Local varables declared in the same block are aligned by their first character. cddl/sbin/zfsd/case_file.cc: cddl/sbin/zfsd/zfsd.cc: cddl/sbin/zfsd/dev_ctl_event.cc: o Function arguments wrap to the first column after the function's opening '('. o syslog strings referencing a method use the fully qualified method name. o There are no spaces after '(' or before ')' in conditionals. o Boolean operators in conditionals are aligned on the right side and indented based on the level of their operation. o Cache return values in local variable to avoid the need to compress whitespace to make lines fit in 80 cols. o There is one newline between function declarations. cddl/sbin/zfsd/vdev.h: cddl/sbin/zfsd/vdev.cc: o Wrap comments at 76 cols (i.e. what fmt does by default). o Method names start with a capital letter. o Implementations are never inlined within a class definition. This just encourages consumers of an interface to depend unnecessarily upon the implementation. cddl/sbin/zfsd/zfsd.cc: o Simple checks in conditionals (like '==' and '!=') do not require extra parenthesis. cddl/sbin/zfsd/dev_ctl_event.cc: o Use a constant format string so that syslog() cannot be confused by random '%' characters in the string we are logging. Submitted by: gibbs Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Added: projects/zfsd/head/cddl/sbin/zfsd/guid.cc projects/zfsd/head/cddl/sbin/zfsd/guid.h Modified: projects/zfsd/head/cddl/sbin/zfsd/Makefile projects/zfsd/head/cddl/sbin/zfsd/case_file.cc projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc projects/zfsd/head/cddl/sbin/zfsd/vdev.cc projects/zfsd/head/cddl/sbin/zfsd/vdev.h projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Modified: projects/zfsd/head/cddl/sbin/zfsd/Makefile ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/Makefile Fri Oct 11 23:02:46 2013 (r256359) +++ projects/zfsd/head/cddl/sbin/zfsd/Makefile Fri Oct 11 23:11:33 2013 (r256360) @@ -4,11 +4,12 @@ PROG_CXX= zfsd SRCS= callout.cc \ case_file.cc \ dev_ctl_event.cc \ + guid.cc \ vdev.cc \ vdev_iterator.cc \ zfsd.cc \ zfsd_exception.cc \ - zpool_list.cc \ + zpool_list.cc \ zfsd_main.cc NO_MAN= YES Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Fri Oct 11 23:02:46 2013 (r256359) +++ projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Fri Oct 11 23:11:33 2013 (r256360) @@ -372,37 +372,36 @@ CaseFile::ReEvaluate(const ZfsEvent &eve bool CaseFile::ActivateSpare() { - nvlist_t *config, *nvroot; - nvlist_t **spares; - zpool_handle_t *zhp; - char *devPath, *vdev_type; - const char* poolname; - unsigned nspares, i; + nvlist_t *config, *nvroot; + nvlist_t **spares; + zpool_handle_t *zhp; + char *devPath, *vdev_type; + const char *poolname; + u_int nspares, i; + int error; ZpoolList zpl(ZpoolList::ZpoolByGUID, &m_poolGUID); if (zpl.empty()) { - syslog(LOG_ERR, "CaseFile::Replace: could not find pool for " - "pool_guid %ju", (uint64_t)m_poolGUID); + syslog(LOG_ERR, "CaseFile::ActivateSpare: Could not find pool " + "for pool_guid %ju.", (uint64_t)m_poolGUID); return (false); } zhp = zpl.front(); poolname = zpool_get_name(zhp); config = zpool_get_config(zhp, NULL); if (config == NULL) { - syslog(LOG_ERR, - "ActivateSpare: Could not find pool config for pool %s", - poolname); + syslog(LOG_ERR, "CaseFile::ActivateSpare: Could not find pool " + "config for pool %s", poolname); return (false); } if (nvlist_lookup_nvlist(config, ZPOOL_CONFIG_VDEV_TREE, &nvroot) != 0){ - syslog(LOG_ERR, - "ActivateSpare: Could not find vdev tree for pool %s", - poolname); + syslog(LOG_ERR, "CaseFile::ActivateSpare: Could not find vdev " + "tree for pool %s", poolname); return (false); } nspares = 0; nvlist_lookup_nvlist_array(nvroot, ZPOOL_CONFIG_SPARES, &spares, - &nspares); + &nspares); if (nspares == 0) { /* The pool has no spares configured */ return (false); @@ -413,14 +412,14 @@ CaseFile::ActivateSpare() { if (nvlist_lookup_uint64_array(spares[i], ZPOOL_CONFIG_VDEV_STATS, (uint64_t**)&vs, &nstats) != 0) { - syslog(LOG_ERR, "ActivateSpare: Could not find vdev " - "stats for pool %s, spare %d", - poolname, i); + syslog(LOG_ERR, "CaseFile::ActivateSpare: Could not " + "find vdev stats for pool %s, spare %d", + poolname, i); return (false); } - if ( (vs->vs_aux != VDEV_AUX_SPARED) - && (vs->vs_state == VDEV_STATE_HEALTHY)) { + if ((vs->vs_aux != VDEV_AUX_SPARED) + && (vs->vs_state == VDEV_STATE_HEALTHY)) { /* We found a usable spare */ break; } @@ -431,15 +430,19 @@ CaseFile::ActivateSpare() { return (false); } - if (nvlist_lookup_string(spares[i], ZPOOL_CONFIG_PATH, &devPath) != 0){ - syslog(LOG_ERR, "ActivateSpare: Cannot determine the path of " - "pool %s, spare %d", poolname, i); + error = nvlist_lookup_string(spares[i], ZPOOL_CONFIG_PATH, &devPath); + if (error != 0) { + syslog(LOG_ERR, "CaseFile::ActivateSpare: Cannot determine " + "the path of pool %s, spare %d. Error %d", + poolname, i, error); return (false); } - if (nvlist_lookup_string(spares[i], ZPOOL_CONFIG_TYPE, &vdev_type)!= 0){ - syslog(LOG_ERR, "ActivateSpare: Cannot determine the vdev type " - "of pool %s, spare %d", poolname, i); + error = nvlist_lookup_string(spares[i], ZPOOL_CONFIG_TYPE, &vdev_type); + if (error != 0) { + syslog(LOG_ERR, "CaseFile::ActivateSpare: Cannot determine " + "the vdev type of pool %s, spare %d. Error %d", + poolname, i, error); return (false); } @@ -728,7 +731,6 @@ CaseFile::SerializeEvList(const DevCtlEv } } - void CaseFile::Serialize() { @@ -800,15 +802,17 @@ CaseFile::OnGracePeriodEnded() if (zpool_vdev_degrade(zpl.front(), (uint64_t)m_vdevGUID, VDEV_AUX_ERR_EXCEEDED) == 0) { syslog(LOG_INFO, "Degrading vdev(%s/%s)", - PoolGUIDString().c_str(), VdevGUIDString().c_str()); + PoolGUIDString().c_str(), + VdevGUIDString().c_str()); Close(); return; } else { syslog(LOG_ERR, "Degrade vdev(%s/%s): %s: %s\n", - PoolGUIDString().c_str(), VdevGUIDString().c_str(), - libzfs_error_action(g_zfsHandle), - libzfs_error_description(g_zfsHandle)); + PoolGUIDString().c_str(), + VdevGUIDString().c_str(), + libzfs_error_action(g_zfsHandle), + libzfs_error_description(g_zfsHandle)); } } Serialize(); @@ -824,7 +828,7 @@ CaseFile::Replace(const char* vdev_type, ZpoolList zpl(ZpoolList::ZpoolByGUID, &m_poolGUID); if (zpl.empty()) { syslog(LOG_ERR, "CaseFile::Replace: could not find pool for " - "pool_guid %ju", (uint64_t)m_poolGUID); + "pool_guid %ju.", (uint64_t)m_poolGUID); return (false); } zhp = zpl.front(); Modified: projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc Fri Oct 11 23:02:46 2013 (r256359) +++ projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc Fri Oct 11 23:11:33 2013 (r256360) @@ -165,7 +165,7 @@ DevCtlEvent::CreateEvent(const string &e EventFactoryRegistry::iterator foundMethod(s_factoryRegistry.find(key)); if (foundMethod == s_factoryRegistry.end()) { syslog(LOG_INFO, "DevCtlEvent::CreateEvent: unhandled event %s", - eventString.c_str()); + eventString.c_str()); return (NULL); } return ((foundMethod->second)(type, nvpairs, eventString)); @@ -684,7 +684,7 @@ ZfsEvent::Process() const msg << zpool_get_name(zpl.front()) << ","; msg << vdev.GUID() << ") "; msg << (queued ? "queued" : "dropped"); - syslog(priority, msg.str().c_str()); + syslog(priority, "%s", msg.str().c_str()); return; } } Added: projects/zfsd/head/cddl/sbin/zfsd/guid.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/zfsd/head/cddl/sbin/zfsd/guid.cc Fri Oct 11 23:11:33 2013 (r256360) @@ -0,0 +1,62 @@ +/*- + * Copyright (c) 2012 Spectra Logic Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer, + * without modification. + * 2. Redistributions in binary form must reproduce at minimum a disclaimer + * substantially similar to the "NO WARRANTY" disclaimer below + * ("Disclaimer") and any redistribution must be conditioned upon + * including a substantially similar Disclaimer requirement for further + * binary redistribution. + * + * NO WARRANTY + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGES. + * + * Authors: Alan Somers (Spectra Logic Corporation) + * + * $FreeBSD$ + */ + +/** + * \file guid.cc + * + * Implementation of the Guid class. + */ +#include + +#include +#include +#include + +#include +#include + +#include "guid.h" + +__FBSDID("$FreeBSD$"); +/*=========================== Class Implementations ==========================*/ +/*----------------------------------- Guid -----------------------------------*/ +std::ostream& +operator<< (std::ostream& out, Guid g) +{ + if (g.IsValid()) + out << (uint64_t)g; + else + out << "None"; + return (out); +} Added: projects/zfsd/head/cddl/sbin/zfsd/guid.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/zfsd/head/cddl/sbin/zfsd/guid.h Fri Oct 11 23:11:33 2013 (r256360) @@ -0,0 +1,136 @@ +/*- + * Copyright (c) 2012 Spectra Logic Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer, + * without modification. + * 2. Redistributions in binary form must reproduce at minimum a disclaimer + * substantially similar to the "NO WARRANTY" disclaimer below + * ("Disclaimer") and any redistribution must be conditioned upon + * including a substantially similar Disclaimer requirement for further + * binary redistribution. + * + * NO WARRANTY + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGES. + * + * Authors: Alan Somers (Spectra Logic Corporation) + * + * $FreeBSD$ + */ + +/** + * \file guid.h + * + * Definition of the Guid class. + */ +#ifndef _GUID_H_ +#define _GUID_H_ + +#include + +/** + * \brief Object that represents guids. + * + * It can generally be manipulated as a uint64_t, but with a special + * value "None" that does not equal any valid guid. + * + * As of this writing, spa_generate_guid() in spa_misc.c explicitly + * refuses to return a guid of 0. So this class uses 0 as a flag + * value for "None". In the future, if 0 is allowed to be a valid + * guid, the implementation of this class must change. + */ +class Guid +{ +public: + /* Constructors */ + Guid(); + Guid(uint64_t guid); + + /* Assignment */ + Guid& operator=(const Guid& rhs); + + /* Test the validity of this guid. */ + bool IsValid() const; + + /* Comparison to other Guid operators */ + bool operator==(const Guid& rhs) const; + bool operator!=(const Guid& rhs) const; + + /* Integer conversion operators */ + operator uint64_t() const; + operator bool() const; + + static const uint64_t NONE_FLAG = 0; +protected: + /* The stored value. 0 is a flag for "None" */ + uint64_t m_GUID; +}; + +//- Guid Inline Public Methods ------------------------------------------------ +inline +Guid::Guid() + : m_GUID(NONE_FLAG) +{ +} + +inline +Guid::Guid(uint64_t guid) + : m_GUID(guid) +{ +} + +inline Guid& +Guid::operator=(const Guid &rhs) +{ + m_GUID = rhs.m_GUID; + return (*this); +} + +inline bool +Guid::IsValid() const +{ + return (m_GUID != NONE_FLAG); +} + +inline bool +Guid::operator==(const Guid& rhs) const +{ + return (m_GUID == rhs.m_GUID); +} + +inline bool +Guid::operator!=(const Guid& rhs) const +{ + return (m_GUID != rhs.m_GUID); +} + +inline +Guid::operator uint64_t() const +{ + return (m_GUID); +} + +inline +Guid::operator bool() const +{ + return (m_GUID != NONE_FLAG); +} + +/** Convert the GUID into its string representation */ +std::ostream& operator<< (std::ostream& out, Guid g); + +#endif /* _GUID_H_ */ Modified: projects/zfsd/head/cddl/sbin/zfsd/vdev.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/vdev.cc Fri Oct 11 23:02:46 2013 (r256359) +++ projects/zfsd/head/cddl/sbin/zfsd/vdev.cc Fri Oct 11 23:11:33 2013 (r256360) @@ -50,16 +50,6 @@ __FBSDID("$FreeBSD$"); using std::stringstream; /*=========================== Class Implementations ==========================*/ -/*----------------------------------- Guid -----------------------------------*/ -std::ostream& operator<< (std::ostream& out, Guid g){ - if (g.isValid()) - out << (uint64_t) g; - else - out << "None"; - return (out); -} - - /*----------------------------------- Vdev -----------------------------------*/ Vdev::Vdev(zpool_handle_t *pool, nvlist_t *config) : m_poolConfig(zpool_get_config(pool, NULL)), Modified: projects/zfsd/head/cddl/sbin/zfsd/vdev.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/vdev.h Fri Oct 11 23:02:46 2013 (r256359) +++ projects/zfsd/head/cddl/sbin/zfsd/vdev.h Fri Oct 11 23:11:33 2013 (r256360) @@ -46,56 +46,7 @@ #include #include - -/** - * \brief Object that represents guids. - * - * It can generally be manipulated as a uint64_t, but with a special value - * "None" that does not equal any valid guid. - * - * As of this writing, spa_generate_guid() in spa_misc.c explicitly refuses to - * return a guid of 0. So this class uses 0 as a flag value for "None". In the - * future, if 0 is allowed to be a valid guid, the implementation of this class - * must change. - */ -class Guid -{ -public: - /* Constructors */ - Guid(uint64_t guid) : m_GUID(guid) {}; - Guid() { m_GUID = NONE_FLAG; }; - - /* Assignment */ - Guid& operator=(const uint64_t& other) { - m_GUID = other; - return (*this); - }; - - /* Test the validity of this guid. */ - bool isValid() const { return ((bool)m_GUID); }; - - /* Comparison to other Guid operators */ - bool operator==(const Guid& other) const { - return (m_GUID == other.m_GUID); - }; - bool operator!=(const Guid& other) const { - return (m_GUID != other.m_GUID); - }; - - /* Integer conversion operators */ - operator uint64_t() const { return (m_GUID); }; - operator bool() const { return (m_GUID != NONE_FLAG); }; - -protected: - const static uint64_t NONE_FLAG = 0; - /* The stored value. 0 is a flag for "None" */ - uint64_t m_GUID; -}; - - -/** Convert the GUID into its string representation */ -std::ostream& operator<< (std::ostream& out, Guid g); - +#include "guid.h" /** * \brief Wrapper class for a vdev's name/value configuration list @@ -161,6 +112,7 @@ private: nvlist_t *m_config; }; +//- Vdev Inline Public Methods ------------------------------------------------ inline Guid Vdev::PoolGUID() const { Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Fri Oct 11 23:02:46 2013 (r256359) +++ projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Fri Oct 11 23:11:33 2013 (r256360) @@ -518,16 +518,17 @@ ZfsDaemon::EventsPending() fds->events = POLLIN; fds->revents = 0; result = poll(fds, NUM_ELEMENTS(fds), /*timeout*/0); - } while ( (result == -1) && (errno == EINTR) ) ; + } while (result == -1 && errno == EINTR); if (result == -1) { /* Unexpected error; try reconnecting the socket */ - throw ZfsdException( - "ZfsdDaemon::EventsPending(): Unexpected error from poll()"); + throw ZfsdException("ZfsdDaemon::EventsPending(): " + "Unexpected error from poll()"); } if ((fds->revents & POLLHUP) != 0) { - /* The other end hung up the socket. Throw an exception + /* + * The other end hung up the socket. Throw an exception * so ZfsDaemon will try to reconnect */ throw ZfsdException("ZfsDaemon::EventsPending(): Got POLLHUP"); @@ -535,8 +536,8 @@ ZfsDaemon::EventsPending() if ((fds->revents & POLLERR) != 0) { /* Try reconnecting. */ - throw ZfsdException( - "ZfsdDaemon:EventsPending(): Got POLLERR. Reconnecting."); + throw ZfsdException("ZfsdDaemon:EventsPending(): Got POLLERR. " + " Reconnecting."); } return ((fds->revents & POLLIN) != 0); @@ -703,5 +704,3 @@ ZfsDaemon::EventLoop() } } } - - From owner-svn-src-projects@FreeBSD.ORG Sat Oct 12 09:56:10 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 9EF21CDB; Sat, 12 Oct 2013 09:56:10 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7448A2465; Sat, 12 Oct 2013 09:56:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9C9uATB013907; Sat, 12 Oct 2013 09:56:10 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9C9uAVj013906; Sat, 12 Oct 2013 09:56:10 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201310120956.r9C9uAVj013906@svn.freebsd.org> From: Alexander Motin Date: Sat, 12 Oct 2013 09:56:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256370 - projects/camlock/sys/kern X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Oct 2013 09:56:10 -0000 Author: mav Date: Sat Oct 12 09:56:09 2013 New Revision: 256370 URL: http://svnweb.freebsd.org/changeset/base/256370 Log: - Take BIO lock in biodone() only when there is no completion callback set and so we should wake up thread waiting in biowait(). - Remove msleep() timeout from biowait(). It was added 11 years ago, when there was no locks used, and it should not be needed any more. Modified: projects/camlock/sys/kern/vfs_bio.c Modified: projects/camlock/sys/kern/vfs_bio.c ============================================================================== --- projects/camlock/sys/kern/vfs_bio.c Sat Oct 12 07:50:15 2013 (r256369) +++ projects/camlock/sys/kern/vfs_bio.c Sat Oct 12 09:56:09 2013 (r256370) @@ -3559,9 +3559,6 @@ biodone(struct bio *bp) vm_offset_t start, end; int transient; - mtxp = mtx_pool_find(mtxpool_sleep, bp); - mtx_lock(mtxp); - bp->bio_flags |= BIO_DONE; if ((bp->bio_flags & BIO_TRANSIENT_MAPPING) != 0) { start = trunc_page((vm_offset_t)bp->bio_data); end = round_page((vm_offset_t)bp->bio_data + bp->bio_length); @@ -3571,11 +3568,16 @@ biodone(struct bio *bp) start = end = 0; } done = bp->bio_done; - if (done == NULL) + if (done == NULL) { + mtxp = mtx_pool_find(mtxpool_sleep, bp); + mtx_lock(mtxp); + bp->bio_flags |= BIO_DONE; wakeup(bp); - mtx_unlock(mtxp); - if (done != NULL) + mtx_unlock(mtxp); + } else { + bp->bio_flags |= BIO_DONE; done(bp); + } if (transient) { pmap_qremove(start, OFF_TO_IDX(end - start)); vmem_free(transient_arena, start, end - start); @@ -3585,9 +3587,6 @@ biodone(struct bio *bp) /* * Wait for a BIO to finish. - * - * XXX: resort to a timeout for now. The optimal locking (if any) for this - * case is not yet clear. */ int biowait(struct bio *bp, const char *wchan) @@ -3597,7 +3596,7 @@ biowait(struct bio *bp, const char *wcha mtxp = mtx_pool_find(mtxpool_sleep, bp); mtx_lock(mtxp); while ((bp->bio_flags & BIO_DONE) == 0) - msleep(bp, mtxp, PRIBIO, wchan, hz / 10); + msleep(bp, mtxp, PRIBIO, wchan, 0); mtx_unlock(mtxp); if (bp->bio_error != 0) return (bp->bio_error); From owner-svn-src-projects@FreeBSD.ORG Sat Oct 12 10:26:41 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 0D6EF47F; Sat, 12 Oct 2013 10:26:41 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EFDC225DF; Sat, 12 Oct 2013 10:26:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9CAQepZ029728; Sat, 12 Oct 2013 10:26:40 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9CAQehP029727; Sat, 12 Oct 2013 10:26:40 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201310121026.r9CAQehP029727@svn.freebsd.org> From: Alexander Motin Date: Sat, 12 Oct 2013 10:26:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256371 - projects/camlock/sys/geom X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Oct 2013 10:26:41 -0000 Author: mav Date: Sat Oct 12 10:26:40 2013 New Revision: 256371 URL: http://svnweb.freebsd.org/changeset/base/256371 Log: Fix passing uninitialized bio_resid argument to g_trace(). Curious that I've found it during profiling by unexpected cache miss. :) Modified: projects/camlock/sys/geom/geom_dev.c Modified: projects/camlock/sys/geom/geom_dev.c ============================================================================== --- projects/camlock/sys/geom/geom_dev.c Sat Oct 12 09:56:09 2013 (r256370) +++ projects/camlock/sys/geom/geom_dev.c Sat Oct 12 10:26:40 2013 (r256371) @@ -486,16 +486,16 @@ g_dev_done(struct bio *bp2) sc = cp->private; bp = bp2->bio_parent; bp->bio_error = bp2->bio_error; - if (bp->bio_error != 0) { + bp->bio_completed = bp2->bio_completed; + bp->bio_resid = bp2->bio_resid; + if (bp2->bio_error != 0) { g_trace(G_T_BIO, "g_dev_done(%p) had error %d", - bp2, bp->bio_error); + bp2, bp2->bio_error); bp->bio_flags |= BIO_ERROR; } else { g_trace(G_T_BIO, "g_dev_done(%p/%p) resid %ld completed %jd", - bp2, bp, bp->bio_resid, (intmax_t)bp2->bio_completed); + bp2, bp, bp2->bio_resid, (intmax_t)bp2->bio_completed); } - bp->bio_resid = bp->bio_length - bp2->bio_completed; - bp->bio_completed = bp2->bio_completed; g_destroy_bio(bp2); destroy = 0; mtx_lock(&sc->sc_mtx); From owner-svn-src-projects@FreeBSD.ORG Sat Oct 12 11:37:49 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 81289D6; Sat, 12 Oct 2013 11:37:49 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6E15428F3; Sat, 12 Oct 2013 11:37:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9CBbnHF065615; Sat, 12 Oct 2013 11:37:49 GMT (envelope-from andrew@svn.freebsd.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9CBbmDT065599; Sat, 12 Oct 2013 11:37:48 GMT (envelope-from andrew@svn.freebsd.org) Message-Id: <201310121137.r9CBbmDT065599@svn.freebsd.org> From: Andrew Turner Date: Sat, 12 Oct 2013 11:37:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256372 - projects/arm_eabi_vfp/lib/msun/arm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Oct 2013 11:37:49 -0000 Author: andrew Date: Sat Oct 12 11:37:47 2013 New Revision: 256372 URL: http://svnweb.freebsd.org/changeset/base/256372 Log: First cut at floating-point environment functions that work with both softfloat and vfp. This will be needed for places where people wish to use vfp in a softfloat world, or to help moving to the softfp ABI. With the softfp ABI the floating-point helpers may be written using the existing softfloat code. Even if they are built on vfp existing applications may be using the softfloat rounding values that will need to be translated to vfp values. Added: projects/arm_eabi_vfp/lib/msun/arm/fenv-mangle.h (contents, props changed) projects/arm_eabi_vfp/lib/msun/arm/fenv-softfp.c (contents, props changed) projects/arm_eabi_vfp/lib/msun/arm/fenv-vfp.c (contents, props changed) Modified: projects/arm_eabi_vfp/lib/msun/arm/Makefile.inc projects/arm_eabi_vfp/lib/msun/arm/fenv.c projects/arm_eabi_vfp/lib/msun/arm/fenv.h Modified: projects/arm_eabi_vfp/lib/msun/arm/Makefile.inc ============================================================================== --- projects/arm_eabi_vfp/lib/msun/arm/Makefile.inc Sat Oct 12 10:26:40 2013 (r256371) +++ projects/arm_eabi_vfp/lib/msun/arm/Makefile.inc Sat Oct 12 11:37:47 2013 (r256372) @@ -2,3 +2,8 @@ LDBL_PREC = 53 SYM_MAPS += ${.CURDIR}/arm/Symbol.map + +.if ${TARGET_ARCH} == "armv6" +ARCH_SRCS = fenv-softfp.c fenv-vfp.c +.endif + Added: projects/arm_eabi_vfp/lib/msun/arm/fenv-mangle.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/arm_eabi_vfp/lib/msun/arm/fenv-mangle.h Sat Oct 12 11:37:47 2013 (r256372) @@ -0,0 +1,50 @@ +/*- + * Copyright (c) 2013 Andrew Turner + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifdef _FENV_MANGLE_H_ +#error Only include fenv-mangle.h once +#endif + +#define _FENV_MANGLE_H_ + +#ifndef FENV_MANGLE +#error FENV_MANGLE is undefined +#endif + +#define feclearexcept FENV_MANGLE(feclearexcept) +#define fegetexceptflag FENV_MANGLE(fegetexceptflag) +#define fesetexceptflag FENV_MANGLE(fesetexceptflag) +#define feraiseexcept FENV_MANGLE(feraiseexcept) +#define fetestexcept FENV_MANGLE(fetestexcept) +#define fegetround FENV_MANGLE(fegetround) +#define fesetround FENV_MANGLE(fesetround) +#define fegetenv FENV_MANGLE(fegetenv) +#define feholdexcept FENV_MANGLE(feholdexcept) +#define fesetenv FENV_MANGLE(fesetenv) +#define feupdateenv FENV_MANGLE(feupdateenv) + Added: projects/arm_eabi_vfp/lib/msun/arm/fenv-softfp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/arm_eabi_vfp/lib/msun/arm/fenv-softfp.c Sat Oct 12 11:37:47 2013 (r256372) @@ -0,0 +1,32 @@ +/*- + * Copyright (c) 2013 Andrew Turner + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#define FENV_MANGLE(x) __softfp_ ##x +#include "fenv-mangle.h" +#include "fenv.c" + Added: projects/arm_eabi_vfp/lib/msun/arm/fenv-vfp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/arm_eabi_vfp/lib/msun/arm/fenv-vfp.c Sat Oct 12 11:37:47 2013 (r256372) @@ -0,0 +1,33 @@ +/*- + * Copyright (c) 2013 Andrew Turner + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#define FENV_MANGLE(x) __vfp_ ##x +#include "fenv-mangle.h" +#define __ARM_PCS_VFP +#include "fenv.c" + Modified: projects/arm_eabi_vfp/lib/msun/arm/fenv.c ============================================================================== --- projects/arm_eabi_vfp/lib/msun/arm/fenv.c Sat Oct 12 10:26:40 2013 (r256371) +++ projects/arm_eabi_vfp/lib/msun/arm/fenv.c Sat Oct 12 11:37:47 2013 (r256372) @@ -1,5 +1,6 @@ /*- * Copyright (c) 2004 David Schultz + * Copyright (c) 2013 Andrew Turner * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -29,6 +30,24 @@ #define __fenv_static #include "fenv.h" +/* When SOFTFP_ABI is defined we are using the softfp ABI. */ +#if defined(__VFP_FP__) && !defined(__ARM_PCS_VFP) +#define SOFTFP_ABI +#endif + + +#ifndef FENV_MANGLE +/* + * Hopefully the system ID byte is immutable, so it's valid to use + * this as a default environment. + */ +const fenv_t __fe_dfl_env = 0; +#endif + + +/* If this is a non-mangled softfp version special processing is required */ +#if defined(FENV_MANGLE) || !defined(SOFTFP_ABI) + /* * The following macros map between the softfloat emulator's flags and * the hardware's FPSR. The hardware this file was written for doesn't @@ -49,12 +68,6 @@ #error "This file must be compiled with C99 'inline' semantics" #endif -/* - * Hopefully the system ID byte is immutable, so it's valid to use - * this as a default environment. - */ -const fenv_t __fe_dfl_env = 0; - extern inline int feclearexcept(int __excepts); extern inline int fegetexceptflag(fexcept_t *__flagp, int __excepts); extern inline int fesetexceptflag(const fexcept_t *__flagp, int __excepts); @@ -66,3 +79,189 @@ extern inline int fegetenv(fenv_t *__env extern inline int feholdexcept(fenv_t *__envp); extern inline int fesetenv(const fenv_t *__envp); extern inline int feupdateenv(const fenv_t *__envp); + +#else /* !FENV_MANGLE && SOFTFP_ABI */ +/* Set by libc when the VFP unit is enabled */ +extern int _libc_arm_fpu_present; + +int __softfp_feclearexcept(int __excepts); +int __softfp_fegetexceptflag(fexcept_t *__flagp, int __excepts); +int __softfp_fesetexceptflag(const fexcept_t *__flagp, int __excepts); +int __softfp_feraiseexcept(int __excepts); +int __softfp_fetestexcept(int __excepts); +int __softfp_fegetround(void); +int __softfp_fesetround(int __round); +int __softfp_fegetenv(fenv_t *__envp); +int __softfp_feholdexcept(fenv_t *__envp); +int __softfp_fesetenv(const fenv_t *__envp); +int __softfp_feupdateenv(const fenv_t *__envp); + +int __vfp_feclearexcept(int __excepts); +int __vfp_fegetexceptflag(fexcept_t *__flagp, int __excepts); +int __vfp_fesetexceptflag(const fexcept_t *__flagp, int __excepts); +int __vfp_feraiseexcept(int __excepts); +int __vfp_fetestexcept(int __excepts); +int __vfp_fegetround(void); +int __vfp_fesetround(int __round); +int __vfp_fegetenv(fenv_t *__envp); +int __vfp_feholdexcept(fenv_t *__envp); +int __vfp_fesetenv(const fenv_t *__envp); +int __vfp_feupdateenv(const fenv_t *__envp); + +static int +__softfp_round_to_vfp(int round) +{ + + switch (round) { + case FE_TONEAREST: + default: + return VFP_FE_TONEAREST; + case FE_TOWARDZERO: + return VFP_FE_TOWARDZERO; + case FE_UPWARD: + return VFP_FE_UPWARD; + case FE_DOWNWARD: + return VFP_FE_DOWNWARD; + } +} + +static int +__softfp_round_from_vfp(int round) +{ + + switch (round) { + case VFP_FE_TONEAREST: + default: + return FE_TONEAREST; + case VFP_FE_TOWARDZERO: + return FE_TOWARDZERO; + case VFP_FE_UPWARD: + return FE_UPWARD; + case VFP_FE_DOWNWARD: + return FE_DOWNWARD; + } +} + +int feclearexcept(int __excepts) +{ + + if (_libc_arm_fpu_present) + __vfp_feclearexcept(__excepts); + __softfp_feclearexcept(__excepts); + + return (0); +} + +int fegetexceptflag(fexcept_t *__flagp, int __excepts) +{ + fexcept_t __vfp_flagp; + + __vfp_flagp = 0; + if (_libc_arm_fpu_present) + __vfp_fegetexceptflag(&__vfp_flagp, __excepts); + __softfp_fegetexceptflag(__flagp, __excepts); + + *__flagp |= __vfp_flagp; + + return (0); +} + +int fesetexceptflag(const fexcept_t *__flagp, int __excepts) +{ + + if (_libc_arm_fpu_present) + __vfp_fesetexceptflag(__flagp, __excepts); + __softfp_fesetexceptflag(__flagp, __excepts); + + return (0); +} + +int feraiseexcept(int __excepts) +{ + + if (_libc_arm_fpu_present) + __vfp_feraiseexcept(__excepts); + __softfp_feraiseexcept(__excepts); + + return (0); +} + +int fetestexcept(int __excepts) +{ + int __got_excepts; + + __got_excepts = 0; + if (_libc_arm_fpu_present) + __got_excepts = __vfp_fetestexcept(__excepts); + + if (__got_excepts == 0) + __got_excepts = __softfp_fetestexcept(__excepts); + + return (__got_excepts); +} + +int fegetround(void) +{ + + if (_libc_arm_fpu_present) + return __softfp_round_from_vfp(__vfp_fegetround()); + return __softfp_fegetround(); +} + +int fesetround(int __round) +{ + + if (_libc_arm_fpu_present) + __vfp_fesetround(__softfp_round_to_vfp(__round)); + __softfp_fesetround(__round); + + return (0); +} + +int fegetenv(fenv_t *__envp) +{ + fenv_t __vfp_envp; + + __vfp_envp = 0; + if (_libc_arm_fpu_present) + __vfp_fegetenv(&__vfp_envp); + __softfp_fegetenv(__envp); + *__envp |= __vfp_envp; + + return (0); +} + +int feholdexcept(fenv_t *__envp) +{ + fenv_t __vfp_envp; + + __vfp_envp = 0; + if (_libc_arm_fpu_present) + __vfp_feholdexcept(&__vfp_envp); + __softfp_feholdexcept(__envp); + *__envp |= __vfp_envp; + + return (0); +} + +int fesetenv(const fenv_t *__envp) +{ + + if (_libc_arm_fpu_present) + __vfp_fesetenv(__envp); + __softfp_fesetenv(__envp); + + return (0); +} + +int feupdateenv(const fenv_t *__envp) +{ + + if (_libc_arm_fpu_present) + __vfp_feupdateenv(__envp); + __softfp_feupdateenv(__envp); + + return (0); +} +#endif + Modified: projects/arm_eabi_vfp/lib/msun/arm/fenv.h ============================================================================== --- projects/arm_eabi_vfp/lib/msun/arm/fenv.h Sat Oct 12 10:26:40 2013 (r256371) +++ projects/arm_eabi_vfp/lib/msun/arm/fenv.h Sat Oct 12 11:37:47 2013 (r256372) @@ -54,11 +54,16 @@ typedef __uint32_t fexcept_t; #endif /* Rounding modes */ +#define VFP_FE_TONEAREST 0x00000000 +#define VFP_FE_UPWARD 0x00400000 +#define VFP_FE_DOWNWARD 0x00800000 +#define VFP_FE_TOWARDZERO 0x00c00000 + #ifdef __ARM_PCS_VFP -#define FE_TONEAREST 0x00000000 -#define FE_UPWARD 0x00400000 -#define FE_DOWNWARD 0x00800000 -#define FE_TOWARDZERO 0x00c00000 +#define FE_TONEAREST VFP_FE_TONEAREST +#define FE_UPWARD VFP_FE_UPWARD +#define FE_DOWNWARD VFP_FE_DOWNWARD +#define FE_TOWARDZERO VFP_FE_TOWARDZERO #else #define FE_TONEAREST 0x0000 #define FE_TOWARDZERO 0x0001 From owner-svn-src-projects@FreeBSD.ORG Sat Oct 12 12:17:59 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 8AD58B16; Sat, 12 Oct 2013 12:17:59 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 791402AE2; Sat, 12 Oct 2013 12:17:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9CCHxaU086724; Sat, 12 Oct 2013 12:17:59 GMT (envelope-from andrew@svn.freebsd.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9CCHxdd086723; Sat, 12 Oct 2013 12:17:59 GMT (envelope-from andrew@svn.freebsd.org) Message-Id: <201310121217.r9CCHxdd086723@svn.freebsd.org> From: Andrew Turner Date: Sat, 12 Oct 2013 12:17:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256373 - projects/arm_eabi_vfp/lib/libc/arm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Oct 2013 12:17:59 -0000 Author: andrew Date: Sat Oct 12 12:17:58 2013 New Revision: 256373 URL: http://svnweb.freebsd.org/changeset/base/256373 Log: Export _libc_arm_fpu_present to allow libm to determine if the vfp is present or not. Modified: projects/arm_eabi_vfp/lib/libc/arm/Symbol.map Modified: projects/arm_eabi_vfp/lib/libc/arm/Symbol.map ============================================================================== --- projects/arm_eabi_vfp/lib/libc/arm/Symbol.map Sat Oct 12 11:37:47 2013 (r256372) +++ projects/arm_eabi_vfp/lib/libc/arm/Symbol.map Sat Oct 12 12:17:58 2013 (r256373) @@ -76,4 +76,6 @@ FBSDprivate_1.0 { __fixunsdfsi; __extendsfdf2; __truncdfsf2; + + _libc_arm_fpu_present; }; From owner-svn-src-projects@FreeBSD.ORG Sat Oct 12 14:21:05 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D5E55EFA; Sat, 12 Oct 2013 14:21:05 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C2B8A2FA4; Sat, 12 Oct 2013 14:21:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9CEL5xW051551; Sat, 12 Oct 2013 14:21:05 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9CEL4l3051545; Sat, 12 Oct 2013 14:21:04 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201310121421.r9CEL4l3051545@svn.freebsd.org> From: Alexander Motin Date: Sat, 12 Oct 2013 14:21:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256378 - in projects/camlock/sys: cam dev/ahci dev/mvs dev/siis X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Oct 2013 14:21:05 -0000 Author: mav Date: Sat Oct 12 14:21:04 2013 New Revision: 256378 URL: http://svnweb.freebsd.org/changeset/base/256378 Log: Deprecate and remove old batch CCB completion mechanism xpt_batch_start() / xpt_batch_done() as not enough flexible and requiring extra locking. Instead declare new function xpt_done_direct() to allow SIM hint CAM that it holds no locks, reenterable, etc. and this request completion can be processed just now in place. The new KPI may be a bit more complicated for use by SIM then previous, but it is more effcient and allows SIM to have several completion threads (interrupt vectors). Modified: projects/camlock/sys/cam/cam_xpt.c projects/camlock/sys/cam/cam_xpt_sim.h projects/camlock/sys/dev/ahci/ahci.c projects/camlock/sys/dev/ahci/ahci.h projects/camlock/sys/dev/mvs/mvs.c projects/camlock/sys/dev/siis/siis.c Modified: projects/camlock/sys/cam/cam_xpt.c ============================================================================== --- projects/camlock/sys/cam/cam_xpt.c Sat Oct 12 12:57:57 2013 (r256377) +++ projects/camlock/sys/cam/cam_xpt.c Sat Oct 12 14:21:04 2013 (r256378) @@ -159,7 +159,8 @@ SYSCTL_INT(_kern_cam, OID_AUTO, boot_del struct cam_doneq { struct mtx_padalign cam_doneq_mtx; - TAILQ_HEAD(, ccb_hdr) cam_doneq; + STAILQ_HEAD(, ccb_hdr) cam_doneq; + int cam_doneq_sleep; }; static struct cam_doneq cam_doneqs[MAXCPU]; @@ -924,7 +925,7 @@ xpt_init(void *dummy) for (i = 0; i < cam_num_doneqs; i++) { mtx_init(&cam_doneqs[i].cam_doneq_mtx, "CAM doneq", NULL, MTX_DEF); - TAILQ_INIT(&cam_doneqs[i].cam_doneq); + STAILQ_INIT(&cam_doneqs[i].cam_doneq); error = kproc_kthread_add(xpt_done_td, &cam_doneqs[i], &cam_proc, NULL, 0, 0, "cam", "doneq%d", i); if (error != 0) { @@ -4412,71 +4413,34 @@ xpt_release_simq_timeout(void *arg) void xpt_done(union ccb *done_ccb) { - struct cam_sim *sim; struct cam_doneq *queue; int run, hash; CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_TRACE, ("xpt_done\n")); - if ((done_ccb->ccb_h.func_code & XPT_FC_QUEUED) != 0) { - /* - * Queue up the request for handling by our SWI handler - * any of the "non-immediate" type of ccbs. - */ - sim = done_ccb->ccb_h.path->bus->sim; - mtx_lock(&sim->sim_doneq_mtx); - if (sim->sim_doneq_flags & CAM_SIM_DQ_BATCH) { - TAILQ_INSERT_TAIL(&sim->sim_doneq, &done_ccb->ccb_h, - sim_links.tqe); - done_ccb->ccb_h.pinfo.index = CAM_DONEQ_INDEX; - mtx_unlock(&sim->sim_doneq_mtx); - return; - } - run = ((sim->sim_doneq_flags & CAM_SIM_DQ_POLLED) == 0); - mtx_unlock(&sim->sim_doneq_mtx); - hash = (done_ccb->ccb_h.path_id + done_ccb->ccb_h.target_id + - done_ccb->ccb_h.target_lun) % cam_num_doneqs; - queue = &cam_doneqs[hash]; - mtx_lock(&queue->cam_doneq_mtx); - if (!TAILQ_EMPTY(&queue->cam_doneq)) - run = 0; - TAILQ_INSERT_TAIL(&queue->cam_doneq, &done_ccb->ccb_h, - sim_links.tqe); - done_ccb->ccb_h.pinfo.index = CAM_DONEQ_INDEX; - mtx_unlock(&queue->cam_doneq_mtx); - if (run) - wakeup(&queue->cam_doneq); - } -} - -void -xpt_batch_start(struct cam_sim *sim) -{ + if ((done_ccb->ccb_h.func_code & XPT_FC_QUEUED) == 0) + return; - mtx_lock(&sim->sim_doneq_mtx); - KASSERT((sim->sim_doneq_flags & CAM_SIM_DQ_BATCH) == 0, - ("Batch flag already set")); - sim->sim_doneq_flags |= CAM_SIM_DQ_BATCH; - mtx_unlock(&sim->sim_doneq_mtx); + hash = (done_ccb->ccb_h.path_id + done_ccb->ccb_h.target_id + + done_ccb->ccb_h.target_lun) % cam_num_doneqs; + queue = &cam_doneqs[hash]; + mtx_lock(&queue->cam_doneq_mtx); + run = (queue->cam_doneq_sleep && STAILQ_EMPTY(&queue->cam_doneq)); + STAILQ_INSERT_TAIL(&queue->cam_doneq, &done_ccb->ccb_h, sim_links.stqe); + done_ccb->ccb_h.pinfo.index = CAM_DONEQ_INDEX; + mtx_unlock(&queue->cam_doneq_mtx); + if (run) + wakeup(&queue->cam_doneq); } void -xpt_batch_done(struct cam_sim *sim) +xpt_done_direct(union ccb *done_ccb) { - struct ccb_hdr *ccb_h; - mtx_assert(sim->mtx, MA_NOTOWNED); - mtx_lock(&sim->sim_doneq_mtx); - KASSERT((sim->sim_doneq_flags & CAM_SIM_DQ_BATCH) != 0, - ("Batch flag was not set")); - sim->sim_doneq_flags &= ~CAM_SIM_DQ_BATCH; - while ((ccb_h = TAILQ_FIRST(&sim->sim_doneq)) != NULL) { - TAILQ_REMOVE(&sim->sim_doneq, ccb_h, sim_links.tqe); - mtx_unlock(&sim->sim_doneq_mtx); - ccb_h->pinfo.index = CAM_UNQUEUED_INDEX; - xpt_done_process(ccb_h); - mtx_lock(&sim->sim_doneq_mtx); - } - mtx_unlock(&sim->sim_doneq_mtx); + CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_TRACE, ("xpt_done_direct\n")); + if ((done_ccb->ccb_h.func_code & XPT_FC_QUEUED) == 0) + return; + + xpt_done_process(&done_ccb->ccb_h); } union ccb * @@ -5265,18 +5229,26 @@ xpt_done_td(void *arg) { struct cam_doneq *queue = arg; struct ccb_hdr *ccb_h; + STAILQ_HEAD(, ccb_hdr) doneq; + STAILQ_INIT(&doneq); mtx_lock(&queue->cam_doneq_mtx); while (1) { - if ((ccb_h = TAILQ_FIRST(&queue->cam_doneq)) == NULL) { + while (STAILQ_EMPTY(&queue->cam_doneq)) { + queue->cam_doneq_sleep = 1; msleep(&queue->cam_doneq, &queue->cam_doneq_mtx, PRIBIO, "-", 0); - continue; + queue->cam_doneq_sleep = 0; } - TAILQ_REMOVE(&queue->cam_doneq, ccb_h, sim_links.tqe); + STAILQ_CONCAT(&doneq, &queue->cam_doneq); mtx_unlock(&queue->cam_doneq_mtx); - ccb_h->pinfo.index = CAM_UNQUEUED_INDEX; - xpt_done_process(ccb_h); + + while ((ccb_h = STAILQ_FIRST(&doneq)) != NULL) { + STAILQ_REMOVE_HEAD(&doneq, sim_links.stqe); + ccb_h->pinfo.index = CAM_UNQUEUED_INDEX; + xpt_done_process(ccb_h); + } + mtx_lock(&queue->cam_doneq_mtx); } } @@ -5304,8 +5276,8 @@ camisr_runqueue(struct cam_sim *sim) for (i = 0; i < cam_num_doneqs; i++) { queue = &cam_doneqs[i]; mtx_lock(&queue->cam_doneq_mtx); - while ((ccb_h = TAILQ_FIRST(&queue->cam_doneq)) != NULL) { - TAILQ_REMOVE(&queue->cam_doneq, ccb_h, sim_links.tqe); + while ((ccb_h = STAILQ_FIRST(&queue->cam_doneq)) != NULL) { + STAILQ_REMOVE_HEAD(&queue->cam_doneq, sim_links.stqe); mtx_unlock(&queue->cam_doneq_mtx); ccb_h->pinfo.index = CAM_UNQUEUED_INDEX; xpt_done_process(ccb_h); Modified: projects/camlock/sys/cam/cam_xpt_sim.h ============================================================================== --- projects/camlock/sys/cam/cam_xpt_sim.h Sat Oct 12 12:57:57 2013 (r256377) +++ projects/camlock/sys/cam/cam_xpt_sim.h Sat Oct 12 14:21:04 2013 (r256378) @@ -46,8 +46,7 @@ u_int32_t xpt_freeze_devq(struct cam_pat void xpt_release_devq(struct cam_path *path, u_int count, int run_queue); void xpt_done(union ccb *done_ccb); -void xpt_batch_start(struct cam_sim *sim); -void xpt_batch_done(struct cam_sim *sim); +void xpt_done_direct(union ccb *done_ccb); #endif #endif /* _CAM_CAM_XPT_SIM_H */ Modified: projects/camlock/sys/dev/ahci/ahci.c ============================================================================== --- projects/camlock/sys/dev/ahci/ahci.c Sat Oct 12 12:57:57 2013 (r256377) +++ projects/camlock/sys/dev/ahci/ahci.c Sat Oct 12 14:21:04 2013 (r256378) @@ -1000,6 +1000,7 @@ ahci_ch_attach(device_t dev) mtx_init(&ch->mtx, "AHCI channel lock", NULL, MTX_DEF); resource_int_value(device_get_name(dev), device_get_unit(dev), "pm_level", &ch->pm_level); + STAILQ_INIT(&ch->doneq); if (ch->pm_level > 3) callout_init_mtx(&ch->pm_timer, &ch->mtx, 0); callout_init_mtx(&ch->reset_timer, &ch->mtx, 0); @@ -1465,16 +1466,35 @@ ahci_notify_events(device_t dev, u_int32 } static void +ahci_done(struct ahci_channel *ch, union ccb *ccb) +{ + + mtx_assert(&ch->mtx, MA_OWNED); + if ((ccb->ccb_h.func_code & XPT_FC_QUEUED) == 0 || + ch->batch == 0) { + xpt_done(ccb); + return; + } + + STAILQ_INSERT_TAIL(&ch->doneq, &ccb->ccb_h, sim_links.stqe); +} + +static void ahci_ch_intr_locked(void *data) { device_t dev = (device_t)data; struct ahci_channel *ch = device_get_softc(dev); + struct ccb_hdr *ccb_h; - xpt_batch_start(ch->sim); mtx_lock(&ch->mtx); + ch->batch = 1; ahci_ch_intr(data); + ch->batch = 0; mtx_unlock(&ch->mtx); - xpt_batch_done(ch->sim); + while ((ccb_h = STAILQ_FIRST(&ch->doneq)) != NULL) { + STAILQ_REMOVE_HEAD(&ch->doneq, sim_links.stqe); + xpt_done_direct((union ccb *)ccb_h); + } } static void @@ -1598,7 +1618,7 @@ ahci_ch_intr(void *data) xpt_freeze_devq(fccb->ccb_h.path, 1); fccb->ccb_h.status |= CAM_DEV_QFRZN; } - xpt_done(fccb); + ahci_done(ch, fccb); } for (i = 0; i < ch->numslots; i++) { /* XXX: reqests in loading state. */ @@ -2007,7 +2027,7 @@ ahci_timeout(struct ahci_slot *slot) xpt_freeze_devq(fccb->ccb_h.path, 1); fccb->ccb_h.status |= CAM_DEV_QFRZN; } - xpt_done(fccb); + ahci_done(ch, fccb); } if (!ch->fbs_enabled && !ch->wrongccs) { /* Without FBS we know real timeout source. */ @@ -2213,7 +2233,7 @@ ahci_end_transaction(struct ahci_slot *s ch->hold[slot->slot] = ccb; ch->numhslots++; } else - xpt_done(ccb); + ahci_done(ch, ccb); /* If we have no other active commands, ... */ if (ch->rslots == 0) { /* if there was fatal error - reset port. */ @@ -2273,7 +2293,7 @@ completeall: continue; ch->hold[i]->ccb_h.status &= ~CAM_STATUS_MASK; ch->hold[i]->ccb_h.status |= CAM_RESRC_UNAVAIL; - xpt_done(ch->hold[i]); + ahci_done(ch, ch->hold[i]); ch->hold[i] = NULL; ch->numhslots--; } @@ -2361,7 +2381,7 @@ ahci_process_read_log(device_t dev, unio ch->hold[i]->ccb_h.status &= ~CAM_STATUS_MASK; ch->hold[i]->ccb_h.status |= CAM_REQUEUE_REQ; } - xpt_done(ch->hold[i]); + ahci_done(ch, ch->hold[i]); ch->hold[i] = NULL; ch->numhslots--; } @@ -2376,7 +2396,7 @@ ahci_process_read_log(device_t dev, unio continue; if (ch->hold[i]->ccb_h.func_code != XPT_ATA_IO) continue; - xpt_done(ch->hold[i]); + ahci_done(ch, ch->hold[i]); ch->hold[i] = NULL; ch->numhslots--; } @@ -2401,7 +2421,7 @@ ahci_process_request_sense(device_t dev, ch->hold[i]->ccb_h.status &= ~CAM_STATUS_MASK; ch->hold[i]->ccb_h.status |= CAM_AUTOSENSE_FAIL; } - xpt_done(ch->hold[i]); + ahci_done(ch, ch->hold[i]); ch->hold[i] = NULL; ch->numhslots--; xpt_free_ccb(ccb); @@ -2585,7 +2605,7 @@ ahci_reset(device_t dev) xpt_freeze_devq(fccb->ccb_h.path, 1); fccb->ccb_h.status |= CAM_DEV_QFRZN; } - xpt_done(fccb); + ahci_done(ch, fccb); } /* Kill the engine and requeue all running commands. */ ahci_stop(dev); @@ -2599,7 +2619,7 @@ ahci_reset(device_t dev) for (i = 0; i < ch->numslots; i++) { if (!ch->hold[i]) continue; - xpt_done(ch->hold[i]); + ahci_done(ch, ch->hold[i]); ch->hold[i] = NULL; ch->numhslots--; } @@ -2795,12 +2815,12 @@ ahci_check_ids(device_t dev, union ccb * if (ccb->ccb_h.target_id > ((ch->caps & AHCI_CAP_SPM) ? 15 : 0)) { ccb->ccb_h.status = CAM_TID_INVALID; - xpt_done(ccb); + ahci_done(ch, ccb); return (-1); } if (ccb->ccb_h.target_lun != 0) { ccb->ccb_h.status = CAM_LUN_INVALID; - xpt_done(ccb); + ahci_done(ch, ccb); return (-1); } return (0); @@ -2992,7 +3012,7 @@ ahciaction(struct cam_sim *sim, union cc ccb->ccb_h.status = CAM_REQ_INVALID; break; } - xpt_done(ccb); + ahci_done(ch, ccb); } static void Modified: projects/camlock/sys/dev/ahci/ahci.h ============================================================================== --- projects/camlock/sys/dev/ahci/ahci.h Sat Oct 12 12:57:57 2013 (r256377) +++ projects/camlock/sys/dev/ahci/ahci.h Sat Oct 12 14:21:04 2013 (r256378) @@ -409,6 +409,8 @@ struct ahci_channel { struct ahci_slot slot[AHCI_MAX_SLOTS]; union ccb *hold[AHCI_MAX_SLOTS]; struct mtx mtx; /* state lock */ + STAILQ_HEAD(, ccb_hdr) doneq; /* queue of completed CCBs */ + int batch; /* doneq is in use */ int devices; /* What is present */ int pm_present; /* PM presence reported */ int fbs_enabled; /* FIS-based switching enabled */ Modified: projects/camlock/sys/dev/mvs/mvs.c ============================================================================== --- projects/camlock/sys/dev/mvs/mvs.c Sat Oct 12 12:57:57 2013 (r256377) +++ projects/camlock/sys/dev/mvs/mvs.c Sat Oct 12 14:21:04 2013 (r256378) @@ -653,11 +653,9 @@ mvs_ch_intr_locked(void *data) device_t dev = (device_t)arg->arg; struct mvs_channel *ch = device_get_softc(dev); - xpt_batch_start(ch->sim); mtx_lock(&ch->mtx); mvs_ch_intr(data); mtx_unlock(&ch->mtx); - xpt_batch_done(ch->sim); } static void Modified: projects/camlock/sys/dev/siis/siis.c ============================================================================== --- projects/camlock/sys/dev/siis/siis.c Sat Oct 12 12:57:57 2013 (r256377) +++ projects/camlock/sys/dev/siis/siis.c Sat Oct 12 14:21:04 2013 (r256378) @@ -837,11 +837,9 @@ siis_ch_intr_locked(void *data) device_t dev = (device_t)data; struct siis_channel *ch = device_get_softc(dev); - xpt_batch_start(ch->sim); mtx_lock(&ch->mtx); siis_ch_intr(data); mtx_unlock(&ch->mtx); - xpt_batch_done(ch->sim); } static void From owner-svn-src-projects@FreeBSD.ORG Sat Oct 12 14:23:34 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 7E3E4FEC; Sat, 12 Oct 2013 14:23:34 +0000 (UTC) (envelope-from cherry@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6BC4B2FAF; Sat, 12 Oct 2013 14:23:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9CENYCk052299; Sat, 12 Oct 2013 14:23:34 GMT (envelope-from cherry@svn.freebsd.org) Received: (from cherry@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9CENYCq052298; Sat, 12 Oct 2013 14:23:34 GMT (envelope-from cherry@svn.freebsd.org) Message-Id: <201310121423.r9CENYCq052298@svn.freebsd.org> From: "Cherry G. Mathew" Date: Sat, 12 Oct 2013 14:23:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256379 - projects/amd64_xen_pv/sys/amd64/xen X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Oct 2013 14:23:34 -0000 Author: cherry Date: Sat Oct 12 14:23:33 2013 New Revision: 256379 URL: http://svnweb.freebsd.org/changeset/base/256379 Log: Initialise percpu vcpu_info properly with the dpcpu api Approved by: gibbs(implicit) Modified: projects/amd64_xen_pv/sys/amd64/xen/machdep.c Modified: projects/amd64_xen_pv/sys/amd64/xen/machdep.c ============================================================================== --- projects/amd64_xen_pv/sys/amd64/xen/machdep.c Sat Oct 12 14:21:04 2013 (r256378) +++ projects/amd64_xen_pv/sys/amd64/xen/machdep.c Sat Oct 12 14:23:33 2013 (r256379) @@ -466,13 +466,6 @@ initxen(struct start_info *si) KASSERT(PTOV(physfree) <= (xenstack + 512 * 1024), ("Attempt to use unmapped va\n")); - /* Register the rest of free physical memory with phys_avail[] */ - /* dump_avail[] starts at index 1 */ - phys_avail[pa_index++] = physfree; - dump_avail[pa_index] = physfree; - phys_avail[pa_index++] = ptoa(physmem); - dump_avail[pa_index] = ptoa(physmem); - /* * This may be done better later if it gets more high level * components in it. If so just link td->td_proc here. @@ -532,9 +525,22 @@ initxen(struct start_info *si) /* per cpu structures for cpu0 */ pcpu_init(pc, 0, sizeof(struct pcpu)); + + dpcpu_init((void *)(PTOV(physfree)), 0); + physfree += DPCPU_SIZE; + + /* XXX: This is a hack until we have MP */ + DPCPU_ID_SET(0, vcpu_info, &HYPERVISOR_shared_info->vcpu_info[0]); + + /* Register the rest of free physical memory with phys_avail[] */ + /* dump_avail[] starts at index 1 */ + phys_avail[pa_index++] = physfree; + dump_avail[pa_index] = physfree; + phys_avail[pa_index++] = ptoa(physmem); + dump_avail[pa_index] = ptoa(physmem); + PCPU_SET(prvspace, pc); PCPU_SET(curthread, &thread0); - PCPU_SET(tssp, &common_tss[0]); /* Dummy - see definition */ PCPU_SET(commontssp, &common_tss[0]); /* Dummy - see definition */ PCPU_SET(fs32p, (void *)xpmap_ptom(VTOP(&gdt[GUFS32_SEL]))); /* Note: On Xen PV, we set the machine address. */ From owner-svn-src-projects@FreeBSD.ORG Sat Oct 12 16:03:33 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 42C75BCA; Sat, 12 Oct 2013 16:03:33 +0000 (UTC) (envelope-from markm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2C056243E; Sat, 12 Oct 2013 16:03:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9CG3Xt5004082; Sat, 12 Oct 2013 16:03:33 GMT (envelope-from markm@svn.freebsd.org) Received: (from markm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9CG3W0U004074; Sat, 12 Oct 2013 16:03:32 GMT (envelope-from markm@svn.freebsd.org) Message-Id: <201310121603.r9CG3W0U004074@svn.freebsd.org> From: Mark Murray Date: Sat, 12 Oct 2013 16:03:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256383 - in projects/random_number_generator: . bin/freebsd-version cddl/contrib/opensolaris/cmd/dtrace etc etc/atf etc/defaults etc/mtree etc/rc.d gnu/usr.bin/cc/cc_tools gnu/usr.bin/... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Oct 2013 16:03:33 -0000 Author: markm Date: Sat Oct 12 16:03:31 2013 New Revision: 256383 URL: http://svnweb.freebsd.org/changeset/base/256383 Log: MFC - tracking commit Added: projects/random_number_generator/usr.sbin/bsdconfig/share/keymap.subr - copied unchanged from r256381, head/usr.sbin/bsdconfig/share/keymap.subr projects/random_number_generator/usr.sbin/bsdinstall/scripts/entropy - copied unchanged from r256381, head/usr.sbin/bsdinstall/scripts/entropy projects/random_number_generator/usr.sbin/bsdinstall/scripts/zfsboot - copied unchanged from r256381, head/usr.sbin/bsdinstall/scripts/zfsboot Deleted: projects/random_number_generator/etc/atf/ projects/random_number_generator/share/atf/ projects/random_number_generator/share/examples/atf/ projects/random_number_generator/share/xml/ projects/random_number_generator/share/xsl/ projects/random_number_generator/usr.bin/atf/atf-config/ projects/random_number_generator/usr.bin/atf/atf-report/ projects/random_number_generator/usr.bin/atf/atf-run/ projects/random_number_generator/usr.bin/atf/atf-version/ Modified: projects/random_number_generator/Makefile.inc1 projects/random_number_generator/ObsoleteFiles.inc projects/random_number_generator/UPDATING projects/random_number_generator/bin/freebsd-version/freebsd-version.sh.in projects/random_number_generator/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 projects/random_number_generator/etc/Makefile projects/random_number_generator/etc/defaults/periodic.conf projects/random_number_generator/etc/defaults/rc.conf projects/random_number_generator/etc/ftpusers projects/random_number_generator/etc/group projects/random_number_generator/etc/master.passwd projects/random_number_generator/etc/mtree/BSD.root.dist projects/random_number_generator/etc/mtree/BSD.usr.dist projects/random_number_generator/etc/network.subr projects/random_number_generator/etc/rc.d/jail projects/random_number_generator/etc/rc.d/netif projects/random_number_generator/etc/rc.subr projects/random_number_generator/gnu/usr.bin/cc/cc_tools/freebsd-native.h projects/random_number_generator/gnu/usr.bin/groff/tmac/mdoc.local projects/random_number_generator/lib/clang/clang.build.mk projects/random_number_generator/lib/libcrypt/tests/crypt_tests.c projects/random_number_generator/lib/libstand/tftp.c projects/random_number_generator/release/release.sh projects/random_number_generator/sbin/camcontrol/modeedit.c projects/random_number_generator/sbin/iscontrol/iscsi.conf.5 projects/random_number_generator/share/Makefile projects/random_number_generator/share/examples/Makefile projects/random_number_generator/share/man/man4/random.4 projects/random_number_generator/share/man/man5/Makefile projects/random_number_generator/share/man/man5/rc.conf.5 projects/random_number_generator/share/man/man7/Makefile projects/random_number_generator/share/misc/bsd-family-tree projects/random_number_generator/share/misc/committers-src.dot projects/random_number_generator/share/mk/atf.test.mk projects/random_number_generator/share/syscons/keymaps/INDEX.keymaps projects/random_number_generator/sys/amd64/conf/GENERIC projects/random_number_generator/sys/arm/versatile/versatile_pci.c projects/random_number_generator/sys/boot/i386/btx/btx/btx.S projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c projects/random_number_generator/sys/conf/newvers.sh projects/random_number_generator/sys/contrib/ipfilter/netinet/ip_tftp_pxy.c projects/random_number_generator/sys/dev/ata/ata-all.c projects/random_number_generator/sys/dev/ata/ata-card.c projects/random_number_generator/sys/dev/bxe/bxe.c projects/random_number_generator/sys/dev/bxe/bxe_stats.c projects/random_number_generator/sys/dev/bxe/ecore_sp.h projects/random_number_generator/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c projects/random_number_generator/sys/dev/hyperv/include/hyperv.h projects/random_number_generator/sys/dev/hyperv/netvsc/hv_net_vsc.h projects/random_number_generator/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/random_number_generator/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c projects/random_number_generator/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c projects/random_number_generator/sys/dev/hyperv/storvsc/hv_vstorage.h projects/random_number_generator/sys/dev/hyperv/vmbus/hv_channel.c projects/random_number_generator/sys/dev/hyperv/vmbus/hv_hv.c projects/random_number_generator/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c projects/random_number_generator/sys/dev/hyperv/vmbus/hv_vmbus_priv.h projects/random_number_generator/sys/dev/vmware/vmxnet3/if_vmx.c projects/random_number_generator/sys/dev/vmware/vmxnet3/if_vmxvar.h projects/random_number_generator/sys/i386/conf/GENERIC projects/random_number_generator/sys/kern/kern_mbuf.c projects/random_number_generator/sys/mips/mips/bus_space_generic.c projects/random_number_generator/sys/net80211/ieee80211_freebsd.c projects/random_number_generator/sys/netinet6/in6_ifattach.c projects/random_number_generator/sys/ofed/drivers/infiniband/hw/mlx4/main.c projects/random_number_generator/sys/sys/param.h projects/random_number_generator/sys/vm/vm_phys.c projects/random_number_generator/tools/build/mk/OptionalObsoleteFiles.inc projects/random_number_generator/usr.bin/atf/Makefile projects/random_number_generator/usr.bin/atf/Makefile.inc projects/random_number_generator/usr.sbin/bhyve/pci_emul.c projects/random_number_generator/usr.sbin/bsdconfig/include/messages.subr projects/random_number_generator/usr.sbin/bsdconfig/share/Makefile projects/random_number_generator/usr.sbin/bsdconfig/share/device.subr projects/random_number_generator/usr.sbin/bsdconfig/share/dialog.subr projects/random_number_generator/usr.sbin/bsdconfig/share/strings.subr projects/random_number_generator/usr.sbin/bsdconfig/share/variable.subr projects/random_number_generator/usr.sbin/bsdinstall/bsdinstall projects/random_number_generator/usr.sbin/bsdinstall/bsdinstall.8 projects/random_number_generator/usr.sbin/bsdinstall/scripts/Makefile projects/random_number_generator/usr.sbin/bsdinstall/scripts/auto projects/random_number_generator/usr.sbin/bsdinstall/scripts/config projects/random_number_generator/usr.sbin/bsdinstall/scripts/jail projects/random_number_generator/usr.sbin/bsdinstall/scripts/keymap projects/random_number_generator/usr.sbin/bsdinstall/scripts/netconfig projects/random_number_generator/usr.sbin/bsdinstall/scripts/script projects/random_number_generator/usr.sbin/bsdinstall/scripts/services projects/random_number_generator/usr.sbin/jail/jail.c Directory Properties: projects/random_number_generator/ (props changed) projects/random_number_generator/cddl/ (props changed) projects/random_number_generator/cddl/contrib/opensolaris/ (props changed) projects/random_number_generator/gnu/usr.bin/cc/cc_tools/ (props changed) projects/random_number_generator/sbin/ (props changed) projects/random_number_generator/share/examples/kld/random_adaptor/random_adaptor_example.c (props changed) projects/random_number_generator/share/man/man4/ (props changed) projects/random_number_generator/sys/ (props changed) projects/random_number_generator/sys/boot/ (props changed) projects/random_number_generator/sys/cddl/contrib/opensolaris/ (props changed) projects/random_number_generator/sys/conf/ (props changed) projects/random_number_generator/sys/contrib/ipfilter/ (props changed) projects/random_number_generator/sys/dev/hyperv/ (props changed) projects/random_number_generator/usr.sbin/bhyve/ (props changed) projects/random_number_generator/usr.sbin/jail/ (props changed) Modified: projects/random_number_generator/Makefile.inc1 ============================================================================== --- projects/random_number_generator/Makefile.inc1 Sat Oct 12 15:56:13 2013 (r256382) +++ projects/random_number_generator/Makefile.inc1 Sat Oct 12 16:03:31 2013 (r256383) @@ -329,7 +329,7 @@ TARGET_ABI= gnueabi .else TARGET_ABI= unknown .endif -TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.0 +TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0 XFLAGS+= -target ${TARGET_TRIPLE} .endif .endif Modified: projects/random_number_generator/ObsoleteFiles.inc ============================================================================== --- projects/random_number_generator/ObsoleteFiles.inc Sat Oct 12 15:56:13 2013 (r256382) +++ projects/random_number_generator/ObsoleteFiles.inc Sat Oct 12 16:03:31 2013 (r256383) @@ -38,8 +38,27 @@ # xargs -n1 | sort | uniq -d; # done +# 20131013: Removal of the ATF tools +OLD_FILES+=etc/atf/FreeBSD.conf +OLD_FILES+=etc/atf/atf-run.hooks +OLD_FILES+=etc/atf/common.conf +OLD_FILES+=usr/bin/atf-config +OLD_FILES+=usr/bin/atf-report +OLD_FILES+=usr/bin/atf-run +OLD_FILES+=usr/bin/atf-version +OLD_FILES+=usr/share/atf/atf-run.hooks +OLD_FILES+=usr/share/examples/atf/atf-run.hooks +OLD_FILES+=usr/share/examples/atf/tests-results.css +OLD_FILES+=usr/share/man/man1/atf-config.1.gz +OLD_FILES+=usr/share/man/man1/atf-report.1.gz +OLD_FILES+=usr/share/man/man1/atf-run.1.gz +OLD_FILES+=usr/share/man/man1/atf-version.1.gz +OLD_FILES+=usr/share/man/man5/atf-formats.5.gz +OLD_FILES+=usr/share/man/man7/atf.7.gz +OLD_FILES+=usr/share/xml/atf/tests-results.dtd +OLD_FILES+=usr/share/xsl/atf/tests-results.xsl # 20131009: freebsd-version moved from /libexec to /bin -OLD_FILES+=/libexec/freebsd-version +OLD_FILES+=libexec/freebsd-version # 20131001: ar and ranlib from binutils not used OLD_FILES+=usr/bin/gnu-ar OLD_FILES+=usr/bin/gnu-ranlib @@ -6093,6 +6112,13 @@ OLD_LIBS+=usr/lib/libkse.so.1 OLD_LIBS+=usr/lib/liblwres.so.3 OLD_LIBS+=usr/lib/pam_ftp.so.2 +# 20131013: Removal of the ATF tools +OLD_DIRS+=etc/atf +OLD_DIRS+=usr/share/examples/atf +OLD_DIRS+=usr/share/xml/atf +OLD_DIRS+=usr/share/xml +OLD_DIRS+=usr/share/xsl/atf +OLD_DIRS+=usr/share/xsl # 20040925: bind9 import OLD_DIRS+=usr/share/doc/bind/html OLD_DIRS+=usr/share/doc/bind/misc Modified: projects/random_number_generator/UPDATING ============================================================================== --- projects/random_number_generator/UPDATING Sat Oct 12 15:56:13 2013 (r256382) +++ projects/random_number_generator/UPDATING Sat Oct 12 16:03:31 2013 (r256383) @@ -16,8 +16,8 @@ from older versions of FreeBSD, try WITH head, and then rebuild without this option. The bootstrap process from older version of current is a bit fragile. -NOTE TO PEOPLE WHO THINK THAT FreeBSD 10.x IS SLOW: - FreeBSD 10.x has many debugging features turned on, in both the kernel +NOTE TO PEOPLE WHO THINK THAT FreeBSD 11.x IS SLOW: + FreeBSD 11.x has many debugging features turned on, in both the kernel and userland. These features attempt to detect incorrect use of system primitives, and encourage loud failure through extra sanity checking and fail stop semantics. They also substantially impact @@ -31,6 +31,25 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20131010: + The rc.d/jail script has been updated to support jail(8) + configuration file. The "jail__*" rc.conf(5) variables + for per-jail configuration are automatically converted to + /var/run/jail..conf before the jail(8) utility is invoked. + This is transparently backward compatible. See below about some + incompatibilities and rc.conf(5) manual page for more details. + + These variables are now deprecated in favor of jail(8) configuration + file. One can use "rc.d/jail config " command to generate + a jail(8) configuration file in /var/run/jail..conf without + running the jail(8) utility. The default pathname of the + configuration file is /etc/jail.conf and can be specified by + using $jail_conf or $jail__conf variables. + + Please note that jail_devfs_ruleset accepts an integer at + this moment. Please consider to rewrite the ruleset name + with an integer. + 20130930: BIND has been removed from the base system. If all you need is a local resolver, simply enable and start the local_unbound Modified: projects/random_number_generator/bin/freebsd-version/freebsd-version.sh.in ============================================================================== --- projects/random_number_generator/bin/freebsd-version/freebsd-version.sh.in Sat Oct 12 15:56:13 2013 (r256382) +++ projects/random_number_generator/bin/freebsd-version/freebsd-version.sh.in Sat Oct 12 16:03:31 2013 (r256383) @@ -81,7 +81,7 @@ userland_version() { # Print a usage string and exit. # usage() { - echo "usage: $progname [-ku]\n" >&2 + echo "usage: $progname [-ku]" >&2 exit 1 } Modified: projects/random_number_generator/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 ============================================================================== --- projects/random_number_generator/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 Sat Oct 12 15:56:13 2013 (r256382) +++ projects/random_number_generator/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 Sat Oct 12 16:03:31 2013 (r256383) @@ -2,7 +2,7 @@ .\" CDDL HEADER START .\" .\" The contents of this file are subject to the terms of the -.\" Common Development and Distribution License (the "License"). +.\" Common Development and Distribution License (the "License"). .\" You may not use this file except in compliance with the License. .\" .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE @@ -18,653 +18,660 @@ .\" .\" CDDL HEADER END .\" Copyright (c) 2006, Sun Microsystems, Inc. All Rights Reserved. -.TH dtrace 1M "5 Sep 2006" "SunOS 5.11" "System Administration Commands" -.SH NAME -dtrace \- DTrace dynamic tracing compiler and tracing utility -.SH SYNOPSIS -.LP -.nf -\fBdtrace\fR [\fB-32\fR | \fB-64\fR] [\fB-aACeFGHhlqSvVwZ\fR] [\fB-b\fR \fIbufsz\fR] [\fB-c\fR \fIcmd\fR] - [\fB-D\fR \fIname\fR [\fI=value\fR]] [\fB-I\fR \fIpath\fR] [\fB-L\fR \fIpath\fR] [\fB-o\fR \fIoutput\fR] - [\fB-s\fR \fIscript\fR] [\fB-U\fR \fIname\fR] [\fB-x\fR \fIarg\fR [\fI=val\fR]] - [\fB-X\fR a | c | s | t] [\fB-p\fR \fIpid\fR] - [\fB-P\fR \fIprovider\fR [[\fIpredicate\fR] \fIaction\fR]] - [\fB-m\fR [\fIprovider:\fR] \fImodule\fR [[\fIpredicate\fR] \fIaction\fR]] - [\fB-f\fR [[\fIprovider:\fR] \fImodule:\fR] \fIfunction\fR [[\fIpredicate\fR] \fIaction\fR]] - [\fB-n\fR [[[\fIprovider:\fR] \fImodule:\fR] \fIfunction:\fR] \fIname\fR [[\fIpredicate\fR] \fIaction\fR]] - [\fB-i\fR \fIprobe-id\fR [[\fIpredicate\fR] \fIaction\fR]] -.fi - -.SH DESCRIPTION -.sp -.LP -DTrace is a comprehensive dynamic tracing framework for the Solaris Operating System. DTrace provides a powerful infrastructure that permits administrators, developers, and service personnel to concisely answer arbitrary questions about the behavior of the operating system and user programs. -.sp -.LP -The \fISolaris Dynamic Tracing Guide\fR describes how to use DTrace to observe, debug, and tune system behavior. Refer to this book for a detailed description of DTrace features, including the bundled DTrace observability -tools, instrumentation providers, and the D programming language. -.sp -.LP -The \fBdtrace\fR command provides a generic interface to the essential services provided by the DTrace facility, including: -.RS +4 -.TP -.ie t \(bu -.el o +.\" +.\" $FreeBSD$ +.\" +.Dd October 5, 2013 +.Dt DTRACE 1 +.Os +.Sh NAME +.Nm dtrace +.Nd dynamic tracing compiler and tracing utility +.Sh SYNOPSIS +.Nm +.Op Fl 32 | Fl 64 +.Op Fl aACeFGhHlqSvVwZ +.Op Fl b Ar bufsz +.Op Fl c Ar cmd +.Op Fl D Ar name Op Ns = Ns value +.Op Fl I Ar path +.Op Fl L Ar path +.Op Fl o Ar output +.Op Fl s Ar script +.Op Fl U Ar name +.Op Fl x Ar arg Op Ns = Ns value +.Op Fl X Cm a | c | s | t +.Op Fl p Ar pid +.Op Fl P Ar provider Oo Oo Ar predicate Oc Ar action Oc +.Op Fl m Oo Ar provider : Oc Ar module Oo Oo Ar predicate Oc Ar action Oc +.Op Fl f Oo Oo Ar provider : Oc Ar module : Oc Ar function Oo Oo Ar predicate \ + Oc Ar action Oc +.Op Fl n Oo Oo Oo Ar provider : Oc Ar module : Oc Ar function : Oc Ar name \ + Oo Oo Ar predicate Oc Ar action Oc +.Op Fl i Ar probe-id Oo Oo Ar predicate Oc Ar action Oc +.Sh DESCRIPTION +DTrace is a comprehensive dynamic tracing framework ported from Solaris. +DTrace provides a powerful infrastructure that permits administrators, +developers, and service personnel to concisely answer arbitrary questions about +the behavior of the operating system and user programs. +.Pp +The +.Nm +command provides a generic interface to the essential services provided by the +DTrace facility, including: +.Bl -bullet -offset indent +.It Options that list the set of probes and providers currently published by DTrace -.RE -.RS +4 -.TP -.ie t \(bu -.el o -Options that enable probes directly using any of the probe description specifiers (provider, module, function, name) -.RE -.RS +4 -.TP -.ie t \(bu -.el o -Options that run the D compiler and compile one or more D program files or programs written directly on the command line -.RE -.RS +4 -.TP -.ie t \(bu -.el o +.It +Options that enable probes directly using any of the probe description +specifiers (provider, module, function, name) +.It +Options that run the D compiler and compile one or more D program files or +programs written directly on the command line +.It Options that generate anonymous tracing programs -.RE -.RS +4 -.TP -.ie t \(bu -.el o +.It Options that generate program stability reports -.RE -.RS +4 -.TP -.ie t \(bu -.el o -Options that modify DTrace tracing and buffering behavior and enable additional D compiler features -.RE -.sp -.LP -You can use \fBdtrace\fR to create D scripts by using it in a \fB#!\fR declaration to create an interpreter file. You can also use \fBdtrace\fR to attempt to compile D programs and determine their properties without actually enabling tracing using the \fB-e\fR option. See \fBOPTIONS\fR. See the \fISolaris Dynamic Tracing Guide\fR for detailed examples of how to use the \fBdtrace\fR utility to perform these tasks. -.SH OPTIONS -.sp -.LP -The arguments accepted by the \fB-P\fR, \fB-m\fR, \fB-f\fR, \fB-n\fR, and \fB-i\fR options can include an optional D language \fIpredicate\fR enclosed in slashes \fB//\fR and optional D language \fIaction\fR statement list enclosed in braces \fB{}\fR. D program code specified on the command line must be appropriately quoted to avoid intepretation of meta-characters by the shell. -.sp -.LP +.It +Options that modify DTrace tracing and buffering behavior and enable +additional D compiler features +.El +.Pp +You can use +.Nm +to create D scripts by using it in a shebang declaration to create an +interpreter file. +You can also use +.Nm +to attempt to compile D programs and determine their properties without +actually enabling traces using the +.Fl e +option. +.Sh OPTIONS +The arguments accepted by the +.Fl P , +.Fl m , +.Fl f , +.Fl n , +and +.Fl i +options can include an optional D language +.Ar predicate +enclosed in slashes and an optional D language +.Ar action +statement list enclosed in braces. +D program code specified on the command line must be appropriately quoted to +avoid interpretation of meta-characters by the shell. +.Pp The following options are supported: -.sp -.ne 2 -.mk -.na -\fB\fB-32\fR | \fB-64\fR\fR -.ad -.sp .6 -.RS 4n -The D compiler produces programs using the native data model of the operating system kernel. You can use the \fBisainfo\fR \fB-b\fR command to determine the current operating system data model. If the \fB-32\fR option is specified, \fBdtrace\fR forces -the D compiler to compile a D program using the 32-bit data model. If the \fB-64\fR option is specified, \fBdtrace\fR forces the D compiler to compile a D program using the 64-bit data model. These options are typically not required as \fBdtrace\fR selects the -native data model as the default. The data model affects the sizes of integer types and other language properties. D programs compiled for either data model can be executed on both 32-bit and 64-bit kernels. The \fB-32\fR and \fB-64\fR options also determine the ELF file format -(ELF32 or ELF64) produced by the \fB-G\fR option. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-a\fR\fR -.ad -.sp .6 -.RS 4n -Claim anonymous tracing state and display the traced data. You can combine the \fB-a\fR option with the \fB-e\fR option to force \fBdtrace\fR to exit immediately after consuming the anonymous tracing state rather than continuing to wait for new -data. See the \fISolaris Dynamic Tracing Guide\fR for more information about anonymous tracing. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-A\fR\fR -.ad -.sp .6 -.RS 4n -Generate \fBdriver.conf\fR(4) directives for anonymous tracing. This option constructs a set of \fBdtrace\fR(7D) configuration file directives to enable the specified probes for anonymous tracing and then exits. By default, \fBdtrace\fR attempts to store the directives to the file \fB/kernel/drv/dtrace.conf\fR. You can modify this behavior if you use the \fB-o\fR option to specify an alternate output file. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-b\fR \fIbufsz\fR\fR -.ad -.sp .6 -.RS 4n -Set principal trace buffer size (\fIbufsz\fR). The trace buffer size can include any of the size suffixes \fBk\fR, \fBm\fR, \fBg\fR, or \fBt\fR. If the buffer space cannot be allocated, \fBdtrace\fR attempts -to reduce the buffer size or exit depending on the setting of the \fBbufresize\fR property. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-c\fR \fIcmd\fR\fR -.ad -.sp .6 -.RS 4n -Run the specified command \fIcmd\fR and exit upon its completion. If more than one \fB-c\fR option is present on the command line, \fBdtrace\fR exits when all commands have exited, reporting the exit status for each child process as it -terminates. The process-ID of the first command is made available to any D programs specified on the command line or using the \fB-s\fR option through the \fB$target\fR macro variable. Refer to the \fISolaris Dynamic Tracing Guide\fR for more information -on macro variables. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-C\fR\fR -.ad -.sp .6 -.RS 4n -Run the C preprocessor \fBcpp\fR(1) over D programs before compiling them. You can pass options to the C preprocessor using the \fB-D\fR, \fB-U\fR, \fB-I\fR, and \fB-H\fR options. You can select the degree of C standard conformance if you use the \fB-X\fR option. For a description of the set of tokens defined by the D compiler when invoking the C preprocessor, see \fB-X\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-D\fR \fIname\fR \fB[=\fR\fIvalue\fR\fB]\fR\fR -.ad -.sp .6 -.RS 4n -Define \fIname\fR when invoking \fBcpp\fR(1) (enabled using the \fB-C\fR option). If you specify the equals sign (\fB=\fR) -and additional \fIvalue\fR, the name is assigned the corresponding value. This option passes the \fB-D\fR option to each \fBcpp\fR invocation. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-e\fR\fR -.ad -.sp .6 -.RS 4n -Exit after compiling any requests and consuming anonymous tracing state (\fB-a\fR option) but prior to enabling any probes. You can combine this option with the \fB-a\fR option to print anonymous tracing data and exit. You can also combine this option with D -compiler options. This combination verifies that the programs compile without actually executing them and enabling the corresponding instrumentation. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-f\fR\fB[[\fR\fIprovider\fR\fB:]\fR\fImodule\fR\fB:]\fR\fIfunction\fR\fB[[\fR\fIpredicate\fR\fB]\fR\fIaction\fR\fB]]\fR\fR -.ad -.sp .6 -.RS 4n -Specify function name to trace or list (\fB-l\fR option). The corresponding argument can include any of the probe description forms \fIprovider:module:function\fR, \fImodule:function\fR, or \fIfunction\fR. -Unspecified probe description fields are left blank and match any probes regardless of the values in those fields. If no qualifiers other than \fIfunction\fR are specified in the description, all probes with the corresponding \fIfunction\fR are matched. -The \fB-f\fR argument can be suffixed with an optional D probe clause. You can specify more than one \fB-f\fR option on the command line at a time. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-F\fR\fR -.ad -.sp .6 -.RS 4n -Coalesce trace output by identifying function entry and return. Function entry probe reports are indented and their output is prefixed with \fB->\fR. Function return probe reports are unindented and their output is prefixed with \fB<-\fR\&. System call -entry probe reports are indented and their output is prefixed with \fB=>\fR. System call return probe reports are unindented and their output is prefixed with \fB<=\fR\&. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-G\fR\fR -.ad -.sp .6 -.RS 4n -Generate an ELF file containing an embedded DTrace program. The DTrace probes specified in the program are saved inside of a relocatable ELF object which can be linked into another program. If the \fB-o\fR option is present, the ELF file is saved using the pathname specified -as the argument for this operand. If the \fB-o\fR option is not present and the DTrace program is contained with a file whose name is \fB\fIfilename\fR.d\fR, then the ELF file is saved using the name \fB\fIfilename\fR.o\fR. -Otherwise the ELF file is saved using the name \fBd.out\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-H\fR\fR -.ad -.sp .6 -.RS 4n -Print the pathnames of included files when invoking \fBcpp\fR(1) (enabled using the \fB-C\fR option). This option passes the \fB-H\fR option -to each \fBcpp\fR invocation, causing it to display the list of pathnames, one for each line, to \fBstderr\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-h\fR\fR -.ad -.sp .6 -.RS 4n -Generate a header file containing macros that correspond to probes in the specified provider definitions. This option should be used to generate a header file that is included by other source files for later use with the \fB-G\fR option. If the \fB-o\fR option -is present, the header file is saved using the pathname specified as the argument for that option. If the \fB-o\fR option is not present and the DTrace program is contained with a file whose name is \fIfilename\fR\fB\&.d\fR, then the header file is saved -using the name \fIfilename\fR\fB\&.h\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-i\fR \fIprobe-id\fR\fB[[\fR\fIpredicate\fR] \fIaction\fR\fB]\fR\fR -.ad -.sp .6 -.RS 4n -Specify probe identifier (\fIprobe-id\fR) to trace or list (\fB-l\fR option). You can specify probe IDs using decimal integers as shown by \fBdtrace\fR \fB-l\fR. The \fB-i\fR argument can be suffixed with an optional -D probe clause. You can specify more than one \fB-i\fR option at a time. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-I\fR \fIpath\fR\fR -.ad -.sp .6 -.RS 4n -Add the specified directory \fIpath\fR to the search path for \fB#include\fR files when invoking \fBcpp\fR(1) (enabled -using the \fB-C\fR option). This option passes the \fB-I\fR option to each \fBcpp\fR invocation. The specified \fIpath\fR is inserted into the search path ahead of the default directory list. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-L\fR \fIpath\fR\fR -.ad -.sp .6 -.RS 4n -Add the specified directory \fIpath\fR to the search path for DTrace libraries. DTrace libraries are used to contain common definitions that can be used when writing D programs. The specified \fIpath\fR is added after the default library -search path. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-l\fR\fR -.ad -.sp .6 -.RS 4n -List probes instead of enabling them. If the \fB-l\fR option is specified, \fBdtrace\fR produces a report of the probes matching the descriptions given using the \fB-P\fR, \fB-m\fR, \fB-f\fR, \fB-n\fR, \fB-i\fR, -and \fB-s\fR options. If none of these options are specified, this option lists all probes. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-m\fR [[\fIprovider:\fR] \fImodule:\fR [[\fIpredicate\fR] \fIaction\fR]]\fR -.ad -.sp .6 -.RS 4n -Specify module name to trace or list (\fB-l\fR option). The corresponding argument can include any of the probe description forms \fIprovider:module\fR or \fImodule\fR. Unspecified probe description fields are left blank and match -any probes regardless of the values in those fields. If no qualifiers other than \fImodule\fR are specified in the description, all probes with a corresponding \fImodule\fR are matched. The \fB-m\fR argument can be suffixed with an optional D -probe clause. More than one \fB-m\fR option can be specified on the command line at a time. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-n\fR [[[\fIprovider:\fR] \fImodule:\fR] \fIfunction:\fR] \fIname\fR [[\fIpredicate\fR] \fIaction\fR]\fR -.ad -.sp .6 -.RS 4n -Specify probe name to trace or list (\fB-l\fR option). The corresponding argument can include any of the probe description forms \fIprovider:module:function:name\fR, \fImodule:function:name\fR, \fIfunction:name\fR, -or \fIname\fR. Unspecified probe description fields are left blank and match any probes regardless of the values in those fields. If no qualifiers other than \fIname\fR are specified in the description, all probes with a corresponding \fIname\fR are -matched. The \fB-n\fR argument can be suffixed with an optional D probe clause. More than one \fB-n\fR option can be specified on the command line at a time. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-o\fR \fIoutput\fR\fR -.ad -.sp .6 -.RS 4n -Specify the \fIoutput\fR file for the \fB-A\fR , \fB-G\fR, and \fB-l\fR options, or for the traced data itself. If the \fB-A\fR option is present and \fB-o\fR is not present, the default output file is \fB/kernel/drv/dtrace.conf\fR. If the \fB-G\fR option is present and the \fB-s\fR option's argument is of the form \fB\fIfilename\fR.d\fR and \fB-o\fR is not present, the default output file is \fB\fIfilename\fR.o\fR. -Otherwise the default output file is \fBd.out\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-p\fR \fIpid\fR\fR -.ad -.sp .6 -.RS 4n -Grab the specified process-ID \fIpid\fR, cache its symbol tables, and exit upon its completion. If more than one \fB-p\fR option is present on the command line, \fBdtrace\fR exits when all commands have exited, reporting the exit status -for each process as it terminates. The first process-ID is made available to any D programs specified on the command line or using the \fB-s\fR option through the \fB$target\fR macro variable. Refer to the \fISolaris Dynamic Tracing Guide\fR for -more information on macro variables. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-P\fR \fIprovider\fR \fB[[\fR\fIpredicate\fR\fB]\fR \fIaction\fR]\fR -.ad -.sp .6 -.RS 4n -Specify provider name to trace or list (\fB-l\fR option). The remaining probe description fields module, function, and name are left blank and match any probes regardless of the values in those fields. The \fB-P\fR argument can be suffixed with an optional D -probe clause. You can specify more than one \fB-P\fR option on the command line at a time. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-q\fR\fR -.ad -.sp .6 -.RS 4n -Set quiet mode. \fBdtrace\fR suppresses messages such as the number of probes matched by the specified options and D programs and does not print column headers, the CPU ID, the probe ID, or insert newlines into the output. Only data traced and formatted by D program -statements such as \fBtrace()\fR and \fBprintf()\fR is displayed to \fBstdout\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-s\fR\fR -.ad -.sp .6 -.RS 4n -Compile the specified D program source file. If the \fB-e\fR option is present, the program is compiled but instrumentation is not enabled. If the \fB-l\fR option is present, the program is compiled and the set of probes matched by it is listed, but instrumentation -is not enabled. If none of \fB-e\fR, \fB-l\fR, \fB-G\fR, or \fB-A\fR are present, the instrumentation specified by the D program is enabled and tracing begins. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-S\fR\fR -.ad -.sp .6 -.RS 4n -Show D compiler intermediate code. The D compiler produces a report of the intermediate code generated for each D program to \fBstderr\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-U\fR \fIname\fR\fR -.ad -.sp .6 -.RS 4n -Undefine the specified \fIname\fR when invoking \fBcpp\fR(1) (enabled using the \fB-C\fR option). This option passes the \fB-U\fR option to each \fBcpp\fR invocation. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-v\fR\fR -.ad -.sp .6 -.RS 4n -Set verbose mode. If the \fB-v\fR option is specified, \fBdtrace\fR produces a program stability report showing the minimum interface stability and dependency level for the specified D programs. DTrace stability levels are explained in further detail in the \fISolaris Dynamic Tracing Guide\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-V\fR\fR -.ad -.sp .6 -.RS 4n -Report the highest D programming interface version supported by \fBdtrace\fR. The version information is printed to \fBstdout\fR and the \fBdtrace\fR command exits. Refer to the \fISolaris Dynamic Tracing Guide\fR for -more information about DTrace versioning features. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-w\fR\fR -.ad -.sp .6 -.RS 4n -Permit destructive actions in D programs specified using the \fB-s\fR, \fB-P\fR, \fB-m\fR, \fB-f\fR, \fB-n\fR, or \fB-i\fR options. If the \fB-w\fR option is not specified, \fBdtrace\fR does not -permit the compilation or enabling of a D program that contains destructive actions. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-x\fR \fIarg\fR [\fI=val\fR]\fR -.ad -.sp .6 -.RS 4n -Enable or modify a DTrace runtime option or D compiler option. The list of options is found in the \fISolaris Dynamic Tracing Guide\fR. Boolean options are enabled by specifying their name. Options with values are set by separating the option name and -value with an equals sign (\fB=\fR). -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-X\fR \fBa | c | s | t\fR\fR -.ad -.sp .6 -.RS 4n -Specify the degree of conformance to the ISO C standard that should be selected when invoking \fBcpp\fR(1) (enabled using the \fB-C\fR option). -The \fB-X\fR option argument affects the value and presence of the \fB__STDC__\fR macro depending upon the value of the argument letter. -.sp -The \fB-X\fR option supports the following arguments: -.sp -.ne 2 -.mk -.na -\fB\fBa\fR\fR -.ad -.RS 5n -.rt -Default. ISO C plus K&R compatibility extensions, with semantic changes required by ISO C. This is the default mode if \fB-X\fR is not specified. The predefined macro \fB__STDC__\fR has a value of 0 when \fBcpp\fR is invoked in conjunction -with the \fB-Xa\fR option. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fBc\fR\fR -.ad -.RS 5n -.rt -Conformance. Strictly conformant ISO C, without K&R C compatibility extensions. The predefined macro \fB__STDC__\fR has a value of 1 when \fBcpp\fR is invoked in conjunction with the \fB-Xc\fR option. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fBs\fR\fR -.ad -.RS 5n -.rt -K&R C only. The macro \fB__STDC__\fR is not defined when \fBcpp\fR is invoked in conjunction with the \fB-Xs\fR option. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fBt\fR\fR -.ad -.RS 5n -.rt -Transition. ISO C plus K&R C compatibility extensions, without semantic changes required by ISO C. The predefined macro \fB__STDC__\fR has a value of 0 when \fBcpp\fR is invoked in conjunction with the \fB-Xt\fR option. -.RE - -As the \fB-X\fR option only affects how the D compiler invokes the C preprocessor, the \fB-Xa\fR and \fB-Xt\fR options are equivalent from the perspective of D and both are provided only to ease re-use of settings from a C build environment. -.sp -Regardless of the \fB-X\fR mode, the following additional C preprocessor definitions are always specified and valid in all modes: -.RS +4 -.TP -.ie t \(bu -.el o -\fB__sun\fR -.RE -.RS +4 -.TP -.ie t \(bu -.el o -\fB__unix\fR -.RE -.RS +4 -.TP -.ie t \(bu -.el o -\fB__SVR4\fR -.RE -.RS +4 -.TP -.ie t \(bu -.el o -\fB__sparc\fR (on SPARC systems only) -.RE -.RS +4 -.TP -.ie t \(bu -.el o -\fB__sparcv9\fR (on SPARC systems only when 64-bit programs are compiled) -.RE -.RS +4 -.TP -.ie t \(bu -.el o -\fB__i386\fR (on x86 systems only when 32-bit programs are compiled) -.RE -.RS +4 -.TP -.ie t \(bu -.el o -\fB__amd64\fR (on x86 systems only when 64-bit programs are compiled) -.RE -.RS +4 -.TP -.ie t \(bu -.el o -\fB__\fI`uname -s`\fR_\fI`uname -r`\fR\fR (for example, \fB__SunOS_5_10\fR) -.RE -.RS +4 -.TP -.ie t \(bu -.el o -\fB__SUNW_D=1\fR -.RE -.RS +4 -.TP -.ie t \(bu -.el o -\fB__SUNW_D_VERSION=0x\fIMMmmmuuu\fR\fR -.sp -Where \fIMM\fR is the major release value in hexadecimal, \fImmm\fR is the minor release value in hexadecimal, and \fIuuu\fR is the -micro release value in hexadecimal. Refer to the \fISolaris Dynamic Tracing Guide\fR for more information about DTrace versioning. -.RE -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-Z\fR\fR -.ad -.sp .6 -.RS 4n -Permit probe descriptions that match zero probes. If the \fB-Z\fR option is not specified, \fBdtrace\fR reports an error and exits if any probe descriptions specified in D program files (\fB-s\fR option) or on the command line (\fB-P\fR, \fB-m\fR, \fB-f\fR, \fB-n\fR, or \fB-i\fR options) contain descriptions that do not match any known probes. -.RE - -.SH OPERANDS -.sp -.LP -You can specify zero or more additional arguments on the \fBdtrace\fR command line to define a set of macro variables (\fB$1\fR, \fB$2\fR, and so forth). The additional arguments can be used in D programs specified using the \fB-s\fR option -or on the command line. The use of macro variables is described further in the \fISolaris Dynamic Tracing Guide\fR. -.SH EXIT STATUS -.sp -.LP -The following exit values are returned: -.sp -.ne 2 -.mk -.na -\fB0\fR -.ad -.RS 5n -.rt -Successful completion. -.sp -For D program requests, an exit status of \fB0\fR indicates that programs were successfully compiled, probes were successfully enabled, or anonymous state was successfully retrieved. \fBdtrace\fR returns \fB0\fR even if the specified tracing requests -encountered errors or drops. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB1\fR\fR -.ad -.RS 5n -.rt +.Bl -tag -width indent +.It Fl 32 | Fl 64 +The D compiler produces programs using the native data model of the operating +system kernel. +If the +.Fl 32 +option is specified, +.Nm +forces the D compiler to compile a D program using the 32-bit data model. +If the +.Fl 64 +option is specified, +.Nm +forces the D compiler to compile a D program using the 64-bit data model. +These options are typically not required as +.Nm +selects the native data model as the default. +The data model affects the sizes of integer types and other language properties. +D programs compiled for either data model can be executed on both 32-bit and +64-bit kernels. +The +.Fl 32 +and +.Fl 64 +options also determine the +.Xr elf 5 +file format (ELF32 or ELF64) produced by the +.Fl G +option. +.It Fl a +Claim anonymous tracing state and display the traced data. +You can combine the +.Fl a +option with the +.Fl e +option to force +.Nm +to exit immediately after consuming the anonymous tracing state rather than +continuing to wait for new data. +.It Fl A +Generate directives for anonymous tracing and write them to +.Pa /boot/dtrace.dof . +This option constructs a set of dtrace configuration file directives to enable +the specified probes for anonymous tracing and then exits. +By default, +.Nm +attempts to store the directives to the file +.Pa /boot/dtrace.dof . +This behavior can be modified using the +.Fl o +option to specify an alternate output file. +.It Fl b Ar bufsz +Set the principal trace buffer size to +.Ar bufsz . +The trace buffer size can include any of the size suffixes k, m, g, or t. +If the buffer space cannot be allocated, +.Nm dtrace +attempts to reduce the buffer size or exit depending on the setting of the +bufresize property. +.It Fl c Ar cmd +Run the specified command +.Ar cmd +and exit upon its completion. +If more than one +.Fl c +option is present on the command line, +.Nm dtrace +exits when all commands have exited, reporting the exit status for each child +process as it terminates. +The process ID of the first command is made available to any D programs +specified on the command line or using the +.Fl s +option through the +.Li $target +macro variable. +.It Fl C +Run the C preprocessor +.Xr cpp 1 +over D programs before compiling them. +You can pass options to the C preprocessor using the +.Fl D , +.Fl U , +.Fl I , +and +.Fl H +options. +You can select the degree of C standard conformance if you use the +.Fl X +option. +For a description of the set of tokens defined by the D compiler when invoking +the C preprocessor, see +.Fl X . +.It Fl D Ar name Op Ns = Ns value +Define +.Ar name +when invoking +.Xr cpp 1 +(enabled using the +.Fl C +option). +If you specify an additional +.Ar value , +the name is assigned the corresponding value. +This option passes the +.Fl D +option to each +.Xr cpp 1 +invocation. +.It Fl e +Exit after compiling any requests and consuming anonymous tracing state +.Fl ( a +option) but prior to enabling any probes. +You can combine this option with the +.Fl a +option to print anonymous tracing data and exit. +You can also combine this option with D compiler options. +This combination verifies that the programs compile without actually executing +them and enabling the corresponding instrumentation. +.It Fl f Oo Oo Ar provider : Oc Ar module : Oc Ar function Oo Oo Ar predicate \ + Oc Ar action Oc +Specify function name to trace or list +.Fl ( l +option). +The corresponding argument can include any of the probe description forms +.Ar provider:module:function , +.Ar module:function , +or +.Ar function . +Unspecified probe description fields are left blank and match any probes +regardless of the values in those fields. +If no qualifiers other than +.Ar function +are specified in the description, all probes with the corresponding +.Ar function +are matched. +The +.Fl f +argument can be suffixed with an optional D probe clause. +You can specify more than one +.Fl f +option on the command line at a time. +.It Fl F +Coalesce trace output by identifying function entry and return. +Function entry probe reports are indented and their output is prefixed with +.Ql -> . +Function return probe reports are unindented and their output is prefixed with +.Ql <- . +System call entry probe reports are indented and their output is prefixed with +.Ql => . +System call return probe reports are unindented and their output is prefixed +with +.Ql <= . +.It Fl G +Generate an ELF file containing an embedded DTrace program. +The DTrace probes specified in the program are saved inside of a relocatable ELF +object which can be linked into another program. +If the +.Fl o +option is present, the ELF file is saved using the pathname specified as the +argument for this operand. +If the +.Fl o +option is not present and the DTrace program is contained with a file whose name +is +.Ar filename.d , +then the ELF file is saved using the name +.Ar filename.o . +Otherwise the ELF file is saved using the name d.out. +.It Fl h +Generate a header file containing macros that correspond to probes in the +specified provider definitions. +This option should be used to generate a header file that is included by other +source files for later use with the +.It Fl H +Print the pathnames of included files when invoking +.Xr cpp 1 +(enabled using the +.Fl C +option). +This option passes the +.Fl H +option to each +.Xr cpp 1 +invocation, causing it to display the list of pathnames, one for each line, to +standard error. +.Fl G +option. +If the +.Fl o +option +is present, the header file is saved using the pathname specified as the +argument for that option. *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Sat Oct 12 18:24:53 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 76FF4588; Sat, 12 Oct 2013 18:24:53 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 551DF2A9F; Sat, 12 Oct 2013 18:24:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9CIOrc8079235; Sat, 12 Oct 2013 18:24:53 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9CIOq66079232; Sat, 12 Oct 2013 18:24:52 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201310121824.r9CIOq66079232@svn.freebsd.org> From: Alexander Motin Date: Sat, 12 Oct 2013 18:24:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256388 - projects/camlock/sys/dev/ahci X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Oct 2013 18:24:53 -0000 Author: mav Date: Sat Oct 12 18:24:52 2013 New Revision: 256388 URL: http://svnweb.freebsd.org/changeset/base/256388 Log: Set of optimizations for ahci(4), respecting CAM improvements: - Add tunable hint.ahci.X.direct to control when to use direct request completion and when prefer to use CAM threads. Set default based on number of supported MSI vectors and implemented ports. - Move heavy AHCI_P_IS read out of the lock to reduce its scope. This reduces lock congestion spinning under high IOPS from 10% to almost zero. - Create several optimized interrupt handlers for different configurations to avoid unneeded branching there at run time. At this point I can totally max out 6 SSDs on ICH10 AHCI doing 640K IOPS, while having only 30% of CPU load on 2x6x2 CPU Xeon E5645 system. Modified: projects/camlock/sys/dev/ahci/ahci.c projects/camlock/sys/dev/ahci/ahci.h Modified: projects/camlock/sys/dev/ahci/ahci.c ============================================================================== --- projects/camlock/sys/dev/ahci/ahci.c Sat Oct 12 17:46:13 2013 (r256387) +++ projects/camlock/sys/dev/ahci/ahci.c Sat Oct 12 18:24:52 2013 (r256388) @@ -55,6 +55,7 @@ __FBSDID("$FreeBSD$"); static int ahci_setup_interrupt(device_t dev); static void ahci_intr(void *data); static void ahci_intr_one(void *data); +static void ahci_intr_one_edge(void *data); static int ahci_suspend(device_t dev); static int ahci_resume(device_t dev); static int ahci_ch_init(device_t dev); @@ -62,8 +63,9 @@ static int ahci_ch_deinit(device_t dev); static int ahci_ch_suspend(device_t dev); static int ahci_ch_resume(device_t dev); static void ahci_ch_pm(void *arg); -static void ahci_ch_intr_locked(void *data); -static void ahci_ch_intr(void *data); +static void ahci_ch_intr(void *arg); +static void ahci_ch_intr_direct(void *arg); +static void ahci_ch_intr_main(struct ahci_channel *ch, uint32_t istatus); static int ahci_ctlr_reset(device_t dev); static int ahci_ctlr_setup(device_t dev); static void ahci_begin_transaction(device_t dev, union ccb *ccb); @@ -397,6 +399,7 @@ ahci_attach(device_t dev) struct ahci_controller *ctlr = device_get_softc(dev); device_t child; int error, unit, speed, i; + u_int u; uint32_t devid = pci_get_devid(dev); uint8_t revid = pci_get_revid(dev); u_int32_t version; @@ -496,6 +499,12 @@ ahci_attach(device_t dev) rman_fini(&ctlr->sc_iomem); return ENXIO; } + i = 0; + for (u = ctlr->ichannels; u != 0; u >>= 1) + i += (u & 1); + ctlr->direct = (ctlr->msi && (ctlr->numirqs > 1 || i <= 3)); + resource_int_value(device_get_name(dev), device_get_unit(dev), + "direct", &ctlr->direct); /* Announce HW capabilities. */ speed = (ctlr->caps & AHCI_CAP_ISS) >> AHCI_CAP_ISS_SHIFT; device_printf(dev, @@ -677,24 +686,26 @@ static int ahci_setup_interrupt(device_t dev) { struct ahci_controller *ctlr = device_get_softc(dev); - int i, msi = 2; + int i; + ctlr->msi = 2; /* Process hints. */ if (ctlr->quirks & AHCI_Q_NOMSI) - msi = 0; + ctlr->msi = 0; resource_int_value(device_get_name(dev), - device_get_unit(dev), "msi", &msi); - if (msi < 0) - msi = 0; - else if (msi == 1) - msi = min(1, pci_msi_count(dev)); - else if (msi > 1) - msi = pci_msi_count(dev); + device_get_unit(dev), "msi", &ctlr->msi); + ctlr->numirqs = 1; + if (ctlr->msi < 0) + ctlr->msi = 0; + else if (ctlr->msi == 1) + ctlr->msi = min(1, pci_msi_count(dev)); + else if (ctlr->msi > 1) { + ctlr->msi = 2; + ctlr->numirqs = pci_msi_count(dev); + } /* Allocate MSI if needed/present. */ - if (msi && pci_alloc_msi(dev, &msi) == 0) { - ctlr->numirqs = msi; - } else { - msi = 0; + if (ctlr->msi && pci_alloc_msi(dev, &ctlr->numirqs) != 0) { + ctlr->msi = 0; ctlr->numirqs = 1; } /* Check for single MSI vector fallback. */ @@ -706,7 +717,7 @@ ahci_setup_interrupt(device_t dev) /* Allocate all IRQs. */ for (i = 0; i < ctlr->numirqs; i++) { ctlr->irqs[i].ctlr = ctlr; - ctlr->irqs[i].r_irq_rid = i + (msi ? 1 : 0); + ctlr->irqs[i].r_irq_rid = i + (ctlr->msi ? 1 : 0); if (ctlr->numirqs == 1 || i >= ctlr->channels || (ctlr->ccc && i == ctlr->cccv)) ctlr->irqs[i].mode = AHCI_IRQ_MODE_ALL; @@ -720,7 +731,9 @@ ahci_setup_interrupt(device_t dev) return ENXIO; } if ((bus_setup_intr(dev, ctlr->irqs[i].r_irq, ATA_INTR_FLAGS, NULL, - (ctlr->irqs[i].mode == AHCI_IRQ_MODE_ONE) ? ahci_intr_one : ahci_intr, + (ctlr->irqs[i].mode != AHCI_IRQ_MODE_ONE) ? ahci_intr : + ((ctlr->quirks & AHCI_Q_EDGEIS) ? ahci_intr_one_edge : + ahci_intr_one), &ctlr->irqs[i], &ctlr->irqs[i].handle))) { /* SOS XXX release r_irq */ device_printf(dev, "unable to setup interrupt\n"); @@ -789,14 +802,25 @@ ahci_intr_one(void *data) int unit; unit = irq->r_irq_rid - 1; - /* Some controllers have edge triggered IS. */ - if (ctlr->quirks & AHCI_Q_EDGEIS) - ATA_OUTL(ctlr->r_mem, AHCI_IS, 1 << unit); if ((arg = ctlr->interrupt[unit].argument)) ctlr->interrupt[unit].function(arg); /* AHCI declares level triggered IS. */ - if (!(ctlr->quirks & AHCI_Q_EDGEIS)) - ATA_OUTL(ctlr->r_mem, AHCI_IS, 1 << unit); + ATA_OUTL(ctlr->r_mem, AHCI_IS, 1 << unit); +} + +static void +ahci_intr_one_edge(void *data) +{ + struct ahci_controller_irq *irq = data; + struct ahci_controller *ctlr = irq->ctlr; + void *arg; + int unit; + + unit = irq->r_irq_rid - 1; + /* Some controllers have edge triggered IS. */ + ATA_OUTL(ctlr->r_mem, AHCI_IS, 1 << unit); + if ((arg = ctlr->interrupt[unit].argument)) + ctlr->interrupt[unit].function(arg); } static struct resource * @@ -1046,7 +1070,8 @@ ahci_ch_attach(device_t dev) goto err0; } if ((bus_setup_intr(dev, ch->r_irq, ATA_INTR_FLAGS, NULL, - ahci_ch_intr_locked, dev, &ch->ih))) { + ctlr->direct ? ahci_ch_intr_direct : ahci_ch_intr, + dev, &ch->ih))) { device_printf(dev, "Unable to setup interrupt\n"); error = ENXIO; goto err1; @@ -1480,15 +1505,38 @@ ahci_done(struct ahci_channel *ch, union } static void -ahci_ch_intr_locked(void *data) +ahci_ch_intr(void *arg) +{ + device_t dev = (device_t)arg; + struct ahci_channel *ch = device_get_softc(dev); + uint32_t istatus; + + /* Read interrupt statuses. */ + istatus = ATA_INL(ch->r_mem, AHCI_P_IS); + if (istatus == 0) + return; + + mtx_lock(&ch->mtx); + ahci_ch_intr_main(ch, istatus); + mtx_unlock(&ch->mtx); +} + +static void +ahci_ch_intr_direct(void *arg) { - device_t dev = (device_t)data; + device_t dev = (device_t)arg; struct ahci_channel *ch = device_get_softc(dev); struct ccb_hdr *ccb_h; + uint32_t istatus; + + /* Read interrupt statuses. */ + istatus = ATA_INL(ch->r_mem, AHCI_P_IS); + if (istatus == 0) + return; mtx_lock(&ch->mtx); ch->batch = 1; - ahci_ch_intr(data); + ahci_ch_intr_main(ch, istatus); ch->batch = 0; mtx_unlock(&ch->mtx); while ((ccb_h = STAILQ_FIRST(&ch->doneq)) != NULL) { @@ -1515,18 +1563,14 @@ ahci_ch_pm(void *arg) } static void -ahci_ch_intr(void *data) +ahci_ch_intr_main(struct ahci_channel *ch, uint32_t istatus) { - device_t dev = (device_t)data; - struct ahci_channel *ch = device_get_softc(dev); - uint32_t istatus, cstatus, serr = 0, sntf = 0, ok, err; + device_t dev = ch->dev; + uint32_t cstatus, serr = 0, sntf = 0, ok, err; enum ahci_err_type et; int i, ccs, port, reset = 0; - /* Read and clear interrupt statuses. */ - istatus = ATA_INL(ch->r_mem, AHCI_P_IS); - if (istatus == 0) - return; + /* Clear interrupt statuses. */ ATA_OUTL(ch->r_mem, AHCI_P_IS, istatus); /* Read command statuses. */ if (ch->numtslots != 0) @@ -3019,8 +3063,12 @@ static void ahcipoll(struct cam_sim *sim) { struct ahci_channel *ch = (struct ahci_channel *)cam_sim_softc(sim); + uint32_t istatus; - ahci_ch_intr(ch->dev); + /* Read interrupt statuses and process if any. */ + istatus = ATA_INL(ch->r_mem, AHCI_P_IS); + if (istatus != 0) + ahci_ch_intr_main(ch, istatus); if (ch->resetting != 0 && (--ch->resetpolldiv <= 0 || !callout_pending(&ch->reset_timer))) { ch->resetpolldiv = 1000; Modified: projects/camlock/sys/dev/ahci/ahci.h ============================================================================== --- projects/camlock/sys/dev/ahci/ahci.h Sat Oct 12 17:46:13 2013 (r256387) +++ projects/camlock/sys/dev/ahci/ahci.h Sat Oct 12 18:24:52 2013 (r256388) @@ -483,6 +483,8 @@ struct ahci_controller { int ichannels; int ccc; /* CCC timeout */ int cccv; /* CCC vector */ + int direct; /* Direct command completion */ + int msi; /* MSI interupts */ struct { void (*function)(void *); void *argument; From owner-svn-src-projects@FreeBSD.ORG Sat Oct 12 22:36:11 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 69E22247; Sat, 12 Oct 2013 22:36:11 +0000 (UTC) (envelope-from bryanv@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5161B245F; Sat, 12 Oct 2013 22:36:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9CMaBnn008536; Sat, 12 Oct 2013 22:36:11 GMT (envelope-from bryanv@svn.freebsd.org) Received: (from bryanv@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9CMa7Rm008503; Sat, 12 Oct 2013 22:36:07 GMT (envelope-from bryanv@svn.freebsd.org) Message-Id: <201310122236.r9CMa7Rm008503@svn.freebsd.org> From: Bryan Venteicher Date: Sat, 12 Oct 2013 22:36:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256394 - in projects/virtio: . bin bin/chflags bin/dd bin/freebsd-version bin/ls bin/pkill bin/ps bin/sh cddl/contrib/opensolaris/cmd/dtrace cddl/contrib/opensolaris/cmd/zfs cddl/contr... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Oct 2013 22:36:11 -0000 Author: bryanv Date: Sat Oct 12 22:36:01 2013 New Revision: 256394 URL: http://svnweb.freebsd.org/changeset/base/256394 Log: IFC @ r256393 Added: projects/virtio/bin/freebsd-version/ - copied from r256393, head/bin/freebsd-version/ projects/virtio/cddl/lib/libdtrace/ip.d - copied unchanged from r256393, head/cddl/lib/libdtrace/ip.d projects/virtio/cddl/lib/libdtrace/tcp.d - copied unchanged from r256393, head/cddl/lib/libdtrace/tcp.d projects/virtio/cddl/lib/libdtrace/udp.d - copied unchanged from r256393, head/cddl/lib/libdtrace/udp.d projects/virtio/contrib/bmake/unit-tests/sunshcmd - copied unchanged from r256393, head/contrib/bmake/unit-tests/sunshcmd projects/virtio/contrib/dialog/package/freebsd/ - copied from r256393, head/contrib/dialog/package/freebsd/ projects/virtio/contrib/dialog/po/fa.po - copied unchanged from r256393, head/contrib/dialog/po/fa.po projects/virtio/contrib/ipfilter/WhatsNew50.txt - copied unchanged from r256393, head/contrib/ipfilter/WhatsNew50.txt projects/virtio/contrib/ipfilter/arc4random.c - copied unchanged from r256393, head/contrib/ipfilter/arc4random.c projects/virtio/contrib/ipfilter/genmask.c - copied unchanged from r256393, head/contrib/ipfilter/genmask.c projects/virtio/contrib/ipfilter/ip_dstlist.c - copied unchanged from r256393, head/contrib/ipfilter/ip_dstlist.c projects/virtio/contrib/ipfilter/ip_dstlist.h - copied unchanged from r256393, head/contrib/ipfilter/ip_dstlist.h projects/virtio/contrib/ipfilter/ip_fil_compat.c - copied unchanged from r256393, head/contrib/ipfilter/ip_fil_compat.c projects/virtio/contrib/ipfilter/ipf_rb.h - copied unchanged from r256393, head/contrib/ipfilter/ipf_rb.h projects/virtio/contrib/ipfilter/lib/allocmbt.c - copied unchanged from r256393, head/contrib/ipfilter/lib/allocmbt.c projects/virtio/contrib/ipfilter/lib/assigndefined.c - copied unchanged from r256393, head/contrib/ipfilter/lib/assigndefined.c projects/virtio/contrib/ipfilter/lib/connecttcp.c - copied unchanged from r256393, head/contrib/ipfilter/lib/connecttcp.c projects/virtio/contrib/ipfilter/lib/dupmbt.c - copied unchanged from r256393, head/contrib/ipfilter/lib/dupmbt.c projects/virtio/contrib/ipfilter/lib/familyname.c - copied unchanged from r256393, head/contrib/ipfilter/lib/familyname.c projects/virtio/contrib/ipfilter/lib/findword.c - copied unchanged from r256393, head/contrib/ipfilter/lib/findword.c projects/virtio/contrib/ipfilter/lib/freembt.c - copied unchanged from r256393, head/contrib/ipfilter/lib/freembt.c projects/virtio/contrib/ipfilter/lib/ftov.c - copied unchanged from r256393, head/contrib/ipfilter/lib/ftov.c projects/virtio/contrib/ipfilter/lib/geticmptype.c - copied unchanged from r256393, head/contrib/ipfilter/lib/geticmptype.c projects/virtio/contrib/ipfilter/lib/icmptypename.c - copied unchanged from r256393, head/contrib/ipfilter/lib/icmptypename.c projects/virtio/contrib/ipfilter/lib/icmptypes.c - copied unchanged from r256393, head/contrib/ipfilter/lib/icmptypes.c projects/virtio/contrib/ipfilter/lib/interror.c - copied unchanged from r256393, head/contrib/ipfilter/lib/interror.c projects/virtio/contrib/ipfilter/lib/ipf_perror.c - copied unchanged from r256393, head/contrib/ipfilter/lib/ipf_perror.c projects/virtio/contrib/ipfilter/lib/load_dstlist.c - copied unchanged from r256393, head/contrib/ipfilter/lib/load_dstlist.c projects/virtio/contrib/ipfilter/lib/load_dstlistnode.c - copied unchanged from r256393, head/contrib/ipfilter/lib/load_dstlistnode.c projects/virtio/contrib/ipfilter/lib/mb_hexdump.c - copied unchanged from r256393, head/contrib/ipfilter/lib/mb_hexdump.c projects/virtio/contrib/ipfilter/lib/msgdsize.c - copied unchanged from r256393, head/contrib/ipfilter/lib/msgdsize.c projects/virtio/contrib/ipfilter/lib/parsefields.c - copied unchanged from r256393, head/contrib/ipfilter/lib/parsefields.c projects/virtio/contrib/ipfilter/lib/parseipfexpr.c - copied unchanged from r256393, head/contrib/ipfilter/lib/parseipfexpr.c projects/virtio/contrib/ipfilter/lib/parsewhoisline.c - copied unchanged from r256393, head/contrib/ipfilter/lib/parsewhoisline.c projects/virtio/contrib/ipfilter/lib/poolio.c - copied unchanged from r256393, head/contrib/ipfilter/lib/poolio.c projects/virtio/contrib/ipfilter/lib/prependmbt.c - copied unchanged from r256393, head/contrib/ipfilter/lib/prependmbt.c projects/virtio/contrib/ipfilter/lib/printactiveaddr.c - copied unchanged from r256393, head/contrib/ipfilter/lib/printactiveaddr.c projects/virtio/contrib/ipfilter/lib/printaddr.c - copied unchanged from r256393, head/contrib/ipfilter/lib/printaddr.c projects/virtio/contrib/ipfilter/lib/printdstl_live.c - copied unchanged from r256393, head/contrib/ipfilter/lib/printdstl_live.c projects/virtio/contrib/ipfilter/lib/printdstlist.c - copied unchanged from r256393, head/contrib/ipfilter/lib/printdstlist.c projects/virtio/contrib/ipfilter/lib/printdstlistdata.c - copied unchanged from r256393, head/contrib/ipfilter/lib/printdstlistdata.c projects/virtio/contrib/ipfilter/lib/printdstlistnode.c - copied unchanged from r256393, head/contrib/ipfilter/lib/printdstlistnode.c projects/virtio/contrib/ipfilter/lib/printdstlistpolicy.c - copied unchanged from r256393, head/contrib/ipfilter/lib/printdstlistpolicy.c projects/virtio/contrib/ipfilter/lib/printfieldhdr.c - copied unchanged from r256393, head/contrib/ipfilter/lib/printfieldhdr.c projects/virtio/contrib/ipfilter/lib/printhost.c - copied unchanged from r256393, head/contrib/ipfilter/lib/printhost.c projects/virtio/contrib/ipfilter/lib/printipfexpr.c - copied unchanged from r256393, head/contrib/ipfilter/lib/printipfexpr.c projects/virtio/contrib/ipfilter/lib/printiphdr.c - copied unchanged from r256393, head/contrib/ipfilter/lib/printiphdr.c projects/virtio/contrib/ipfilter/lib/printlookup.c - copied unchanged from r256393, head/contrib/ipfilter/lib/printlookup.c projects/virtio/contrib/ipfilter/lib/printnataddr.c - copied unchanged from r256393, head/contrib/ipfilter/lib/printnataddr.c projects/virtio/contrib/ipfilter/lib/printnatfield.c - copied unchanged from r256393, head/contrib/ipfilter/lib/printnatfield.c projects/virtio/contrib/ipfilter/lib/printnatside.c - copied unchanged from r256393, head/contrib/ipfilter/lib/printnatside.c projects/virtio/contrib/ipfilter/lib/printpoolfield.c - copied unchanged from r256393, head/contrib/ipfilter/lib/printpoolfield.c projects/virtio/contrib/ipfilter/lib/printstatefields.c - copied unchanged from r256393, head/contrib/ipfilter/lib/printstatefields.c projects/virtio/contrib/ipfilter/lib/printtcpflags.c - copied unchanged from r256393, head/contrib/ipfilter/lib/printtcpflags.c projects/virtio/contrib/ipfilter/lib/printunit.c - copied unchanged from r256393, head/contrib/ipfilter/lib/printunit.c projects/virtio/contrib/ipfilter/lib/save_execute.c - copied unchanged from r256393, head/contrib/ipfilter/lib/save_execute.c projects/virtio/contrib/ipfilter/lib/save_file.c - copied unchanged from r256393, head/contrib/ipfilter/lib/save_file.c projects/virtio/contrib/ipfilter/lib/save_nothing.c - copied unchanged from r256393, head/contrib/ipfilter/lib/save_nothing.c projects/virtio/contrib/ipfilter/lib/save_syslog.c - copied unchanged from r256393, head/contrib/ipfilter/lib/save_syslog.c projects/virtio/contrib/ipfilter/lib/save_v1trap.c - copied unchanged from r256393, head/contrib/ipfilter/lib/save_v1trap.c projects/virtio/contrib/ipfilter/lib/save_v2trap.c - copied unchanged from r256393, head/contrib/ipfilter/lib/save_v2trap.c projects/virtio/contrib/ipfilter/lib/vtof.c - copied unchanged from r256393, head/contrib/ipfilter/lib/vtof.c - copied unchanged from r256393, head/contrib/ipfilter/ml_ipl.c - copied unchanged from r256393, head/contrib/ipfilter/mlfk_ipl.c - copied unchanged from r256393, head/contrib/ipfilter/mli_ipl.c - copied unchanged from r256393, head/contrib/ipfilter/mln_ipl.c projects/virtio/contrib/ipfilter/mln_rule.c - copied unchanged from r256393, head/contrib/ipfilter/mln_rule.c projects/virtio/contrib/ipfilter/mlo_ipl.c - copied unchanged from r256393, head/contrib/ipfilter/mlo_ipl.c projects/virtio/contrib/ipfilter/mlo_rule.c - copied unchanged from r256393, head/contrib/ipfilter/mlo_rule.c - copied unchanged from r256393, head/contrib/ipfilter/mls_ipl.c projects/virtio/contrib/ipfilter/mls_rule.c - copied unchanged from r256393, head/contrib/ipfilter/mls_rule.c projects/virtio/contrib/ipfilter/mlso_rule.c - copied unchanged from r256393, head/contrib/ipfilter/mlso_rule.c projects/virtio/contrib/ipfilter/radix_ipf.c - copied unchanged from r256393, head/contrib/ipfilter/radix_ipf.c projects/virtio/contrib/ipfilter/sys/ - copied from r256393, head/contrib/ipfilter/sys/ projects/virtio/contrib/ipfilter/tools/ipfsyncd.c - copied unchanged from r256393, head/contrib/ipfilter/tools/ipfsyncd.c projects/virtio/contrib/ldns-host/ - copied from r256393, head/contrib/ldns-host/ projects/virtio/contrib/ldns/drill/config.h - copied unchanged from r256393, head/contrib/ldns/drill/config.h projects/virtio/contrib/ldns/drill/drill.1 - copied unchanged from r256393, head/contrib/ldns/drill/drill.1 - copied from r256393, head/contrib/libexecinfo/ projects/virtio/contrib/llvm/tools/lldb/ - copied from r256393, head/contrib/llvm/tools/lldb/ projects/virtio/contrib/openpam/lib/libpam/ - copied from r256393, head/contrib/openpam/lib/libpam/ projects/virtio/contrib/openpam/m4/ - copied from r256393, head/contrib/openpam/m4/ projects/virtio/contrib/openpam/mkpkgng.in - copied unchanged from r256393, head/contrib/openpam/mkpkgng.in projects/virtio/contrib/openpam/t/t_file.c - copied unchanged from r256393, head/contrib/openpam/t/t_file.c projects/virtio/contrib/openpam/test-driver - copied unchanged from r256393, head/contrib/openpam/test-driver projects/virtio/contrib/unbound/config.h - copied unchanged from r256393, head/contrib/unbound/config.h projects/virtio/contrib/unbound/doc/libunbound.3 - copied unchanged from r256393, head/contrib/unbound/doc/libunbound.3 projects/virtio/contrib/unbound/doc/unbound-anchor.8 - copied unchanged from r256393, head/contrib/unbound/doc/unbound-anchor.8 projects/virtio/contrib/unbound/doc/unbound-checkconf.8 - copied unchanged from r256393, head/contrib/unbound/doc/unbound-checkconf.8 projects/virtio/contrib/unbound/doc/unbound-control.8 - copied unchanged from r256393, head/contrib/unbound/doc/unbound-control.8 projects/virtio/contrib/unbound/doc/unbound.8 - copied unchanged from r256393, head/contrib/unbound/doc/unbound.8 projects/virtio/contrib/unbound/doc/unbound.conf.5 - copied unchanged from r256393, head/contrib/unbound/doc/unbound.conf.5 projects/virtio/contrib/unbound/freebsd-configure.sh - copied unchanged from r256393, head/contrib/unbound/freebsd-configure.sh projects/virtio/contrib/unbound/freebsd-sources.pl - copied unchanged from r256393, head/contrib/unbound/freebsd-sources.pl projects/virtio/contrib/unbound/libunbound/worker.h - copied unchanged from r256393, head/contrib/unbound/libunbound/worker.h projects/virtio/contrib/unbound/smallapp/unbound-control-setup.sh.in - copied unchanged from r256393, head/contrib/unbound/smallapp/unbound-control-setup.sh.in projects/virtio/crypto/openssh/Makefile.in - copied unchanged from r256393, head/crypto/openssh/Makefile.in projects/virtio/crypto/openssh/buildpkg.sh.in - copied unchanged from r256393, head/crypto/openssh/buildpkg.sh.in projects/virtio/crypto/openssh/config.sub - copied unchanged from r256393, head/crypto/openssh/config.sub projects/virtio/crypto/openssh/configure - copied unchanged from r256393, head/crypto/openssh/configure projects/virtio/crypto/openssh/configure.ac - copied unchanged from r256393, head/crypto/openssh/configure.ac projects/virtio/crypto/openssh/contrib/ - copied from r256393, head/crypto/openssh/contrib/ projects/virtio/crypto/openssh/fixalgorithms - copied unchanged from r256393, head/crypto/openssh/fixalgorithms projects/virtio/crypto/openssh/freebsd-configure.sh - copied unchanged from r256393, head/crypto/openssh/freebsd-configure.sh projects/virtio/crypto/openssh/install-sh - copied unchanged from r256393, head/crypto/openssh/install-sh projects/virtio/crypto/openssh/krb5_config.h - copied unchanged from r256393, head/crypto/openssh/krb5_config.h projects/virtio/crypto/openssh/mdoc2man.awk - copied unchanged from r256393, head/crypto/openssh/mdoc2man.awk projects/virtio/crypto/openssh/moduli.0 - copied unchanged from r256393, head/crypto/openssh/moduli.0 projects/virtio/crypto/openssh/nchan.ms - copied unchanged from r256393, head/crypto/openssh/nchan.ms projects/virtio/crypto/openssh/nchan2.ms - copied unchanged from r256393, head/crypto/openssh/nchan2.ms projects/virtio/crypto/openssh/openbsd-compat/Makefile.in - copied unchanged from r256393, head/crypto/openssh/openbsd-compat/Makefile.in projects/virtio/crypto/openssh/openbsd-compat/getopt.h - copied unchanged from r256393, head/crypto/openssh/openbsd-compat/getopt.h projects/virtio/crypto/openssh/openbsd-compat/getopt_long.c - copied unchanged from r256393, head/crypto/openssh/openbsd-compat/getopt_long.c projects/virtio/crypto/openssh/openbsd-compat/getrrsetbyname-ldns.c - copied unchanged from r256393, head/crypto/openssh/openbsd-compat/getrrsetbyname-ldns.c projects/virtio/crypto/openssh/openbsd-compat/regress/ - copied from r256393, head/crypto/openssh/openbsd-compat/regress/ projects/virtio/crypto/openssh/openbsd-compat/strnlen.c - copied unchanged from r256393, head/crypto/openssh/openbsd-compat/strnlen.c projects/virtio/crypto/openssh/openssh.xml.in - copied unchanged from r256393, head/crypto/openssh/openssh.xml.in projects/virtio/crypto/openssh/opensshd.init.in - copied unchanged from r256393, head/crypto/openssh/opensshd.init.in projects/virtio/crypto/openssh/regress/ - copied from r256393, head/crypto/openssh/regress/ projects/virtio/crypto/openssh/sandbox-seccomp-filter.c - copied unchanged from r256393, head/crypto/openssh/sandbox-seccomp-filter.c projects/virtio/crypto/openssh/scp.0 - copied unchanged from r256393, head/crypto/openssh/scp.0 projects/virtio/crypto/openssh/sftp-server.0 - copied unchanged from r256393, head/crypto/openssh/sftp-server.0 projects/virtio/crypto/openssh/sftp.0 - copied unchanged from r256393, head/crypto/openssh/sftp.0 projects/virtio/crypto/openssh/ssh-add.0 - copied unchanged from r256393, head/crypto/openssh/ssh-add.0 projects/virtio/crypto/openssh/ssh-agent.0 - copied unchanged from r256393, head/crypto/openssh/ssh-agent.0 projects/virtio/crypto/openssh/ssh-keygen.0 - copied unchanged from r256393, head/crypto/openssh/ssh-keygen.0 projects/virtio/crypto/openssh/ssh-keyscan.0 - copied unchanged from r256393, head/crypto/openssh/ssh-keyscan.0 projects/virtio/crypto/openssh/ssh-keysign.0 - copied unchanged from r256393, head/crypto/openssh/ssh-keysign.0 projects/virtio/crypto/openssh/ssh-pkcs11-helper.0 - copied unchanged from r256393, head/crypto/openssh/ssh-pkcs11-helper.0 projects/virtio/crypto/openssh/ssh.0 - copied unchanged from r256393, head/crypto/openssh/ssh.0 projects/virtio/crypto/openssh/ssh_config.0 - copied unchanged from r256393, head/crypto/openssh/ssh_config.0 projects/virtio/crypto/openssh/sshd.0 - copied unchanged from r256393, head/crypto/openssh/sshd.0 projects/virtio/crypto/openssh/sshd_config.0 - copied unchanged from r256393, head/crypto/openssh/sshd_config.0 projects/virtio/crypto/openssh/survey.sh.in - copied unchanged from r256393, head/crypto/openssh/survey.sh.in projects/virtio/etc/libmap32.conf - copied unchanged from r256393, head/etc/libmap32.conf projects/virtio/etc/periodic/monthly/450.status-security - copied unchanged from r256393, head/etc/periodic/monthly/450.status-security projects/virtio/etc/periodic/weekly/450.status-security - copied unchanged from r256393, head/etc/periodic/weekly/450.status-security projects/virtio/etc/rc.d/ctld - copied unchanged from r256393, head/etc/rc.d/ctld projects/virtio/etc/rc.d/iscsictl - copied unchanged from r256393, head/etc/rc.d/iscsictl projects/virtio/etc/rc.d/iscsid - copied unchanged from r256393, head/etc/rc.d/iscsid projects/virtio/etc/rc.d/local_unbound - copied unchanged from r256393, head/etc/rc.d/local_unbound projects/virtio/gnu/usr.bin/cc/include/__wmmintrin_aes.h - copied unchanged from r256393, head/gnu/usr.bin/cc/include/__wmmintrin_aes.h projects/virtio/gnu/usr.bin/cc/include/__wmmintrin_pclmul.h - copied unchanged from r256393, head/gnu/usr.bin/cc/include/__wmmintrin_pclmul.h projects/virtio/include/mk-osreldate.sh - copied unchanged from r256393, head/include/mk-osreldate.sh projects/virtio/lib/clang/liblldb/ - copied from r256393, head/lib/clang/liblldb/ projects/virtio/lib/clang/liblldbAPI/ - copied from r256393, head/lib/clang/liblldbAPI/ projects/virtio/lib/clang/liblldbBreakpoint/ - copied from r256393, head/lib/clang/liblldbBreakpoint/ projects/virtio/lib/clang/liblldbCommands/ - copied from r256393, head/lib/clang/liblldbCommands/ projects/virtio/lib/clang/liblldbCore/ - copied from r256393, head/lib/clang/liblldbCore/ projects/virtio/lib/clang/liblldbDataFormatters/ - copied from r256393, head/lib/clang/liblldbDataFormatters/ projects/virtio/lib/clang/liblldbExpression/ - copied from r256393, head/lib/clang/liblldbExpression/ projects/virtio/lib/clang/liblldbHostCommon/ - copied from r256393, head/lib/clang/liblldbHostCommon/ projects/virtio/lib/clang/liblldbHostFreeBSD/ - copied from r256393, head/lib/clang/liblldbHostFreeBSD/ projects/virtio/lib/clang/liblldbInterpreter/ - copied from r256393, head/lib/clang/liblldbInterpreter/ projects/virtio/lib/clang/liblldbPluginABISysV_x86_64/ - copied from r256393, head/lib/clang/liblldbPluginABISysV_x86_64/ projects/virtio/lib/clang/liblldbPluginCXXItaniumABI/ - copied from r256393, head/lib/clang/liblldbPluginCXXItaniumABI/ projects/virtio/lib/clang/liblldbPluginDisassemblerLLVM/ - copied from r256393, head/lib/clang/liblldbPluginDisassemblerLLVM/ projects/virtio/lib/clang/liblldbPluginDynamicLoaderPosixDYLD/ - copied from r256393, head/lib/clang/liblldbPluginDynamicLoaderPosixDYLD/ projects/virtio/lib/clang/liblldbPluginDynamicLoaderStatic/ - copied from r256393, head/lib/clang/liblldbPluginDynamicLoaderStatic/ projects/virtio/lib/clang/liblldbPluginInstructionARM/ - copied from r256393, head/lib/clang/liblldbPluginInstructionARM/ projects/virtio/lib/clang/liblldbPluginObjectContainerBSDArchive/ - copied from r256393, head/lib/clang/liblldbPluginObjectContainerBSDArchive/ projects/virtio/lib/clang/liblldbPluginObjectFileELF/ - copied from r256393, head/lib/clang/liblldbPluginObjectFileELF/ projects/virtio/lib/clang/liblldbPluginPlatformFreeBSD/ - copied from r256393, head/lib/clang/liblldbPluginPlatformFreeBSD/ projects/virtio/lib/clang/liblldbPluginPlatformGDB/ - copied from r256393, head/lib/clang/liblldbPluginPlatformGDB/ projects/virtio/lib/clang/liblldbPluginProcessElfCore/ - copied from r256393, head/lib/clang/liblldbPluginProcessElfCore/ projects/virtio/lib/clang/liblldbPluginProcessFreeBSD/ - copied from r256393, head/lib/clang/liblldbPluginProcessFreeBSD/ projects/virtio/lib/clang/liblldbPluginProcessGDBRemote/ - copied from r256393, head/lib/clang/liblldbPluginProcessGDBRemote/ projects/virtio/lib/clang/liblldbPluginProcessPOSIX/ - copied from r256393, head/lib/clang/liblldbPluginProcessPOSIX/ projects/virtio/lib/clang/liblldbPluginProcessUtility/ - copied from r256393, head/lib/clang/liblldbPluginProcessUtility/ projects/virtio/lib/clang/liblldbPluginSymbolFileDWARF/ - copied from r256393, head/lib/clang/liblldbPluginSymbolFileDWARF/ projects/virtio/lib/clang/liblldbPluginSymbolFileSymtab/ - copied from r256393, head/lib/clang/liblldbPluginSymbolFileSymtab/ projects/virtio/lib/clang/liblldbPluginSymbolVendorELF/ - copied from r256393, head/lib/clang/liblldbPluginSymbolVendorELF/ projects/virtio/lib/clang/liblldbPluginUnwindAssemblyInstEmulation/ - copied from r256393, head/lib/clang/liblldbPluginUnwindAssemblyInstEmulation/ projects/virtio/lib/clang/liblldbPluginUnwindAssemblyX86/ - copied from r256393, head/lib/clang/liblldbPluginUnwindAssemblyX86/ projects/virtio/lib/clang/liblldbSymbol/ - copied from r256393, head/lib/clang/liblldbSymbol/ projects/virtio/lib/clang/liblldbTarget/ - copied from r256393, head/lib/clang/liblldbTarget/ projects/virtio/lib/clang/liblldbUtility/ - copied from r256393, head/lib/clang/liblldbUtility/ projects/virtio/lib/clang/lldb.lib.mk - copied unchanged from r256393, head/lib/clang/lldb.lib.mk projects/virtio/lib/libc/capability/ - copied from r256393, head/lib/libc/capability/ projects/virtio/lib/libc/gen/dup3.3 - copied unchanged from r256393, head/lib/libc/gen/dup3.3 projects/virtio/lib/libc/gen/dup3.c - copied unchanged from r256393, head/lib/libc/gen/dup3.c projects/virtio/lib/libc/include/errlst.h - copied unchanged from r256393, head/lib/libc/include/errlst.h projects/virtio/lib/libc/sys/procctl.2 - copied unchanged from r256393, head/lib/libc/sys/procctl.2 projects/virtio/lib/libexecinfo/ - copied from r256393, head/lib/libexecinfo/ projects/virtio/lib/libiconv_compat/ - copied from r256393, head/lib/libiconv_compat/ projects/virtio/lib/libunbound/ - copied from r256393, head/lib/libunbound/ projects/virtio/lib/msun/src/imprecise.c - copied unchanged from r256393, head/lib/msun/src/imprecise.c projects/virtio/share/examples/kld/random_adaptor/ - copied from r256393, head/share/examples/kld/random_adaptor/ projects/virtio/share/man/man4/gpio.4 - copied unchanged from r256393, head/share/man/man4/gpio.4 projects/virtio/share/man/man4/procdesc.4 - copied unchanged from r256393, head/share/man/man4/procdesc.4 projects/virtio/share/man/man4/vmx.4 - copied unchanged from r256393, head/share/man/man4/vmx.4 projects/virtio/share/man/man9/VOP_ADVISE.9 - copied unchanged from r256393, head/share/man/man9/VOP_ADVISE.9 projects/virtio/share/man/man9/VOP_ALLOCATE.9 - copied unchanged from r256393, head/share/man/man9/VOP_ALLOCATE.9 projects/virtio/sys/arm/broadcom/bcm2835/bcm2835_gpio.h - copied unchanged from r256393, head/sys/arm/broadcom/bcm2835/bcm2835_gpio.h projects/virtio/sys/arm/conf/DIGI-CCWMX53 - copied unchanged from r256393, head/sys/arm/conf/DIGI-CCWMX53 projects/virtio/sys/arm/freescale/imx/files.imx53 - copied unchanged from r256393, head/sys/arm/freescale/imx/files.imx53 projects/virtio/sys/arm/freescale/imx/imx51_machdep.c - copied unchanged from r256393, head/sys/arm/freescale/imx/imx51_machdep.c projects/virtio/sys/arm/freescale/imx/imx53_machdep.c - copied unchanged from r256393, head/sys/arm/freescale/imx/imx53_machdep.c projects/virtio/sys/arm/freescale/imx/std.imx53 - copied unchanged from r256393, head/sys/arm/freescale/imx/std.imx53 projects/virtio/sys/arm/ti/ti_sdhci.c - copied unchanged from r256393, head/sys/arm/ti/ti_sdhci.c projects/virtio/sys/boot/fdt/dts/digi-ccwmx53.dts - copied unchanged from r256393, head/sys/boot/fdt/dts/digi-ccwmx53.dts projects/virtio/sys/boot/fdt/dts/imx53x.dtsi - copied unchanged from r256393, head/sys/boot/fdt/dts/imx53x.dtsi projects/virtio/sys/cam/ctl/ctl_frontend_iscsi.c - copied unchanged from r256393, head/sys/cam/ctl/ctl_frontend_iscsi.c projects/virtio/sys/cam/ctl/ctl_frontend_iscsi.h - copied unchanged from r256393, head/sys/cam/ctl/ctl_frontend_iscsi.h projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_raidz.h - copied unchanged from r256393, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_raidz.h projects/virtio/sys/compat/freebsd32/freebsd32_capability.c - copied unchanged from r256393, head/sys/compat/freebsd32/freebsd32_capability.c projects/virtio/sys/compat/freebsd32/freebsd32_misc.h - copied unchanged from r256393, head/sys/compat/freebsd32/freebsd32_misc.h projects/virtio/sys/contrib/dev/drm2/ - copied from r256393, head/sys/contrib/dev/drm2/ projects/virtio/sys/contrib/dev/iwn/iwlwifi-2000-18.168.6.1.fw.uu - copied unchanged from r256393, head/sys/contrib/dev/iwn/iwlwifi-2000-18.168.6.1.fw.uu projects/virtio/sys/contrib/ipfilter/netinet/ip_dns_pxy.c - copied unchanged from r256393, head/sys/contrib/ipfilter/netinet/ip_dns_pxy.c projects/virtio/sys/contrib/ipfilter/netinet/ip_dstlist.c - copied unchanged from r256393, head/sys/contrib/ipfilter/netinet/ip_dstlist.c projects/virtio/sys/contrib/ipfilter/netinet/ip_dstlist.h - copied unchanged from r256393, head/sys/contrib/ipfilter/netinet/ip_dstlist.h projects/virtio/sys/contrib/ipfilter/netinet/ip_nat6.c - copied unchanged from r256393, head/sys/contrib/ipfilter/netinet/ip_nat6.c projects/virtio/sys/contrib/ipfilter/netinet/ip_tftp_pxy.c - copied unchanged from r256393, head/sys/contrib/ipfilter/netinet/ip_tftp_pxy.c projects/virtio/sys/contrib/ipfilter/netinet/ipf_rb.h - copied unchanged from r256393, head/sys/contrib/ipfilter/netinet/ipf_rb.h projects/virtio/sys/contrib/ipfilter/netinet/radix_ipf.c - copied unchanged from r256393, head/sys/contrib/ipfilter/netinet/radix_ipf.c projects/virtio/sys/contrib/ipfilter/netinet/radix_ipf.h - copied unchanged from r256393, head/sys/contrib/ipfilter/netinet/radix_ipf.h projects/virtio/sys/crypto/aesni/aesencdec.h - copied unchanged from r256393, head/sys/crypto/aesni/aesencdec.h projects/virtio/sys/dev/bxe/57710_init_values.c - copied unchanged from r256393, head/sys/dev/bxe/57710_init_values.c projects/virtio/sys/dev/bxe/57710_int_offsets.h - copied unchanged from r256393, head/sys/dev/bxe/57710_int_offsets.h projects/virtio/sys/dev/bxe/57711_init_values.c - copied unchanged from r256393, head/sys/dev/bxe/57711_init_values.c projects/virtio/sys/dev/bxe/57711_int_offsets.h - copied unchanged from r256393, head/sys/dev/bxe/57711_int_offsets.h projects/virtio/sys/dev/bxe/57712_init_values.c - copied unchanged from r256393, head/sys/dev/bxe/57712_init_values.c projects/virtio/sys/dev/bxe/57712_int_offsets.h - copied unchanged from r256393, head/sys/dev/bxe/57712_int_offsets.h projects/virtio/sys/dev/bxe/bxe.c - copied unchanged from r256393, head/sys/dev/bxe/bxe.c projects/virtio/sys/dev/bxe/bxe.h - copied unchanged from r256393, head/sys/dev/bxe/bxe.h projects/virtio/sys/dev/bxe/bxe_dcb.h - copied unchanged from r256393, head/sys/dev/bxe/bxe_dcb.h projects/virtio/sys/dev/bxe/bxe_debug.c - copied unchanged from r256393, head/sys/dev/bxe/bxe_debug.c projects/virtio/sys/dev/bxe/bxe_elink.c - copied unchanged from r256393, head/sys/dev/bxe/bxe_elink.c projects/virtio/sys/dev/bxe/bxe_elink.h - copied unchanged from r256393, head/sys/dev/bxe/bxe_elink.h projects/virtio/sys/dev/bxe/bxe_stats.c - copied unchanged from r256393, head/sys/dev/bxe/bxe_stats.c projects/virtio/sys/dev/bxe/bxe_stats.h - copied unchanged from r256393, head/sys/dev/bxe/bxe_stats.h projects/virtio/sys/dev/bxe/ecore_fw_defs.h - copied unchanged from r256393, head/sys/dev/bxe/ecore_fw_defs.h projects/virtio/sys/dev/bxe/ecore_hsi.h - copied unchanged from r256393, head/sys/dev/bxe/ecore_hsi.h projects/virtio/sys/dev/bxe/ecore_init.h - copied unchanged from r256393, head/sys/dev/bxe/ecore_init.h projects/virtio/sys/dev/bxe/ecore_init_ops.h - copied unchanged from r256393, head/sys/dev/bxe/ecore_init_ops.h projects/virtio/sys/dev/bxe/ecore_mfw_req.h - copied unchanged from r256393, head/sys/dev/bxe/ecore_mfw_req.h projects/virtio/sys/dev/bxe/ecore_reg.h - copied unchanged from r256393, head/sys/dev/bxe/ecore_reg.h projects/virtio/sys/dev/bxe/ecore_sp.c - copied unchanged from r256393, head/sys/dev/bxe/ecore_sp.c projects/virtio/sys/dev/bxe/ecore_sp.h - copied unchanged from r256393, head/sys/dev/bxe/ecore_sp.h projects/virtio/sys/dev/drm2/ati_pcigart.c - copied unchanged from r256393, head/sys/dev/drm2/ati_pcigart.c projects/virtio/sys/dev/drm2/drm_buffer.c - copied unchanged from r256393, head/sys/dev/drm2/drm_buffer.c projects/virtio/sys/dev/drm2/drm_buffer.h - copied unchanged from r256393, head/sys/dev/drm2/drm_buffer.h projects/virtio/sys/dev/drm2/drm_core.h - copied unchanged from r256393, head/sys/dev/drm2/drm_core.h projects/virtio/sys/dev/drm2/drm_dp_helper.c - copied unchanged from r256393, head/sys/dev/drm2/drm_dp_helper.c projects/virtio/sys/dev/drm2/drm_fixed.h - copied unchanged from r256393, head/sys/dev/drm2/drm_fixed.h projects/virtio/sys/dev/drm2/drm_os_freebsd.h - copied unchanged from r256393, head/sys/dev/drm2/drm_os_freebsd.h projects/virtio/sys/dev/drm2/radeon/ - copied from r256393, head/sys/dev/drm2/radeon/ projects/virtio/sys/dev/hwpmc/hwpmc_mpc7xxx.c - copied unchanged from r256393, head/sys/dev/hwpmc/hwpmc_mpc7xxx.c projects/virtio/sys/dev/hwpmc/hwpmc_powerpc.h - copied unchanged from r256393, head/sys/dev/hwpmc/hwpmc_powerpc.h - copied from r256393, head/sys/dev/hyperv/ projects/virtio/sys/dev/iscsi/icl.c - copied unchanged from r256393, head/sys/dev/iscsi/icl.c projects/virtio/sys/dev/iscsi/icl.h - copied unchanged from r256393, head/sys/dev/iscsi/icl.h projects/virtio/sys/dev/iscsi/icl_proxy.c - copied unchanged from r256393, head/sys/dev/iscsi/icl_proxy.c projects/virtio/sys/dev/iscsi/iscsi.c - copied unchanged from r256393, head/sys/dev/iscsi/iscsi.c projects/virtio/sys/dev/iscsi/iscsi.h - copied unchanged from r256393, head/sys/dev/iscsi/iscsi.h projects/virtio/sys/dev/iscsi/iscsi_ioctl.h - copied unchanged from r256393, head/sys/dev/iscsi/iscsi_ioctl.h projects/virtio/sys/dev/iscsi/iscsi_proto.h - copied unchanged from r256393, head/sys/dev/iscsi/iscsi_proto.h projects/virtio/sys/dev/iscsi_initiator/ - copied from r256393, head/sys/dev/iscsi_initiator/ projects/virtio/sys/dev/random/dummy_rng.c - copied unchanged from r256393, head/sys/dev/random/dummy_rng.c projects/virtio/sys/dev/random/live_entropy_sources.c - copied unchanged from r256393, head/sys/dev/random/live_entropy_sources.c projects/virtio/sys/dev/random/live_entropy_sources.h - copied unchanged from r256393, head/sys/dev/random/live_entropy_sources.h projects/virtio/sys/dev/random/random_harvestq.c - copied unchanged from r256393, head/sys/dev/random/random_harvestq.c projects/virtio/sys/dev/random/random_harvestq.h - copied unchanged from r256393, head/sys/dev/random/random_harvestq.h projects/virtio/sys/dev/random/rwfile.c - copied unchanged from r256393, head/sys/dev/random/rwfile.c projects/virtio/sys/dev/random/rwfile.h - copied unchanged from r256393, head/sys/dev/random/rwfile.h projects/virtio/sys/dev/uart/uart_dev_ns8250.h - copied unchanged from r256393, head/sys/dev/uart/uart_dev_ns8250.h projects/virtio/sys/dev/uart/uart_dev_ti8250.c - copied unchanged from r256393, head/sys/dev/uart/uart_dev_ti8250.c projects/virtio/sys/dev/vmware/ - copied from r256393, head/sys/dev/vmware/ projects/virtio/sys/dev/xen/timer/ - copied from r256393, head/sys/dev/xen/timer/ projects/virtio/sys/fs/ext2fs/ext2_extents.c - copied unchanged from r256393, head/sys/fs/ext2fs/ext2_extents.c projects/virtio/sys/fs/ext2fs/ext2_extents.h - copied unchanged from r256393, head/sys/fs/ext2fs/ext2_extents.h projects/virtio/sys/kern/subr_capability.c - copied unchanged from r256393, head/sys/kern/subr_capability.c projects/virtio/sys/mips/conf/GXEMUL32 - copied unchanged from r256393, head/sys/mips/conf/GXEMUL32 projects/virtio/sys/mips/conf/PICOSTATION_M2HP - copied unchanged from r256393, head/sys/mips/conf/PICOSTATION_M2HP projects/virtio/sys/mips/conf/PICOSTATION_M2HP.hints - copied unchanged from r256393, head/sys/mips/conf/PICOSTATION_M2HP.hints projects/virtio/sys/mips/conf/WZR-300HP - copied unchanged from r256393, head/sys/mips/conf/WZR-300HP projects/virtio/sys/mips/conf/WZR-300HP.hints - copied unchanged from r256393, head/sys/mips/conf/WZR-300HP.hints projects/virtio/sys/mips/malta/gt_pci_bus_space.c - copied unchanged from r256393, head/sys/mips/malta/gt_pci_bus_space.c projects/virtio/sys/mips/malta/gt_pci_bus_space.h - copied unchanged from r256393, head/sys/mips/malta/gt_pci_bus_space.h projects/virtio/sys/mips/mips/bcopy.S - copied unchanged from r256393, head/sys/mips/mips/bcopy.S projects/virtio/sys/modules/drm2/radeonkms/ - copied from r256393, head/sys/modules/drm2/radeonkms/ projects/virtio/sys/modules/drm2/radeonkmsfw/ - copied from r256393, head/sys/modules/drm2/radeonkmsfw/ - copied from r256393, head/sys/modules/hyperv/ projects/virtio/sys/modules/ibcore/ - copied from r256393, head/sys/modules/ibcore/ projects/virtio/sys/modules/ipoib/ - copied from r256393, head/sys/modules/ipoib/ projects/virtio/sys/modules/iscsi_initiator/ - copied from r256393, head/sys/modules/iscsi_initiator/ projects/virtio/sys/modules/iwnfw/iwn2000/ - copied from r256393, head/sys/modules/iwnfw/iwn2000/ projects/virtio/sys/modules/vmware/ - copied from r256393, head/sys/modules/vmware/ projects/virtio/sys/netinet/in_kdtrace.c - copied unchanged from r256393, head/sys/netinet/in_kdtrace.c projects/virtio/sys/netinet/in_kdtrace.h - copied unchanged from r256393, head/sys/netinet/in_kdtrace.h projects/virtio/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c - copied unchanged from r256393, head/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c projects/virtio/sys/ofed/drivers/infiniband/hw/mlx4/cm.c - copied unchanged from r256393, head/sys/ofed/drivers/infiniband/hw/mlx4/cm.c projects/virtio/sys/ofed/drivers/infiniband/hw/mlx4/mcg.c - copied unchanged from r256393, head/sys/ofed/drivers/infiniband/hw/mlx4/mcg.c projects/virtio/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c - copied unchanged from r256393, head/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c projects/virtio/sys/ofed/drivers/net/mlx4/resource_tracker.c - copied unchanged from r256393, head/sys/ofed/drivers/net/mlx4/resource_tracker.c projects/virtio/sys/ofed/drivers/net/mlx4/sys_tune.c - copied unchanged from r256393, head/sys/ofed/drivers/net/mlx4/sys_tune.c projects/virtio/sys/ofed/include/linux/atomic.h - copied unchanged from r256393, head/sys/ofed/include/linux/atomic.h projects/virtio/sys/ofed/include/linux/clocksource.h - copied unchanged from r256393, head/sys/ofed/include/linux/clocksource.h projects/virtio/sys/ofed/include/rdma/ib_pma.h - copied unchanged from r256393, head/sys/ofed/include/rdma/ib_pma.h projects/virtio/sys/powerpc/pseries/ - copied from r256393, head/sys/powerpc/pseries/ projects/virtio/sys/sys/_unrhdr.h - copied unchanged from r256393, head/sys/sys/_unrhdr.h projects/virtio/sys/sys/caprights.h - copied unchanged from r256393, head/sys/sys/caprights.h projects/virtio/sys/sys/procctl.h - copied unchanged from r256393, head/sys/sys/procctl.h - copied unchanged from r256393, head/sys/x86/include/acpica_machdep.h projects/virtio/sys/x86/xen/ - copied from r256393, head/sys/x86/xen/ projects/virtio/sys/xen/evtchn/evtchnvar.h - copied unchanged from r256393, head/sys/xen/evtchn/evtchnvar.h projects/virtio/sys/xen/xen-os.h - copied unchanged from r256393, head/sys/xen/xen-os.h projects/virtio/tools/build/options/WITHOUT_GNUCXX - copied unchanged from r256393, head/tools/build/options/WITHOUT_GNUCXX projects/virtio/tools/build/options/WITHOUT_ICONV - copied unchanged from r256393, head/tools/build/options/WITHOUT_ICONV projects/virtio/tools/build/options/WITHOUT_LDNS_UTILS - copied unchanged from r256393, head/tools/build/options/WITHOUT_LDNS_UTILS projects/virtio/tools/build/options/WITHOUT_UNBOUND - copied unchanged from r256393, head/tools/build/options/WITHOUT_UNBOUND projects/virtio/tools/build/options/WITH_GCC - copied unchanged from r256393, head/tools/build/options/WITH_GCC projects/virtio/tools/build/options/WITH_GNUCXX - copied unchanged from r256393, head/tools/build/options/WITH_GNUCXX projects/virtio/tools/build/options/WITH_LIBICONV_COMPAT - copied unchanged from r256393, head/tools/build/options/WITH_LIBICONV_COMPAT projects/virtio/tools/build/options/WITH_LLDB - copied unchanged from r256393, head/tools/build/options/WITH_LLDB projects/virtio/tools/build/options/WITH_USB_GADGET_EXAMPLES - copied unchanged from r256393, head/tools/build/options/WITH_USB_GADGET_EXAMPLES projects/virtio/tools/regression/bin/sh/builtins/alias4.0 - copied unchanged from r256393, head/tools/regression/bin/sh/builtins/alias4.0 projects/virtio/tools/regression/bin/sh/builtins/jobid1.0 - copied unchanged from r256393, head/tools/regression/bin/sh/builtins/jobid1.0 projects/virtio/tools/regression/bin/sh/builtins/jobid2.0 - copied unchanged from r256393, head/tools/regression/bin/sh/builtins/jobid2.0 projects/virtio/tools/regression/bin/sh/builtins/local4.0 - copied unchanged from r256393, head/tools/regression/bin/sh/builtins/local4.0 projects/virtio/tools/regression/bin/sh/builtins/return8.0 - copied unchanged from r256393, head/tools/regression/bin/sh/builtins/return8.0 projects/virtio/tools/regression/bin/sh/builtins/type3.0 - copied unchanged from r256393, head/tools/regression/bin/sh/builtins/type3.0 projects/virtio/tools/regression/bin/sh/expansion/arith13.0 - copied unchanged from r256393, head/tools/regression/bin/sh/expansion/arith13.0 projects/virtio/tools/regression/bin/sh/parser/empty-cmd1.0 - copied unchanged from r256393, head/tools/regression/bin/sh/parser/empty-cmd1.0 projects/virtio/tools/regression/bin/sh/parser/only-redir2.0 - copied unchanged from r256393, head/tools/regression/bin/sh/parser/only-redir2.0 projects/virtio/tools/regression/bin/sh/parser/only-redir3.0 - copied unchanged from r256393, head/tools/regression/bin/sh/parser/only-redir3.0 projects/virtio/tools/regression/bin/sh/parser/only-redir4.0 - copied unchanged from r256393, head/tools/regression/bin/sh/parser/only-redir4.0 projects/virtio/tools/regression/file/fcntlflags/ - copied from r256393, head/tools/regression/file/fcntlflags/ projects/virtio/tools/regression/iscsi/ - copied from r256393, head/tools/regression/iscsi/ projects/virtio/tools/regression/lib/libc/stdio/test-fopen.c - copied unchanged from r256393, head/tools/regression/lib/libc/stdio/test-fopen.c projects/virtio/tools/regression/lib/libc/stdio/test-fopen.t - copied unchanged from r256393, head/tools/regression/lib/libc/stdio/test-fopen.t projects/virtio/tools/regression/lib/libc/stdio/test-mkostemp.t - copied unchanged from r256393, head/tools/regression/lib/libc/stdio/test-mkostemp.t projects/virtio/tools/regression/lib/libutil/test-humanize_number.c - copied unchanged from r256393, head/tools/regression/lib/libutil/test-humanize_number.c projects/virtio/tools/regression/lib/libutil/test-humanize_number.t - copied unchanged from r256393, head/tools/regression/lib/libutil/test-humanize_number.t projects/virtio/tools/tools/drm/ - copied from r256393, head/tools/tools/drm/ projects/virtio/usr.bin/calendar/calcpp.c - copied unchanged from r256393, head/usr.bin/calendar/calcpp.c projects/virtio/usr.bin/calendar/calendars/ru_RU.UTF-8/ - copied from r256393, head/usr.bin/calendar/calendars/ru_RU.UTF-8/ projects/virtio/usr.bin/clang/lldb/ - copied from r256393, head/usr.bin/clang/lldb/ projects/virtio/usr.bin/drill/ - copied from r256393, head/usr.bin/drill/ projects/virtio/usr.bin/iscsictl/ - copied from r256393, head/usr.bin/iscsictl/ projects/virtio/usr.bin/protect/ - copied from r256393, head/usr.bin/protect/ projects/virtio/usr.bin/vi/catalog/dutch.UTF-8.base - copied unchanged from r256393, head/usr.bin/vi/catalog/dutch.UTF-8.base projects/virtio/usr.bin/vi/catalog/french.UTF-8.base - copied unchanged from r256393, head/usr.bin/vi/catalog/french.UTF-8.base projects/virtio/usr.bin/vi/catalog/german.UTF-8.base - copied unchanged from r256393, head/usr.bin/vi/catalog/german.UTF-8.base projects/virtio/usr.bin/vi/catalog/polish.UTF-8.base - copied unchanged from r256393, head/usr.bin/vi/catalog/polish.UTF-8.base projects/virtio/usr.bin/vi/catalog/ru_RU.UTF-8.base - copied unchanged from r256393, head/usr.bin/vi/catalog/ru_RU.UTF-8.base projects/virtio/usr.bin/vi/catalog/spanish.UTF-8.base - copied unchanged from r256393, head/usr.bin/vi/catalog/spanish.UTF-8.base projects/virtio/usr.bin/vi/catalog/swedish.UTF-8.base - copied unchanged from r256393, head/usr.bin/vi/catalog/swedish.UTF-8.base projects/virtio/usr.bin/vi/catalog/uk_UA.UTF-8.base - copied unchanged from r256393, head/usr.bin/vi/catalog/uk_UA.UTF-8.base projects/virtio/usr.bin/vi/catalog/zh_CN.UTF-8.base - copied unchanged from r256393, head/usr.bin/vi/catalog/zh_CN.UTF-8.base projects/virtio/usr.sbin/bhyve/ahci.h - copied unchanged from r256393, head/usr.sbin/bhyve/ahci.h projects/virtio/usr.sbin/bhyve/block_if.c - copied unchanged from r256393, head/usr.sbin/bhyve/block_if.c projects/virtio/usr.sbin/bhyve/block_if.h - copied unchanged from r256393, head/usr.sbin/bhyve/block_if.h projects/virtio/usr.sbin/bhyve/pci_ahci.c - copied unchanged from r256393, head/usr.sbin/bhyve/pci_ahci.c projects/virtio/usr.sbin/bsdconfig/examples/browse_packages_ftp.sh - copied unchanged from r256393, head/usr.sbin/bsdconfig/examples/browse_packages_ftp.sh projects/virtio/usr.sbin/bsdconfig/examples/browse_packages_http.sh - copied unchanged from r256393, head/usr.sbin/bsdconfig/examples/browse_packages_http.sh projects/virtio/usr.sbin/bsdconfig/share/keymap.subr - copied unchanged from r256393, head/usr.sbin/bsdconfig/share/keymap.subr projects/virtio/usr.sbin/bsdinstall/scripts/entropy - copied unchanged from r256393, head/usr.sbin/bsdinstall/scripts/entropy projects/virtio/usr.sbin/bsdinstall/scripts/zfsboot - copied unchanged from r256393, head/usr.sbin/bsdinstall/scripts/zfsboot projects/virtio/usr.sbin/ctld/ - copied from r256393, head/usr.sbin/ctld/ projects/virtio/usr.sbin/iscsid/ - copied from r256393, head/usr.sbin/iscsid/ projects/virtio/usr.sbin/unbound/ - copied from r256393, head/usr.sbin/unbound/ Directory Properties: projects/virtio/contrib/ipfilter/ml_ipl.c (props changed) projects/virtio/contrib/ipfilter/mlfk_ipl.c (props changed) projects/virtio/contrib/ipfilter/mli_ipl.c (props changed) projects/virtio/contrib/ipfilter/mln_ipl.c (props changed) projects/virtio/contrib/ipfilter/mls_ipl.c (props changed) projects/virtio/contrib/libexecinfo/ (props changed) projects/virtio/sys/dev/hyperv/ (props changed) projects/virtio/sys/modules/hyperv/ (props changed) projects/virtio/sys/x86/include/acpica_machdep.h (props changed) Replaced: projects/virtio/contrib/openpam/lib/Makefile.am - copied unchanged from r256393, head/contrib/openpam/lib/Makefile.am projects/virtio/contrib/openpam/lib/Makefile.in - copied unchanged from r256393, head/contrib/openpam/lib/Makefile.in Deleted: projects/virtio/contrib/bind9/ projects/virtio/contrib/dialog/samples/copifuncs/ projects/virtio/contrib/dialog/samples/install/ projects/virtio/contrib/ipfilter/.cvsignore projects/virtio/contrib/ipfilter/BSD/ projects/virtio/contrib/ipfilter/FAQ.FreeBSD projects/virtio/contrib/ipfilter/FWTK/ projects/virtio/contrib/ipfilter/FreeBSD/ projects/virtio/contrib/ipfilter/FreeBSD-2.2/ projects/virtio/contrib/ipfilter/FreeBSD-3/ projects/virtio/contrib/ipfilter/FreeBSD-4.0/ projects/virtio/contrib/ipfilter/IMPORTANT projects/virtio/contrib/ipfilter/INST.FreeBSD-2.2 projects/virtio/contrib/ipfilter/INSTALL.FreeBSD projects/virtio/contrib/ipfilter/INSTALL.xBSD projects/virtio/contrib/ipfilter/IPF.KANJI projects/virtio/contrib/ipfilter/WhatsNew40.txt projects/virtio/contrib/ipfilter/bsdinstall projects/virtio/contrib/ipfilter/etc/ projects/virtio/contrib/ipfilter/iplang/.cvsignore projects/virtio/contrib/ipfilter/ipsend/.cvsignore projects/virtio/contrib/ipfilter/ipsend/README projects/virtio/contrib/ipfilter/ipsend/hpux.c projects/virtio/contrib/ipfilter/ipsend/in_var.h projects/virtio/contrib/ipfilter/ipsend/ip_var.h projects/virtio/contrib/ipfilter/ipsend/tcpip.h projects/virtio/contrib/ipfilter/lib/ipft_ef.c projects/virtio/contrib/ipfilter/lib/ipft_sn.c projects/virtio/contrib/ipfilter/lib/ipft_td.c projects/virtio/contrib/ipfilter/net/.cvsignore projects/virtio/contrib/ipfilter/perl/ projects/virtio/contrib/ipfilter/radix.c projects/virtio/contrib/ipfilter/rules/.cvsignore projects/virtio/contrib/ipfilter/samples/.cvsignore projects/virtio/contrib/ipfilter/test/ projects/virtio/contrib/ipfilter/todo projects/virtio/contrib/openpam/FREEBSD-vendor projects/virtio/contrib/openpam/lib/openpam_borrow_cred.c projects/virtio/contrib/openpam/lib/openpam_check_owner_perms.c projects/virtio/contrib/openpam/lib/openpam_configure.c projects/virtio/contrib/openpam/lib/openpam_constants.c projects/virtio/contrib/openpam/lib/openpam_constants.h projects/virtio/contrib/openpam/lib/openpam_ctype.h projects/virtio/contrib/openpam/lib/openpam_debug.h projects/virtio/contrib/openpam/lib/openpam_dispatch.c projects/virtio/contrib/openpam/lib/openpam_dynamic.c projects/virtio/contrib/openpam/lib/openpam_features.c projects/virtio/contrib/openpam/lib/openpam_features.h projects/virtio/contrib/openpam/lib/openpam_findenv.c projects/virtio/contrib/openpam/lib/openpam_free_data.c projects/virtio/contrib/openpam/lib/openpam_free_envlist.c projects/virtio/contrib/openpam/lib/openpam_get_feature.c projects/virtio/contrib/openpam/lib/openpam_get_option.c projects/virtio/contrib/openpam/lib/openpam_impl.h projects/virtio/contrib/openpam/lib/openpam_load.c projects/virtio/contrib/openpam/lib/openpam_log.c projects/virtio/contrib/openpam/lib/openpam_nullconv.c projects/virtio/contrib/openpam/lib/openpam_readline.c projects/virtio/contrib/openpam/lib/openpam_readlinev.c projects/virtio/contrib/openpam/lib/openpam_readword.c projects/virtio/contrib/openpam/lib/openpam_restore_cred.c projects/virtio/contrib/openpam/lib/openpam_set_feature.c projects/virtio/contrib/openpam/lib/openpam_set_option.c projects/virtio/contrib/openpam/lib/openpam_static.c projects/virtio/contrib/openpam/lib/openpam_straddch.c projects/virtio/contrib/openpam/lib/openpam_strlcat.h projects/virtio/contrib/openpam/lib/openpam_strlcmp.h projects/virtio/contrib/openpam/lib/openpam_strlcpy.h projects/virtio/contrib/openpam/lib/openpam_subst.c projects/virtio/contrib/openpam/lib/openpam_ttyconv.c projects/virtio/contrib/openpam/lib/pam_acct_mgmt.c projects/virtio/contrib/openpam/lib/pam_authenticate.c projects/virtio/contrib/openpam/lib/pam_authenticate_secondary.c projects/virtio/contrib/openpam/lib/pam_chauthtok.c projects/virtio/contrib/openpam/lib/pam_close_session.c projects/virtio/contrib/openpam/lib/pam_end.c projects/virtio/contrib/openpam/lib/pam_error.c projects/virtio/contrib/openpam/lib/pam_get_authtok.c projects/virtio/contrib/openpam/lib/pam_get_data.c projects/virtio/contrib/openpam/lib/pam_get_item.c projects/virtio/contrib/openpam/lib/pam_get_mapped_authtok.c projects/virtio/contrib/openpam/lib/pam_get_mapped_username.c projects/virtio/contrib/openpam/lib/pam_get_user.c projects/virtio/contrib/openpam/lib/pam_getenv.c projects/virtio/contrib/openpam/lib/pam_getenvlist.c projects/virtio/contrib/openpam/lib/pam_info.c projects/virtio/contrib/openpam/lib/pam_open_session.c projects/virtio/contrib/openpam/lib/pam_prompt.c projects/virtio/contrib/openpam/lib/pam_putenv.c projects/virtio/contrib/openpam/lib/pam_set_data.c projects/virtio/contrib/openpam/lib/pam_set_item.c projects/virtio/contrib/openpam/lib/pam_set_mapped_authtok.c projects/virtio/contrib/openpam/lib/pam_set_mapped_username.c projects/virtio/contrib/openpam/lib/pam_setcred.c projects/virtio/contrib/openpam/lib/pam_setenv.c projects/virtio/contrib/openpam/lib/pam_sm_acct_mgmt.c projects/virtio/contrib/openpam/lib/pam_sm_authenticate.c projects/virtio/contrib/openpam/lib/pam_sm_authenticate_secondary.c projects/virtio/contrib/openpam/lib/pam_sm_chauthtok.c projects/virtio/contrib/openpam/lib/pam_sm_close_session.c projects/virtio/contrib/openpam/lib/pam_sm_get_mapped_authtok.c projects/virtio/contrib/openpam/lib/pam_sm_get_mapped_username.c projects/virtio/contrib/openpam/lib/pam_sm_open_session.c projects/virtio/contrib/openpam/lib/pam_sm_set_mapped_authtok.c projects/virtio/contrib/openpam/lib/pam_sm_set_mapped_username.c projects/virtio/contrib/openpam/lib/pam_sm_setcred.c projects/virtio/contrib/openpam/lib/pam_start.c projects/virtio/contrib/openpam/lib/pam_strerror.c projects/virtio/contrib/openpam/lib/pam_verror.c projects/virtio/contrib/openpam/lib/pam_vinfo.c projects/virtio/contrib/openpam/lib/pam_vprompt.c projects/virtio/crypto/openssh/openbsd-compat/getopt.c projects/virtio/etc/atf/ projects/virtio/etc/mtree/BIND.chroot.dist projects/virtio/etc/mtree/BIND.include.dist projects/virtio/gnu/usr.bin/binutils/ar/Makefile projects/virtio/gnu/usr.bin/binutils/ar/ar.1 projects/virtio/gnu/usr.bin/binutils/ranlib/Makefile projects/virtio/gnu/usr.bin/binutils/ranlib/ranlib.1 projects/virtio/gnu/usr.bin/patch/ projects/virtio/lib/bind/ projects/virtio/lib/libpam/libpam/pam_std_option.c projects/virtio/share/atf/ projects/virtio/share/doc/bind9/ projects/virtio/share/examples/atf/ projects/virtio/share/xml/ projects/virtio/share/xsl/ projects/virtio/sys/amd64/conf/XENHVM projects/virtio/sys/arm/freescale/imx/imx_machdep.c projects/virtio/sys/contrib/ipfilter/netinet/QNX_OCL.txt projects/virtio/sys/crypto/aesni/aesencdec_amd64.S projects/virtio/sys/crypto/aesni/aesencdec_i386.S projects/virtio/sys/dev/bxe/bxe_debug.h projects/virtio/sys/dev/bxe/bxe_fw_defs.h projects/virtio/sys/dev/bxe/bxe_hsi.h projects/virtio/sys/dev/bxe/bxe_include.h projects/virtio/sys/dev/bxe/bxe_init.h projects/virtio/sys/dev/bxe/bxe_init_values_e1.h projects/virtio/sys/dev/bxe/bxe_init_values_e1h.h projects/virtio/sys/dev/bxe/bxe_link.c projects/virtio/sys/dev/bxe/bxe_link.h projects/virtio/sys/dev/bxe/bxe_reg.h projects/virtio/sys/dev/bxe/bxe_self_test.h projects/virtio/sys/dev/bxe/dump_e1.h projects/virtio/sys/dev/bxe/dump_e1h.h projects/virtio/sys/dev/bxe/hw_dump_reg_st.h projects/virtio/sys/dev/bxe/if_bxe.c projects/virtio/sys/dev/bxe/if_bxe.h projects/virtio/sys/dev/iscsi/initiator/ projects/virtio/sys/dev/random/probe.c projects/virtio/sys/dev/xen/xenpci/evtchn.c projects/virtio/sys/i386/conf/XENHVM projects/virtio/sys/i386/include/xen/xen_clock_util.h projects/virtio/sys/i386/xen/xen_clock_util.c projects/virtio/sys/i386/xen/xen_rtc.c projects/virtio/sys/kern/uipc_cow.c projects/virtio/sys/modules/iscsi/initiator/ projects/virtio/sys/xen/evtchn/evtchn.c projects/virtio/tools/build/options/WITHOUT_BIND projects/virtio/tools/build/options/WITHOUT_BIND_DNSSEC projects/virtio/tools/build/options/WITHOUT_BIND_ETC projects/virtio/tools/build/options/WITHOUT_BIND_LIBS_LWRES projects/virtio/tools/build/options/WITHOUT_BIND_MTREE projects/virtio/tools/build/options/WITHOUT_BIND_NAMED projects/virtio/tools/build/options/WITHOUT_BIND_UTILS projects/virtio/tools/build/options/WITH_BIND_IDN projects/virtio/tools/build/options/WITH_BIND_LARGE_FILE projects/virtio/tools/build/options/WITH_BIND_LIBS projects/virtio/tools/build/options/WITH_BIND_SIGCHASE projects/virtio/tools/build/options/WITH_BIND_XML projects/virtio/tools/build/options/WITH_BSDCONFIG projects/virtio/tools/build/options/WITH_GNU_PATCH projects/virtio/tools/build/options/WITH_ICONV projects/virtio/tools/build/options/WITH_LDNS_UTILS projects/virtio/usr.bin/atf/atf-config/ projects/virtio/usr.bin/atf/atf-report/ projects/virtio/usr.bin/atf/atf-run/ projects/virtio/usr.bin/atf/atf-version/ projects/virtio/usr.bin/dig/ projects/virtio/usr.bin/nslookup/ projects/virtio/usr.bin/nsupdate/ projects/virtio/usr.sbin/arpaname/ projects/virtio/usr.sbin/bsdconfig/examples/browse_packages.sh projects/virtio/usr.sbin/ddns-confgen/ projects/virtio/usr.sbin/dnssec-dsfromkey/ projects/virtio/usr.sbin/dnssec-keyfromlabel/ projects/virtio/usr.sbin/dnssec-keygen/ projects/virtio/usr.sbin/dnssec-revoke/ projects/virtio/usr.sbin/dnssec-settime/ projects/virtio/usr.sbin/dnssec-signzone/ projects/virtio/usr.sbin/genrandom/ projects/virtio/usr.sbin/isc-hmac-fixup/ projects/virtio/usr.sbin/named/ projects/virtio/usr.sbin/named-checkconf/ projects/virtio/usr.sbin/named-checkzone/ projects/virtio/usr.sbin/named-journalprint/ projects/virtio/usr.sbin/nsec3hash/ projects/virtio/usr.sbin/rndc/ projects/virtio/usr.sbin/rndc-confgen/ Modified: projects/virtio/LOCKS projects/virtio/Makefile projects/virtio/Makefile.inc1 projects/virtio/ObsoleteFiles.inc projects/virtio/UPDATING projects/virtio/bin/Makefile projects/virtio/bin/chflags/chflags.1 projects/virtio/bin/dd/dd.1 projects/virtio/bin/ls/ls.1 projects/virtio/bin/pkill/pkill.c projects/virtio/bin/ps/keyword.c projects/virtio/bin/ps/ps.1 projects/virtio/bin/sh/alias.c projects/virtio/bin/sh/arith_yylex.c projects/virtio/bin/sh/eval.c projects/virtio/bin/sh/eval.h projects/virtio/bin/sh/exec.c projects/virtio/bin/sh/jobs.c projects/virtio/bin/sh/jobs.h projects/virtio/bin/sh/main.c projects/virtio/bin/sh/parser.c projects/virtio/bin/sh/parser.h projects/virtio/bin/sh/redir.c projects/virtio/bin/sh/redir.h projects/virtio/bin/sh/sh.1 projects/virtio/bin/sh/trap.c projects/virtio/bin/sh/trap.h projects/virtio/bin/sh/var.c projects/virtio/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 projects/virtio/cddl/contrib/opensolaris/cmd/zfs/zfs.8 projects/virtio/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c projects/virtio/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 projects/virtio/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c projects/virtio/cddl/contrib/opensolaris/common/ctf/ctf_create.c projects/virtio/cddl/contrib/opensolaris/common/ctf/ctf_error.c projects/virtio/cddl/contrib/opensolaris/common/ctf/ctf_impl.h projects/virtio/cddl/contrib/opensolaris/common/ctf/ctf_open.c projects/virtio/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c projects/virtio/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h projects/virtio/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c projects/virtio/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c projects/virtio/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c projects/virtio/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c projects/virtio/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c projects/virtio/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h projects/virtio/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c projects/virtio/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h projects/virtio/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c projects/virtio/cddl/lib/libdtrace/Makefile projects/virtio/cddl/lib/libzpool/Makefile projects/virtio/cddl/usr.bin/ztest/Makefile projects/virtio/cddl/usr.sbin/zdb/Makefile projects/virtio/contrib/binutils/bfd/elflink.c projects/virtio/contrib/binutils/bfd/elfxx-mips.c projects/virtio/contrib/binutils/binutils/readelf.c projects/virtio/contrib/binutils/gas/config/tc-arm.c projects/virtio/contrib/binutils/gas/config/tc-i386.c projects/virtio/contrib/binutils/include/elf/common.h projects/virtio/contrib/binutils/opcodes/i386-dis.c projects/virtio/contrib/binutils/opcodes/i386-opc.h projects/virtio/contrib/binutils/opcodes/i386-opc.tbl projects/virtio/contrib/binutils/opcodes/i386-tbl.h projects/virtio/contrib/bmake/ChangeLog projects/virtio/contrib/bmake/FILES projects/virtio/contrib/bmake/Makefile projects/virtio/contrib/bmake/bmake.1 projects/virtio/contrib/bmake/bmake.cat1 projects/virtio/contrib/bmake/compat.c projects/virtio/contrib/bmake/job.c projects/virtio/contrib/bmake/main.c projects/virtio/contrib/bmake/make.1 projects/virtio/contrib/bmake/make.h projects/virtio/contrib/bmake/mk/ChangeLog projects/virtio/contrib/bmake/mk/gendirdeps.mk projects/virtio/contrib/bmake/mk/install-mk projects/virtio/contrib/bmake/mk/libs.mk projects/virtio/contrib/bmake/mk/progs.mk projects/virtio/contrib/bmake/parse.c projects/virtio/contrib/bmake/unit-tests/Makefile.in projects/virtio/contrib/bmake/unit-tests/test.exp projects/virtio/contrib/bmake/var.c projects/virtio/contrib/dialog/CHANGES projects/virtio/contrib/dialog/VERSION projects/virtio/contrib/dialog/aclocal.m4 projects/virtio/contrib/dialog/arrows.c projects/virtio/contrib/dialog/buildlist.c projects/virtio/contrib/dialog/checklist.c projects/virtio/contrib/dialog/config.guess projects/virtio/contrib/dialog/config.sub projects/virtio/contrib/dialog/configure projects/virtio/contrib/dialog/configure.in projects/virtio/contrib/dialog/dialog.1 projects/virtio/contrib/dialog/dialog.3 projects/virtio/contrib/dialog/dialog.c projects/virtio/contrib/dialog/dialog.h projects/virtio/contrib/dialog/formbox.c projects/virtio/contrib/dialog/guage.c projects/virtio/contrib/dialog/inputstr.c projects/virtio/contrib/dialog/makefile.in projects/virtio/contrib/dialog/menubox.c projects/virtio/contrib/dialog/mixedform.c projects/virtio/contrib/dialog/package/debian/changelog projects/virtio/contrib/dialog/package/debian/copyright projects/virtio/contrib/dialog/package/dialog.spec projects/virtio/contrib/dialog/po/lt.po projects/virtio/contrib/dialog/samples/inputbox6-utf8 projects/virtio/contrib/dialog/samples/report-tempfile projects/virtio/contrib/dialog/treeview.c projects/virtio/contrib/dialog/util.c projects/virtio/contrib/gcc/ChangeLog.gcc43 projects/virtio/contrib/gcc/config/arm/ieee754-df.S projects/virtio/contrib/gcc/config/arm/libunwind.S projects/virtio/contrib/gcc/config/arm/unwind-arm.c projects/virtio/contrib/gcc/config/arm/unwind-arm.h projects/virtio/contrib/gcc/config/i386/i386.c projects/virtio/contrib/gcc/config/i386/i386.h projects/virtio/contrib/gcc/config/i386/i386.opt projects/virtio/contrib/gcc/doc/extend.texi projects/virtio/contrib/gcc/doc/invoke.texi projects/virtio/contrib/gcc/opth-gen.awk projects/virtio/contrib/gcclibs/libcpp/expr.c projects/virtio/contrib/gcclibs/libcpp/include/cpplib.h projects/virtio/contrib/ipfilter/BNF projects/virtio/contrib/ipfilter/HISTORY projects/virtio/contrib/ipfilter/Makefile projects/virtio/contrib/ipfilter/NAT.FreeBSD projects/virtio/contrib/ipfilter/ip_fil.c projects/virtio/contrib/ipfilter/ipf.h projects/virtio/contrib/ipfilter/iplang/Makefile projects/virtio/contrib/ipfilter/iplang/iplang.h projects/virtio/contrib/ipfilter/iplang/iplang.tst projects/virtio/contrib/ipfilter/iplang/iplang_l.l projects/virtio/contrib/ipfilter/iplang/iplang_y.y projects/virtio/contrib/ipfilter/ipmon.h projects/virtio/contrib/ipfilter/ipsd/Makefile projects/virtio/contrib/ipfilter/ipsd/ipsd.c projects/virtio/contrib/ipfilter/ipsd/ipsdr.c projects/virtio/contrib/ipfilter/ipsd/linux.h projects/virtio/contrib/ipfilter/ipsd/sbpf.c projects/virtio/contrib/ipfilter/ipsd/sdlpi.c projects/virtio/contrib/ipfilter/ipsd/slinux.c projects/virtio/contrib/ipfilter/ipsd/snit.c projects/virtio/contrib/ipfilter/ipsend/44arp.c projects/virtio/contrib/ipfilter/ipsend/Makefile projects/virtio/contrib/ipfilter/ipsend/arp.c projects/virtio/contrib/ipfilter/ipsend/dlcommon.c projects/virtio/contrib/ipfilter/ipsend/ip.c projects/virtio/contrib/ipfilter/ipsend/ipresend.c projects/virtio/contrib/ipfilter/ipsend/ipsend.5 projects/virtio/contrib/ipfilter/ipsend/ipsend.c projects/virtio/contrib/ipfilter/ipsend/ipsend.h projects/virtio/contrib/ipfilter/ipsend/ipsopt.c projects/virtio/contrib/ipfilter/ipsend/iptest.c projects/virtio/contrib/ipfilter/ipsend/iptests.c projects/virtio/contrib/ipfilter/ipsend/larp.c projects/virtio/contrib/ipfilter/ipsend/linux.h projects/virtio/contrib/ipfilter/ipsend/lsock.c projects/virtio/contrib/ipfilter/ipsend/resend.c projects/virtio/contrib/ipfilter/ipsend/sbpf.c projects/virtio/contrib/ipfilter/ipsend/sdlpi.c projects/virtio/contrib/ipfilter/ipsend/sirix.c projects/virtio/contrib/ipfilter/ipsend/slinux.c projects/virtio/contrib/ipfilter/ipsend/snit.c projects/virtio/contrib/ipfilter/ipsend/sock.c projects/virtio/contrib/ipfilter/ipt.h projects/virtio/contrib/ipfilter/kmem.h projects/virtio/contrib/ipfilter/l4check/Makefile projects/virtio/contrib/ipfilter/l4check/l4check.c projects/virtio/contrib/ipfilter/lib/Makefile projects/virtio/contrib/ipfilter/lib/addicmp.c projects/virtio/contrib/ipfilter/lib/addipopt.c projects/virtio/contrib/ipfilter/lib/alist_free.c projects/virtio/contrib/ipfilter/lib/alist_new.c projects/virtio/contrib/ipfilter/lib/bcopywrap.c projects/virtio/contrib/ipfilter/lib/binprint.c projects/virtio/contrib/ipfilter/lib/buildopts.c projects/virtio/contrib/ipfilter/lib/checkrev.c projects/virtio/contrib/ipfilter/lib/count4bits.c projects/virtio/contrib/ipfilter/lib/count6bits.c projects/virtio/contrib/ipfilter/lib/debug.c projects/virtio/contrib/ipfilter/lib/facpri.c projects/virtio/contrib/ipfilter/lib/facpri.h projects/virtio/contrib/ipfilter/lib/fill6bits.c projects/virtio/contrib/ipfilter/lib/flags.c projects/virtio/contrib/ipfilter/lib/gethost.c projects/virtio/contrib/ipfilter/lib/getifname.c projects/virtio/contrib/ipfilter/lib/getnattype.c projects/virtio/contrib/ipfilter/lib/getport.c projects/virtio/contrib/ipfilter/lib/getportproto.c projects/virtio/contrib/ipfilter/lib/getproto.c projects/virtio/contrib/ipfilter/lib/getsumd.c projects/virtio/contrib/ipfilter/lib/hostname.c projects/virtio/contrib/ipfilter/lib/icmpcode.c projects/virtio/contrib/ipfilter/lib/initparse.c projects/virtio/contrib/ipfilter/lib/ionames.c projects/virtio/contrib/ipfilter/lib/ipf_dotuning.c projects/virtio/contrib/ipfilter/lib/ipft_hx.c projects/virtio/contrib/ipfilter/lib/ipft_pc.c projects/virtio/contrib/ipfilter/lib/ipft_tx.c projects/virtio/contrib/ipfilter/lib/ipoptsec.c projects/virtio/contrib/ipfilter/lib/kmem.c projects/virtio/contrib/ipfilter/lib/kmem.h projects/virtio/contrib/ipfilter/lib/kmemcpywrap.c projects/virtio/contrib/ipfilter/lib/kvatoname.c projects/virtio/contrib/ipfilter/lib/load_file.c projects/virtio/contrib/ipfilter/lib/load_hash.c projects/virtio/contrib/ipfilter/lib/load_hashnode.c projects/virtio/contrib/ipfilter/lib/load_http.c projects/virtio/contrib/ipfilter/lib/load_pool.c projects/virtio/contrib/ipfilter/lib/load_poolnode.c projects/virtio/contrib/ipfilter/lib/load_url.c projects/virtio/contrib/ipfilter/lib/mutex_emul.c projects/virtio/contrib/ipfilter/lib/nametokva.c projects/virtio/contrib/ipfilter/lib/nat_setgroupmap.c projects/virtio/contrib/ipfilter/lib/ntomask.c projects/virtio/contrib/ipfilter/lib/optname.c projects/virtio/contrib/ipfilter/lib/optprint.c projects/virtio/contrib/ipfilter/lib/optprintv6.c projects/virtio/contrib/ipfilter/lib/optvalue.c projects/virtio/contrib/ipfilter/lib/portname.c projects/virtio/contrib/ipfilter/lib/print_toif.c projects/virtio/contrib/ipfilter/lib/printactivenat.c projects/virtio/contrib/ipfilter/lib/printaps.c projects/virtio/contrib/ipfilter/lib/printbuf.c projects/virtio/contrib/ipfilter/lib/printfr.c projects/virtio/contrib/ipfilter/lib/printfraginfo.c projects/virtio/contrib/ipfilter/lib/printhash.c projects/virtio/contrib/ipfilter/lib/printhash_live.c projects/virtio/contrib/ipfilter/lib/printhashdata.c projects/virtio/contrib/ipfilter/lib/printhashnode.c projects/virtio/contrib/ipfilter/lib/printhostmap.c projects/virtio/contrib/ipfilter/lib/printhostmask.c projects/virtio/contrib/ipfilter/lib/printifname.c projects/virtio/contrib/ipfilter/lib/printip.c projects/virtio/contrib/ipfilter/lib/printlog.c projects/virtio/contrib/ipfilter/lib/printmask.c projects/virtio/contrib/ipfilter/lib/printnat.c projects/virtio/contrib/ipfilter/lib/printpacket.c projects/virtio/contrib/ipfilter/lib/printpacket6.c projects/virtio/contrib/ipfilter/lib/printpool.c projects/virtio/contrib/ipfilter/lib/printpool_live.c projects/virtio/contrib/ipfilter/lib/printpooldata.c projects/virtio/contrib/ipfilter/lib/printpoolnode.c projects/virtio/contrib/ipfilter/lib/printportcmp.c projects/virtio/contrib/ipfilter/lib/printproto.c projects/virtio/contrib/ipfilter/lib/printsbuf.c projects/virtio/contrib/ipfilter/lib/printstate.c projects/virtio/contrib/ipfilter/lib/printtqtable.c projects/virtio/contrib/ipfilter/lib/printtunable.c projects/virtio/contrib/ipfilter/lib/remove_hash.c projects/virtio/contrib/ipfilter/lib/remove_hashnode.c projects/virtio/contrib/ipfilter/lib/remove_pool.c projects/virtio/contrib/ipfilter/lib/remove_poolnode.c projects/virtio/contrib/ipfilter/lib/resetlexer.c projects/virtio/contrib/ipfilter/lib/rwlock_emul.c projects/virtio/contrib/ipfilter/lib/tcpflags.c projects/virtio/contrib/ipfilter/lib/tcpoptnames.c projects/virtio/contrib/ipfilter/lib/v6ionames.c projects/virtio/contrib/ipfilter/lib/v6optvalue.c projects/virtio/contrib/ipfilter/lib/var.c projects/virtio/contrib/ipfilter/lib/verbose.c projects/virtio/contrib/ipfilter/man/Makefile projects/virtio/contrib/ipfilter/man/ipf.4 projects/virtio/contrib/ipfilter/man/ipf.5 projects/virtio/contrib/ipfilter/man/ipfilter.4 projects/virtio/contrib/ipfilter/man/ipfilter.4.mandoc projects/virtio/contrib/ipfilter/man/ipfstat.8 projects/virtio/contrib/ipfilter/man/ipftest.1 projects/virtio/contrib/ipfilter/man/ipmon.5 projects/virtio/contrib/ipfilter/man/ipnat.4 projects/virtio/contrib/ipfilter/man/ipnat.5 projects/virtio/contrib/ipfilter/man/ipnat.8 projects/virtio/contrib/ipfilter/man/ippool.5 projects/virtio/contrib/ipfilter/man/ippool.8 projects/virtio/contrib/ipfilter/md5.c projects/virtio/contrib/ipfilter/mkfilters projects/virtio/contrib/ipfilter/mlf_ipl.c projects/virtio/contrib/ipfilter/mlf_rule.c projects/virtio/contrib/ipfilter/mlfk_rule.c projects/virtio/contrib/ipfilter/mlh_rule.c (contents, props changed) projects/virtio/contrib/ipfilter/opts.h projects/virtio/contrib/ipfilter/pcap-ipf.h projects/virtio/contrib/ipfilter/radix_ipf.h projects/virtio/contrib/ipfilter/rules/BASIC_1.FW projects/virtio/contrib/ipfilter/rules/BASIC_2.FW projects/virtio/contrib/ipfilter/rules/firewall projects/virtio/contrib/ipfilter/rules/ipmon.conf projects/virtio/contrib/ipfilter/rules/server projects/virtio/contrib/ipfilter/samples/proxy.c projects/virtio/contrib/ipfilter/samples/relay.c projects/virtio/contrib/ipfilter/snoop.h projects/virtio/contrib/ipfilter/tools/BNF.ipf projects/virtio/contrib/ipfilter/tools/Makefile projects/virtio/contrib/ipfilter/tools/ipf.c projects/virtio/contrib/ipfilter/tools/ipf_y.y projects/virtio/contrib/ipfilter/tools/ipfcomp.c projects/virtio/contrib/ipfilter/tools/ipfs.c projects/virtio/contrib/ipfilter/tools/ipfstat.c projects/virtio/contrib/ipfilter/tools/ipftest.c projects/virtio/contrib/ipfilter/tools/ipmon.c projects/virtio/contrib/ipfilter/tools/ipmon_y.y projects/virtio/contrib/ipfilter/tools/ipnat.c projects/virtio/contrib/ipfilter/tools/ipnat_y.y projects/virtio/contrib/ipfilter/tools/ippool.c projects/virtio/contrib/ipfilter/tools/ippool_y.y projects/virtio/contrib/ipfilter/tools/ipscan_y.y projects/virtio/contrib/ipfilter/tools/ipsyncm.c projects/virtio/contrib/ipfilter/tools/ipsyncs.c projects/virtio/contrib/ipfilter/tools/lex_var.h projects/virtio/contrib/ipfilter/tools/lexer.c projects/virtio/contrib/ipfilter/tools/lexer.h projects/virtio/contrib/ldns/ldns/dnssec_verify.h projects/virtio/contrib/ldns/ldns/util.h projects/virtio/contrib/libc++/include/memory projects/virtio/contrib/libcxxrt/exception.cc projects/virtio/contrib/libcxxrt/libelftc_dem_gnu3.c projects/virtio/contrib/libcxxrt/typeinfo.cc projects/virtio/contrib/libcxxrt/unwind-itanium.h projects/virtio/contrib/llvm/include/llvm/IR/CallingConv.h projects/virtio/contrib/llvm/include/llvm/MC/MCInstPrinter.h projects/virtio/contrib/llvm/lib/AsmParser/LLLexer.cpp projects/virtio/contrib/llvm/lib/AsmParser/LLParser.cpp projects/virtio/contrib/llvm/lib/AsmParser/LLToken.h projects/virtio/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp projects/virtio/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp projects/virtio/contrib/llvm/lib/IR/AsmWriter.cpp projects/virtio/contrib/llvm/lib/MC/MCInstPrinter.cpp projects/virtio/contrib/llvm/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp projects/virtio/contrib/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp projects/virtio/contrib/llvm/lib/Target/Hexagon/HexagonISelDAGToDAG.cpp projects/virtio/contrib/llvm/lib/Target/MSP430/MSP430ISelDAGToDAG.cpp projects/virtio/contrib/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp projects/virtio/contrib/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp projects/virtio/contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp projects/virtio/contrib/llvm/lib/Target/R600/AMDILISelDAGToDAG.cpp projects/virtio/contrib/llvm/lib/Target/Sparc/SparcISelDAGToDAG.cpp projects/virtio/contrib/llvm/lib/Target/SystemZ/SystemZISelDAGToDAG.cpp projects/virtio/contrib/llvm/lib/Target/X86/InstPrinter/X86ATTInstPrinter.cpp projects/virtio/contrib/llvm/lib/Target/X86/InstPrinter/X86IntelInstPrinter.cpp projects/virtio/contrib/llvm/lib/Target/X86/X86CallingConv.td projects/virtio/contrib/llvm/lib/Target/X86/X86FastISel.cpp projects/virtio/contrib/llvm/lib/Target/X86/X86FixupLEAs.cpp projects/virtio/contrib/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp projects/virtio/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp projects/virtio/contrib/llvm/lib/Target/X86/X86InstrInfo.cpp projects/virtio/contrib/llvm/lib/Target/X86/X86Subtarget.h projects/virtio/contrib/llvm/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp projects/virtio/contrib/llvm/tools/clang/include/clang-c/Index.h projects/virtio/contrib/llvm/tools/clang/include/clang/AST/Type.h projects/virtio/contrib/llvm/tools/clang/include/clang/Basic/Attr.td projects/virtio/contrib/llvm/tools/clang/include/clang/Basic/Specifiers.h projects/virtio/contrib/llvm/tools/clang/lib/AST/DumpXML.cpp projects/virtio/contrib/llvm/tools/clang/lib/AST/MicrosoftMangle.cpp projects/virtio/contrib/llvm/tools/clang/lib/AST/Type.cpp projects/virtio/contrib/llvm/tools/clang/lib/AST/TypePrinter.cpp projects/virtio/contrib/llvm/tools/clang/lib/Basic/Targets.cpp projects/virtio/contrib/llvm/tools/clang/lib/CodeGen/CGCall.cpp projects/virtio/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp projects/virtio/contrib/llvm/tools/clang/lib/Driver/ToolChains.h projects/virtio/contrib/llvm/tools/clang/lib/Sema/SemaDeclAttr.cpp projects/virtio/contrib/llvm/tools/clang/lib/Sema/SemaExpr.cpp projects/virtio/contrib/llvm/tools/clang/lib/Sema/SemaInit.cpp projects/virtio/contrib/llvm/tools/clang/lib/Sema/SemaType.cpp projects/virtio/contrib/openpam/CREDITS projects/virtio/contrib/openpam/HISTORY projects/virtio/contrib/openpam/INSTALL projects/virtio/contrib/openpam/LICENSE projects/virtio/contrib/openpam/Makefile.am projects/virtio/contrib/openpam/Makefile.in projects/virtio/contrib/openpam/README projects/virtio/contrib/openpam/RELNOTES projects/virtio/contrib/openpam/TODO projects/virtio/contrib/openpam/aclocal.m4 projects/virtio/contrib/openpam/autogen.sh projects/virtio/contrib/openpam/bin/Makefile.am projects/virtio/contrib/openpam/bin/Makefile.in projects/virtio/contrib/openpam/bin/openpam_dump_policy/Makefile.am projects/virtio/contrib/openpam/bin/openpam_dump_policy/Makefile.in projects/virtio/contrib/openpam/bin/openpam_dump_policy/openpam_dump_policy.c projects/virtio/contrib/openpam/bin/pamtest/Makefile.am projects/virtio/contrib/openpam/bin/pamtest/Makefile.in projects/virtio/contrib/openpam/bin/pamtest/pamtest.1 projects/virtio/contrib/openpam/bin/pamtest/pamtest.c projects/virtio/contrib/openpam/bin/su/Makefile.am projects/virtio/contrib/openpam/bin/su/Makefile.in projects/virtio/contrib/openpam/bin/su/su.1 projects/virtio/contrib/openpam/bin/su/su.c projects/virtio/contrib/openpam/compile projects/virtio/contrib/openpam/config.guess projects/virtio/contrib/openpam/config.h.in projects/virtio/contrib/openpam/config.sub projects/virtio/contrib/openpam/configure projects/virtio/contrib/openpam/configure.ac projects/virtio/contrib/openpam/depcomp projects/virtio/contrib/openpam/doc/Makefile.am projects/virtio/contrib/openpam/doc/Makefile.in projects/virtio/contrib/openpam/doc/man/Makefile.am projects/virtio/contrib/openpam/doc/man/Makefile.in projects/virtio/contrib/openpam/doc/man/openpam.3 projects/virtio/contrib/openpam/doc/man/openpam.man projects/virtio/contrib/openpam/doc/man/openpam_borrow_cred.3 projects/virtio/contrib/openpam/doc/man/openpam_free_data.3 projects/virtio/contrib/openpam/doc/man/openpam_free_envlist.3 projects/virtio/contrib/openpam/doc/man/openpam_get_feature.3 projects/virtio/contrib/openpam/doc/man/openpam_get_option.3 projects/virtio/contrib/openpam/doc/man/openpam_log.3 projects/virtio/contrib/openpam/doc/man/openpam_nullconv.3 projects/virtio/contrib/openpam/doc/man/openpam_readline.3 projects/virtio/contrib/openpam/doc/man/openpam_readlinev.3 projects/virtio/contrib/openpam/doc/man/openpam_readword.3 projects/virtio/contrib/openpam/doc/man/openpam_restore_cred.3 projects/virtio/contrib/openpam/doc/man/openpam_set_feature.3 projects/virtio/contrib/openpam/doc/man/openpam_set_option.3 projects/virtio/contrib/openpam/doc/man/openpam_straddch.3 projects/virtio/contrib/openpam/doc/man/openpam_subst.3 projects/virtio/contrib/openpam/doc/man/openpam_ttyconv.3 projects/virtio/contrib/openpam/doc/man/pam.3 projects/virtio/contrib/openpam/doc/man/pam.conf.5 projects/virtio/contrib/openpam/doc/man/pam.man projects/virtio/contrib/openpam/doc/man/pam_acct_mgmt.3 projects/virtio/contrib/openpam/doc/man/pam_authenticate.3 projects/virtio/contrib/openpam/doc/man/pam_chauthtok.3 projects/virtio/contrib/openpam/doc/man/pam_close_session.3 projects/virtio/contrib/openpam/doc/man/pam_conv.3 projects/virtio/contrib/openpam/doc/man/pam_end.3 projects/virtio/contrib/openpam/doc/man/pam_error.3 projects/virtio/contrib/openpam/doc/man/pam_get_authtok.3 projects/virtio/contrib/openpam/doc/man/pam_get_data.3 projects/virtio/contrib/openpam/doc/man/pam_get_item.3 projects/virtio/contrib/openpam/doc/man/pam_get_user.3 projects/virtio/contrib/openpam/doc/man/pam_getenv.3 projects/virtio/contrib/openpam/doc/man/pam_getenvlist.3 projects/virtio/contrib/openpam/doc/man/pam_info.3 projects/virtio/contrib/openpam/doc/man/pam_open_session.3 projects/virtio/contrib/openpam/doc/man/pam_prompt.3 projects/virtio/contrib/openpam/doc/man/pam_putenv.3 projects/virtio/contrib/openpam/doc/man/pam_set_data.3 projects/virtio/contrib/openpam/doc/man/pam_set_item.3 projects/virtio/contrib/openpam/doc/man/pam_setcred.3 projects/virtio/contrib/openpam/doc/man/pam_setenv.3 projects/virtio/contrib/openpam/doc/man/pam_sm_acct_mgmt.3 projects/virtio/contrib/openpam/doc/man/pam_sm_authenticate.3 projects/virtio/contrib/openpam/doc/man/pam_sm_chauthtok.3 projects/virtio/contrib/openpam/doc/man/pam_sm_close_session.3 projects/virtio/contrib/openpam/doc/man/pam_sm_open_session.3 projects/virtio/contrib/openpam/doc/man/pam_sm_setcred.3 projects/virtio/contrib/openpam/doc/man/pam_start.3 projects/virtio/contrib/openpam/doc/man/pam_strerror.3 projects/virtio/contrib/openpam/doc/man/pam_verror.3 projects/virtio/contrib/openpam/doc/man/pam_vinfo.3 projects/virtio/contrib/openpam/doc/man/pam_vprompt.3 projects/virtio/contrib/openpam/include/Makefile.am projects/virtio/contrib/openpam/include/Makefile.in projects/virtio/contrib/openpam/include/security/Makefile.am projects/virtio/contrib/openpam/include/security/Makefile.in projects/virtio/contrib/openpam/include/security/openpam.h projects/virtio/contrib/openpam/include/security/openpam_attr.h projects/virtio/contrib/openpam/include/security/openpam_version.h projects/virtio/contrib/openpam/include/security/pam_appl.h projects/virtio/contrib/openpam/include/security/pam_constants.h projects/virtio/contrib/openpam/include/security/pam_modules.h projects/virtio/contrib/openpam/include/security/pam_types.h projects/virtio/contrib/openpam/install-sh projects/virtio/contrib/openpam/misc/gendoc.pl projects/virtio/contrib/openpam/missing projects/virtio/contrib/openpam/modules/Makefile.am projects/virtio/contrib/openpam/modules/Makefile.in projects/virtio/contrib/openpam/modules/pam_deny/Makefile.am projects/virtio/contrib/openpam/modules/pam_deny/Makefile.in projects/virtio/contrib/openpam/modules/pam_deny/pam_deny.c projects/virtio/contrib/openpam/modules/pam_permit/Makefile.am projects/virtio/contrib/openpam/modules/pam_permit/Makefile.in projects/virtio/contrib/openpam/modules/pam_permit/pam_permit.c projects/virtio/contrib/openpam/modules/pam_unix/Makefile.am projects/virtio/contrib/openpam/modules/pam_unix/Makefile.in projects/virtio/contrib/openpam/modules/pam_unix/pam_unix.c projects/virtio/contrib/openpam/pamgdb.in projects/virtio/contrib/openpam/t/Makefile.am projects/virtio/contrib/openpam/t/Makefile.in projects/virtio/contrib/openpam/t/t.h projects/virtio/contrib/openpam/t/t_main.c projects/virtio/contrib/openpam/t/t_openpam_readlinev.c projects/virtio/contrib/openpam/t/t_openpam_readword.c projects/virtio/contrib/pam_modules/pam_passwdqc/pam_passwdqc.c projects/virtio/contrib/sendmail/include/sm/os/sm_os_freebsd.h projects/virtio/contrib/tcpdump/tcpdump.c projects/virtio/contrib/unbound/config.h.in projects/virtio/contrib/unbound/configure projects/virtio/contrib/unbound/configure.ac projects/virtio/contrib/unbound/daemon/cachedump.c projects/virtio/contrib/unbound/daemon/remote.c projects/virtio/contrib/unbound/daemon/remote.h projects/virtio/contrib/unbound/daemon/unbound.c projects/virtio/contrib/unbound/daemon/worker.c projects/virtio/contrib/unbound/daemon/worker.h projects/virtio/contrib/unbound/libunbound/context.c projects/virtio/contrib/unbound/libunbound/context.h projects/virtio/contrib/unbound/libunbound/libunbound.c projects/virtio/contrib/unbound/libunbound/libworker.c projects/virtio/contrib/unbound/libunbound/libworker.h projects/virtio/contrib/unbound/libunbound/unbound.h projects/virtio/contrib/unbound/smallapp/unbound-anchor.c projects/virtio/contrib/unbound/smallapp/unbound-control-setup.sh projects/virtio/contrib/unbound/smallapp/worker_cb.c projects/virtio/contrib/unbound/util/config_file.c projects/virtio/contrib/unbound/util/config_file.h projects/virtio/contrib/unbound/util/configlexer.c projects/virtio/contrib/unbound/util/configparser.c projects/virtio/contrib/unbound/util/configparser.h projects/virtio/contrib/unbound/util/fptr_wlist.c projects/virtio/crypto/openssh/ChangeLog projects/virtio/crypto/openssh/FREEBSD-upgrade projects/virtio/crypto/openssh/README projects/virtio/crypto/openssh/aclocal.m4 projects/virtio/crypto/openssh/addrmatch.c projects/virtio/crypto/openssh/auth-chall.c projects/virtio/crypto/openssh/auth-krb5.c projects/virtio/crypto/openssh/auth-options.c projects/virtio/crypto/openssh/auth-pam.c projects/virtio/crypto/openssh/auth-rsa.c projects/virtio/crypto/openssh/auth.c projects/virtio/crypto/openssh/auth.h projects/virtio/crypto/openssh/auth1.c projects/virtio/crypto/openssh/auth2-chall.c projects/virtio/crypto/openssh/auth2-gss.c projects/virtio/crypto/openssh/auth2-hostbased.c projects/virtio/crypto/openssh/auth2-jpake.c projects/virtio/crypto/openssh/auth2-kbdint.c projects/virtio/crypto/openssh/auth2-passwd.c projects/virtio/crypto/openssh/auth2-pubkey.c projects/virtio/crypto/openssh/auth2.c projects/virtio/crypto/openssh/authfd.c projects/virtio/crypto/openssh/authfile.c projects/virtio/crypto/openssh/bufaux.c projects/virtio/crypto/openssh/bufbn.c projects/virtio/crypto/openssh/bufec.c projects/virtio/crypto/openssh/buffer.c projects/virtio/crypto/openssh/buffer.h projects/virtio/crypto/openssh/canohost.c projects/virtio/crypto/openssh/channels.c projects/virtio/crypto/openssh/channels.h projects/virtio/crypto/openssh/cipher-3des1.c projects/virtio/crypto/openssh/cipher-aes.c projects/virtio/crypto/openssh/cipher-ctr.c projects/virtio/crypto/openssh/cipher.c projects/virtio/crypto/openssh/cipher.h projects/virtio/crypto/openssh/clientloop.c projects/virtio/crypto/openssh/clientloop.h projects/virtio/crypto/openssh/compat.c projects/virtio/crypto/openssh/config.guess projects/virtio/crypto/openssh/config.h projects/virtio/crypto/openssh/config.h.in projects/virtio/crypto/openssh/defines.h projects/virtio/crypto/openssh/dh.c projects/virtio/crypto/openssh/dns.c projects/virtio/crypto/openssh/groupaccess.c projects/virtio/crypto/openssh/gss-genr.c projects/virtio/crypto/openssh/gss-serv-krb5.c projects/virtio/crypto/openssh/gss-serv.c projects/virtio/crypto/openssh/hostfile.c projects/virtio/crypto/openssh/hostfile.h projects/virtio/crypto/openssh/includes.h projects/virtio/crypto/openssh/jpake.c projects/virtio/crypto/openssh/kex.c projects/virtio/crypto/openssh/kex.h projects/virtio/crypto/openssh/kexdhc.c projects/virtio/crypto/openssh/kexdhs.c projects/virtio/crypto/openssh/kexecdh.c projects/virtio/crypto/openssh/kexecdhc.c projects/virtio/crypto/openssh/kexecdhs.c projects/virtio/crypto/openssh/kexgexc.c projects/virtio/crypto/openssh/kexgexs.c projects/virtio/crypto/openssh/key.c projects/virtio/crypto/openssh/key.h projects/virtio/crypto/openssh/krl.c projects/virtio/crypto/openssh/log.c projects/virtio/crypto/openssh/log.h projects/virtio/crypto/openssh/loginrec.c projects/virtio/crypto/openssh/mac.c projects/virtio/crypto/openssh/mac.h projects/virtio/crypto/openssh/match.c projects/virtio/crypto/openssh/misc.c projects/virtio/crypto/openssh/misc.h projects/virtio/crypto/openssh/moduli.c projects/virtio/crypto/openssh/monitor.c projects/virtio/crypto/openssh/monitor_mm.c projects/virtio/crypto/openssh/monitor_wrap.c projects/virtio/crypto/openssh/mux.c projects/virtio/crypto/openssh/myproposal.h projects/virtio/crypto/openssh/openbsd-compat/bsd-cygwin_util.c projects/virtio/crypto/openssh/openbsd-compat/bsd-cygwin_util.h projects/virtio/crypto/openssh/openbsd-compat/bsd-misc.h projects/virtio/crypto/openssh/openbsd-compat/openbsd-compat.h projects/virtio/crypto/openssh/openbsd-compat/port-aix.c projects/virtio/crypto/openssh/openbsd-compat/port-linux.c projects/virtio/crypto/openssh/openbsd-compat/xcrypt.c projects/virtio/crypto/openssh/packet.c projects/virtio/crypto/openssh/packet.h projects/virtio/crypto/openssh/pathnames.h projects/virtio/crypto/openssh/progressmeter.c projects/virtio/crypto/openssh/readconf.c projects/virtio/crypto/openssh/readconf.h projects/virtio/crypto/openssh/readpass.c projects/virtio/crypto/openssh/roaming_client.c projects/virtio/crypto/openssh/roaming_common.c projects/virtio/crypto/openssh/rsa.c projects/virtio/crypto/openssh/sandbox-systrace.c projects/virtio/crypto/openssh/schnorr.c projects/virtio/crypto/openssh/scp.1 projects/virtio/crypto/openssh/scp.c projects/virtio/crypto/openssh/servconf.c projects/virtio/crypto/openssh/servconf.h projects/virtio/crypto/openssh/serverloop.c projects/virtio/crypto/openssh/session.c projects/virtio/crypto/openssh/sftp-client.c projects/virtio/crypto/openssh/sftp-client.h projects/virtio/crypto/openssh/sftp-common.c projects/virtio/crypto/openssh/sftp-glob.c projects/virtio/crypto/openssh/sftp-server.8 projects/virtio/crypto/openssh/sftp-server.c projects/virtio/crypto/openssh/sftp.1 projects/virtio/crypto/openssh/sftp.c projects/virtio/crypto/openssh/ssh-add.c projects/virtio/crypto/openssh/ssh-agent.c projects/virtio/crypto/openssh/ssh-dss.c projects/virtio/crypto/openssh/ssh-ecdsa.c projects/virtio/crypto/openssh/ssh-gss.h projects/virtio/crypto/openssh/ssh-keygen.1 projects/virtio/crypto/openssh/ssh-keygen.c projects/virtio/crypto/openssh/ssh-keyscan.1 projects/virtio/crypto/openssh/ssh-keyscan.c projects/virtio/crypto/openssh/ssh-keysign.8 projects/virtio/crypto/openssh/ssh-keysign.c projects/virtio/crypto/openssh/ssh-pkcs11-client.c projects/virtio/crypto/openssh/ssh-pkcs11-helper.8 projects/virtio/crypto/openssh/ssh-pkcs11-helper.c projects/virtio/crypto/openssh/ssh-pkcs11.c projects/virtio/crypto/openssh/ssh-rsa.c projects/virtio/crypto/openssh/ssh.1 projects/virtio/crypto/openssh/ssh.c projects/virtio/crypto/openssh/ssh_config projects/virtio/crypto/openssh/ssh_config.5 projects/virtio/crypto/openssh/ssh_namespace.h projects/virtio/crypto/openssh/sshconnect.c projects/virtio/crypto/openssh/sshconnect1.c projects/virtio/crypto/openssh/sshconnect2.c projects/virtio/crypto/openssh/sshd.8 projects/virtio/crypto/openssh/sshd.c projects/virtio/crypto/openssh/sshd_config projects/virtio/crypto/openssh/sshd_config.5 projects/virtio/crypto/openssh/sshlogin.c projects/virtio/crypto/openssh/sshlogin.h projects/virtio/crypto/openssh/uidswap.c projects/virtio/crypto/openssh/umac.c projects/virtio/crypto/openssh/umac.h projects/virtio/crypto/openssh/umac128.c projects/virtio/crypto/openssh/uuencode.c projects/virtio/crypto/openssh/version.h projects/virtio/crypto/openssh/xmalloc.c projects/virtio/crypto/openssh/xmalloc.h projects/virtio/etc/Makefile projects/virtio/etc/defaults/periodic.conf projects/virtio/etc/defaults/rc.conf projects/virtio/etc/devd/usb.conf projects/virtio/etc/ftpusers projects/virtio/etc/group projects/virtio/etc/master.passwd projects/virtio/etc/mtree/BSD.include.dist projects/virtio/etc/mtree/BSD.root.dist projects/virtio/etc/mtree/BSD.usr.dist projects/virtio/etc/mtree/BSD.var.dist projects/virtio/etc/mtree/Makefile projects/virtio/etc/network.subr projects/virtio/etc/periodic/daily/Makefile projects/virtio/etc/periodic/monthly/Makefile projects/virtio/etc/periodic/security/100.chksetuid projects/virtio/etc/periodic/security/110.neggrpperm projects/virtio/etc/periodic/security/200.chkmounts projects/virtio/etc/periodic/security/300.chkuid0 projects/virtio/etc/periodic/security/400.passwdless projects/virtio/etc/periodic/security/410.logincheck projects/virtio/etc/periodic/security/460.chkportsum projects/virtio/etc/periodic/security/500.ipfwdenied projects/virtio/etc/periodic/security/510.ipfdenied projects/virtio/etc/periodic/security/520.pfdenied projects/virtio/etc/periodic/security/550.ipfwlimit projects/virtio/etc/periodic/security/610.ipf6denied projects/virtio/etc/periodic/security/700.kernelmsg projects/virtio/etc/periodic/security/800.loginfail projects/virtio/etc/periodic/security/900.tcpwrap projects/virtio/etc/periodic/security/security.functions projects/virtio/etc/periodic/weekly/Makefile projects/virtio/etc/portsnap.conf projects/virtio/etc/rc.d/Makefile projects/virtio/etc/rc.d/NETWORKING projects/virtio/etc/rc.d/bsnmpd projects/virtio/etc/rc.d/initrandom projects/virtio/etc/rc.d/ipfilter projects/virtio/etc/rc.d/ipfs projects/virtio/etc/rc.d/ipmon projects/virtio/etc/rc.d/jail projects/virtio/etc/rc.d/netif projects/virtio/etc/rc.d/routing projects/virtio/etc/rc.d/savecore projects/virtio/etc/rc.d/sendmail projects/virtio/etc/rc.d/sshd projects/virtio/etc/rc.subr projects/virtio/games/fortune/datfiles/freebsd-tips projects/virtio/gnu/lib/Makefile projects/virtio/gnu/lib/libdialog/dlg_config.h projects/virtio/gnu/lib/libstdc++/Makefile projects/virtio/gnu/lib/libstdc++/config.h projects/virtio/gnu/lib/libsupc++/Makefile projects/virtio/gnu/usr.bin/Makefile projects/virtio/gnu/usr.bin/binutils/Makefile projects/virtio/gnu/usr.bin/cc/Makefile projects/virtio/gnu/usr.bin/cc/cc_tools/freebsd-native.h projects/virtio/gnu/usr.bin/cc/include/Makefile projects/virtio/gnu/usr.bin/groff/tmac/mdoc.local projects/virtio/include/Makefile projects/virtio/include/dirent.h projects/virtio/include/iconv.h projects/virtio/include/paths.h projects/virtio/include/unistd.h projects/virtio/kerberos5/Makefile.inc projects/virtio/kerberos5/lib/libheimipcc/Makefile projects/virtio/kerberos5/lib/libheimipcs/Makefile projects/virtio/kerberos5/lib/libkrb5/Makefile projects/virtio/kerberos5/libexec/digest-service/Makefile projects/virtio/kerberos5/libexec/kcm/Makefile projects/virtio/lib/Makefile projects/virtio/lib/clang/Makefile projects/virtio/lib/clang/clang.build.mk projects/virtio/lib/clang/libllvmmc/Makefile projects/virtio/lib/clang/libllvmsupport/Makefile projects/virtio/lib/clang/libllvmx86disassembler/Makefile projects/virtio/lib/csu/arm/crt1.c projects/virtio/lib/csu/common/notes.h projects/virtio/lib/libarchive/Makefile projects/virtio/lib/libc++/Makefile projects/virtio/lib/libc/Makefile projects/virtio/lib/libc/amd64/sys/setlogin.S projects/virtio/lib/libc/arm/_fpmath.h projects/virtio/lib/libc/arm/arith.h projects/virtio/lib/libc/arm/softfloat/arm-gcc.h projects/virtio/lib/libc/db/btree/bt_open.c projects/virtio/lib/libc/db/hash/hash_page.c projects/virtio/lib/libc/gen/Makefile.inc projects/virtio/lib/libc/gen/Symbol.map projects/virtio/lib/libc/gen/closedir.c projects/virtio/lib/libc/gen/directory.3 projects/virtio/lib/libc/gen/errlst.c projects/virtio/lib/libc/gen/getlogin.c projects/virtio/lib/libc/gen/lockf.3 projects/virtio/lib/libc/gen/signal.3 projects/virtio/lib/libc/gen/strtofflags.c projects/virtio/lib/libc/gen/wordexp.c projects/virtio/lib/libc/gmon/gmon.c projects/virtio/lib/libc/i386/sys/setlogin.S projects/virtio/lib/libc/iconv/Symbol.map projects/virtio/lib/libc/iconv/citrus_iconv_local.h projects/virtio/lib/libc/iconv/iconv.c projects/virtio/lib/libc/include/compat.h projects/virtio/lib/libc/include/libc_private.h projects/virtio/lib/libc/net/ether_addr.c projects/virtio/lib/libc/net/eui64.c projects/virtio/lib/libc/net/getaddrinfo.c projects/virtio/lib/libc/net/gethostbyht.c projects/virtio/lib/libc/net/gethostbyname.3 projects/virtio/lib/libc/net/getnetbyht.c projects/virtio/lib/libc/net/getprotoent.c projects/virtio/lib/libc/net/getservent.c projects/virtio/lib/libc/net/hesiod.c projects/virtio/lib/libc/net/if_nametoindex.c projects/virtio/lib/libc/net/name6.c projects/virtio/lib/libc/net/nscachedcli.c projects/virtio/lib/libc/net/nsdispatch.c projects/virtio/lib/libc/net/rcmd.c projects/virtio/lib/libc/net/sctp_sys_calls.c projects/virtio/lib/libc/posix1e/mac.c projects/virtio/lib/libc/resolv/res_init.c projects/virtio/lib/libc/resolv/res_query.c projects/virtio/lib/libc/resolv/res_send.c projects/virtio/lib/libc/stdio/flags.c projects/virtio/lib/libc/stdio/xprintf_errno.c projects/virtio/lib/libc/stdlib/strtonum.3 projects/virtio/lib/libc/stdlib/system.c projects/virtio/lib/libc/string/strerror.c projects/virtio/lib/libc/sys/Makefile.inc projects/virtio/lib/libc/sys/Symbol.map projects/virtio/lib/libc/sys/accept.2 projects/virtio/lib/libc/sys/cap_ioctls_limit.2 projects/virtio/lib/libc/sys/chflags.2 projects/virtio/lib/libc/sys/close.2 projects/virtio/lib/libc/sys/dup.2 projects/virtio/lib/libc/sys/ioctl.2 projects/virtio/lib/libc/sys/mmap.2 projects/virtio/lib/libc/sys/pdfork.2 projects/virtio/lib/libc/sys/pselect.2 projects/virtio/lib/libc/sys/read.2 projects/virtio/lib/libc/sys/sigaction.2 projects/virtio/lib/libc/sys/sigpending.2 projects/virtio/lib/libc/sys/sigreturn.2 projects/virtio/lib/libc/sys/sigsuspend.2 projects/virtio/lib/libc/sys/sigwait.2 projects/virtio/lib/libc/sys/socketpair.2 projects/virtio/lib/libc/sys/wait.2 projects/virtio/lib/libc/sys/write.2 projects/virtio/lib/libcompiler_rt/Makefile projects/virtio/lib/libcrypt/tests/crypt_tests.c projects/virtio/lib/libedit/readline.c projects/virtio/lib/libelf/libelf_data.c projects/virtio/lib/libfetch/http.c projects/virtio/lib/libiconv_modules/Makefile.inc projects/virtio/lib/libkiconv/xlat16_iconv.c projects/virtio/lib/libldns/Makefile projects/virtio/lib/libpam/libpam/Makefile projects/virtio/lib/libpam/modules/pam_passwdqc/Makefile projects/virtio/lib/libpam/modules/pam_ssh/Makefile projects/virtio/lib/libprocstat/libprocstat.c projects/virtio/lib/libprocstat/libprocstat.h projects/virtio/lib/libstand/tftp.c projects/virtio/lib/libthread_db/arch/arm/libpthread_md.c projects/virtio/lib/libusb/libusb20_ugen20.c projects/virtio/lib/libutil/expand_number.c projects/virtio/lib/libutil/humanize_number.3 projects/virtio/lib/libutil/humanize_number.c projects/virtio/lib/libutil/login_auth.c projects/virtio/lib/libutil/login_cap.c projects/virtio/lib/libutil/pidfile.c projects/virtio/lib/libutil/quotafile.c projects/virtio/lib/libutil/uucplock.c projects/virtio/lib/libvmmapi/vmmapi.c projects/virtio/lib/libvmmapi/vmmapi.h projects/virtio/lib/msun/Makefile projects/virtio/lib/msun/Symbol.map projects/virtio/lib/msun/src/math_private.h projects/virtio/lib/msun/src/s_erf.c projects/virtio/lib/msun/src/s_erff.c projects/virtio/libexec/rtld-elf/libmap.c projects/virtio/libexec/rtld-elf/libmap.h projects/virtio/libexec/rtld-elf/rtld.c projects/virtio/libexec/rtld-elf/rtld.h projects/virtio/release/Makefile projects/virtio/release/picobsd/build/picobsd projects/virtio/release/powerpc/mkisoimages.sh projects/virtio/release/release.conf.sample projects/virtio/release/release.sh projects/virtio/release/scripts/mm-mtree.sh projects/virtio/sbin/bsdlabel/bsdlabel.8 projects/virtio/sbin/camcontrol/camcontrol.8 projects/virtio/sbin/camcontrol/camcontrol.c projects/virtio/sbin/camcontrol/fwdownload.c projects/virtio/sbin/camcontrol/modeedit.c projects/virtio/sbin/ccdconfig/ccdconfig.8 projects/virtio/sbin/dhclient/bpf.c projects/virtio/sbin/dhclient/dhclient.c projects/virtio/sbin/etherswitchcfg/etherswitchcfg.8 projects/virtio/sbin/etherswitchcfg/etherswitchcfg.c projects/virtio/sbin/fdisk/fdisk.8 projects/virtio/sbin/fsck_ffs/fsutil.c projects/virtio/sbin/gbde/gbde.8 projects/virtio/sbin/geom/class/eli/geli.8 projects/virtio/sbin/geom/class/shsec/gshsec.8 projects/virtio/sbin/geom/class/virstor/gvirstor.8 projects/virtio/sbin/gvinum/gvinum.8 projects/virtio/sbin/hastd/hast.h projects/virtio/sbin/hastd/primary.c projects/virtio/sbin/hastd/secondary.c projects/virtio/sbin/hastd/subr.c projects/virtio/sbin/init/init.c projects/virtio/sbin/ipf/ipf/Makefile projects/virtio/sbin/ipf/ipftest/Makefile projects/virtio/sbin/ipf/libipf/Makefile projects/virtio/sbin/iscontrol/auth_subr.c projects/virtio/sbin/iscontrol/config.c projects/virtio/sbin/iscontrol/fsm.c projects/virtio/sbin/iscontrol/iscontrol.8 projects/virtio/sbin/iscontrol/iscontrol.c projects/virtio/sbin/iscontrol/iscsi.conf.5 projects/virtio/sbin/iscontrol/login.c projects/virtio/sbin/iscontrol/misc.c projects/virtio/sbin/iscontrol/pdu.c projects/virtio/sbin/mount_msdosfs/mount_msdosfs.8 projects/virtio/sbin/newfs/newfs.8 projects/virtio/sbin/newfs_msdos/newfs_msdos.8 projects/virtio/sbin/newfs_msdos/newfs_msdos.c projects/virtio/sbin/newfs_nandfs/newfs_nandfs.8 projects/virtio/sbin/nvmecontrol/perftest.c projects/virtio/sbin/recoverdisk/recoverdisk.1 projects/virtio/sbin/route/route.c projects/virtio/sbin/swapon/swapon.c projects/virtio/secure/lib/libssh/Makefile projects/virtio/secure/libexec/sftp-server/Makefile projects/virtio/secure/libexec/ssh-keysign/Makefile projects/virtio/secure/libexec/ssh-pkcs11-helper/Makefile projects/virtio/secure/usr.bin/bdes/bdes.1 projects/virtio/secure/usr.bin/scp/Makefile projects/virtio/secure/usr.bin/sftp/Makefile projects/virtio/secure/usr.bin/ssh-add/Makefile projects/virtio/secure/usr.bin/ssh-agent/Makefile projects/virtio/secure/usr.bin/ssh-keygen/Makefile projects/virtio/secure/usr.bin/ssh-keyscan/Makefile projects/virtio/secure/usr.bin/ssh/Makefile projects/virtio/secure/usr.sbin/sshd/Makefile projects/virtio/share/Makefile projects/virtio/share/doc/Makefile projects/virtio/share/examples/Makefile projects/virtio/share/examples/bhyve/vmrun.sh projects/virtio/share/examples/kld/Makefile projects/virtio/share/examples/scsi_target/scsi_target.c projects/virtio/share/i18n/csmapper/Makefile projects/virtio/share/i18n/esdb/Makefile projects/virtio/share/man/man4/Makefile projects/virtio/share/man/man4/altera_avgen.4 projects/virtio/share/man/man4/altq.4 projects/virtio/share/man/man4/bxe.4 projects/virtio/share/man/man4/capsicum.4 projects/virtio/share/man/man4/cd.4 projects/virtio/share/man/man4/ctl.4 projects/virtio/share/man/man4/ddb.4 projects/virtio/share/man/man4/geom.4 projects/virtio/share/man/man4/geom_linux_lvm.4 projects/virtio/share/man/man4/netgraph.4 projects/virtio/share/man/man4/netmap.4 projects/virtio/share/man/man4/ntb.4 projects/virtio/share/man/man4/psm.4 projects/virtio/share/man/man4/random.4 projects/virtio/share/man/man4/rsu.4 projects/virtio/share/man/man4/sa.4 projects/virtio/share/man/man4/sysmouse.4 projects/virtio/share/man/man4/udav.4 projects/virtio/share/man/man4/urtwn.4 projects/virtio/share/man/man4/vlan.4 projects/virtio/share/man/man4/vtnet.4 projects/virtio/share/man/man5/Makefile projects/virtio/share/man/man5/ext2fs.5 projects/virtio/share/man/man5/fstab.5 projects/virtio/share/man/man5/libmap.conf.5 projects/virtio/share/man/man5/msdosfs.5 projects/virtio/share/man/man5/periodic.conf.5 projects/virtio/share/man/man5/rc.conf.5 projects/virtio/share/man/man5/reiserfs.5 projects/virtio/share/man/man5/src.conf.5 projects/virtio/share/man/man7/Makefile projects/virtio/share/man/man7/release.7 projects/virtio/share/man/man8/picobsd.8 projects/virtio/share/man/man8/rc.8 projects/virtio/share/man/man8/rc.subr.8 projects/virtio/share/man/man9/EVENTHANDLER.9 projects/virtio/share/man/man9/Makefile projects/virtio/share/man/man9/SDT.9 projects/virtio/share/man/man9/VOP_FSYNC.9 projects/virtio/share/man/man9/atomic.9 projects/virtio/share/man/man9/firmware.9 projects/virtio/share/man/man9/lock.9 projects/virtio/share/man/man9/netisr.9 projects/virtio/share/man/man9/pfil.9 projects/virtio/share/man/man9/sleep.9 projects/virtio/share/man/man9/sysctl.9 projects/virtio/share/man/man9/sysctl_add_oid.9 projects/virtio/share/man/man9/timeout.9 projects/virtio/share/man/man9/vm_map_find.9 projects/virtio/share/man/man9/vm_page_grab.9 projects/virtio/share/man/man9/vnode.9 projects/virtio/share/misc/bsd-family-tree projects/virtio/share/misc/committers-ports.dot projects/virtio/share/misc/committers-src.dot projects/virtio/share/mk/atf.test.mk projects/virtio/share/mk/bsd.lib.mk projects/virtio/share/mk/bsd.libnames.mk projects/virtio/share/mk/bsd.own.mk projects/virtio/share/mk/bsd.prog.mk projects/virtio/share/mk/sys.mk projects/virtio/share/syscons/keymaps/INDEX.keymaps projects/virtio/sys/amd64/amd64/apic_vector.S projects/virtio/sys/amd64/amd64/cpu_switch.S projects/virtio/sys/amd64/amd64/db_disasm.c projects/virtio/sys/amd64/amd64/genassym.c projects/virtio/sys/amd64/amd64/initcpu.c projects/virtio/sys/amd64/amd64/machdep.c projects/virtio/sys/amd64/amd64/minidump_machdep.c projects/virtio/sys/amd64/amd64/mp_machdep.c projects/virtio/sys/amd64/amd64/pmap.c projects/virtio/sys/amd64/amd64/sys_machdep.c projects/virtio/sys/amd64/amd64/trap.c projects/virtio/sys/amd64/amd64/vm_machdep.c projects/virtio/sys/amd64/conf/GENERIC projects/virtio/sys/amd64/conf/NOTES projects/virtio/sys/amd64/include/acpica_machdep.h projects/virtio/sys/amd64/include/apicvar.h projects/virtio/sys/amd64/include/asm.h projects/virtio/sys/amd64/include/atomic.h projects/virtio/sys/amd64/include/cpu.h projects/virtio/sys/amd64/include/cpufunc.h projects/virtio/sys/amd64/include/intr_machdep.h projects/virtio/sys/amd64/include/pcpu.h projects/virtio/sys/amd64/include/pmap.h projects/virtio/sys/amd64/include/sf_buf.h projects/virtio/sys/amd64/include/smp.h projects/virtio/sys/amd64/include/vmm.h (contents, props changed) projects/virtio/sys/amd64/include/vmm_dev.h (contents, props changed) projects/virtio/sys/amd64/include/vmm_instruction_emul.h (contents, props changed) projects/virtio/sys/amd64/include/vmparam.h projects/virtio/sys/amd64/include/xen/hypercall.h projects/virtio/sys/amd64/include/xen/xen-os.h projects/virtio/sys/amd64/linux32/linux32_machdep.c projects/virtio/sys/amd64/linux32/linux32_proto.h projects/virtio/sys/amd64/linux32/linux32_syscall.h projects/virtio/sys/amd64/linux32/linux32_syscalls.c projects/virtio/sys/amd64/linux32/linux32_sysent.c projects/virtio/sys/amd64/vmm/amd/amdv.c projects/virtio/sys/amd64/vmm/intel/ept.c projects/virtio/sys/amd64/vmm/intel/ept.h projects/virtio/sys/amd64/vmm/intel/vmcs.c projects/virtio/sys/amd64/vmm/intel/vmcs.h projects/virtio/sys/amd64/vmm/intel/vmx.c projects/virtio/sys/amd64/vmm/intel/vmx.h projects/virtio/sys/amd64/vmm/intel/vmx_genassym.c projects/virtio/sys/amd64/vmm/intel/vmx_support.S projects/virtio/sys/amd64/vmm/intel/vtd.c projects/virtio/sys/amd64/vmm/io/ppt.c projects/virtio/sys/amd64/vmm/io/ppt.h projects/virtio/sys/amd64/vmm/vmm.c projects/virtio/sys/amd64/vmm/vmm_dev.c projects/virtio/sys/amd64/vmm/vmm_instruction_emul.c projects/virtio/sys/amd64/vmm/vmm_mem.c projects/virtio/sys/amd64/vmm/vmm_mem.h projects/virtio/sys/amd64/vmm/vmm_msr.c projects/virtio/sys/amd64/vmm/x86.c projects/virtio/sys/amd64/vmm/x86.h projects/virtio/sys/arm/arm/genassym.c projects/virtio/sys/arm/arm/irq_dispatch.S projects/virtio/sys/arm/arm/machdep.c projects/virtio/sys/arm/arm/mp_machdep.c projects/virtio/sys/arm/arm/pmap-v6.c projects/virtio/sys/arm/arm/pmap.c projects/virtio/sys/arm/arm/stdatomic.c projects/virtio/sys/arm/arm/swtch.S projects/virtio/sys/arm/arm/sys_machdep.c projects/virtio/sys/arm/arm/undefined.c projects/virtio/sys/arm/arm/vfp.c projects/virtio/sys/arm/arm/vm_machdep.c projects/virtio/sys/arm/broadcom/bcm2835/bcm2835_gpio.c projects/virtio/sys/arm/broadcom/bcm2835/bcm2835_systimer.c projects/virtio/sys/arm/conf/ARMADAXP projects/virtio/sys/arm/conf/ARNDALE projects/virtio/sys/arm/conf/BEAGLEBONE projects/virtio/sys/arm/conf/CUBIEBOARD projects/virtio/sys/arm/conf/CUBIEBOARD2 projects/virtio/sys/arm/conf/EFIKA_MX projects/virtio/sys/arm/conf/PANDABOARD projects/virtio/sys/arm/conf/RPI-B projects/virtio/sys/arm/conf/VERSATILEPB projects/virtio/sys/arm/conf/ZEDBOARD projects/virtio/sys/arm/freescale/imx/files.imx51 projects/virtio/sys/arm/freescale/imx/imx51_ccm.c projects/virtio/sys/arm/freescale/imx/imx51_gpio.c projects/virtio/sys/arm/freescale/imx/imx51_iomux.c projects/virtio/sys/arm/freescale/imx/imx_gpt.c projects/virtio/sys/arm/freescale/imx/imx_gptreg.h projects/virtio/sys/arm/freescale/imx/imx_wdog.c projects/virtio/sys/arm/include/fp.h projects/virtio/sys/arm/include/ieee.h projects/virtio/sys/arm/include/param.h projects/virtio/sys/arm/include/pcb.h projects/virtio/sys/arm/include/pcpu.h projects/virtio/sys/arm/include/pmap.h projects/virtio/sys/arm/include/pte.h projects/virtio/sys/arm/include/sf_buf.h projects/virtio/sys/arm/include/vmparam.h projects/virtio/sys/arm/s3c2xx0/uart_bus_s3c2410.c projects/virtio/sys/arm/s3c2xx0/uart_cpu_s3c2410.c projects/virtio/sys/arm/samsung/exynos/exynos5_machdep.c projects/virtio/sys/arm/ti/am335x/am335x_prcm.c projects/virtio/sys/arm/ti/am335x/files.am335x projects/virtio/sys/arm/ti/files.ti projects/virtio/sys/arm/ti/ti_prcm.h projects/virtio/sys/arm/versatile/versatile_pci.c projects/virtio/sys/boot/arm/ixp425/boot2/Makefile projects/virtio/sys/boot/common/loader.8 projects/virtio/sys/boot/fdt/dts/am335x.dtsi projects/virtio/sys/boot/forth/beastie.4th projects/virtio/sys/boot/forth/loader.conf projects/virtio/sys/boot/forth/version.4th projects/virtio/sys/boot/forth/version.4th.8 projects/virtio/sys/boot/i386/btx/btx/btx.S projects/virtio/sys/boot/i386/efi/Makefile projects/virtio/sys/boot/i386/libi386/biosacpi.c projects/virtio/sys/boot/powerpc/boot1.chrp/Makefile projects/virtio/sys/boot/userboot/libstand/Makefile projects/virtio/sys/boot/userboot/test/Makefile projects/virtio/sys/boot/userboot/userboot/Makefile projects/virtio/sys/bsm/audit_kevents.h projects/virtio/sys/bsm/audit_record.h projects/virtio/sys/cam/ata/ata_da.c projects/virtio/sys/cam/cam.h projects/virtio/sys/cam/cam_ccb.h projects/virtio/sys/cam/cam_compat.c projects/virtio/sys/cam/cam_compat.h projects/virtio/sys/cam/cam_debug.h projects/virtio/sys/cam/cam_periph.c projects/virtio/sys/cam/cam_xpt.c projects/virtio/sys/cam/cam_xpt.h projects/virtio/sys/cam/ctl/ctl.c projects/virtio/sys/cam/ctl/ctl.h projects/virtio/sys/cam/ctl/ctl_backend.h projects/virtio/sys/cam/ctl/ctl_backend_block.c projects/virtio/sys/cam/ctl/ctl_backend_ramdisk.c projects/virtio/sys/cam/ctl/ctl_frontend.h projects/virtio/sys/cam/ctl/ctl_io.h projects/virtio/sys/cam/ctl/ctl_ioctl.h projects/virtio/sys/cam/ctl/scsi_ctl.c projects/virtio/sys/cam/scsi/scsi_all.c projects/virtio/sys/cam/scsi/scsi_all.h projects/virtio/sys/cam/scsi/scsi_ch.c projects/virtio/sys/cam/scsi/scsi_da.c projects/virtio/sys/cam/scsi/scsi_da.h projects/virtio/sys/cam/scsi/scsi_enc.c projects/virtio/sys/cam/scsi/scsi_enc_ses.c projects/virtio/sys/cam/scsi/scsi_pass.c projects/virtio/sys/cam/scsi/scsi_sa.c projects/virtio/sys/cam/scsi/scsi_targ_bh.c projects/virtio/sys/cam/scsi/scsi_target.c projects/virtio/sys/cddl/compat/opensolaris/sys/file.h projects/virtio/sys/cddl/compat/opensolaris/sys/kcondvar.h projects/virtio/sys/cddl/compat/opensolaris/sys/time.h projects/virtio/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c projects/virtio/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h projects/virtio/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c projects/virtio/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c projects/virtio/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/virtio/sys/cddl/contrib/opensolaris/uts/common/sys/ctf_api.h projects/virtio/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h projects/virtio/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h projects/virtio/sys/cddl/dev/dtrace/dtrace_clone.c projects/virtio/sys/cddl/dev/dtrace/dtrace_load.c projects/virtio/sys/cddl/dev/dtrace/dtrace_unload.c projects/virtio/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S projects/virtio/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c projects/virtio/sys/cddl/dev/dtrace/powerpc/dtrace_subr.c projects/virtio/sys/cddl/dev/fbt/fbt.c projects/virtio/sys/cddl/dev/fbt/fbt_powerpc.c projects/virtio/sys/cddl/dev/sdt/sdt.c projects/virtio/sys/compat/freebsd32/freebsd32.h projects/virtio/sys/compat/freebsd32/freebsd32_ioctl.c projects/virtio/sys/compat/freebsd32/freebsd32_misc.c projects/virtio/sys/compat/freebsd32/freebsd32_proto.h projects/virtio/sys/compat/freebsd32/freebsd32_syscall.h projects/virtio/sys/compat/freebsd32/freebsd32_syscalls.c projects/virtio/sys/compat/freebsd32/freebsd32_sysent.c projects/virtio/sys/compat/freebsd32/freebsd32_systrace_args.c projects/virtio/sys/compat/freebsd32/syscalls.master projects/virtio/sys/compat/linux/linux_dtrace.h projects/virtio/sys/compat/linux/linux_file.c projects/virtio/sys/compat/linux/linux_futex.c projects/virtio/sys/compat/linux/linux_ioctl.c projects/virtio/sys/compat/linux/linux_misc.c projects/virtio/sys/compat/linux/linux_socket.c projects/virtio/sys/compat/linux/linux_uid16.c projects/virtio/sys/compat/ndis/kern_ndis.c projects/virtio/sys/compat/ndis/ndis_var.h projects/virtio/sys/compat/svr4/imgact_svr4.c projects/virtio/sys/compat/svr4/svr4_fcntl.c projects/virtio/sys/compat/svr4/svr4_filio.c projects/virtio/sys/compat/svr4/svr4_ioctl.c projects/virtio/sys/compat/svr4/svr4_misc.c projects/virtio/sys/compat/svr4/svr4_stream.c projects/virtio/sys/conf/Makefile.amd64 projects/virtio/sys/conf/NOTES projects/virtio/sys/conf/files projects/virtio/sys/conf/files.amd64 projects/virtio/sys/conf/files.arm projects/virtio/sys/conf/files.i386 projects/virtio/sys/conf/files.mips projects/virtio/sys/conf/files.powerpc projects/virtio/sys/conf/kern.post.mk projects/virtio/sys/conf/newvers.sh projects/virtio/sys/conf/options projects/virtio/sys/conf/options.amd64 projects/virtio/sys/conf/options.arm projects/virtio/sys/conf/options.i386 projects/virtio/sys/conf/options.mips projects/virtio/sys/conf/options.powerpc projects/virtio/sys/contrib/dev/acpica/acpica_prep.sh projects/virtio/sys/contrib/dev/acpica/changes.txt (contents, props changed) projects/virtio/sys/contrib/dev/acpica/common/adisasm.c projects/virtio/sys/contrib/dev/acpica/common/adwalk.c projects/virtio/sys/contrib/dev/acpica/common/dmextern.c projects/virtio/sys/contrib/dev/acpica/common/dmtable.c projects/virtio/sys/contrib/dev/acpica/compiler/aslcompile.c projects/virtio/sys/contrib/dev/acpica/compiler/aslglobal.h projects/virtio/sys/contrib/dev/acpica/compiler/aslload.c projects/virtio/sys/contrib/dev/acpica/compiler/aslmain.c projects/virtio/sys/contrib/dev/acpica/compiler/asloptions.c projects/virtio/sys/contrib/dev/acpica/compiler/dtcompile.c projects/virtio/sys/contrib/dev/acpica/components/debugger/dbcmds.c projects/virtio/sys/contrib/dev/acpica/components/debugger/dbfileio.c projects/virtio/sys/contrib/dev/acpica/components/debugger/dbinput.c projects/virtio/sys/contrib/dev/acpica/components/debugger/dbnames.c projects/virtio/sys/contrib/dev/acpica/components/events/evgpeutil.c projects/virtio/sys/contrib/dev/acpica/components/events/evmisc.c projects/virtio/sys/contrib/dev/acpica/components/events/evregion.c projects/virtio/sys/contrib/dev/acpica/components/events/evsci.c projects/virtio/sys/contrib/dev/acpica/components/events/evxface.c projects/virtio/sys/contrib/dev/acpica/components/hardware/hwxface.c projects/virtio/sys/contrib/dev/acpica/components/namespace/nsaccess.c projects/virtio/sys/contrib/dev/acpica/components/namespace/nsdump.c projects/virtio/sys/contrib/dev/acpica/components/namespace/nsxfeval.c projects/virtio/sys/contrib/dev/acpica/components/tables/tbinstal.c projects/virtio/sys/contrib/dev/acpica/components/tables/tbprint.c projects/virtio/sys/contrib/dev/acpica/components/tables/tbxfroot.c projects/virtio/sys/contrib/dev/acpica/components/utilities/utdebug.c projects/virtio/sys/contrib/dev/acpica/components/utilities/utglobal.c projects/virtio/sys/contrib/dev/acpica/include/acdebug.h projects/virtio/sys/contrib/dev/acpica/include/acdisasm.h projects/virtio/sys/contrib/dev/acpica/include/acevents.h projects/virtio/sys/contrib/dev/acpica/include/acexcep.h projects/virtio/sys/contrib/dev/acpica/include/acglobal.h projects/virtio/sys/contrib/dev/acpica/include/aclocal.h projects/virtio/sys/contrib/dev/acpica/include/acnamesp.h projects/virtio/sys/contrib/dev/acpica/include/acpiosxf.h projects/virtio/sys/contrib/dev/acpica/include/acpixf.h projects/virtio/sys/contrib/dev/acpica/include/actypes.h projects/virtio/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c projects/virtio/sys/contrib/ipfilter/netinet/fil.c projects/virtio/sys/contrib/ipfilter/netinet/ip_auth.c projects/virtio/sys/contrib/ipfilter/netinet/ip_auth.h projects/virtio/sys/contrib/ipfilter/netinet/ip_compat.h projects/virtio/sys/contrib/ipfilter/netinet/ip_fil.h projects/virtio/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c (contents, props changed) projects/virtio/sys/contrib/ipfilter/netinet/ip_frag.c projects/virtio/sys/contrib/ipfilter/netinet/ip_frag.h projects/virtio/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c projects/virtio/sys/contrib/ipfilter/netinet/ip_htable.c projects/virtio/sys/contrib/ipfilter/netinet/ip_htable.h projects/virtio/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c projects/virtio/sys/contrib/ipfilter/netinet/ip_irc_pxy.c projects/virtio/sys/contrib/ipfilter/netinet/ip_log.c projects/virtio/sys/contrib/ipfilter/netinet/ip_lookup.c projects/virtio/sys/contrib/ipfilter/netinet/ip_lookup.h projects/virtio/sys/contrib/ipfilter/netinet/ip_nat.c projects/virtio/sys/contrib/ipfilter/netinet/ip_nat.h projects/virtio/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c projects/virtio/sys/contrib/ipfilter/netinet/ip_pool.c projects/virtio/sys/contrib/ipfilter/netinet/ip_pool.h projects/virtio/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c projects/virtio/sys/contrib/ipfilter/netinet/ip_proxy.c projects/virtio/sys/contrib/ipfilter/netinet/ip_proxy.h projects/virtio/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c (contents, props changed) projects/virtio/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c projects/virtio/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c projects/virtio/sys/contrib/ipfilter/netinet/ip_rules.c projects/virtio/sys/contrib/ipfilter/netinet/ip_scan.c projects/virtio/sys/contrib/ipfilter/netinet/ip_scan.h projects/virtio/sys/contrib/ipfilter/netinet/ip_state.c projects/virtio/sys/contrib/ipfilter/netinet/ip_state.h projects/virtio/sys/contrib/ipfilter/netinet/ip_sync.c projects/virtio/sys/contrib/ipfilter/netinet/ip_sync.h projects/virtio/sys/contrib/ipfilter/netinet/ipl.h projects/virtio/sys/contrib/ipfilter/netinet/mlfk_ipl.c projects/virtio/sys/contrib/rdma/ib_umem.h projects/virtio/sys/contrib/rdma/krping/krping.c projects/virtio/sys/contrib/rdma/krping/krping.h projects/virtio/sys/contrib/rdma/krping/krping_dev.c projects/virtio/sys/crypto/aesni/aeskeys_amd64.S projects/virtio/sys/crypto/aesni/aesni.c projects/virtio/sys/crypto/aesni/aesni.h projects/virtio/sys/crypto/aesni/aesni_wrap.c projects/virtio/sys/dev/aac/aac_linux.c projects/virtio/sys/dev/aacraid/aacraid_linux.c projects/virtio/sys/dev/aacraid/aacraid_pci.c projects/virtio/sys/dev/acpica/Osd/OsdSynch.c projects/virtio/sys/dev/acpica/acpi_thermal.c projects/virtio/sys/dev/acpica/acpi_timer.c projects/virtio/sys/dev/adb/adb_mouse.c projects/virtio/sys/dev/advansys/adw_pci.c projects/virtio/sys/dev/agp/agp.c projects/virtio/sys/dev/agp/agp_i810.c projects/virtio/sys/dev/ahci/ahci.c projects/virtio/sys/dev/aic7xxx/ahc_pci.c projects/virtio/sys/dev/aic7xxx/ahd_pci.c projects/virtio/sys/dev/amdtemp/amdtemp.c projects/virtio/sys/dev/amr/amr_linux.c projects/virtio/sys/dev/amr/amr_pci.c projects/virtio/sys/dev/an/if_an_pci.c projects/virtio/sys/dev/arcmsr/arcmsr.c projects/virtio/sys/dev/asr/asr.c projects/virtio/sys/dev/ata/ata-all.c projects/virtio/sys/dev/ata/ata-card.c projects/virtio/sys/dev/ata/ata-pci.c projects/virtio/sys/dev/ath/ath_hal/ar5212/ar5212.h projects/virtio/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c projects/virtio/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c projects/virtio/sys/dev/ath/if_ath.c projects/virtio/sys/dev/ath/if_ath_tx.c projects/virtio/sys/dev/atkbdc/psm.c projects/virtio/sys/dev/bce/if_bce.c projects/virtio/sys/dev/bktr/bktr_os.c projects/virtio/sys/dev/buslogic/bt_pci.c projects/virtio/sys/dev/bwi/bwimac.c projects/virtio/sys/dev/cas/if_cas.c projects/virtio/sys/dev/cfi/cfi_bus_nexus.c projects/virtio/sys/dev/cfi/cfi_core.c projects/virtio/sys/dev/cfi/cfi_dev.c projects/virtio/sys/dev/cfi/cfi_disk.c projects/virtio/sys/dev/cfi/cfi_reg.h projects/virtio/sys/dev/cfi/cfi_var.h projects/virtio/sys/dev/cpuctl/cpuctl.c projects/virtio/sys/dev/cxgb/cxgb_sge.c projects/virtio/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c projects/virtio/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c projects/virtio/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c projects/virtio/sys/dev/cxgbe/adapter.h projects/virtio/sys/dev/cxgbe/offload.h projects/virtio/sys/dev/cxgbe/osdep.h projects/virtio/sys/dev/cxgbe/t4_main.c projects/virtio/sys/dev/cxgbe/t4_sge.c projects/virtio/sys/dev/cxgbe/t4_tracer.c projects/virtio/sys/dev/cxgbe/tom/t4_cpl_io.c projects/virtio/sys/dev/cxgbe/tom/t4_listen.c projects/virtio/sys/dev/cxgbe/tom/t4_tom.c projects/virtio/sys/dev/cxgbe/tom/t4_tom.h projects/virtio/sys/dev/dpt/dpt_pci.c projects/virtio/sys/dev/drm2/drmP.h projects/virtio/sys/dev/drm2/drm_atomic.h projects/virtio/sys/dev/drm2/drm_context.c projects/virtio/sys/dev/drm2/drm_crtc.c projects/virtio/sys/dev/drm2/drm_crtc.h projects/virtio/sys/dev/drm2/drm_crtc_helper.h projects/virtio/sys/dev/drm2/drm_dp_helper.h projects/virtio/sys/dev/drm2/drm_dp_iic_helper.c projects/virtio/sys/dev/drm2/drm_drv.c projects/virtio/sys/dev/drm2/drm_edid.c projects/virtio/sys/dev/drm2/drm_gem.c projects/virtio/sys/dev/drm2/drm_gem_names.c projects/virtio/sys/dev/drm2/drm_ioctl.c projects/virtio/sys/dev/drm2/drm_irq.c projects/virtio/sys/dev/drm2/drm_linux_list.h projects/virtio/sys/dev/drm2/drm_pci.c projects/virtio/sys/dev/drm2/drm_pciids.h projects/virtio/sys/dev/drm2/drm_sysctl.c projects/virtio/sys/dev/drm2/i915/i915_gem.c projects/virtio/sys/dev/drm2/i915/i915_gem_execbuffer.c projects/virtio/sys/dev/drm2/i915/intel_crt.c projects/virtio/sys/dev/drm2/i915/intel_display.c projects/virtio/sys/dev/drm2/i915/intel_dp.c projects/virtio/sys/dev/drm2/i915/intel_drv.h projects/virtio/sys/dev/drm2/i915/intel_hdmi.c projects/virtio/sys/dev/drm2/i915/intel_lvds.c projects/virtio/sys/dev/drm2/i915/intel_panel.c projects/virtio/sys/dev/drm2/i915/intel_sdvo.c projects/virtio/sys/dev/drm2/i915/intel_tv.c projects/virtio/sys/dev/drm2/ttm/ttm_bo.c projects/virtio/sys/dev/drm2/ttm/ttm_bo_driver.h projects/virtio/sys/dev/drm2/ttm/ttm_bo_util.c projects/virtio/sys/dev/drm2/ttm/ttm_bo_vm.c projects/virtio/sys/dev/drm2/ttm/ttm_execbuf_util.c projects/virtio/sys/dev/drm2/ttm/ttm_page_alloc.c projects/virtio/sys/dev/drm2/ttm/ttm_tt.c projects/virtio/sys/dev/e1000/e1000_80003es2lan.c projects/virtio/sys/dev/e1000/e1000_80003es2lan.h projects/virtio/sys/dev/e1000/e1000_82571.c projects/virtio/sys/dev/e1000/e1000_82575.c projects/virtio/sys/dev/e1000/e1000_82575.h projects/virtio/sys/dev/e1000/e1000_api.c projects/virtio/sys/dev/e1000/e1000_defines.h projects/virtio/sys/dev/e1000/e1000_hw.h projects/virtio/sys/dev/e1000/e1000_i210.c projects/virtio/sys/dev/e1000/e1000_i210.h projects/virtio/sys/dev/e1000/e1000_ich8lan.c projects/virtio/sys/dev/e1000/e1000_ich8lan.h projects/virtio/sys/dev/e1000/e1000_mac.c projects/virtio/sys/dev/e1000/e1000_osdep.h projects/virtio/sys/dev/e1000/e1000_phy.c projects/virtio/sys/dev/e1000/e1000_phy.h projects/virtio/sys/dev/e1000/e1000_regs.h projects/virtio/sys/dev/e1000/e1000_vf.h projects/virtio/sys/dev/e1000/if_em.c projects/virtio/sys/dev/e1000/if_igb.c projects/virtio/sys/dev/e1000/if_igb.h projects/virtio/sys/dev/e1000/if_lem.c projects/virtio/sys/dev/fatm/if_fatm.c projects/virtio/sys/dev/fb/vesa.c projects/virtio/sys/dev/fdc/fdc.c projects/virtio/sys/dev/filemon/filemon.c projects/virtio/sys/dev/firewire/fwdev.c projects/virtio/sys/dev/firewire/fwohci_pci.c projects/virtio/sys/dev/firewire/sbp.c projects/virtio/sys/dev/flash/mx25l.c projects/virtio/sys/dev/fxp/if_fxp.c projects/virtio/sys/dev/glxsb/glxsb.c projects/virtio/sys/dev/gpio/gpiobus.c projects/virtio/sys/dev/gxemul/cons/gxemul_cons.c projects/virtio/sys/dev/gxemul/disk/gxemul_disk.c projects/virtio/sys/dev/gxemul/disk/gxemul_diskreg.h projects/virtio/sys/dev/gxemul/ether/gxreg.h projects/virtio/sys/dev/hatm/if_hatm.c projects/virtio/sys/dev/hatm/if_hatm_intr.c projects/virtio/sys/dev/hifn/hifn7751.c projects/virtio/sys/dev/hpt27xx/hpt27xx_osm_bsd.c projects/virtio/sys/dev/hpt27xx/os_bsd.h projects/virtio/sys/dev/hptiop/hptiop.c projects/virtio/sys/dev/hptiop/hptiop.h projects/virtio/sys/dev/hptmv/entry.c projects/virtio/sys/dev/hptmv/osbsd.h projects/virtio/sys/dev/hptnr/hptnr_osm_bsd.c projects/virtio/sys/dev/hptnr/os_bsd.h projects/virtio/sys/dev/hptrr/hptrr_osm_bsd.c projects/virtio/sys/dev/hptrr/os_bsd.h projects/virtio/sys/dev/hwpmc/hwpmc_core.c projects/virtio/sys/dev/hwpmc/hwpmc_logging.c projects/virtio/sys/dev/hwpmc/hwpmc_mod.c projects/virtio/sys/dev/hwpmc/hwpmc_powerpc.c projects/virtio/sys/dev/hwpmc/pmc_events.h projects/virtio/sys/dev/if_ndis/if_ndis.c projects/virtio/sys/dev/iicbus/if_ic.c projects/virtio/sys/dev/iir/iir.c projects/virtio/sys/dev/iir/iir.h projects/virtio/sys/dev/iir/iir_ctrl.c projects/virtio/sys/dev/iir/iir_pci.c projects/virtio/sys/dev/ipmi/ipmi_linux.c projects/virtio/sys/dev/ips/ips_pci.c projects/virtio/sys/dev/isci/isci.c projects/virtio/sys/dev/isci/isci_io_request.c projects/virtio/sys/dev/isci/isci_sysctl.c projects/virtio/sys/dev/isci/isci_task_request.c projects/virtio/sys/dev/isp/isp_freebsd.c projects/virtio/sys/dev/isp/isp_pci.c projects/virtio/sys/dev/iwn/if_iwn.c projects/virtio/sys/dev/ixgb/if_ixgb.c projects/virtio/sys/dev/ixgbe/ixgbe.c projects/virtio/sys/dev/ixgbe/ixv.c projects/virtio/sys/dev/jme/if_jme.c projects/virtio/sys/dev/lge/if_lge.c projects/virtio/sys/dev/lmc/if_lmc.c projects/virtio/sys/dev/md/md.c projects/virtio/sys/dev/mfi/mfi_cam.c projects/virtio/sys/dev/mfi/mfi_linux.c projects/virtio/sys/dev/mfi/mfi_pci.c projects/virtio/sys/dev/mfi/mfi_syspd.c projects/virtio/sys/dev/mfi/mfireg.h projects/virtio/sys/dev/mge/if_mge.c projects/virtio/sys/dev/mly/mly.c projects/virtio/sys/dev/mmc/mmc.c projects/virtio/sys/dev/mmc/mmcsd.c projects/virtio/sys/dev/mn/if_mn.c projects/virtio/sys/dev/mps/mps_pci.c projects/virtio/sys/dev/mps/mps_sas.c projects/virtio/sys/dev/mps/mps_sas_lsi.c projects/virtio/sys/dev/mpt/mpt_pci.c projects/virtio/sys/dev/mwl/if_mwl.c projects/virtio/sys/dev/mwl/if_mwl_pci.c projects/virtio/sys/dev/mxge/if_mxge.c projects/virtio/sys/dev/netmap/if_igb_netmap.h projects/virtio/sys/dev/nfe/if_nfe.c projects/virtio/sys/dev/ntb/if_ntb/if_ntb.c projects/virtio/sys/dev/ntb/ntb_hw/ntb_hw.c projects/virtio/sys/dev/ntb/ntb_hw/ntb_hw.h projects/virtio/sys/dev/ntb/ntb_hw/ntb_regs.h projects/virtio/sys/dev/nvd/nvd.c projects/virtio/sys/dev/nvme/nvme.c projects/virtio/sys/dev/nvme/nvme.h projects/virtio/sys/dev/nvme/nvme_ctrlr.c projects/virtio/sys/dev/nvme/nvme_ns.c projects/virtio/sys/dev/nvme/nvme_private.h projects/virtio/sys/dev/nvme/nvme_test.c projects/virtio/sys/dev/ofw/ofw_bus_subr.c projects/virtio/sys/dev/ofw/ofw_console.c projects/virtio/sys/dev/ofw/openfirm.c projects/virtio/sys/dev/ofw/openfirm.h projects/virtio/sys/dev/patm/if_patm.c projects/virtio/sys/dev/patm/if_patm_tx.c projects/virtio/sys/dev/pccbb/pccbb_pci.c projects/virtio/sys/dev/pci/pcivar.h projects/virtio/sys/dev/pci/vga_pci.c projects/virtio/sys/dev/ppbus/if_plip.c projects/virtio/sys/dev/pst/pst-pci.c projects/virtio/sys/dev/qlxgb/qla_hw.c projects/virtio/sys/dev/qlxgbe/ql_misc.c projects/virtio/sys/dev/qlxgbe/ql_os.c projects/virtio/sys/dev/random/harvest.c projects/virtio/sys/dev/random/hash.c projects/virtio/sys/dev/random/hash.h projects/virtio/sys/dev/random/ivy.c projects/virtio/sys/dev/random/nehemiah.c projects/virtio/sys/dev/random/random_adaptors.c projects/virtio/sys/dev/random/random_adaptors.h projects/virtio/sys/dev/random/randomdev.c projects/virtio/sys/dev/random/randomdev.h projects/virtio/sys/dev/random/randomdev_soft.c projects/virtio/sys/dev/random/randomdev_soft.h projects/virtio/sys/dev/random/yarrow.c projects/virtio/sys/dev/random/yarrow.h projects/virtio/sys/dev/rndtest/rndtest.c projects/virtio/sys/dev/rp/rp_pci.c projects/virtio/sys/dev/safe/safe.c projects/virtio/sys/dev/sdhci/sdhci.c projects/virtio/sys/dev/sdhci/sdhci.h projects/virtio/sys/dev/sfxge/sfxge_rx.c projects/virtio/sys/dev/sound/pci/als4000.c projects/virtio/sys/dev/sound/pci/aureal.c projects/virtio/sys/dev/sound/pci/cmi.c projects/virtio/sys/dev/sound/pci/cs4281.c projects/virtio/sys/dev/sound/pci/csa.c projects/virtio/sys/dev/sound/pci/ds1.c projects/virtio/sys/dev/sound/pci/emu10k1.c projects/virtio/sys/dev/sound/pci/emu10kx.c projects/virtio/sys/dev/sound/pci/envy24.c projects/virtio/sys/dev/sound/pci/envy24ht.c projects/virtio/sys/dev/sound/pci/es137x.c projects/virtio/sys/dev/sound/pci/fm801.c projects/virtio/sys/dev/sound/pci/hdspe.c projects/virtio/sys/dev/sound/pci/maestro.c projects/virtio/sys/dev/sound/pci/maestro3.c projects/virtio/sys/dev/sound/pci/neomagic.c projects/virtio/sys/dev/sound/pci/solo.c projects/virtio/sys/dev/sound/pci/t4dwave.c projects/virtio/sys/dev/sound/pci/via82c686.c projects/virtio/sys/dev/sound/pci/vibes.c projects/virtio/sys/dev/stge/if_stge.c projects/virtio/sys/dev/streams/streams.c projects/virtio/sys/dev/sym/sym_hipd.c projects/virtio/sys/dev/syscons/scmouse.c projects/virtio/sys/dev/syscons/syscons.c projects/virtio/sys/dev/tdfx/tdfx_linux.c projects/virtio/sys/dev/tdfx/tdfx_pci.c projects/virtio/sys/dev/ti/if_ti.c projects/virtio/sys/dev/twa/tw_osl_freebsd.c projects/virtio/sys/dev/tws/tws.c projects/virtio/sys/dev/tws/tws_cam.c projects/virtio/sys/dev/uart/uart.h projects/virtio/sys/dev/uart/uart_bus_fdt.c projects/virtio/sys/dev/uart/uart_core.c projects/virtio/sys/dev/uart/uart_cpu_fdt.c projects/virtio/sys/dev/uart/uart_dev_ns8250.c projects/virtio/sys/dev/ubsec/ubsec.c projects/virtio/sys/dev/usb/controller/dwc_otg.c projects/virtio/sys/dev/usb/controller/ehci.c projects/virtio/sys/dev/usb/controller/ehci_pci.c projects/virtio/sys/dev/usb/controller/musb_otg.c projects/virtio/sys/dev/usb/controller/ohci_pci.c projects/virtio/sys/dev/usb/controller/xhci.c projects/virtio/sys/dev/usb/controller/xhci.h projects/virtio/sys/dev/usb/controller/xhci_pci.c projects/virtio/sys/dev/usb/input/ukbd.c projects/virtio/sys/dev/usb/net/if_udav.c projects/virtio/sys/dev/usb/net/if_usie.c projects/virtio/sys/dev/usb/net/uhso.c projects/virtio/sys/dev/usb/serial/uftdi.c projects/virtio/sys/dev/usb/storage/umass.c projects/virtio/sys/dev/usb/usb_compat_linux.c projects/virtio/sys/dev/usb/usb_hub.c projects/virtio/sys/dev/usb/usb_ioctl.h projects/virtio/sys/dev/usb/usb_request.c projects/virtio/sys/dev/usb/usbdevs projects/virtio/sys/dev/usb/wlan/if_run.c projects/virtio/sys/dev/virtio/network/if_vtnet.c projects/virtio/sys/dev/virtio/network/if_vtnetvar.h projects/virtio/sys/dev/virtio/network/virtio_net.h projects/virtio/sys/dev/virtio/pci/virtio_pci.c projects/virtio/sys/dev/virtio/virtio_if.m projects/virtio/sys/dev/virtio/virtqueue.c projects/virtio/sys/dev/virtio/virtqueue.h projects/virtio/sys/dev/vkbd/vkbd.c projects/virtio/sys/dev/wb/if_wb.c projects/virtio/sys/dev/wi/if_wi_pci.c projects/virtio/sys/dev/xen/balloon/balloon.c projects/virtio/sys/dev/xen/blkback/blkback.c projects/virtio/sys/dev/xen/blkfront/blkfront.c projects/virtio/sys/dev/xen/blkfront/block.h projects/virtio/sys/dev/xen/console/console.c projects/virtio/sys/dev/xen/console/xencons_ring.c projects/virtio/sys/dev/xen/control/control.c projects/virtio/sys/dev/xen/netback/netback.c projects/virtio/sys/dev/xen/netfront/netfront.c projects/virtio/sys/dev/xen/xenpci/xenpci.c projects/virtio/sys/dev/xen/xenpci/xenpcivar.h projects/virtio/sys/fs/cd9660/cd9660_vfsops.c projects/virtio/sys/fs/devfs/devfs_vnops.c projects/virtio/sys/fs/ext2fs/ext2_alloc.c projects/virtio/sys/fs/ext2fs/ext2_balloc.c projects/virtio/sys/fs/ext2fs/ext2_bmap.c projects/virtio/sys/fs/ext2fs/ext2_dinode.h projects/virtio/sys/fs/ext2fs/ext2_extern.h projects/virtio/sys/fs/ext2fs/ext2_htree.c projects/virtio/sys/fs/ext2fs/ext2_inode.c projects/virtio/sys/fs/ext2fs/ext2_inode_cnv.c projects/virtio/sys/fs/ext2fs/ext2_lookup.c projects/virtio/sys/fs/ext2fs/ext2_subr.c projects/virtio/sys/fs/ext2fs/ext2_vfsops.c projects/virtio/sys/fs/ext2fs/ext2_vnops.c projects/virtio/sys/fs/ext2fs/ext2fs.h projects/virtio/sys/fs/ext2fs/inode.h projects/virtio/sys/fs/fdescfs/fdesc_vnops.c projects/virtio/sys/fs/fuse/fuse_vfsops.c projects/virtio/sys/fs/msdosfs/msdosfs_denode.c projects/virtio/sys/fs/msdosfs/msdosfs_vnops.c projects/virtio/sys/fs/nfs/nfs.h projects/virtio/sys/fs/nfs/nfsport.h projects/virtio/sys/fs/nfs/nfsrvcache.h projects/virtio/sys/fs/nfsclient/nfs_clkrpc.c projects/virtio/sys/fs/nfsclient/nfs_clport.c projects/virtio/sys/fs/nfsclient/nfs_clvfsops.c projects/virtio/sys/fs/nfsserver/nfs_nfsdcache.c projects/virtio/sys/fs/nfsserver/nfs_nfsdport.c projects/virtio/sys/fs/nullfs/null_vnops.c projects/virtio/sys/fs/smbfs/smbfs_node.c projects/virtio/sys/fs/smbfs/smbfs_vnops.c projects/virtio/sys/fs/tmpfs/tmpfs_subr.c projects/virtio/sys/fs/tmpfs/tmpfs_vfsops.c projects/virtio/sys/fs/tmpfs/tmpfs_vnops.c projects/virtio/sys/geom/eli/g_eli.c projects/virtio/sys/geom/geom_dev.c projects/virtio/sys/geom/geom_disk.c projects/virtio/sys/geom/geom_int.h projects/virtio/sys/geom/geom_kern.c projects/virtio/sys/geom/geom_subr.c projects/virtio/sys/geom/mirror/g_mirror.c projects/virtio/sys/geom/part/g_part_ldm.c projects/virtio/sys/geom/raid/g_raid.c projects/virtio/sys/geom/raid/g_raid.h projects/virtio/sys/geom/raid/tr_raid5.c projects/virtio/sys/geom/zero/g_zero.c projects/virtio/sys/i386/conf/GENERIC projects/virtio/sys/i386/conf/NOTES projects/virtio/sys/i386/i386/apic_vector.s projects/virtio/sys/i386/i386/genassym.c projects/virtio/sys/i386/i386/initcpu.c projects/virtio/sys/i386/i386/machdep.c projects/virtio/sys/i386/i386/mp_machdep.c projects/virtio/sys/i386/i386/pmap.c projects/virtio/sys/i386/i386/sys_machdep.c projects/virtio/sys/i386/i386/vm_machdep.c projects/virtio/sys/i386/ibcs2/ibcs2_fcntl.c projects/virtio/sys/i386/ibcs2/ibcs2_ioctl.c projects/virtio/sys/i386/ibcs2/ibcs2_misc.c projects/virtio/sys/i386/ibcs2/ibcs2_sysvec.c projects/virtio/sys/i386/ibcs2/imgact_coff.c projects/virtio/sys/i386/include/acpica_machdep.h projects/virtio/sys/i386/include/apicvar.h projects/virtio/sys/i386/include/asm.h projects/virtio/sys/i386/include/atomic.h projects/virtio/sys/i386/include/cpu.h projects/virtio/sys/i386/include/intr_machdep.h projects/virtio/sys/i386/include/pcpu.h projects/virtio/sys/i386/include/pmap.h projects/virtio/sys/i386/include/sf_buf.h projects/virtio/sys/i386/include/smp.h projects/virtio/sys/i386/include/xen/xen-os.h projects/virtio/sys/i386/include/xen/xenfunc.h projects/virtio/sys/i386/include/xen/xenvar.h projects/virtio/sys/i386/isa/npx.c projects/virtio/sys/i386/linux/imgact_linux.c projects/virtio/sys/i386/linux/linux_machdep.c projects/virtio/sys/i386/linux/linux_proto.h projects/virtio/sys/i386/linux/linux_syscall.h projects/virtio/sys/i386/linux/linux_syscalls.c projects/virtio/sys/i386/linux/linux_sysent.c projects/virtio/sys/i386/xen/clock.c projects/virtio/sys/i386/xen/exception.s projects/virtio/sys/i386/xen/locore.s projects/virtio/sys/i386/xen/mp_machdep.c projects/virtio/sys/i386/xen/mptable.c projects/virtio/sys/i386/xen/pmap.c projects/virtio/sys/i386/xen/xen_machdep.c projects/virtio/sys/ia64/conf/GENERIC projects/virtio/sys/ia64/ia32/ia32_signal.c projects/virtio/sys/ia64/ia64/pmap.c projects/virtio/sys/ia64/ia64/vm_machdep.c projects/virtio/sys/ia64/include/acpica_machdep.h projects/virtio/sys/ia64/include/sf_buf.h projects/virtio/sys/kern/capabilities.conf projects/virtio/sys/kern/imgact_elf.c projects/virtio/sys/kern/imgact_gzip.c projects/virtio/sys/kern/init_main.c projects/virtio/sys/kern/init_sysent.c projects/virtio/sys/kern/kern_condvar.c projects/virtio/sys/kern/kern_descrip.c projects/virtio/sys/kern/kern_event.c projects/virtio/sys/kern/kern_exec.c projects/virtio/sys/kern/kern_exit.c projects/virtio/sys/kern/kern_fork.c projects/virtio/sys/kern/kern_intr.c projects/virtio/sys/kern/kern_jail.c projects/virtio/sys/kern/kern_kthread.c projects/virtio/sys/kern/kern_ktrace.c projects/virtio/sys/kern/kern_linker.c projects/virtio/sys/kern/kern_lock.c projects/virtio/sys/kern/kern_malloc.c projects/virtio/sys/kern/kern_mbuf.c projects/virtio/sys/kern/kern_mutex.c projects/virtio/sys/kern/kern_physio.c projects/virtio/sys/kern/kern_proc.c projects/virtio/sys/kern/kern_rangelock.c projects/virtio/sys/kern/kern_rmlock.c projects/virtio/sys/kern/kern_rwlock.c projects/virtio/sys/kern/kern_sdt.c projects/virtio/sys/kern/kern_sharedpage.c projects/virtio/sys/kern/kern_sig.c projects/virtio/sys/kern/kern_sx.c projects/virtio/sys/kern/kern_synch.c projects/virtio/sys/kern/kern_timeout.c projects/virtio/sys/kern/link_elf.c projects/virtio/sys/kern/link_elf_obj.c projects/virtio/sys/kern/makesyscalls.sh projects/virtio/sys/kern/sched_ule.c projects/virtio/sys/kern/subr_bus.c projects/virtio/sys/kern/subr_mbpool.c projects/virtio/sys/kern/subr_prf.c projects/virtio/sys/kern/subr_sbuf.c projects/virtio/sys/kern/subr_smp.c projects/virtio/sys/kern/subr_taskqueue.c projects/virtio/sys/kern/subr_uio.c projects/virtio/sys/kern/subr_unit.c projects/virtio/sys/kern/subr_vmem.c projects/virtio/sys/kern/subr_witness.c projects/virtio/sys/kern/sys_capability.c projects/virtio/sys/kern/sys_generic.c projects/virtio/sys/kern/sys_pipe.c projects/virtio/sys/kern/sys_procdesc.c projects/virtio/sys/kern/sys_process.c projects/virtio/sys/kern/sys_socket.c projects/virtio/sys/kern/syscalls.c projects/virtio/sys/kern/syscalls.master projects/virtio/sys/kern/systrace_args.c projects/virtio/sys/kern/sysv_shm.c projects/virtio/sys/kern/tty.c projects/virtio/sys/kern/tty_pts.c projects/virtio/sys/kern/uipc_debug.c projects/virtio/sys/kern/uipc_mbuf.c projects/virtio/sys/kern/uipc_mqueue.c projects/virtio/sys/kern/uipc_sem.c projects/virtio/sys/kern/uipc_shm.c projects/virtio/sys/kern/uipc_sockbuf.c projects/virtio/sys/kern/uipc_socket.c projects/virtio/sys/kern/uipc_syscalls.c projects/virtio/sys/kern/uipc_usrreq.c projects/virtio/sys/kern/vfs_acl.c projects/virtio/sys/kern/vfs_aio.c projects/virtio/sys/kern/vfs_bio.c projects/virtio/sys/kern/vfs_cluster.c projects/virtio/sys/kern/vfs_extattr.c projects/virtio/sys/kern/vfs_lookup.c projects/virtio/sys/kern/vfs_mount.c projects/virtio/sys/kern/vfs_mountroot.c projects/virtio/sys/kern/vfs_subr.c projects/virtio/sys/kern/vfs_syscalls.c projects/virtio/sys/kern/vfs_vnops.c projects/virtio/sys/libkern/arm/aeabi_unwind.c projects/virtio/sys/libkern/ashldi3.c projects/virtio/sys/mips/atheros/apb.c projects/virtio/sys/mips/atheros/ar71xx_gpio.c projects/virtio/sys/mips/atheros/ar71xx_gpiovar.h projects/virtio/sys/mips/atheros/ar71xx_spi.c projects/virtio/sys/mips/atheros/ar71xxreg.h projects/virtio/sys/mips/atheros/ar933x_chip.c projects/virtio/sys/mips/atheros/ar934xreg.h projects/virtio/sys/mips/atheros/if_arge.c projects/virtio/sys/mips/cavium/octeon_rnd.c projects/virtio/sys/mips/conf/AR934X_BASE projects/virtio/sys/mips/conf/DIR-825 projects/virtio/sys/mips/conf/DIR-825.hints projects/virtio/sys/mips/conf/MALTA projects/virtio/sys/mips/conf/MALTA64 projects/virtio/sys/mips/conf/ROUTERSTATION.hints projects/virtio/sys/mips/conf/TP-WN1043ND projects/virtio/sys/mips/gxemul/mpreg.h projects/virtio/sys/mips/include/_stdint.h projects/virtio/sys/mips/include/asm.h projects/virtio/sys/mips/include/cpuregs.h projects/virtio/sys/mips/include/sf_buf.h projects/virtio/sys/mips/malta/files.malta projects/virtio/sys/mips/malta/gt_pci.c projects/virtio/sys/mips/malta/malta_machdep.c projects/virtio/sys/mips/malta/yamon.c projects/virtio/sys/mips/mips/bus_space_generic.c projects/virtio/sys/mips/mips/elf_trampoline.c projects/virtio/sys/mips/mips/pmap.c projects/virtio/sys/mips/mips/support.S projects/virtio/sys/mips/mips/tlb.c projects/virtio/sys/mips/mips/vm_machdep.c projects/virtio/sys/mips/nlm/board.c projects/virtio/sys/mips/nlm/board.h projects/virtio/sys/mips/nlm/board_cpld.c projects/virtio/sys/mips/nlm/dev/net/nae.c projects/virtio/sys/mips/nlm/dev/net/xaui.c projects/virtio/sys/mips/nlm/dev/net/xlpge.c projects/virtio/sys/mips/nlm/dev/net/xlpge.h projects/virtio/sys/mips/nlm/dev/sec/nlmrsa.c projects/virtio/sys/mips/nlm/dev/sec/nlmrsalib.h projects/virtio/sys/mips/nlm/hal/nae.h projects/virtio/sys/mips/nlm/hal/nlm_hal.c projects/virtio/sys/mips/nlm/hal/sys.h projects/virtio/sys/modules/Makefile projects/virtio/sys/modules/aesni/Makefile projects/virtio/sys/modules/bxe/Makefile projects/virtio/sys/modules/cam/Makefile projects/virtio/sys/modules/ctl/Makefile projects/virtio/sys/modules/cxgb/cxgb/Makefile projects/virtio/sys/modules/drm2/Makefile projects/virtio/sys/modules/drm2/drm2/Makefile projects/virtio/sys/modules/dtrace/Makefile projects/virtio/sys/modules/dtrace/sdt/Makefile projects/virtio/sys/modules/ext2fs/Makefile projects/virtio/sys/modules/hwpmc/Makefile projects/virtio/sys/modules/ip6_mroute_mod/Makefile projects/virtio/sys/modules/ipfilter/Makefile projects/virtio/sys/modules/iscsi/Makefile projects/virtio/sys/modules/linux/Makefile projects/virtio/sys/modules/mlx4/Makefile projects/virtio/sys/modules/mlx4ib/Makefile projects/virtio/sys/modules/random/Makefile projects/virtio/sys/modules/rdma/Makefile projects/virtio/sys/modules/send/Makefile projects/virtio/sys/modules/sfxge/Makefile projects/virtio/sys/modules/ti/Makefile projects/virtio/sys/modules/virtio/network/Makefile projects/virtio/sys/modules/vmm/Makefile projects/virtio/sys/net/if.c projects/virtio/sys/net/if.h projects/virtio/sys/net/if_enc.c projects/virtio/sys/net/if_ethersubr.c projects/virtio/sys/net/if_fddisubr.c projects/virtio/sys/net/if_gif.c projects/virtio/sys/net/if_gre.c projects/virtio/sys/net/if_iso88025subr.c projects/virtio/sys/net/if_lagg.c projects/virtio/sys/net/if_lagg.h projects/virtio/sys/net/if_llatbl.h projects/virtio/sys/net/if_pfsync.h projects/virtio/sys/net/if_spppsubr.c projects/virtio/sys/net/if_tap.c projects/virtio/sys/net/if_tun.c projects/virtio/sys/net/netisr.c projects/virtio/sys/net/pfil.c projects/virtio/sys/net/pfil.h projects/virtio/sys/net/rtsock.c projects/virtio/sys/net80211/ieee80211.c projects/virtio/sys/net80211/ieee80211_action.c projects/virtio/sys/net80211/ieee80211_freebsd.c projects/virtio/sys/net80211/ieee80211_freebsd.h projects/virtio/sys/net80211/ieee80211_hostap.c projects/virtio/sys/net80211/ieee80211_input.c projects/virtio/sys/net80211/ieee80211_node.c projects/virtio/sys/net80211/ieee80211_output.c projects/virtio/sys/net80211/ieee80211_phy.c projects/virtio/sys/net80211/ieee80211_power.c projects/virtio/sys/net80211/ieee80211_proto.c projects/virtio/sys/net80211/ieee80211_proto.h projects/virtio/sys/net80211/ieee80211_scan_sta.c projects/virtio/sys/net80211/ieee80211_superg.c projects/virtio/sys/net80211/ieee80211_tdma.c projects/virtio/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c projects/virtio/sys/netgraph/netflow/ng_netflow.h projects/virtio/sys/netgraph/ng_iface.c projects/virtio/sys/netinet/icmp_var.h projects/virtio/sys/netinet/if_ether.c projects/virtio/sys/netinet/igmp.c projects/virtio/sys/netinet/igmp_var.h projects/virtio/sys/netinet/in.h projects/virtio/sys/netinet/in_mcast.c projects/virtio/sys/netinet/ip_carp.c projects/virtio/sys/netinet/ip_fastfwd.c projects/virtio/sys/netinet/ip_input.c projects/virtio/sys/netinet/ip_mroute.c projects/virtio/sys/netinet/ip_output.c projects/virtio/sys/netinet/ip_var.h projects/virtio/sys/netinet/pim_var.h projects/virtio/sys/netinet/sctp.h projects/virtio/sys/netinet/sctp_auth.c projects/virtio/sys/netinet/sctp_auth.h projects/virtio/sys/netinet/sctp_dtrace_define.h projects/virtio/sys/netinet/sctp_indata.c projects/virtio/sys/netinet/sctp_input.c projects/virtio/sys/netinet/sctp_os_bsd.h projects/virtio/sys/netinet/sctp_output.c projects/virtio/sys/netinet/sctp_pcb.h projects/virtio/sys/netinet/sctp_structs.h projects/virtio/sys/netinet/sctp_timer.c projects/virtio/sys/netinet/sctp_uio.h projects/virtio/sys/netinet/sctputil.c projects/virtio/sys/netinet/tcp_input.c projects/virtio/sys/netinet/tcp_lro.c projects/virtio/sys/netinet/tcp_lro.h projects/virtio/sys/netinet/tcp_output.c projects/virtio/sys/netinet/tcp_subr.c projects/virtio/sys/netinet/tcp_syncache.c projects/virtio/sys/netinet/tcp_syncache.h projects/virtio/sys/netinet/tcp_usrreq.c projects/virtio/sys/netinet/tcp_var.h projects/virtio/sys/netinet/udp_usrreq.c projects/virtio/sys/netinet/udp_var.h projects/virtio/sys/netinet6/frag6.c projects/virtio/sys/netinet6/in6.c projects/virtio/sys/netinet6/in6_ifattach.c projects/virtio/sys/netinet6/in6_mcast.c projects/virtio/sys/netinet6/ip6_input.c projects/virtio/sys/netinet6/ip6_mroute.c projects/virtio/sys/netinet6/ip6_output.c projects/virtio/sys/netinet6/ip6_var.h projects/virtio/sys/netinet6/mld6.c projects/virtio/sys/netinet6/nd6.c projects/virtio/sys/netinet6/pim6_var.h projects/virtio/sys/netinet6/sctp6_usrreq.c projects/virtio/sys/netinet6/send.c projects/virtio/sys/netinet6/udp6_usrreq.c projects/virtio/sys/netipsec/ipsec.h projects/virtio/sys/netipsec/key_var.h projects/virtio/sys/netnatm/natm.c projects/virtio/sys/netpfil/ipfw/ip_dummynet.c projects/virtio/sys/netpfil/ipfw/ip_fw2.c projects/virtio/sys/netpfil/ipfw/ip_fw_log.c projects/virtio/sys/netpfil/ipfw/ip_fw_nat.c projects/virtio/sys/netpfil/ipfw/ip_fw_private.h projects/virtio/sys/netpfil/pf/pf.c projects/virtio/sys/netpfil/pf/pf_lb.c projects/virtio/sys/netsmb/smb_dev.c projects/virtio/sys/nfsserver/nfs_srvkrpc.c projects/virtio/sys/nlm/nlm_prot_impl.c projects/virtio/sys/ofed/drivers/infiniband/core/addr.c projects/virtio/sys/ofed/drivers/infiniband/core/cma.c projects/virtio/sys/ofed/drivers/infiniband/core/core_priv.h projects/virtio/sys/ofed/drivers/infiniband/core/device.c projects/virtio/sys/ofed/drivers/infiniband/core/sa_query.c projects/virtio/sys/ofed/drivers/infiniband/core/sysfs.c projects/virtio/sys/ofed/drivers/infiniband/core/ucm.c projects/virtio/sys/ofed/drivers/infiniband/core/umem.c projects/virtio/sys/ofed/drivers/infiniband/core/uverbs_cmd.c projects/virtio/sys/ofed/drivers/infiniband/core/uverbs_main.c projects/virtio/sys/ofed/drivers/infiniband/core/verbs.c projects/virtio/sys/ofed/drivers/infiniband/hw/mlx4/Kconfig projects/virtio/sys/ofed/drivers/infiniband/hw/mlx4/Makefile projects/virtio/sys/ofed/drivers/infiniband/hw/mlx4/ah.c projects/virtio/sys/ofed/drivers/infiniband/hw/mlx4/cq.c projects/virtio/sys/ofed/drivers/infiniband/hw/mlx4/mad.c projects/virtio/sys/ofed/drivers/infiniband/hw/mlx4/main.c projects/virtio/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_ib.h projects/virtio/sys/ofed/drivers/infiniband/hw/mlx4/mr.c projects/virtio/sys/ofed/drivers/infiniband/hw/mlx4/qp.c projects/virtio/sys/ofed/drivers/infiniband/hw/mlx4/srq.c projects/virtio/sys/ofed/drivers/infiniband/hw/mlx4/user.h projects/virtio/sys/ofed/drivers/infiniband/hw/mlx4/wc.c projects/virtio/sys/ofed/drivers/infiniband/hw/mthca/mthca_cmd.c projects/virtio/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c projects/virtio/sys/ofed/drivers/infiniband/hw/mthca/mthca_memfree.c projects/virtio/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c projects/virtio/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h projects/virtio/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c projects/virtio/sys/ofed/drivers/net/mlx4/Makefile projects/virtio/sys/ofed/drivers/net/mlx4/alloc.c projects/virtio/sys/ofed/drivers/net/mlx4/catas.c projects/virtio/sys/ofed/drivers/net/mlx4/cmd.c projects/virtio/sys/ofed/drivers/net/mlx4/cq.c projects/virtio/sys/ofed/drivers/net/mlx4/en_cq.c projects/virtio/sys/ofed/drivers/net/mlx4/en_frag.c projects/virtio/sys/ofed/drivers/net/mlx4/en_main.c projects/virtio/sys/ofed/drivers/net/mlx4/en_netdev.c projects/virtio/sys/ofed/drivers/net/mlx4/en_port.c projects/virtio/sys/ofed/drivers/net/mlx4/en_port.h projects/virtio/sys/ofed/drivers/net/mlx4/en_rx.c projects/virtio/sys/ofed/drivers/net/mlx4/en_tx.c projects/virtio/sys/ofed/drivers/net/mlx4/eq.c projects/virtio/sys/ofed/drivers/net/mlx4/fw.c projects/virtio/sys/ofed/drivers/net/mlx4/fw.h projects/virtio/sys/ofed/drivers/net/mlx4/icm.c projects/virtio/sys/ofed/drivers/net/mlx4/icm.h projects/virtio/sys/ofed/drivers/net/mlx4/intf.c projects/virtio/sys/ofed/drivers/net/mlx4/main.c projects/virtio/sys/ofed/drivers/net/mlx4/mcg.c projects/virtio/sys/ofed/drivers/net/mlx4/mlx4.h projects/virtio/sys/ofed/drivers/net/mlx4/mlx4_en.h projects/virtio/sys/ofed/drivers/net/mlx4/mr.c projects/virtio/sys/ofed/drivers/net/mlx4/pd.c projects/virtio/sys/ofed/drivers/net/mlx4/port.c projects/virtio/sys/ofed/drivers/net/mlx4/profile.c projects/virtio/sys/ofed/drivers/net/mlx4/qp.c projects/virtio/sys/ofed/drivers/net/mlx4/reset.c projects/virtio/sys/ofed/drivers/net/mlx4/sense.c projects/virtio/sys/ofed/drivers/net/mlx4/srq.c projects/virtio/sys/ofed/include/asm/atomic.h projects/virtio/sys/ofed/include/asm/byteorder.h projects/virtio/sys/ofed/include/linux/bitops.h projects/virtio/sys/ofed/include/linux/compat.h projects/virtio/sys/ofed/include/linux/device.h projects/virtio/sys/ofed/include/linux/dma-mapping.h projects/virtio/sys/ofed/include/linux/file.h projects/virtio/sys/ofed/include/linux/gfp.h projects/virtio/sys/ofed/include/linux/idr.h projects/virtio/sys/ofed/include/linux/if_ether.h projects/virtio/sys/ofed/include/linux/in6.h projects/virtio/sys/ofed/include/linux/kernel.h projects/virtio/sys/ofed/include/linux/linux_compat.c projects/virtio/sys/ofed/include/linux/list.h projects/virtio/sys/ofed/include/linux/log2.h projects/virtio/sys/ofed/include/linux/mlx4/cmd.h projects/virtio/sys/ofed/include/linux/mlx4/cq.h projects/virtio/sys/ofed/include/linux/mlx4/device.h projects/virtio/sys/ofed/include/linux/mlx4/driver.h projects/virtio/sys/ofed/include/linux/mlx4/qp.h projects/virtio/sys/ofed/include/linux/mlx4/srq.h projects/virtio/sys/ofed/include/linux/moduleparam.h projects/virtio/sys/ofed/include/linux/net.h projects/virtio/sys/ofed/include/linux/pci.h projects/virtio/sys/ofed/include/linux/sysfs.h projects/virtio/sys/ofed/include/linux/types.h projects/virtio/sys/ofed/include/linux/workqueue.h projects/virtio/sys/ofed/include/rdma/ib_cm.h projects/virtio/sys/ofed/include/rdma/ib_mad.h projects/virtio/sys/ofed/include/rdma/ib_sa.h projects/virtio/sys/ofed/include/rdma/ib_umem.h projects/virtio/sys/ofed/include/rdma/ib_user_verbs.h projects/virtio/sys/ofed/include/rdma/ib_verbs.h projects/virtio/sys/opencrypto/cryptodev.c projects/virtio/sys/pc98/conf/GENERIC projects/virtio/sys/pc98/pc98/machdep.c projects/virtio/sys/pci/ncr.c projects/virtio/sys/powerpc/aim/mmu_oea.c projects/virtio/sys/powerpc/aim/mmu_oea64.c projects/virtio/sys/powerpc/aim/mmu_oea64.h projects/virtio/sys/powerpc/aim/nexus.c projects/virtio/sys/powerpc/aim/trap.c projects/virtio/sys/powerpc/aim/vm_machdep.c projects/virtio/sys/powerpc/booke/pmap.c projects/virtio/sys/powerpc/booke/vm_machdep.c projects/virtio/sys/powerpc/conf/DEFAULTS projects/virtio/sys/powerpc/conf/GENERIC projects/virtio/sys/powerpc/conf/GENERIC64 projects/virtio/sys/powerpc/include/_stdint.h projects/virtio/sys/powerpc/include/frame.h projects/virtio/sys/powerpc/include/ofw_machdep.h projects/virtio/sys/powerpc/include/param.h projects/virtio/sys/powerpc/include/platform.h projects/virtio/sys/powerpc/include/pmc_mdep.h projects/virtio/sys/powerpc/include/proc.h projects/virtio/sys/powerpc/include/pte.h projects/virtio/sys/powerpc/include/sf_buf.h projects/virtio/sys/powerpc/include/spr.h projects/virtio/sys/powerpc/ofw/ofw_cpu.c projects/virtio/sys/powerpc/ofw/ofw_machdep.c projects/virtio/sys/powerpc/ofw/ofw_pcibus.c projects/virtio/sys/powerpc/ofw/ofw_syscons.c projects/virtio/sys/powerpc/ofw/ofw_syscons.h projects/virtio/sys/powerpc/ofw/rtas.c projects/virtio/sys/powerpc/powermac/atibl.c projects/virtio/sys/powerpc/powermac/kiic.c projects/virtio/sys/powerpc/powermac/nvbl.c projects/virtio/sys/powerpc/powermac/platform_powermac.c projects/virtio/sys/powerpc/powerpc/busdma_machdep.c projects/virtio/sys/powerpc/powerpc/cpu.c projects/virtio/sys/powerpc/powerpc/intr_machdep.c projects/virtio/sys/powerpc/powerpc/mmu_if.m projects/virtio/sys/powerpc/powerpc/mp_machdep.c projects/virtio/sys/powerpc/powerpc/platform.c projects/virtio/sys/powerpc/powerpc/platform_if.m projects/virtio/sys/powerpc/powerpc/pmap_dispatch.c projects/virtio/sys/powerpc/ps3/ps3cdrom.c projects/virtio/sys/rpc/clnt_dg.c projects/virtio/sys/security/audit/audit.h projects/virtio/sys/security/audit/audit_arg.c projects/virtio/sys/security/audit/audit_bsm.c projects/virtio/sys/security/audit/audit_bsm_klib.c projects/virtio/sys/security/audit/audit_pipe.c projects/virtio/sys/security/audit/audit_private.h projects/virtio/sys/security/audit/bsm_token.c projects/virtio/sys/security/mac/mac_framework.c projects/virtio/sys/security/mac/mac_framework.h projects/virtio/sys/security/mac/mac_internal.h projects/virtio/sys/security/mac/mac_policy.h projects/virtio/sys/security/mac/mac_posix_shm.c projects/virtio/sys/security/mac/mac_syscalls.c projects/virtio/sys/security/mac/mac_vfs.c projects/virtio/sys/security/mac_biba/mac_biba.c projects/virtio/sys/security/mac_mls/mac_mls.c projects/virtio/sys/security/mac_stub/mac_stub.c projects/virtio/sys/security/mac_test/mac_test.c projects/virtio/sys/sparc64/conf/GENERIC projects/virtio/sys/sparc64/include/proc.h projects/virtio/sys/sparc64/include/sf_buf.h projects/virtio/sys/sparc64/sparc64/pmap.c projects/virtio/sys/sparc64/sparc64/sys_machdep.c projects/virtio/sys/sparc64/sparc64/vm_machdep.c projects/virtio/sys/sys/_types.h projects/virtio/sys/sys/bitset.h projects/virtio/sys/sys/buf.h projects/virtio/sys/sys/callout.h projects/virtio/sys/sys/capability.h projects/virtio/sys/sys/conf.h projects/virtio/sys/sys/cpuset.h projects/virtio/sys/sys/elf_common.h projects/virtio/sys/sys/event.h projects/virtio/sys/sys/eventhandler.h projects/virtio/sys/sys/eventvar.h projects/virtio/sys/sys/fcntl.h projects/virtio/sys/sys/file.h projects/virtio/sys/sys/filedesc.h projects/virtio/sys/sys/jail.h projects/virtio/sys/sys/kernel.h projects/virtio/sys/sys/ktrace.h projects/virtio/sys/sys/linker.h projects/virtio/sys/sys/lock.h projects/virtio/sys/sys/lockmgr.h projects/virtio/sys/sys/mbpool.h projects/virtio/sys/sys/mbuf.h projects/virtio/sys/sys/mman.h projects/virtio/sys/sys/mount.h projects/virtio/sys/sys/mouse.h projects/virtio/sys/sys/namei.h projects/virtio/sys/sys/param.h projects/virtio/sys/sys/pmckern.h projects/virtio/sys/sys/proc.h projects/virtio/sys/sys/procdesc.h projects/virtio/sys/sys/random.h projects/virtio/sys/sys/rangelock.h projects/virtio/sys/sys/sdt.h projects/virtio/sys/sys/sf_buf.h projects/virtio/sys/sys/smp.h projects/virtio/sys/sys/sockbuf.h projects/virtio/sys/sys/socket.h projects/virtio/sys/sys/socketvar.h projects/virtio/sys/sys/stat.h projects/virtio/sys/sys/stdatomic.h projects/virtio/sys/sys/syscall.h projects/virtio/sys/sys/syscall.mk projects/virtio/sys/sys/syscallsubr.h projects/virtio/sys/sys/sysctl.h projects/virtio/sys/sys/sysproto.h projects/virtio/sys/sys/systm.h projects/virtio/sys/sys/time.h projects/virtio/sys/sys/timetc.h projects/virtio/sys/sys/types.h projects/virtio/sys/sys/uio.h projects/virtio/sys/sys/user.h projects/virtio/sys/sys/vmmeter.h projects/virtio/sys/ufs/ffs/ffs_alloc.c projects/virtio/sys/ufs/ufs/ufs_dirhash.c projects/virtio/sys/ufs/ufs/ufs_vnops.c projects/virtio/sys/vm/memguard.c projects/virtio/sys/vm/pmap.h projects/virtio/sys/vm/swap_pager.c projects/virtio/sys/vm/uma_core.c projects/virtio/sys/vm/uma_int.h projects/virtio/sys/vm/vm_extern.h projects/virtio/sys/vm/vm_fault.c projects/virtio/sys/vm/vm_glue.c projects/virtio/sys/vm/vm_init.c projects/virtio/sys/vm/vm_kern.c projects/virtio/sys/vm/vm_kern.h projects/virtio/sys/vm/vm_map.c projects/virtio/sys/vm/vm_map.h projects/virtio/sys/vm/vm_mmap.c projects/virtio/sys/vm/vm_object.c projects/virtio/sys/vm/vm_page.c projects/virtio/sys/vm/vm_page.h projects/virtio/sys/vm/vm_pageout.c projects/virtio/sys/vm/vm_phys.c projects/virtio/sys/vm/vm_radix.c projects/virtio/sys/vm/vm_radix.h projects/virtio/sys/vm/vm_reserv.c projects/virtio/sys/x86/acpica/acpi_wakeup.c projects/virtio/sys/x86/acpica/madt.c projects/virtio/sys/x86/include/segments.h projects/virtio/sys/x86/include/stdarg.h projects/virtio/sys/x86/isa/atpic.c projects/virtio/sys/x86/isa/clock.c projects/virtio/sys/x86/x86/intr_machdep.c projects/virtio/sys/x86/x86/io_apic.c projects/virtio/sys/x86/x86/local_apic.c projects/virtio/sys/xen/evtchn.h projects/virtio/sys/xen/evtchn/evtchn_dev.c projects/virtio/sys/xen/features.c projects/virtio/sys/xen/gnttab.c projects/virtio/sys/xen/gnttab.h projects/virtio/sys/xen/hvm.h projects/virtio/sys/xen/interface/event_channel.h projects/virtio/sys/xen/xen_intr.h projects/virtio/sys/xen/xenbus/xenbus.c projects/virtio/sys/xen/xenbus/xenbus_if.m projects/virtio/sys/xen/xenbus/xenbusb_front.c projects/virtio/sys/xen/xenbus/xenbusvar.h projects/virtio/sys/xen/xenstore/xenstore.c projects/virtio/sys/xen/xenstore/xenstore_dev.c projects/virtio/sys/xen/xenstore/xenstorevar.h projects/virtio/tools/build/mk/OptionalObsoleteFiles.inc projects/virtio/tools/build/options/WITHOUT_BINUTILS projects/virtio/tools/build/options/WITHOUT_GCC projects/virtio/tools/build/options/WITHOUT_LDNS projects/virtio/tools/build/options/makeman projects/virtio/tools/make_libdeps.sh projects/virtio/tools/regression/file/dup/dup.c projects/virtio/tools/regression/lib/libc/gen/test-fnmatch.c projects/virtio/tools/regression/lib/libc/stdio/test-fmemopen.t projects/virtio/tools/regression/lib/libc/stdio/test-open_memstream.t projects/virtio/tools/regression/lib/libc/stdio/test-open_wmemstream.t projects/virtio/tools/regression/lib/libutil/Makefile projects/virtio/tools/regression/sockets/sendfile/sendfile.c projects/virtio/tools/test/posixshm/shm_test.c projects/virtio/tools/tools/README projects/virtio/tools/tools/bus_autoconf/bus_load_file.c projects/virtio/tools/tools/ifinfo/ifinfo.c projects/virtio/tools/tools/net80211/wlanstats/Makefile projects/virtio/tools/tools/sysbuild/sysbuild.sh projects/virtio/tools/tools/usbtest/usb_control_ep_test.c projects/virtio/tools/tools/usbtest/usb_modem_test.c projects/virtio/tools/tools/usbtest/usb_msc_test.c projects/virtio/usr.bin/Makefile projects/virtio/usr.bin/atf/Makefile projects/virtio/usr.bin/atf/Makefile.inc projects/virtio/usr.bin/bmake/Makefile projects/virtio/usr.bin/bmake/unit-tests/Makefile projects/virtio/usr.bin/brandelf/brandelf.1 projects/virtio/usr.bin/calendar/Makefile (contents, props changed) projects/virtio/usr.bin/calendar/calendar.1 (contents, props changed) projects/virtio/usr.bin/calendar/calendar.h (contents, props changed) projects/virtio/usr.bin/calendar/calendars/calendar.dutch projects/virtio/usr.bin/calendar/calendars/calendar.freebsd projects/virtio/usr.bin/calendar/io.c (contents, props changed) projects/virtio/usr.bin/calendar/pathnames.h (contents, props changed) projects/virtio/usr.bin/clang/Makefile projects/virtio/usr.bin/dtc/dtc.1 projects/virtio/usr.bin/dtc/dtc.cc projects/virtio/usr.bin/dtc/fdt.cc projects/virtio/usr.bin/dtc/fdt.hh projects/virtio/usr.bin/dtc/input_buffer.cc projects/virtio/usr.bin/host/Makefile projects/virtio/usr.bin/kdump/kdump.c projects/virtio/usr.bin/kdump/mksubr projects/virtio/usr.bin/netstat/inet6.c projects/virtio/usr.bin/patch/Makefile projects/virtio/usr.bin/patch/patch.c projects/virtio/usr.bin/patch/pch.c projects/virtio/usr.bin/patch/util.c projects/virtio/usr.bin/procstat/procstat.1 projects/virtio/usr.bin/procstat/procstat_files.c projects/virtio/usr.bin/rwho/rwho.c projects/virtio/usr.bin/su/su.c projects/virtio/usr.bin/svn/lib/libapr/apr.h projects/virtio/usr.bin/svn/lib/libapr/apr_private.h projects/virtio/usr.bin/svn/svn_private_config.h projects/virtio/usr.bin/truss/syscall.h projects/virtio/usr.bin/truss/syscalls.c projects/virtio/usr.bin/uniq/uniq.c projects/virtio/usr.bin/vi/catalog/Makefile projects/virtio/usr.sbin/Makefile projects/virtio/usr.sbin/arp/arp.c projects/virtio/usr.sbin/bhyve/Makefile projects/virtio/usr.sbin/bhyve/acpi.c projects/virtio/usr.sbin/bhyve/bhyverun.c projects/virtio/usr.sbin/bhyve/bhyverun.h projects/virtio/usr.sbin/bhyve/dbgport.h projects/virtio/usr.sbin/bhyve/ioapic.c projects/virtio/usr.sbin/bhyve/mevent.c projects/virtio/usr.sbin/bhyve/mevent.h projects/virtio/usr.sbin/bhyve/mevent_test.c projects/virtio/usr.sbin/bhyve/pci_emul.c projects/virtio/usr.sbin/bhyve/pci_virtio_block.c projects/virtio/usr.sbin/bhyve/pit_8254.c projects/virtio/usr.sbin/bhyve/rtc.c projects/virtio/usr.sbin/bhyve/virtio.c projects/virtio/usr.sbin/bhyvectl/Makefile projects/virtio/usr.sbin/bhyvectl/bhyvectl.c projects/virtio/usr.sbin/bhyveload/Makefile projects/virtio/usr.sbin/bhyveload/bhyveload.8 projects/virtio/usr.sbin/bhyveload/bhyveload.c projects/virtio/usr.sbin/boot0cfg/boot0cfg.8 projects/virtio/usr.sbin/bsdconfig/bsdconfig projects/virtio/usr.sbin/bsdconfig/console/ttys projects/virtio/usr.sbin/bsdconfig/examples/Makefile projects/virtio/usr.sbin/bsdconfig/include/messages.subr projects/virtio/usr.sbin/bsdconfig/mouse/enable projects/virtio/usr.sbin/bsdconfig/networking/devices projects/virtio/usr.sbin/bsdconfig/networking/share/device.subr projects/virtio/usr.sbin/bsdconfig/networking/share/hostname.subr projects/virtio/usr.sbin/bsdconfig/networking/share/ipaddr.subr projects/virtio/usr.sbin/bsdconfig/networking/share/media.subr projects/virtio/usr.sbin/bsdconfig/networking/share/netmask.subr projects/virtio/usr.sbin/bsdconfig/networking/share/resolv.subr projects/virtio/usr.sbin/bsdconfig/networking/share/routing.subr projects/virtio/usr.sbin/bsdconfig/password/share/password.subr projects/virtio/usr.sbin/bsdconfig/security/kern_securelevel projects/virtio/usr.sbin/bsdconfig/security/security projects/virtio/usr.sbin/bsdconfig/share/Makefile projects/virtio/usr.sbin/bsdconfig/share/common.subr projects/virtio/usr.sbin/bsdconfig/share/device.subr projects/virtio/usr.sbin/bsdconfig/share/dialog.subr projects/virtio/usr.sbin/bsdconfig/share/media/any.subr projects/virtio/usr.sbin/bsdconfig/share/media/cdrom.subr projects/virtio/usr.sbin/bsdconfig/share/media/common.subr projects/virtio/usr.sbin/bsdconfig/share/media/dos.subr projects/virtio/usr.sbin/bsdconfig/share/media/floppy.subr projects/virtio/usr.sbin/bsdconfig/share/media/ftp.subr projects/virtio/usr.sbin/bsdconfig/share/media/http.subr projects/virtio/usr.sbin/bsdconfig/share/media/nfs.subr projects/virtio/usr.sbin/bsdconfig/share/media/options.subr projects/virtio/usr.sbin/bsdconfig/share/media/tcpip.subr projects/virtio/usr.sbin/bsdconfig/share/media/ufs.subr projects/virtio/usr.sbin/bsdconfig/share/media/usb.subr projects/virtio/usr.sbin/bsdconfig/share/mustberoot.subr projects/virtio/usr.sbin/bsdconfig/share/packages/packages.subr projects/virtio/usr.sbin/bsdconfig/share/strings.subr projects/virtio/usr.sbin/bsdconfig/share/variable.subr projects/virtio/usr.sbin/bsdconfig/startup/misc projects/virtio/usr.sbin/bsdconfig/startup/rcconf projects/virtio/usr.sbin/bsdconfig/startup/rcdelete projects/virtio/usr.sbin/bsdconfig/startup/rcvar projects/virtio/usr.sbin/bsdconfig/startup/share/rcconf.subr projects/virtio/usr.sbin/bsdconfig/startup/share/rcedit.subr projects/virtio/usr.sbin/bsdconfig/timezone/timezone projects/virtio/usr.sbin/bsdconfig/usermgmt/groupdel projects/virtio/usr.sbin/bsdconfig/usermgmt/groupedit projects/virtio/usr.sbin/bsdconfig/usermgmt/groupinput projects/virtio/usr.sbin/bsdconfig/usermgmt/share/group_input.subr projects/virtio/usr.sbin/bsdconfig/usermgmt/share/user_input.subr projects/virtio/usr.sbin/bsdconfig/usermgmt/userdel projects/virtio/usr.sbin/bsdconfig/usermgmt/useredit projects/virtio/usr.sbin/bsdconfig/usermgmt/userinput projects/virtio/usr.sbin/bsdconfig/usermgmt/usermgmt projects/virtio/usr.sbin/bsdinstall/bsdinstall projects/virtio/usr.sbin/bsdinstall/bsdinstall.8 projects/virtio/usr.sbin/bsdinstall/partedit/gpart_ops.c projects/virtio/usr.sbin/bsdinstall/partedit/partedit_powerpc.c projects/virtio/usr.sbin/bsdinstall/scripts/Makefile projects/virtio/usr.sbin/bsdinstall/scripts/auto projects/virtio/usr.sbin/bsdinstall/scripts/config projects/virtio/usr.sbin/bsdinstall/scripts/jail projects/virtio/usr.sbin/bsdinstall/scripts/keymap projects/virtio/usr.sbin/bsdinstall/scripts/mirrorselect projects/virtio/usr.sbin/bsdinstall/scripts/netconfig projects/virtio/usr.sbin/bsdinstall/scripts/script projects/virtio/usr.sbin/bsdinstall/scripts/services projects/virtio/usr.sbin/crashinfo/crashinfo.sh projects/virtio/usr.sbin/ctladm/ctladm.8 projects/virtio/usr.sbin/ctladm/ctladm.c projects/virtio/usr.sbin/daemon/daemon.8 projects/virtio/usr.sbin/daemon/daemon.c projects/virtio/usr.sbin/gpioctl/gpioctl.8 projects/virtio/usr.sbin/gpioctl/gpioctl.c projects/virtio/usr.sbin/jail/command.c projects/virtio/usr.sbin/jail/config.c projects/virtio/usr.sbin/jail/jail.8 projects/virtio/usr.sbin/jail/jail.c projects/virtio/usr.sbin/jail/jailp.h projects/virtio/usr.sbin/kldxref/kldxref.c projects/virtio/usr.sbin/makefs/makefs.8 projects/virtio/usr.sbin/makefs/makefs.c projects/virtio/usr.sbin/mergemaster/mergemaster.sh projects/virtio/usr.sbin/mfiutil/mfi_drive.c projects/virtio/usr.sbin/mfiutil/mfiutil.8 projects/virtio/usr.sbin/mfiutil/mfiutil.c projects/virtio/usr.sbin/mtree/create.c projects/virtio/usr.sbin/ntp/config.h projects/virtio/usr.sbin/ntp/libparse/Makefile projects/virtio/usr.sbin/periodic/periodic.sh projects/virtio/usr.sbin/pkg/config.c projects/virtio/usr.sbin/pkg/elf_tables.h projects/virtio/usr.sbin/pkg_install/add/main.c projects/virtio/usr.sbin/rtadvd/config.c projects/virtio/usr.sbin/rtadvd/if.c projects/virtio/usr.sbin/rtsold/dump.c projects/virtio/usr.sbin/rtsold/if.c projects/virtio/usr.sbin/rtsold/probe.c projects/virtio/usr.sbin/rtsold/rtsock.c projects/virtio/usr.sbin/rtsold/rtsol.c projects/virtio/usr.sbin/rtsold/rtsold.c projects/virtio/usr.sbin/rtsold/rtsold.h projects/virtio/usr.sbin/rwhod/rwhod.c projects/virtio/usr.sbin/setfib/setfib.1 projects/virtio/usr.sbin/watch/watch.c Directory Properties: projects/virtio/ (props changed) projects/virtio/cddl/ (props changed) projects/virtio/cddl/contrib/opensolaris/ (props changed) projects/virtio/cddl/contrib/opensolaris/cmd/zfs/ (props changed) projects/virtio/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/virtio/contrib/binutils/ (props changed) projects/virtio/contrib/bmake/ (props changed) projects/virtio/contrib/dialog/ (props changed) projects/virtio/contrib/gcc/ (props changed) projects/virtio/contrib/ipfilter/ (props changed) projects/virtio/contrib/ldns/ (props changed) projects/virtio/contrib/libc++/ (props changed) projects/virtio/contrib/libcxxrt/ (props changed) projects/virtio/contrib/llvm/ (props changed) projects/virtio/contrib/llvm/tools/clang/ (props changed) projects/virtio/contrib/openpam/ (props changed) projects/virtio/contrib/sendmail/ (props changed) projects/virtio/contrib/tcpdump/ (props changed) projects/virtio/contrib/unbound/ (props changed) projects/virtio/contrib/unbound/validator/val_secalgo.c (props changed) projects/virtio/contrib/unbound/validator/val_secalgo.h (props changed) projects/virtio/crypto/openssh/ (props changed) projects/virtio/gnu/lib/ (props changed) projects/virtio/gnu/usr.bin/binutils/ (props changed) projects/virtio/gnu/usr.bin/cc/cc_tools/ (props changed) projects/virtio/lib/libc/ (props changed) projects/virtio/lib/libutil/ (props changed) projects/virtio/lib/libvmmapi/ (props changed) projects/virtio/sbin/ (props changed) projects/virtio/share/examples/kld/random_adaptor/random_adaptor_example.c (props changed) projects/virtio/share/man/man4/ (props changed) projects/virtio/sys/ (props changed) projects/virtio/sys/amd64/include/xen/ (props changed) projects/virtio/sys/amd64/vmm/ (props changed) projects/virtio/sys/boot/ (props changed) projects/virtio/sys/boot/i386/efi/ (props changed) projects/virtio/sys/boot/powerpc/boot1.chrp/ (props changed) projects/virtio/sys/cddl/contrib/opensolaris/ (props changed) projects/virtio/sys/conf/ (props changed) projects/virtio/sys/contrib/dev/acpica/ (props changed) projects/virtio/sys/contrib/dev/acpica/common/ (props changed) projects/virtio/sys/contrib/dev/acpica/compiler/ (props changed) projects/virtio/sys/contrib/dev/acpica/components/debugger/ (props changed) projects/virtio/sys/contrib/dev/acpica/components/events/ (props changed) projects/virtio/sys/contrib/dev/acpica/components/hardware/ (props changed) projects/virtio/sys/contrib/dev/acpica/components/namespace/ (props changed) projects/virtio/sys/contrib/dev/acpica/components/tables/ (props changed) projects/virtio/sys/contrib/dev/acpica/components/utilities/ (props changed) projects/virtio/sys/contrib/dev/acpica/include/ (props changed) projects/virtio/sys/contrib/dev/acpica/os_specific/ (props changed) projects/virtio/sys/contrib/ipfilter/ (props changed) projects/virtio/sys/modules/vmm/ (props changed) projects/virtio/usr.bin/calendar/ (props changed) projects/virtio/usr.bin/procstat/ (props changed) projects/virtio/usr.sbin/bhyve/ (props changed) projects/virtio/usr.sbin/bhyvectl/ (props changed) projects/virtio/usr.sbin/bhyveload/ (props changed) projects/virtio/usr.sbin/jail/ (props changed) projects/virtio/usr.sbin/rtadvd/ (props changed) projects/virtio/usr.sbin/rtsold/ (props changed) Modified: projects/virtio/LOCKS ============================================================================== --- projects/virtio/LOCKS Sat Oct 12 20:01:36 2013 (r256393) +++ projects/virtio/LOCKS Sat Oct 12 22:36:01 2013 (r256394) @@ -12,3 +12,7 @@ releng/5.* Requires Security Officer app releng/6.* Requires Security Officer approval. releng/7.* Requires Security Officer approval. releng/8.* Requires Security Officer approval. +head/sys/dev/random Requires Security Officer approval. +head/sys/libkern/arc4random.c Requires Security Officer approval. +stable/*/sys/dev/random Requires Security Officer approval. +stable/*/sys/libkern/arc4random.c Requires Security Officer approval. Modified: projects/virtio/Makefile ============================================================================== --- projects/virtio/Makefile Sat Oct 12 20:01:36 2013 (r256393) +++ projects/virtio/Makefile Sat Oct 12 22:36:01 2013 (r256394) @@ -242,6 +242,7 @@ cleanworld: # skip this for -n to avoid changing previous behavior of # 'make -n buildworld' etc. ${TGTS}: .MAKE +tinderbox toolchains kernel-toolchains: .MAKE .endif ${TGTS}: @@ -340,7 +341,7 @@ MMAKEENV= MAKEOBJDIRPREFIX=${MYMAKE:H} \ MMAKE= ${MMAKEENV} ${MAKE} \ -D_UPGRADING \ -DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \ - -DNO_CPU_CFLAGS -DNO_WERROR + -DNO_CPU_CFLAGS -DNO_WERROR DESTDIR= PROGNAME=${MYMAKE:T} make bmake: .PHONY @echo @@ -351,16 +352,18 @@ make bmake: .PHONY ${MMAKE} obj && \ ${MMAKE} depend && \ ${MMAKE} all && \ - ${MMAKE} install DESTDIR=${MYMAKE:H} BINDIR= PROGNAME=${MYMAKE:T} + ${MMAKE} install DESTDIR=${MYMAKE:H} BINDIR= + +tinderbox toolchains kernel-toolchains: upgrade_checks tinderbox: - @cd ${.CURDIR} && ${MAKE} DOING_TINDERBOX=YES universe + @cd ${.CURDIR} && ${SUB_MAKE} DOING_TINDERBOX=YES universe toolchains: - @cd ${.CURDIR} && ${MAKE} UNIVERSE_TARGET=toolchain universe + @cd ${.CURDIR} && ${SUB_MAKE} UNIVERSE_TARGET=toolchain universe kernel-toolchains: - @cd ${.CURDIR} && ${MAKE} UNIVERSE_TARGET=kernel-toolchain universe + @cd ${.CURDIR} && ${SUB_MAKE} UNIVERSE_TARGET=kernel-toolchain universe # # universe @@ -371,7 +374,7 @@ kernel-toolchains: # .if make(universe) || make(universe_kernels) || make(tinderbox) || make(targets) TARGETS?=amd64 arm i386 ia64 mips pc98 powerpc sparc64 -TARGET_ARCHES_arm?= arm armeb armv6 armv6eb +TARGET_ARCHES_arm?= arm armeb armv6 TARGET_ARCHES_mips?= mipsel mips mips64el mips64 mipsn32 TARGET_ARCHES_powerpc?= powerpc powerpc64 TARGET_ARCHES_pc98?= i386 @@ -419,7 +422,7 @@ universe_${target}_prologue: universe_pr .if !defined(MAKE_JUST_KERNELS) .for target_arch in ${TARGET_ARCHES_${target}} universe_${target}: universe_${target}_${target_arch} -universe_${target}_${target_arch}: universe_${target}_prologue +universe_${target}_${target_arch}: universe_${target}_prologue .MAKE @echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} started on `LC_ALL=C date`" @(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \ ${SUB_MAKE} ${JFLAG} ${UNIVERSE_TARGET} \ @@ -440,7 +443,7 @@ universe_${target}_kernels: universe_${t .endfor .endif universe_${target}: universe_${target}_kernels -universe_${target}_kernels: universe_${target}_prologue +universe_${target}_kernels: universe_${target}_prologue .MAKE .if exists(${KERNSRCDIR}/${target}/conf/NOTES) @(cd ${KERNSRCDIR}/${target}/conf && env __MAKE_CONF=/dev/null \ ${SUB_MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \ @@ -468,7 +471,7 @@ TARGET_ARCH_${kernel}!= cd ${KERNSRCDIR} .error "Target architecture for ${TARGET}/conf/${kernel} unknown. config(8) likely too old." .endif universe_kernconfs: universe_kernconf_${TARGET}_${kernel} -universe_kernconf_${TARGET}_${kernel}: +universe_kernconf_${TARGET}_${kernel}: .MAKE @(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \ ${SUB_MAKE} ${JFLAG} buildkernel \ TARGET=${TARGET} \ @@ -495,3 +498,11 @@ universe_epilogue: buildLINT: ${MAKE} -C ${.CURDIR}/sys/${_TARGET}/conf LINT + +.if defined(.PARSEDIR) +.if make(universe) +# we do not want a failure of one branch abort all. +MAKE_JOB_ERROR_TOKEN= no +.export MAKE_JOB_ERROR_TOKEN +.endif +.endif Modified: projects/virtio/Makefile.inc1 ============================================================================== --- projects/virtio/Makefile.inc1 Sat Oct 12 20:01:36 2013 (r256393) +++ projects/virtio/Makefile.inc1 Sat Oct 12 22:36:01 2013 (r256394) @@ -132,7 +132,7 @@ VERSION!= uname -srp VERSION+= ${OSRELDATE} .endif -KNOWN_ARCHES?= amd64 arm armeb/arm armv6/arm armv6eb/arm i386 i386/pc98 ia64 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64 +KNOWN_ARCHES?= amd64 arm armeb/arm armv6/arm i386 i386/pc98 ia64 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64 .if ${TARGET} == ${TARGET_ARCH} _t= ${TARGET} .else @@ -265,7 +265,7 @@ WMAKEENV= ${CROSSENV} \ PATH=${TMPPATH} # make hierarchy -HMAKE= PATH=${TMPPATH} ${MAKE} LOCAL_MTREE=${LOCAL_MTREE} +HMAKE= PATH=${TMPPATH} ${MAKE} LOCAL_MTREE=${LOCAL_MTREE:Q} .if defined(NO_ROOT) HMAKE+= PATH=${TMPPATH} METALOG=${METALOG} -DNO_ROOT .endif @@ -329,7 +329,7 @@ TARGET_ABI= gnueabi .else TARGET_ABI= unknown .endif -TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.0 +TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0 XFLAGS+= -target ${TARGET_TRIPLE} .endif .endif @@ -382,6 +382,7 @@ LIB32WMAKEENV+= MAKEOBJDIRPREFIX=${OBJTR PATH=${TMPPATH} \ LIBDIR=/usr/lib32 \ SHLIBDIR=/usr/lib32 \ + LIBPRIVATEDIR=/usr/lib32/private \ COMPILER_TYPE=${WMAKE_COMPILER_TYPE} LIB32WMAKEFLAGS+= \ CC="${XCC} ${LIB32FLAGS}" \ @@ -394,7 +395,7 @@ LIB32WMAKEFLAGS+= \ -DNO_LINT LIB32WMAKE= ${LIB32WMAKEENV} ${MAKE} ${LIB32WMAKEFLAGS} \ - -DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_INFO -DWITHOUT_HTML + -DWITHOUT_MAN -DWITHOUT_INFO -DWITHOUT_HTML LIB32IMAKE= ${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} -DNO_INCS \ ${IMAKE_INSTALL} .endif @@ -484,10 +485,6 @@ _worldtmp: mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \ -p ${WORLDTMP}/usr/lib >/dev/null .endif -.if ${MK_BIND_LIBS} != "no" - mtree -deU -f ${.CURDIR}/etc/mtree/BIND.include.dist \ - -p ${WORLDTMP}/usr/include >/dev/null -.endif .for _mtree in ${LOCAL_MTREE} mtree -deU -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null .endfor @@ -675,8 +672,9 @@ kernel-toolchain: ${TOOLCHAIN_TGTS:N_inc # # Checks to be sure system is ready for installworld/installkernel. # -installcheck: -installcheck_UGID: +installcheck: _installcheck_world _installcheck_kernel +_installcheck_world: +_installcheck_kernel: # # Require DESTDIR to be set if installing for a different architecture or @@ -685,8 +683,9 @@ installcheck_UGID: .if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${TARGET} != ${MACHINE} || \ defined(DB_FROM_SRC) .if !make(distributeworld) -installcheck: installcheck_DESTDIR -installcheck_DESTDIR: +_installcheck_world: __installcheck_DESTDIR +_installcheck_kernel: __installcheck_DESTDIR +__installcheck_DESTDIR: .if !defined(DESTDIR) || empty(DESTDIR) @echo "ERROR: Please set DESTDIR!"; \ false @@ -708,7 +707,12 @@ CHECK_GIDS+= smmsp CHECK_UIDS+= proxy CHECK_GIDS+= proxy authpf .endif -installcheck_UGID: +.if ${MK_UNBOUND} != "no" +CHECK_UIDS+= unbound +CHECK_GIDS+= unbound +.endif +_installcheck_world: __installcheck_UGID +__installcheck_UGID: .for uid in ${CHECK_UIDS} @if ! `id -u ${uid} >/dev/null 2>&1`; then \ echo "ERROR: Required ${uid} user is missing, see /usr/src/UPDATING."; \ @@ -763,7 +767,7 @@ EXTRA_DISTRIBUTIONS+= lib32 MTREE_MAGIC?= mtree 2.0 -distributeworld installworld: installcheck installcheck_UGID +distributeworld installworld: _installcheck_world mkdir -p ${INSTALLTMP} progs=$$(for prog in ${ITOOLS}; do \ if progpath=`which $$prog`; then \ @@ -814,7 +818,7 @@ distributeworld installworld: installche cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \ METALOG=${METALOG} ${IMAKE_INSTALL} ${IMAKE_MTREE} \ DISTBASE=/base DESTDIR=${DESTDIR}/${DISTDIR}/base \ - LOCAL_MTREE=${LOCAL_MTREE} distrib-dirs + LOCAL_MTREE=${LOCAL_MTREE:Q} distrib-dirs .endif ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \ ${IMAKEENV} rm -rf ${INSTALLTMP} @@ -888,7 +892,7 @@ reinstall: @echo ">>> Making hierarchy" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 \ - LOCAL_MTREE=${LOCAL_MTREE} hierarchy + LOCAL_MTREE=${LOCAL_MTREE:Q} hierarchy @echo @echo "--------------------------------------------------------------" @echo ">>> Installing everything" @@ -1041,7 +1045,7 @@ buildkernel: # Install the kernel defined by INSTALLKERNEL # installkernel installkernel.debug \ -reinstallkernel reinstallkernel.debug: installcheck +reinstallkernel reinstallkernel.debug: _installcheck_kernel .if empty(INSTALLKERNEL) @echo "ERROR: No kernel \"${KERNCONF}\" to install."; \ false @@ -1081,9 +1085,11 @@ distributekernel distributekernel.debug: KERNEL=${INSTKERNNAME}.${_kernel} \ DESTDIR=${INSTALL_DDIR}/kernel.${_kernel} \ ${.TARGET:S/distributekernel/install/} +.if defined(NO_ROOT) sed -e 's|^./kernel|.|' \ ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta > \ ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta +.endif .endfor packagekernel: @@ -1469,8 +1475,8 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 ${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \ ${_cddl_lib_libzfs_core} \ lib/libutil ${_lib_libypclnt} lib/libz lib/msun \ - ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ - ${_secure_lib_libssl} + ${_secure_lib_libcrypto} ${_lib_libldns} \ + ${_secure_lib_libssh} ${_secure_lib_libssl} .if ${MK_ATF} != "no" _lib_atf_libatf_c= lib/atf/libatf-c @@ -1506,9 +1512,16 @@ cddl/lib/libzfs_core__L: cddl/lib/libnvp _secure_lib_libcrypto= secure/lib/libcrypto _secure_lib_libssl= secure/lib/libssl lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L +.if ${MK_LDNS} != "no" +_lib_libldns= lib/libldns +lib/libldns__L: secure/lib/libcrypto__L +.endif .if ${MK_OPENSSH} != "no" _secure_lib_libssh= secure/lib/libssh secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L +.if ${MK_LDNS} != "no" +secure/lib/libssh__L: lib/libldns__L +.endif .if ${MK_KERBEROS_SUPPORT} != "no" secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \ kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \ @@ -1725,7 +1738,7 @@ check-old-libs: delete-old-dirs: @echo ">>> Removing old directories" @${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ - -V OLD_DIRS | xargs -n1 | \ + -V OLD_DIRS | xargs -n1 | sort -r | \ while read dir; do \ if [ -d "${DESTDIR}/$${dir}" ]; then \ rmdir -v "${DESTDIR}/$${dir}" || true; \ Modified: projects/virtio/ObsoleteFiles.inc ============================================================================== --- projects/virtio/ObsoleteFiles.inc Sat Oct 12 20:01:36 2013 (r256393) +++ projects/virtio/ObsoleteFiles.inc Sat Oct 12 22:36:01 2013 (r256394) @@ -38,6 +38,284 @@ # xargs -n1 | sort | uniq -d; # done +# 20131013: Removal of the ATF tools +OLD_FILES+=etc/atf/FreeBSD.conf +OLD_FILES+=etc/atf/atf-run.hooks +OLD_FILES+=etc/atf/common.conf +OLD_FILES+=usr/bin/atf-config +OLD_FILES+=usr/bin/atf-report +OLD_FILES+=usr/bin/atf-run +OLD_FILES+=usr/bin/atf-version +OLD_FILES+=usr/share/atf/atf-run.hooks +OLD_FILES+=usr/share/examples/atf/atf-run.hooks +OLD_FILES+=usr/share/examples/atf/tests-results.css +OLD_FILES+=usr/share/man/man1/atf-config.1.gz +OLD_FILES+=usr/share/man/man1/atf-report.1.gz +OLD_FILES+=usr/share/man/man1/atf-run.1.gz +OLD_FILES+=usr/share/man/man1/atf-version.1.gz +OLD_FILES+=usr/share/man/man5/atf-formats.5.gz +OLD_FILES+=usr/share/man/man7/atf.7.gz +OLD_FILES+=usr/share/xml/atf/tests-results.dtd +OLD_FILES+=usr/share/xsl/atf/tests-results.xsl +# 20131009: freebsd-version moved from /libexec to /bin +OLD_FILES+=libexec/freebsd-version +# 20131001: ar and ranlib from binutils not used +OLD_FILES+=usr/bin/gnu-ar +OLD_FILES+=usr/bin/gnu-ranlib +OLD_FILES+=usr/share/man/man1/gnu-ar.1.gz +OLD_FILES+=usr/share/man/man1/gnu-ranlib.1.gz +# 20130930: BIND removed from base +OLD_FILES+=etc/namedb +OLD_FILES+=etc/periodic/daily/470.status-named +OLD_FILES+=usr/bin/dig +OLD_FILES+=usr/bin/nslookup +OLD_FILES+=usr/bin/nsupdate +OLD_DIRS+=usr/include/lwres +OLD_FILES+=usr/include/lwres/context.h +OLD_FILES+=usr/include/lwres/int.h +OLD_FILES+=usr/include/lwres/ipv6.h +OLD_FILES+=usr/include/lwres/lang.h +OLD_FILES+=usr/include/lwres/list.h +OLD_FILES+=usr/include/lwres/lwbuffer.h +OLD_FILES+=usr/include/lwres/lwpacket.h +OLD_FILES+=usr/include/lwres/lwres.h +OLD_FILES+=usr/include/lwres/net.h +OLD_FILES+=usr/include/lwres/netdb.h +OLD_FILES+=usr/include/lwres/platform.h +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_FILES+=usr/lib/liblwres_p.a +OLD_FILES+=usr/sbin/arpaname +OLD_FILES+=usr/sbin/ddns-confgen +OLD_FILES+=usr/sbin/dnssec-dsfromkey +OLD_FILES+=usr/sbin/dnssec-keyfromlabel +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/genrandom +OLD_FILES+=usr/sbin/isc-hmac-fixup +OLD_FILES+=usr/sbin/lwresd +OLD_FILES+=usr/sbin/named +OLD_FILES+=usr/sbin/named-checkconf +OLD_FILES+=usr/sbin/named-checkzone +OLD_FILES+=usr/sbin/named-compilezone +OLD_FILES+=usr/sbin/named-journalprint +OLD_FILES+=usr/sbin/named.reconfig +OLD_FILES+=usr/sbin/named.reload +OLD_FILES+=usr/sbin/nsec3hash +OLD_FILES+=usr/sbin/rndc +OLD_FILES+=usr/sbin/rndc-confgen +OLD_DIRS+=usr/share/doc/bind9 +OLD_FILES+=usr/share/doc/bind9/CHANGES +OLD_FILES+=usr/share/doc/bind9/COPYRIGHT +OLD_FILES+=usr/share/doc/bind9/FAQ +OLD_FILES+=usr/share/doc/bind9/HISTORY +OLD_FILES+=usr/share/doc/bind9/README +OLD_DIRS+=usr/share/doc/bind9/arm +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch01.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch02.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch03.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch04.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch05.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch06.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch07.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch08.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch09.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch10.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.pdf +OLD_FILES+=usr/share/doc/bind9/arm/man.arpaname.html +OLD_FILES+=usr/share/doc/bind9/arm/man.ddns-confgen.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dig.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-dsfromkey.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-keyfromlabel.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-keygen.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-revoke.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-settime.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-signzone.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-verify.html +OLD_FILES+=usr/share/doc/bind9/arm/man.genrandom.html +OLD_FILES+=usr/share/doc/bind9/arm/man.host.html +OLD_FILES+=usr/share/doc/bind9/arm/man.isc-hmac-fixup.html +OLD_FILES+=usr/share/doc/bind9/arm/man.named-checkconf.html +OLD_FILES+=usr/share/doc/bind9/arm/man.named-checkzone.html +OLD_FILES+=usr/share/doc/bind9/arm/man.named-journalprint.html +OLD_FILES+=usr/share/doc/bind9/arm/man.named.html +OLD_FILES+=usr/share/doc/bind9/arm/man.nsec3hash.html +OLD_FILES+=usr/share/doc/bind9/arm/man.nsupdate.html +OLD_FILES+=usr/share/doc/bind9/arm/man.rndc-confgen.html +OLD_FILES+=usr/share/doc/bind9/arm/man.rndc.conf.html +OLD_FILES+=usr/share/doc/bind9/arm/man.rndc.html +OLD_DIRS+=usr/share/doc/bind9/misc +OLD_FILES+=usr/share/doc/bind9/misc/dnssec +OLD_FILES+=usr/share/doc/bind9/misc/format-options.pl +OLD_FILES+=usr/share/doc/bind9/misc/ipv6 +OLD_FILES+=usr/share/doc/bind9/misc/migration +OLD_FILES+=usr/share/doc/bind9/misc/migration-4to9 +OLD_FILES+=usr/share/doc/bind9/misc/options +OLD_FILES+=usr/share/doc/bind9/misc/rfc-compliance +OLD_FILES+=usr/share/doc/bind9/misc/roadmap +OLD_FILES+=usr/share/doc/bind9/misc/sdb +OLD_FILES+=usr/share/doc/bind9/misc/sort-options.pl +OLD_FILES+=usr/share/man/man1/arpaname.1.gz +OLD_FILES+=usr/share/man/man1/dig.1.gz +OLD_FILES+=usr/share/man/man1/nslookup.1.gz +OLD_FILES+=usr/share/man/man1/nsupdate.1.gz +OLD_FILES+=usr/share/man/man3/lwres.3.gz +OLD_FILES+=usr/share/man/man3/lwres_addr_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_add.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_back.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_clear.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_first.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_forward.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_getmem.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint16.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint32.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint8.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_init.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_invalidate.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_putmem.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint16.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint32.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint8.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_subtract.3.gz +OLD_FILES+=usr/share/man/man3/lwres_conf_clear.3.gz +OLD_FILES+=usr/share/man/man3/lwres_conf_get.3.gz +OLD_FILES+=usr/share/man/man3/lwres_conf_init.3.gz +OLD_FILES+=usr/share/man/man3/lwres_conf_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_conf_print.3.gz +OLD_FILES+=usr/share/man/man3/lwres_config.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_allocmem.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_create.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_destroy.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_freemem.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_initserial.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_nextserial.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_sendrecv.3.gz +OLD_FILES+=usr/share/man/man3/lwres_endhostent.3.gz +OLD_FILES+=usr/share/man/man3/lwres_endhostent_r.3.gz +OLD_FILES+=usr/share/man/man3/lwres_freeaddrinfo.3.gz +OLD_FILES+=usr/share/man/man3/lwres_freehostent.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabn.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gai_strerror.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getaddrinfo.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getaddrsbyname.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostbyaddr.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostbyaddr_r.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostbyname.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostbyname2.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostbyname_r.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostent.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostent_r.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getipnode.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getipnodebyaddr.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getipnodebyname.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getnamebyaddr.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getnameinfo.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getrrsetbyname.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnba.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_herror.3.gz +OLD_FILES+=usr/share/man/man3/lwres_hstrerror.3.gz +OLD_FILES+=usr/share/man/man3/lwres_inetntop.3.gz +OLD_FILES+=usr/share/man/man3/lwres_lwpacket_parseheader.3.gz +OLD_FILES+=usr/share/man/man3/lwres_lwpacket_renderheader.3.gz +OLD_FILES+=usr/share/man/man3/lwres_net_ntop.3.gz +OLD_FILES+=usr/share/man/man3/lwres_noop.3.gz +OLD_FILES+=usr/share/man/man3/lwres_nooprequest_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_nooprequest_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_nooprequest_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_noopresponse_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_noopresponse_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_noopresponse_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_packet.3.gz +OLD_FILES+=usr/share/man/man3/lwres_resutil.3.gz +OLD_FILES+=usr/share/man/man3/lwres_sethostent.3.gz +OLD_FILES+=usr/share/man/man3/lwres_sethostent_r.3.gz +OLD_FILES+=usr/share/man/man3/lwres_string_parse.3.gz +OLD_FILES+=usr/share/man/man5/named.conf.5.gz +OLD_FILES+=usr/share/man/man5/rndc.conf.5.gz +OLD_FILES+=usr/share/man/man8/ddns-confgen.8.gz +OLD_FILES+=usr/share/man/man8/dnssec-dsfromkey.8.gz +OLD_FILES+=usr/share/man/man8/dnssec-keyfromlabel.8.gz +OLD_FILES+=usr/share/man/man8/dnssec-keygen.8.gz +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/genrandom.8.gz +OLD_FILES+=usr/share/man/man8/isc-hmac-fixup.8.gz +OLD_FILES+=usr/share/man/man8/lwresd.8.gz +OLD_FILES+=usr/share/man/man8/named-checkconf.8.gz +OLD_FILES+=usr/share/man/man8/named-checkzone.8.gz +OLD_FILES+=usr/share/man/man8/named-compilezone.8.gz +OLD_FILES+=usr/share/man/man8/named-journalprint.8.gz +OLD_FILES+=usr/share/man/man8/named.8.gz +OLD_FILES+=usr/share/man/man8/named.reconfig.8.gz +OLD_FILES+=usr/share/man/man8/named.reload.8.gz +OLD_FILES+=usr/share/man/man8/nsec3hash.8.gz +OLD_FILES+=usr/share/man/man8/rndc-confgen.8.gz +OLD_FILES+=usr/share/man/man8/rndc.8.gz +OLD_DIRS+=var/named/dev +OLD_DIRS+=var/named/etc +OLD_DIRS+=var/named/etc/namedb +OLD_FILES+=var/named/etc/namedb/PROTO.localhost-v6.rev +OLD_FILES+=var/named/etc/namedb/PROTO.localhost.rev +OLD_DIRS+=var/named/etc/namedb/dynamic +OLD_FILES+=var/named/etc/namedb/make-localhost +OLD_DIRS+=var/named/etc/namedb/master +OLD_FILES+=var/named/etc/namedb/master/empty.db +OLD_FILES+=var/named/etc/namedb/master/localhost-forward.db +OLD_FILES+=var/named/etc/namedb/master/localhost-reverse.db +#OLD_FILES+=var/named/etc/namedb/named.conf # intentionally left out +OLD_FILES+=var/named/etc/namedb/named.root +OLD_DIRS+=var/named/etc/namedb/slave +OLD_DIRS+=var/named/var +OLD_DIRS+=var/named/var/dump +OLD_DIRS+=var/named/var/log +OLD_DIRS+=var/named/var/run +OLD_DIRS+=var/named/var/run/named +OLD_DIRS+=var/named/var/stats +OLD_DIRS+=var/run/named +# 20130908: libssh becomes private +OLD_FILES+=usr/lib/libssh.a +OLD_FILES+=usr/lib/libssh.so +OLD_LIBS+=usr/lib/libssh.so.5 +OLD_FILES+=usr/lib/libssh_p.a +OLD_FILES+=usr/lib32/libssh.a +OLD_FILES+=usr/lib32/libssh.so +OLD_LIBS+=usr/lib32/libssh.so.5 +OLD_FILES+=usr/lib32/libssh_p.a +# 20130903: gnupatch is no more +OLD_FILES+=usr/bin/gnupatch +OLD_FILES+=usr/share/man/man1/gnupatch.1.gz +# 20130829: bsdpatch is patch unconditionally +OLD_FILES+=usr/bin/bsdpatch +OLD_FILES+=usr/share/man/man1/bsdpatch.1.gz +# 20130822: bind 9.9.3-P2 import +OLD_LIBS+=usr/lib/liblwres.so.80 +# 20130814: vm_page_busy(9) +OLD_FILES+=usr/share/man/man9/vm_page_flash.9.gz +OLD_FILES+=usr/share/man/man9/vm_page_io.9.gz +OLD_FILES+=usr/share/man/man9/vm_page_io_finish.9.gz +OLD_FILES+=usr/share/man/man9/vm_page_io_start.9.gz +OLD_FILES+=usr/share/man/man9/vm_page_wakeup.9.gz # 20130710: libkvm version bump OLD_LIBS+=lib/libkvm.so.5 OLD_LIBS+=usr/lib32/libkvm.so.5 @@ -114,6 +392,7 @@ OLD_FILES+=usr/include/clang/3.2/xmmintr OLD_FILES+=usr/include/clang/3.2/xopintrin.h OLD_DIRS+=usr/include/clang/3.2 # 20130404: legacy ATA stack removed +OLD_FILES+=etc/periodic/daily/405.status-ata-raid OLD_FILES+=rescue/atacontrol OLD_FILES+=sbin/atacontrol OLD_FILES+=usr/share/man/man8/atacontrol.8.gz @@ -5833,6 +6112,13 @@ OLD_LIBS+=usr/lib/libkse.so.1 OLD_LIBS+=usr/lib/liblwres.so.3 OLD_LIBS+=usr/lib/pam_ftp.so.2 +# 20131013: Removal of the ATF tools +OLD_DIRS+=etc/atf +OLD_DIRS+=usr/share/examples/atf +OLD_DIRS+=usr/share/xml/atf +OLD_DIRS+=usr/share/xml +OLD_DIRS+=usr/share/xsl/atf +OLD_DIRS+=usr/share/xsl # 20040925: bind9 import OLD_DIRS+=usr/share/doc/bind/html OLD_DIRS+=usr/share/doc/bind/misc Modified: projects/virtio/UPDATING ============================================================================== --- projects/virtio/UPDATING Sat Oct 12 20:01:36 2013 (r256393) +++ projects/virtio/UPDATING Sat Oct 12 22:36:01 2013 (r256394) @@ -16,8 +16,8 @@ from older versions of FreeBSD, try WITH head, and then rebuild without this option. The bootstrap process from older version of current is a bit fragile. -NOTE TO PEOPLE WHO THINK THAT FreeBSD 10.x IS SLOW: - FreeBSD 10.x has many debugging features turned on, in both the kernel +NOTE TO PEOPLE WHO THINK THAT FreeBSD 11.x IS SLOW: + FreeBSD 11.x has many debugging features turned on, in both the kernel and userland. These features attempt to detect incorrect use of system primitives, and encourage loud failure through extra sanity checking and fail stop semantics. They also substantially impact @@ -31,6 +31,80 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20131010: + The rc.d/jail script has been updated to support jail(8) + configuration file. The "jail__*" rc.conf(5) variables + for per-jail configuration are automatically converted to + /var/run/jail..conf before the jail(8) utility is invoked. + This is transparently backward compatible. See below about some + incompatibilities and rc.conf(5) manual page for more details. + + These variables are now deprecated in favor of jail(8) configuration + file. One can use "rc.d/jail config " command to generate + a jail(8) configuration file in /var/run/jail..conf without + running the jail(8) utility. The default pathname of the + configuration file is /etc/jail.conf and can be specified by + using $jail_conf or $jail__conf variables. + + Please note that jail_devfs_ruleset accepts an integer at + this moment. Please consider to rewrite the ruleset name + with an integer. + +20130930: + BIND has been removed from the base system. If all you need + is a local resolver, simply enable and start the local_unbound + service instead. Otherwise, several versions of BIND are + available in the ports tree. + +20130916: + With the addition of unbound(8), a new unbound user is now + required during installworld. "mergemaster -p" can be used to + add the user prior to installworld, as documented in the handbook. + +20130911: + OpenSSH is now built with DNSSEC support, and will by default + silently trust signed SSHFP records. This can be controlled with + the VerifyHostKeyDNS client configuration setting. DNSSEC support + can be disabled entirely with the WITHOUT_LDNS option in src.conf. + +20130906: + The GNU Compiler Collection and C++ standard library (libstdc++) + are no longer built by default on platforms where clang is the system + compiler. You can enable them with the WITH_GCC and WITH_GNUCXX + options in src.conf. + +20130905: + The PROCDESC kernel option is now part of the GENERIC kernel + configuration and is required for the rwhod(8) to work. + If you are using custom kernel configuration, you should include + 'options PROCDESC'. + +20130905: + The API and ABI related to the Capsicum framework was modified + in backward incompatible way. The userland libraries and programs + have to be recompiled to work with the new kernel. This includes the + following libraries and programs, but the whole buildworld is + advised: libc, libprocstat, dhclient, tcpdump, hastd, hastctl, + kdump, procstat, rwho, rwhod, uniq. + +20130903: + AES-NI intrinsic support has been added to gcc. The AES-NI module + has been updated to use this support. A new gcc is required to build + the aesni module on both i386 and amd64. + +20130821: + The PADLOCK_RNG and RDRAND_RNG kernel options are now devices. + Thus "device padlock_rng" and "device rdrand_rng" should be + used instead of "options PADLOCK_RNG" & "options RDRAND_RNG". + +20130813: + WITH_ICONV has been split into two feature sets. WITH_ICONV now + enables just the iconv* functionality and is now on by default. + WITH_LIBICONV_COMPAT enables the libiconv api and link time + compatability. Set WITHOUT_ICONV to build the old way. + If you have been using WITH_ICONV before, you will very likely + need to turn on WITH_LIBICONV_COMPAT. + 20130806: INVARIANTS option now enables DEBUG for code with OpenSolaris and Illumos origin, including ZFS. If you have INVARIANTS in your @@ -245,8 +319,8 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 20121201: With the addition of auditdistd(8), a new auditdistd user is now - depended on during installworld. "mergemaster -p" can be used to add - the user prior to installworld, as documented in the handbook. + required during installworld. "mergemaster -p" can be used to + add the user prior to installworld, as documented in the handbook. 20121117: The sin6_scope_id member variable in struct sockaddr_in6 is now @@ -332,9 +406,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 20120913: The random(4) support for the VIA hardware random number generator (`PADLOCK') is no longer enabled unconditionally. - Add the PADLOCK_RNG option in the custom kernel config if + Add the padlock_rng device in the custom kernel config if needed. The GENERIC kernels on i386 and amd64 do include the - option, so the change only affects the custom kernel + device, so the change only affects the custom kernel configurations. 20120908: Modified: projects/virtio/bin/Makefile ============================================================================== --- projects/virtio/bin/Makefile Sat Oct 12 20:01:36 2013 (r256393) +++ projects/virtio/bin/Makefile Sat Oct 12 22:36:01 2013 (r256394) @@ -15,6 +15,7 @@ SUBDIR= cat \ echo \ ed \ expr \ + freebsd-version \ getfacl \ hostname \ kenv \ Modified: projects/virtio/bin/chflags/chflags.1 ============================================================================== --- projects/virtio/bin/chflags/chflags.1 Sat Oct 12 20:01:36 2013 (r256393) +++ projects/virtio/bin/chflags/chflags.1 Sat Oct 12 22:36:01 2013 (r256394) @@ -32,7 +32,7 @@ .\" @(#)chflags.1 8.4 (Berkeley) 5/2/95 .\" $FreeBSD$ .\" -.Dd March 3, 2006 +.Dd April 8, 2013 .Dt CHFLAGS 1 .Os .Sh NAME @@ -101,20 +101,36 @@ The following keywords are currently def .Bl -tag -offset indent -width ".Cm opaque" .It Cm arch , archived set the archived flag (super-user only) -.It Cm opaque -set the opaque flag (owner or super-user only) .It Cm nodump set the nodump flag (owner or super-user only) +.It Cm opaque +set the opaque flag (owner or super-user only) .It Cm sappnd , sappend set the system append-only flag (super-user only) .It Cm schg , schange , simmutable set the system immutable flag (super-user only) +.It Cm snapshot +set the snapshot flag (filesystems do not allow changing this flag) .It Cm sunlnk , sunlink set the system undeletable flag (super-user only) .It Cm uappnd , uappend set the user append-only flag (owner or super-user only) +.It Cm uarch , uarchive +set the archive flag (owner or super-user only) .It Cm uchg , uchange , uimmutable set the user immutable flag (owner or super-user only) +.It Cm uhidden , hidden +set the hidden file attribute (owner or super-user only) +.It Cm uoffline , offline +set the offline file attribute (owner or super-user only) +.It Cm urdonly , rdonly , readonly +set the DOS, Windows and CIFS readonly flag (owner or super-user only) +.It Cm usparse , sparse +set the sparse file attribute (owner or super-user only) +.It Cm usystem , system +set the DOS, Windows and CIFS system flag (owner or super-user only) +.It Cm ureparse , reparse +set the Windows reparse point file attribute (owner or super-user only) .It Cm uunlnk , uunlink set the user undeletable flag (owner or super-user only) .El Modified: projects/virtio/bin/dd/dd.1 ============================================================================== --- projects/virtio/bin/dd/dd.1 Sat Oct 12 20:01:36 2013 (r256393) +++ projects/virtio/bin/dd/dd.1 Sat Oct 12 22:36:01 2013 (r256394) @@ -32,7 +32,7 @@ .\" @(#)dd.1 8.2 (Berkeley) 1/13/94 .\" $FreeBSD$ .\" -.Dd January 23, 2009 +.Dd October 1, 2013 .Dt DD 1 .Os .Sh NAME @@ -378,12 +378,12 @@ will exit. .Sh EXAMPLES Check that a disk drive contains no bad blocks: .Pp -.Dl "dd if=/dev/ad0 of=/dev/null bs=1m" +.Dl "dd if=/dev/ada0 of=/dev/null bs=1m" .Pp Do a refresh of a disk drive, in order to prevent presently recoverable read errors from progressing into unrecoverable read errors: .Pp -.Dl "dd if=/dev/ad0 of=/dev/ad0 bs=1m" +.Dl "dd if=/dev/ada0 of=/dev/ada0 bs=1m" .Pp Remove parity bit from a file: .Pp Modified: projects/virtio/bin/ls/ls.1 ============================================================================== --- projects/virtio/bin/ls/ls.1 Sat Oct 12 20:01:36 2013 (r256393) +++ projects/virtio/bin/ls/ls.1 Sat Oct 12 22:36:01 2013 (r256394) @@ -232,6 +232,9 @@ output. Include the file flags in a long .Pq Fl l output. +See +.Xr chflags 1 +for a list of file flags and their meanings. .It Fl p Write a slash .Pq Ql / Modified: projects/virtio/bin/pkill/pkill.c ============================================================================== --- projects/virtio/bin/pkill/pkill.c Sat Oct 12 20:01:36 2013 (r256393) +++ projects/virtio/bin/pkill/pkill.c Sat Oct 12 22:36:01 2013 (r256394) @@ -481,7 +481,6 @@ main(int argc, char **argv) * We skip P_SYSTEM processes to match ps(1) output. */ if ((kp->ki_flag & P_SYSTEM) == 0 && - kp->ki_loginclass != NULL && strcmp(kp->ki_loginclass, li->li_name) == 0) break; } Modified: projects/virtio/bin/ps/keyword.c ============================================================================== --- projects/virtio/bin/ps/keyword.c Sat Oct 12 20:01:36 2013 (r256393) +++ projects/virtio/bin/ps/keyword.c Sat Oct 12 22:36:01 2013 (r256394) @@ -87,6 +87,7 @@ static VAR var[] = { {"etimes", "ELAPSED", NULL, USER, elapseds, 0, CHAR, NULL, 0}, {"euid", "", "uid", 0, NULL, 0, CHAR, NULL, 0}, {"f", "F", NULL, 0, kvar, KOFF(ki_flag), INT, "x", 0}, + {"fib", "FIB", NULL, 0, kvar, KOFF(ki_fibnum), INT, "d", 0}, {"flags", "", "f", 0, NULL, 0, CHAR, NULL, 0}, {"gid", "GID", NULL, 0, kvar, KOFF(ki_groups), UINT, UIDFMT, 0}, {"group", "GROUP", NULL, LJUST, egroupname, 0, CHAR, NULL, 0}, Modified: projects/virtio/bin/ps/ps.1 ============================================================================== --- projects/virtio/bin/ps/ps.1 Sat Oct 12 20:01:36 2013 (r256393) +++ projects/virtio/bin/ps/ps.1 Sat Oct 12 22:36:01 2013 (r256394) @@ -512,6 +512,9 @@ elapsed running time, format minutes:seconds. .It Cm etimes elapsed running time, in decimal integer seconds +.It Cm fib +default FIB number, see +.Xr setfib 1 .It Cm flags the process flags, in hexadecimal (alias .Cm f ) Modified: projects/virtio/bin/sh/alias.c ============================================================================== --- projects/virtio/bin/sh/alias.c Sat Oct 12 20:01:36 2013 (r256393) +++ projects/virtio/bin/sh/alias.c Sat Oct 12 22:36:01 2013 (r256394) @@ -237,17 +237,19 @@ printaliases(void) } int -aliascmd(int argc, char **argv) +aliascmd(int argc __unused, char **argv __unused) { char *n, *v; int ret = 0; struct alias *ap; - if (argc == 1) { + nextopt(""); + + if (*argptr == NULL) { printaliases(); return (0); } - while ((n = *++argv) != NULL) { + while ((n = *argptr++) != NULL) { if ((v = strchr(n+1, '=')) == NULL) /* n+1: funny ksh stuff */ if ((ap = lookupalias(n, 0)) == NULL) { warning("%s: not found", n); Modified: projects/virtio/bin/sh/arith_yylex.c ============================================================================== --- projects/virtio/bin/sh/arith_yylex.c Sat Oct 12 20:01:36 2013 (r256393) +++ projects/virtio/bin/sh/arith_yylex.c Sat Oct 12 22:36:01 2013 (r256394) @@ -218,9 +218,13 @@ checkeqcur: value += ARITH_REM - '%'; goto checkeq; case '+': + if (buf[1] == '+') + return ARITH_BAD; value += ARITH_ADD - '+'; goto checkeq; case '-': + if (buf[1] == '-') + return ARITH_BAD; value += ARITH_SUB - '-'; goto checkeq; case '~': Modified: projects/virtio/bin/sh/eval.c ============================================================================== --- projects/virtio/bin/sh/eval.c Sat Oct 12 20:01:36 2013 (r256393) +++ projects/virtio/bin/sh/eval.c Sat Oct 12 22:36:01 2013 (r256394) @@ -109,7 +109,6 @@ reseteval(void) { evalskip = 0; loopnest = 0; - funcnest = 0; } @@ -325,7 +324,7 @@ skipping: if (evalskip == SKIPCONT && } if (evalskip == SKIPBREAK && --skipcount <= 0) evalskip = 0; - if (evalskip == SKIPFUNC || evalskip == SKIPFILE) + if (evalskip == SKIPRETURN) status = exitstatus; break; } @@ -1069,7 +1068,7 @@ evalcommand(union node *cmd, int flags, funcnest--; popredir(); INTON; - if (evalskip == SKIPFUNC) { + if (evalskip == SKIPRETURN) { evalskip = 0; skipcount = 0; } @@ -1306,14 +1305,8 @@ returncmd(int argc, char **argv) { int ret = argc > 1 ? number(argv[1]) : oexitstatus; - if (funcnest) { - evalskip = SKIPFUNC; - skipcount = 1; - } else { - /* skip the rest of the file */ - evalskip = SKIPFILE; - skipcount = 1; - } + evalskip = SKIPRETURN; + skipcount = 1; return ret; } Modified: projects/virtio/bin/sh/eval.h ============================================================================== --- projects/virtio/bin/sh/eval.h Sat Oct 12 20:01:36 2013 (r256393) +++ projects/virtio/bin/sh/eval.h Sat Oct 12 22:36:01 2013 (r256394) @@ -67,5 +67,4 @@ extern int skipcount; /* reasons for skipping commands (see comment on breakcmd routine) */ #define SKIPBREAK 1 #define SKIPCONT 2 -#define SKIPFUNC 3 -#define SKIPFILE 4 +#define SKIPRETURN 3 Modified: projects/virtio/bin/sh/exec.c ============================================================================== --- projects/virtio/bin/sh/exec.c Sat Oct 12 20:01:36 2013 (r256393) +++ projects/virtio/bin/sh/exec.c Sat Oct 12 22:36:01 2013 (r256394) @@ -762,5 +762,7 @@ typecmd_impl(int argc, char **argv, int int typecmd(int argc, char **argv) { + if (argc > 2 && strcmp(argv[1], "--") == 0) + argc--, argv++; return typecmd_impl(argc, argv, TYPECMD_TYPE, bltinlookup("PATH", 1)); } Modified: projects/virtio/bin/sh/jobs.c ============================================================================== --- projects/virtio/bin/sh/jobs.c Sat Oct 12 20:01:36 2013 (r256393) +++ projects/virtio/bin/sh/jobs.c Sat Oct 12 22:36:01 2013 (r256394) @@ -83,13 +83,12 @@ static struct job *bgjob = NULL; /* last static struct job *jobmru; /* most recently used job list */ static pid_t initialpgrp; /* pgrp of shell on invocation */ #endif -int in_waitcmd = 0; /* are we in waitcmd()? */ -volatile sig_atomic_t breakwaitcmd = 0; /* should wait be terminated? */ static int ttyfd = -1; /* mode flags for dowait */ #define DOWAIT_BLOCK 0x1 /* wait until a child exits */ -#define DOWAIT_SIG 0x2 /* if DOWAIT_BLOCK, abort on signals */ +#define DOWAIT_SIG 0x2 /* if DOWAIT_BLOCK, abort on SIGINT/SIGQUIT */ +#define DOWAIT_SIG_ANY 0x4 /* if DOWAIT_SIG, abort on any signal */ #if JOBS static void restartjob(struct job *); @@ -183,13 +182,14 @@ out: out2fmt_flush("sh: can't access #if JOBS int -fgcmd(int argc __unused, char **argv) +fgcmd(int argc __unused, char **argv __unused) { struct job *jp; pid_t pgrp; int status; - jp = getjob(argv[1]); + nextopt(""); + jp = getjob(*argptr); if (jp->jobctl == 0) error("job not created under job control"); printjobcmd(jp); @@ -210,8 +210,9 @@ bgcmd(int argc, char **argv) { struct job *jp; + nextopt(""); do { - jp = getjob(*++argv); + jp = getjob(*argptr); if (jp->jobctl == 0) error("job not created under job control"); if (jp->state == JOBDONE) @@ -220,7 +221,7 @@ bgcmd(int argc, char **argv) jp->foreground = 0; out1fmt("[%td] ", jp - jobtab + 1); printjobcmd(jp); - } while (--argc > 1); + } while (*argptr != NULL && *++argptr != NULL); return 0; } @@ -482,7 +483,7 @@ waitcmd(int argc __unused, char **argv _ static int waitcmdloop(struct job *job) { *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Sat Oct 12 22:39:35 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 8FA1543A; Sat, 12 Oct 2013 22:39:35 +0000 (UTC) (envelope-from bryanv@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7AACB247B; Sat, 12 Oct 2013 22:39:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9CMdZ7c009739; Sat, 12 Oct 2013 22:39:35 GMT (envelope-from bryanv@svn.freebsd.org) Received: (from bryanv@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9CMdY7B009736; Sat, 12 Oct 2013 22:39:34 GMT (envelope-from bryanv@svn.freebsd.org) Message-Id: <201310122239.r9CMdY7B009736@svn.freebsd.org> From: Bryan Venteicher Date: Sat, 12 Oct 2013 22:39:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256395 - in projects/virtio: share/man/man9 sys/kern sys/sys X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Oct 2013 22:39:35 -0000 Author: bryanv Date: Sat Oct 12 22:39:34 2013 New Revision: 256395 URL: http://svnweb.freebsd.org/changeset/base/256395 Log: Add sglist_append_bio(9) to append a struct bio's data Modified: projects/virtio/share/man/man9/sglist.9 projects/virtio/sys/kern/subr_sglist.c projects/virtio/sys/sys/sglist.h Modified: projects/virtio/share/man/man9/sglist.9 ============================================================================== --- projects/virtio/share/man/man9/sglist.9 Sat Oct 12 22:36:01 2013 (r256394) +++ projects/virtio/share/man/man9/sglist.9 Sat Oct 12 22:39:34 2013 (r256395) @@ -33,6 +33,7 @@ .Nm sglist , .Nm sglist_alloc , .Nm sglist_append , +.Nm sglist_append_bio , .Nm sglist_append_mbuf , .Nm sglist_append_phys , .Nm sglist_append_uio , @@ -58,6 +59,8 @@ .Ft int .Fn sglist_append "struct sglist *sg" "void *buf" "size_t len" .Ft int +.Fn sglist_append_bio "struct sglist *sg" "struct bio *bp" +.Ft int .Fn sglist_append_mbuf "struct sglist *sg" "struct mbuf *m" .Ft int .Fn sglist_append_phys "struct sglist *sg" "vm_paddr_t paddr" "size_t len" @@ -206,6 +209,13 @@ and is bytes long. .Pp The +.Nm sglist_append_bio +function appends the physical address ranges described by a single bio +.Fa bp +to the scatter/gather list +.Fa sg . +.Pp +The .Nm sglist_append_mbuf function appends the physical address ranges described by an entire mbuf chain Modified: projects/virtio/sys/kern/subr_sglist.c ============================================================================== --- projects/virtio/sys/kern/subr_sglist.c Sat Oct 12 22:36:01 2013 (r256394) +++ projects/virtio/sys/kern/subr_sglist.c Sat Oct 12 22:39:34 2013 (r256395) @@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -40,6 +41,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include @@ -239,6 +241,42 @@ sglist_append(struct sglist *sg, void *b } /* + * Append the segments to describe a bio's data to a scatter/gather list. + * If there are insufficient segments, then this fails with EFBIG. + */ +int +sglist_append_bio(struct sglist *sg, struct bio *bp) +{ + struct sgsave save; + vm_paddr_t paddr; + size_t len, tlen; + int error, i, ma_offs; + + if ((bp->bio_flags & BIO_UNMAPPED) == 0) { + error = sglist_append(sg, bp->bio_data, bp->bio_bcount); + return (error); + } + + if (sg->sg_maxseg == 0) + return (EINVAL); + + SGLIST_SAVE(sg, save); + tlen = bp->bio_bcount; + ma_offs = bp->bio_ma_offset; + for (i = 0; tlen > 0; i++, tlen -= len) { + len = min(PAGE_SIZE - ma_offs, tlen); + paddr = VM_PAGE_TO_PHYS(bp->bio_ma[i]) + ma_offs; + error = sglist_append_phys(sg, paddr, len); + if (error) { + SGLIST_RESTORE(sg, save); + return (error); + } + ma_offs = 0; + } + return (0); +} + +/* * Append a single physical address range to a scatter/gather list. * If there are insufficient segments, then this fails with EFBIG. */ Modified: projects/virtio/sys/sys/sglist.h ============================================================================== --- projects/virtio/sys/sys/sglist.h Sat Oct 12 22:36:01 2013 (r256394) +++ projects/virtio/sys/sys/sglist.h Sat Oct 12 22:39:34 2013 (r256395) @@ -53,6 +53,7 @@ struct sglist { u_short sg_maxseg; }; +struct bio; struct mbuf; struct uio; @@ -83,6 +84,7 @@ sglist_hold(struct sglist *sg) struct sglist *sglist_alloc(int nsegs, int mflags); int sglist_append(struct sglist *sg, void *buf, size_t len); +int sglist_append_bio(struct sglist *sg, struct bio *bp); int sglist_append_mbuf(struct sglist *sg, struct mbuf *m0); int sglist_append_phys(struct sglist *sg, vm_paddr_t paddr, size_t len); From owner-svn-src-projects@FreeBSD.ORG Sat Oct 12 22:40:27 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 37C79518; Sat, 12 Oct 2013 22:40:27 +0000 (UTC) (envelope-from bryanv@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 24D342482; Sat, 12 Oct 2013 22:40:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9CMeRhi010434; Sat, 12 Oct 2013 22:40:27 GMT (envelope-from bryanv@svn.freebsd.org) Received: (from bryanv@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9CMeQwu010432; Sat, 12 Oct 2013 22:40:27 GMT (envelope-from bryanv@svn.freebsd.org) Message-Id: <201310122240.r9CMeQwu010432@svn.freebsd.org> From: Bryan Venteicher Date: Sat, 12 Oct 2013 22:40:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256396 - projects/virtio/sys/kern X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Oct 2013 22:40:27 -0000 Author: bryanv Date: Sat Oct 12 22:40:26 2013 New Revision: 256396 URL: http://svnweb.freebsd.org/changeset/base/256396 Log: Remove an unnecessary variable initialization Modified: projects/virtio/sys/kern/subr_sglist.c Modified: projects/virtio/sys/kern/subr_sglist.c ============================================================================== --- projects/virtio/sys/kern/subr_sglist.c Sat Oct 12 22:39:34 2013 (r256395) +++ projects/virtio/sys/kern/subr_sglist.c Sat Oct 12 22:40:26 2013 (r256396) @@ -321,7 +321,6 @@ sglist_append_mbuf(struct sglist *sg, st if (sg->sg_maxseg == 0) return (EINVAL); - error = 0; SGLIST_SAVE(sg, save); for (m = m0; m != NULL; m = m->m_next) { if (m->m_len > 0) { From owner-svn-src-projects@FreeBSD.ORG Sat Oct 12 22:41:29 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 0957A5F6; Sat, 12 Oct 2013 22:41:29 +0000 (UTC) (envelope-from bryanv@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EAEDA24B1; Sat, 12 Oct 2013 22:41:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9CMfStk012673; Sat, 12 Oct 2013 22:41:28 GMT (envelope-from bryanv@svn.freebsd.org) Received: (from bryanv@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9CMfSlF012672; Sat, 12 Oct 2013 22:41:28 GMT (envelope-from bryanv@svn.freebsd.org) Message-Id: <201310122241.r9CMfSlF012672@svn.freebsd.org> From: Bryan Venteicher Date: Sat, 12 Oct 2013 22:41:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256397 - projects/virtio/sys/dev/virtio/block X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Oct 2013 22:41:29 -0000 Author: bryanv Date: Sat Oct 12 22:41:28 2013 New Revision: 256397 URL: http://svnweb.freebsd.org/changeset/base/256397 Log: Add unmapped IO support to virtio_blk(4) Modified: projects/virtio/sys/dev/virtio/block/virtio_blk.c Modified: projects/virtio/sys/dev/virtio/block/virtio_blk.c ============================================================================== --- projects/virtio/sys/dev/virtio/block/virtio_blk.c Sat Oct 12 22:40:26 2013 (r256396) +++ projects/virtio/sys/dev/virtio/block/virtio_blk.c Sat Oct 12 22:41:28 2013 (r256397) @@ -41,6 +41,9 @@ __FBSDID("$FreeBSD$"); #include #include +#include +#include + #include #include @@ -726,7 +729,7 @@ vtblk_alloc_disk(struct vtblk_softc *sc, dp->d_name = VTBLK_DISK_NAME; dp->d_unit = device_get_unit(dev); dp->d_drv1 = sc; - dp->d_flags = DISKFLAG_CANFLUSHCACHE; + dp->d_flags = DISKFLAG_CANFLUSHCACHE | DISKFLAG_UNMAPPED_BIO; dp->d_hba_vendor = virtio_get_vendor(dev); dp->d_hba_device = virtio_get_device(dev); dp->d_hba_subvendor = virtio_get_subvendor(dev); @@ -931,10 +934,11 @@ vtblk_execute_request(struct vtblk_softc sglist_append(sg, &req->vbr_hdr, sizeof(struct virtio_blk_outhdr)); if (bp->bio_cmd == BIO_READ || bp->bio_cmd == BIO_WRITE) { - error = sglist_append(sg, bp->bio_data, bp->bio_bcount); - if (error || sg->sg_nseg == sg->sg_maxseg) + error = sglist_append_bio(sg, bp); + if (error || sg->sg_nseg == sg->sg_maxseg) { panic("%s: data buffer too big bio:%p error:%d", __func__, bp, error); + } /* BIO_READ means the host writes into our buffer. */ if (bp->bio_cmd == BIO_READ) From owner-svn-src-projects@FreeBSD.ORG Sat Oct 12 22:42:18 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D5C716DE; Sat, 12 Oct 2013 22:42:18 +0000 (UTC) (envelope-from bryanv@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C3DBF24B8; Sat, 12 Oct 2013 22:42:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9CMgIpR013084; Sat, 12 Oct 2013 22:42:18 GMT (envelope-from bryanv@svn.freebsd.org) Received: (from bryanv@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9CMgIV9013083; Sat, 12 Oct 2013 22:42:18 GMT (envelope-from bryanv@svn.freebsd.org) Message-Id: <201310122242.r9CMgIV9013083@svn.freebsd.org> From: Bryan Venteicher Date: Sat, 12 Oct 2013 22:42:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256398 - projects/virtio/sys/dev/virtio/scsi X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Oct 2013 22:42:18 -0000 Author: bryanv Date: Sat Oct 12 22:42:18 2013 New Revision: 256398 URL: http://svnweb.freebsd.org/changeset/base/256398 Log: Add unmapped IO support to virtio_scsi(4) Modified: projects/virtio/sys/dev/virtio/scsi/virtio_scsi.c Modified: projects/virtio/sys/dev/virtio/scsi/virtio_scsi.c ============================================================================== --- projects/virtio/sys/dev/virtio/scsi/virtio_scsi.c Sat Oct 12 22:41:28 2013 (r256397) +++ projects/virtio/sys/dev/virtio/scsi/virtio_scsi.c Sat Oct 12 22:42:18 2013 (r256398) @@ -878,7 +878,7 @@ vtscsi_cam_path_inquiry(struct vtscsi_so cpi->version_num = 1; cpi->hba_inquiry = PI_TAG_ABLE; cpi->target_sprt = 0; - cpi->hba_misc = PIM_SEQSCAN; + cpi->hba_misc = PIM_SEQSCAN | PIM_UNMAPPED; if (vtscsi_bus_reset_disable != 0) cpi->hba_misc |= PIM_NOBUSRESET; cpi->hba_eng_cnt = 0; @@ -946,6 +946,9 @@ vtscsi_sg_append_scsi_buf(struct vtscsi_ (vm_paddr_t) dseg->ds_addr, dseg->ds_len); } break; + case CAM_DATA_BIO: + error = sglist_append_bio(sg, (struct bio *) csio->data_ptr); + break; default: error = EINVAL; break; From owner-svn-src-projects@FreeBSD.ORG Sat Oct 12 23:15:07 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D25C7A59; Sat, 12 Oct 2013 23:15:07 +0000 (UTC) (envelope-from markm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C014C259D; Sat, 12 Oct 2013 23:15:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9CNF75m029358; Sat, 12 Oct 2013 23:15:07 GMT (envelope-from markm@svn.freebsd.org) Received: (from markm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9CNF7DI029353; Sat, 12 Oct 2013 23:15:07 GMT (envelope-from markm@svn.freebsd.org) Message-Id: <201310122315.r9CNF7DI029353@svn.freebsd.org> From: Mark Murray Date: Sat, 12 Oct 2013 23:15:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256399 - projects/random_number_generator/sys/dev/random X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Oct 2013 23:15:07 -0000 Author: markm Date: Sat Oct 12 23:15:06 2013 New Revision: 256399 URL: http://svnweb.freebsd.org/changeset/base/256399 Log: Fix a problem where the priority order of yarrow,dummy can get reversed to dummy,yarrow and break the usability of /dev/random. Fix the name of the tunable to something logical that 'sysctl kern.random' emits. Submitted by: des@ (the idea, code by me) Modified: projects/random_number_generator/sys/dev/random/dummy_rng.c projects/random_number_generator/sys/dev/random/random_adaptors.c projects/random_number_generator/sys/dev/random/randomdev.h projects/random_number_generator/sys/dev/random/randomdev_soft.c Modified: projects/random_number_generator/sys/dev/random/dummy_rng.c ============================================================================== --- projects/random_number_generator/sys/dev/random/dummy_rng.c Sat Oct 12 22:42:18 2013 (r256398) +++ projects/random_number_generator/sys/dev/random/dummy_rng.c Sat Oct 12 23:15:06 2013 (r256399) @@ -102,6 +102,7 @@ struct random_adaptor dummy_random = { .read = (random_read_func_t *)random_null_func, .reseed = (random_reseed_func_t *)random_null_func, .seeded = 0, /* This device can never be seeded */ + .priority = 1, /* Bottom priority, so goes to last position */ }; static int Modified: projects/random_number_generator/sys/dev/random/random_adaptors.c ============================================================================== --- projects/random_number_generator/sys/dev/random/random_adaptors.c Sat Oct 12 22:42:18 2013 (r256398) +++ projects/random_number_generator/sys/dev/random/random_adaptors.c Sat Oct 12 23:15:06 2013 (r256399) @@ -104,12 +104,13 @@ void random_adaptor_choose(struct random_adaptor **adaptor) { char rngs[128], *token, *cp; - struct random_adaptors *rpp; + struct random_adaptors *rppi, *ramax; + unsigned primax; KASSERT(adaptor != NULL, ("pre-conditions failed")); *adaptor = NULL; - if (TUNABLE_STR_FETCH("rngs_want", rngs, sizeof(rngs))) { + if (TUNABLE_STR_FETCH("kern.random.active_adaptor", rngs, sizeof(rngs))) { cp = rngs; while ((token = strsep(&cp, ",")) != NULL) @@ -120,16 +121,22 @@ random_adaptor_choose(struct random_adap " skipping\n", token); } + primax = 0U; if (*adaptor == NULL) { /* - * Fallback to the first thing that's on the list of - * available RNGs. + * Fall back to the highest priority item on the available + * RNG list. */ sx_slock(&adaptors_lock); - rpp = LIST_FIRST(&adaptors); - if (rpp != NULL) - *adaptor = rpp->rsp; + LIST_FOREACH(rppi, &adaptors, entries) { + if (rppi->rsp->priority >= primax) { + ramax = rppi; + primax = rppi->rsp->priority; + } + } + if (ramax != NULL) + *adaptor = ramax->rsp; sx_sunlock(&adaptors_lock); Modified: projects/random_number_generator/sys/dev/random/randomdev.h ============================================================================== --- projects/random_number_generator/sys/dev/random/randomdev.h Sat Oct 12 22:42:18 2013 (r256398) +++ projects/random_number_generator/sys/dev/random/randomdev.h Sat Oct 12 23:15:06 2013 (r256399) @@ -44,6 +44,7 @@ struct random_adaptor { struct selinfo rsel; const char *ident; int seeded; + unsigned priority; random_init_func_t *init; random_deinit_func_t *deinit; random_block_func_t *block; Modified: projects/random_number_generator/sys/dev/random/randomdev_soft.c ============================================================================== --- projects/random_number_generator/sys/dev/random/randomdev_soft.c Sat Oct 12 22:42:18 2013 (r256398) +++ projects/random_number_generator/sys/dev/random/randomdev_soft.c Sat Oct 12 23:15:06 2013 (r256399) @@ -84,6 +84,7 @@ static struct random_adaptor random_cont .poll = randomdev_poll, .reseed = randomdev_flush_reseed, .seeded = 0, /* This will be seeded during entropy processing */ + .priority = 90, /* High priority, so top of the list. Fortuna may still win. */ }; #define RANDOM_MODULE_NAME yarrow #define RANDOM_CSPRNG_NAME "yarrow" @@ -99,6 +100,7 @@ static struct random_adaptor random_cont .poll = randomdev_poll, .reseed = randomdev_flush_reseed, .seeded = 0, /* This will be excplicitly seeded at startup when secured */ + .priority = 100, /* High priority, so top of the list. Beat Yarrow. */ }; #define RANDOM_MODULE_NAME fortuna #define RANDOM_CSPRNG_NAME "fortuna" From owner-svn-src-projects@FreeBSD.ORG Sat Oct 12 23:19:02 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 46AD5BF9; Sat, 12 Oct 2013 23:19:02 +0000 (UTC) (envelope-from markm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3409A25BD; Sat, 12 Oct 2013 23:19:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9CNJ2M7030403; Sat, 12 Oct 2013 23:19:02 GMT (envelope-from markm@svn.freebsd.org) Received: (from markm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9CNJ21c030401; Sat, 12 Oct 2013 23:19:02 GMT (envelope-from markm@svn.freebsd.org) Message-Id: <201310122319.r9CNJ21c030401@svn.freebsd.org> From: Mark Murray Date: Sat, 12 Oct 2013 23:19:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256400 - projects/random_number_generator/sys/dev/random X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Oct 2013 23:19:02 -0000 Author: markm Date: Sat Oct 12 23:19:01 2013 New Revision: 256400 URL: http://svnweb.freebsd.org/changeset/base/256400 Log: Make sure a vaiable is always initialised. Modified: projects/random_number_generator/sys/dev/random/random_adaptors.c Modified: projects/random_number_generator/sys/dev/random/random_adaptors.c ============================================================================== --- projects/random_number_generator/sys/dev/random/random_adaptors.c Sat Oct 12 23:15:06 2013 (r256399) +++ projects/random_number_generator/sys/dev/random/random_adaptors.c Sat Oct 12 23:19:01 2013 (r256400) @@ -129,6 +129,7 @@ random_adaptor_choose(struct random_adap */ sx_slock(&adaptors_lock); + ramax = NULL; LIST_FOREACH(rppi, &adaptors, entries) { if (rppi->rsp->priority >= primax) { ramax = rppi; From owner-svn-src-projects@FreeBSD.ORG Sat Oct 12 23:31:57 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 52188D90; Sat, 12 Oct 2013 23:31:57 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 404552646; Sat, 12 Oct 2013 23:31:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9CNVvOf038427; Sat, 12 Oct 2013 23:31:57 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9CNVvXU038426; Sat, 12 Oct 2013 23:31:57 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201310122331.r9CNVvXU038426@svn.freebsd.org> From: "Simon J. Gerraty" Date: Sat, 12 Oct 2013 23:31:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256401 - projects/bmake/pkgs X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Oct 2013 23:31:57 -0000 Author: sjg Date: Sat Oct 12 23:31:56 2013 New Revision: 256401 URL: http://svnweb.freebsd.org/changeset/base/256401 Log: Report the number of dirdeps so we can track progress. Modified: projects/bmake/pkgs/Makefile Modified: projects/bmake/pkgs/Makefile ============================================================================== --- projects/bmake/pkgs/Makefile Sat Oct 12 23:19:01 2013 (r256400) +++ projects/bmake/pkgs/Makefile Sat Oct 12 23:31:56 2013 (r256401) @@ -134,7 +134,7 @@ $t: dirdeps elapsed_time= seconds=`expr ${now_utc} - ${start_utc}` count-makefiles: .NOMETA - @echo "${TIME_STAMP} Makefiles read: total=${.MAKE.MAKEFILES:[#]} depend=${.MAKE.MAKEFILES:M*depend*:[#]} ${elapsed_time}" + @echo "${TIME_STAMP} Makefiles read: total=${.MAKE.MAKEFILES:[#]} depend=${.MAKE.MAKEFILES:M*depend*:[#]} dirdeps=${.ALLTARGETS:M${SRCTOP}*:O:u:[#]} ${elapsed_time}" .END: _build_finish _build_finish: .NOMETA From owner-svn-src-projects@FreeBSD.ORG Sat Oct 12 23:32:49 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 20717E7C; Sat, 12 Oct 2013 23:32:49 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0EA972654; Sat, 12 Oct 2013 23:32:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9CNWmFe038839; Sat, 12 Oct 2013 23:32:48 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9CNWmQe038838; Sat, 12 Oct 2013 23:32:48 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201310122332.r9CNWmQe038838@svn.freebsd.org> From: "Simon J. Gerraty" Date: Sat, 12 Oct 2013 23:32:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256402 - projects/bmake/lib/clang X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Oct 2013 23:32:49 -0000 Author: sjg Date: Sat Oct 12 23:32:48 2013 New Revision: 256402 URL: http://svnweb.freebsd.org/changeset/base/256402 Log: Make sure we trigger generation of headers Modified: projects/bmake/lib/clang/clang.build.mk Modified: projects/bmake/lib/clang/clang.build.mk ============================================================================== --- projects/bmake/lib/clang/clang.build.mk Sat Oct 12 23:31:56 2013 (r256401) +++ projects/bmake/lib/clang/clang.build.mk Sat Oct 12 23:32:48 2013 (r256402) @@ -196,3 +196,7 @@ Checkers.inc.h: ${CLANG_SRCS}/lib/Static SRCS+= ${TGHDRS:C/$/.inc.h/} DPADD+= ${TGHDRS:C/$/.inc.h/} CLEANFILES+= ${TGHDRS:C/$/.inc.h/} + +# if we are not doing explicit 'make depend', there is +# nothing to cause these to be generated. +beforebuild: ${SRCS:M*.inc.h} From owner-svn-src-projects@FreeBSD.ORG Sat Oct 12 23:33:37 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 10D00F60; Sat, 12 Oct 2013 23:33:37 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F2622265A; Sat, 12 Oct 2013 23:33:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9CNXam8039326; Sat, 12 Oct 2013 23:33:36 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9CNXaTG039325; Sat, 12 Oct 2013 23:33:36 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201310122333.r9CNXaTG039325@svn.freebsd.org> From: "Simon J. Gerraty" Date: Sat, 12 Oct 2013 23:33:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256403 - projects/bmake/usr.bin/kdump X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Oct 2013 23:33:37 -0000 Author: sjg Date: Sat Oct 12 23:33:36 2013 New Revision: 256403 URL: http://svnweb.freebsd.org/changeset/base/256403 Log: Tell cpp to only look where we told it Modified: projects/bmake/usr.bin/kdump/mkioctls Modified: projects/bmake/usr.bin/kdump/mkioctls ============================================================================== --- projects/bmake/usr.bin/kdump/mkioctls Sat Oct 12 23:32:48 2013 (r256402) +++ projects/bmake/usr.bin/kdump/mkioctls Sat Oct 12 23:33:36 2013 (r256403) @@ -38,7 +38,7 @@ case "${MACHINE}" in esac awk -v x="$ioctl_includes" 'BEGIN {print x}' | - $CPP -I$1 -dM -DCOMPAT_43TTY - | + $CPP -nostdinc -I$1 -dM -DCOMPAT_43TTY - | awk -v ioctl_includes="$ioctl_includes" -v style="$style" ' BEGIN { print "/* XXX obnoxious prerequisites. */" From owner-svn-src-projects@FreeBSD.ORG Sat Oct 12 23:37:47 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id C95A5F2; Sat, 12 Oct 2013 23:37:47 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B699E2673; Sat, 12 Oct 2013 23:37:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9CNblE5040325; Sat, 12 Oct 2013 23:37:47 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9CNbl13040322; Sat, 12 Oct 2013 23:37:47 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201310122337.r9CNbl13040322@svn.freebsd.org> From: "Simon J. Gerraty" Date: Sat, 12 Oct 2013 23:37:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256404 - projects/bmake/include X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Oct 2013 23:37:47 -0000 Author: sjg Date: Sat Oct 12 23:37:47 2013 New Revision: 256404 URL: http://svnweb.freebsd.org/changeset/base/256404 Log: In meta mode touch targets like copies so we don't needlessly repeat them. Modified: projects/bmake/include/Makefile Modified: projects/bmake/include/Makefile ============================================================================== --- projects/bmake/include/Makefile Sat Oct 12 23:33:36 2013 (r256403) +++ projects/bmake/include/Makefile Sat Oct 12 23:37:47 2013 (r256404) @@ -93,7 +93,7 @@ _libiconv_compat.h: ${.CURDIR}/Makefile echo "#undef __LIBICONV_COMPAT" >> _libiconv_compat.h .endif .endif - + # Define SHARED to indicate whether you want symbolic links to the system # source (``symlinks''), or a separate copy (``copies''). ``symlinks'' is @@ -178,6 +178,9 @@ compat: -f ${.CURDIR}/../etc/mtree/BIND.include.dist \ -p ${DESTDIR}${INCLUDEDIR} > /dev/null .endif +.if ${MK_META_MODE} == "yes" + touch ${.TARGET} +.endif copies: .for i in ${LDIRS} ${LSUBDIRS} ${LSUBSUBDIRS} altq crypto machine machine/pc \ @@ -257,6 +260,9 @@ copies: cd ${.CURDIR}/../sys/rpc; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 types.h \ ${DESTDIR}${INCLUDEDIR}/rpc +.if ${MK_META_MODE} == "yes" + touch ${.TARGET} +.endif symlinks: @${ECHO} "Setting up symlinks to kernel source tree..." @@ -369,3 +375,6 @@ symlinks: ln -fs ../../../sys/rpc/$$h \ ${DESTDIR}${INCLUDEDIR}/rpc; \ done +.if ${MK_META_MODE} == "yes" + touch ${.TARGET} +.endif From owner-svn-src-projects@FreeBSD.ORG Sat Oct 12 23:40:18 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 4A747241; Sat, 12 Oct 2013 23:40:18 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 200CD26AB; Sat, 12 Oct 2013 23:40:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9CNeH5X041093; Sat, 12 Oct 2013 23:40:18 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9CNeHOc041092; Sat, 12 Oct 2013 23:40:17 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201310122340.r9CNeHOc041092@svn.freebsd.org> From: "Simon J. Gerraty" Date: Sat, 12 Oct 2013 23:40:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256405 - projects/bmake/share/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Oct 2013 23:40:18 -0000 Author: sjg Date: Sat Oct 12 23:40:17 2013 New Revision: 256405 URL: http://svnweb.freebsd.org/changeset/base/256405 Log: When TARGET_SPEC_VARS is non-trivial, we need to apply the same filtering when setting _machines as we do to _build_dirs. Modified: projects/bmake/share/mk/dirdeps.mk Modified: projects/bmake/share/mk/dirdeps.mk ============================================================================== --- projects/bmake/share/mk/dirdeps.mk Sat Oct 12 23:37:47 2013 (r256404) +++ projects/bmake/share/mk/dirdeps.mk Sat Oct 12 23:40:17 2013 (r256405) @@ -149,11 +149,11 @@ DEP_$v ?= ${$v} JOT ?= jot _tspec_x := ${${JOT} ${TARGET_SPEC_VARS:[#]}:L:sh} # this handles unqualified entries -M_dep_qual_fixes = C;(/[^/.,]+)$$;\1.${DEP_TARGET_SPEC}; +M_dep_qual_fixes = C;(/[^/.,]+)$$;\1.$${DEP_TARGET_SPEC}; # there needs to be at least one item missing for these to make sense .for i in ${_tspec_x:[2..-1]} _tspec_m$i := ${TARGET_SPEC_VARS:[2..$i]:@w@[^,]+@:ts,} -_tspec_a$i := ,${TARGET_SPEC_VARS:[$i..-1]:@v@$${DEP_$v}@:ts,} +_tspec_a$i := ,${TARGET_SPEC_VARS:[$i..-1]:@v@$$$${DEP_$v}@:ts,} M_dep_qual_fixes += C;(\.${_tspec_m$i})$$;\1${_tspec_a$i}; .endfor .else @@ -359,7 +359,8 @@ _machines := ${_machines:O:u} .if ${TARGET_SPEC_VARS:[#]} > 1 # we need to tweak _machines _dm := ${DEP_MACHINE} -_machines := ${_machines:@DEP_MACHINE@${DEP_TARGET_SPEC}@} +# apply the same filtering that we do when qualifying DIRDEPS. +_machines := ${_machines:@DEP_MACHINE@${DEP_TARGET_SPEC}@:${M_dep_qual_fixes:ts:}:O:u} DEP_MACHINE := ${_dm} .endif @@ -464,6 +465,9 @@ ${_this_dir}.$m: ${_build_dirs:M*.$m:N${ .if ${_DIRDEP_CHECKED:M$d} == "" # once only _DIRDEP_CHECKED += $d +.if !empty(_debug_search) +.info checking $d +.endif # Note: _build_dirs is fully qualifed so d:R is always the directory .if exists(${d:R}) # Warning: there is an assumption here that MACHINE is always @@ -471,7 +475,8 @@ _DIRDEP_CHECKED += $d # If TARGET_SPEC and MACHINE are insufficient, you have a problem. _m := ${.MAKE.DEPENDFILE_PREFERENCE:T:S;${TARGET_SPEC}$;${d:E};:S;${MACHINE};${d:E:C/,.*//};:@m@${exists(${d:R}/$m):?${d:R}/$m:}@:[1]} .if !empty(_m) -_qm := ${_m:${M_dep_qual_fixes:ts:}} +# M_dep_qual_fixes isn't geared to Makefile.depend +_qm := ${_m:C;(\.depend)$;\1.${d:E};:${M_dep_qual_fixes:ts:}} .if !empty(_debug_search) .info Looking for ${_qm} .endif From owner-svn-src-projects@FreeBSD.ORG Sat Oct 12 23:42:55 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id C968634D; Sat, 12 Oct 2013 23:42:55 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9B73C26BA; Sat, 12 Oct 2013 23:42:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9CNgtMo043859; Sat, 12 Oct 2013 23:42:55 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9CNgtQx043858; Sat, 12 Oct 2013 23:42:55 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201310122342.r9CNgtQx043858@svn.freebsd.org> From: "Simon J. Gerraty" Date: Sat, 12 Oct 2013 23:42:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256406 - projects/bmake/share/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Oct 2013 23:42:55 -0000 Author: sjg Date: Sat Oct 12 23:42:55 2013 New Revision: 256406 URL: http://svnweb.freebsd.org/changeset/base/256406 Log: Some re-org and cleanup. Make it easier to subst some dirs in dirdeps with variables. Tweak M_dep_qual_fixes esp. for pseudo machines like "host" so that it can DTRT against _machines (in dirdeps.mk). Modified: projects/bmake/share/mk/local.dirdeps.mk Modified: projects/bmake/share/mk/local.dirdeps.mk ============================================================================== --- projects/bmake/share/mk/local.dirdeps.mk Sat Oct 12 23:40:17 2013 (r256405) +++ projects/bmake/share/mk/local.dirdeps.mk Sat Oct 12 23:42:55 2013 (r256406) @@ -1,3 +1,35 @@ +.if !target(_DIRDEP_USE) +# we are the 1st makefile + +# DEP_MACHINE is set before we get here, this may not be. +DEP_RELDIR ?= ${RELDIR} + +.if ${.TARGETS:Uall:M*/*} && empty(DIRDEPS) +# This little trick let's us do +# +# mk -f dirdeps.mk some/dir.i386,bsd +# +DIRDEPS := ${.TARGETS:M*/*} +${.TARGETS:Nall}: all +.endif + +# pseudo machines get no qualification +.for m in host common +M_dep_qual_fixes += C;($m),[^/.,]*$$;\1; +.endfor + +#.info M_dep_qual_fixes=${M_dep_qual_fixes} +# we want to supress these dependencies for host tools +DIRDEPS_FILTER.host = \ + Ninclude* \ + Nlib/lib* \ + Nlib/csu* \ + Nlib/[mn]* \ + Ngnu/lib/csu* \ + Ngnu/lib/lib[a-r]* \ + + +.endif .if ${DEP_MACHINE} != "host" @@ -6,6 +38,13 @@ DIRDEPS += gnu/lib/libssp/libssp_nonshared .endif +# some optional things +.if !defined(WITHOUT_CTF) && ${DEP_RELDIR:U${RELDIR}:Mcddl/usr.bin/ctf*} == "" +DIRDEPS += \ + cddl/usr.bin/ctfconvert.host \ + cddl/usr.bin/ctfmerge.host +.endif + .endif # we need pkgs/pseudo/stage to prep the stage tree @@ -13,19 +52,9 @@ DIRDEPS += gnu/lib/libssp/libssp_nonshar DIRDEPS += pkgs/pseudo/stage .endif -M_dep_qual_fixes += C;\.host,[^/.,]*$$;.host; -M_dep_qual_fixes += C;\.common,[^/.,]*$$;.common; - CSU_DIR.i386 = csu/i386-elf +DEP_MACHINE_ARCH = ${MACHINE_ARCH.${DEP_MACHINE}} CSU_DIR.${DEP_MACHINE_ARCH} ?= csu/${DEP_MACHINE_ARCH} CSU_DIR := ${CSU_DIR.${DEP_MACHINE_ARCH}} - -# we want to supress these dependencies for host tools -DIRDEPS_FILTER.host = \ - Ninclude* \ - Nlib/lib* \ - Nlib/csu* \ - Nlib/[mn]* \ - Ngnu/lib/csu* \ - Ngnu/lib/lib[a-r]* \ - +BOOT_MACHINE_DIR:= ${BOOT_MACHINE_DIR.${DEP_MACHINE}} +KERNEL_NAME:= ${KERNEL_NAME.${DEP_MACHINE}} From owner-svn-src-projects@FreeBSD.ORG Sat Oct 12 23:44:51 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 8BF9B43D; Sat, 12 Oct 2013 23:44:51 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 79BE926C4; Sat, 12 Oct 2013 23:44:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9CNipH5044383; Sat, 12 Oct 2013 23:44:51 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9CNipVE044381; Sat, 12 Oct 2013 23:44:51 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201310122344.r9CNipVE044381@svn.freebsd.org> From: "Simon J. Gerraty" Date: Sat, 12 Oct 2013 23:44:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256407 - projects/bmake/share/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Oct 2013 23:44:51 -0000 Author: sjg Date: Sat Oct 12 23:44:50 2013 New Revision: 256407 URL: http://svnweb.freebsd.org/changeset/base/256407 Log: Sync-up with what's being use in Juniper for building ATF in meta mode. Modified: projects/bmake/share/mk/bsd.own.mk projects/bmake/share/mk/bsd.test.mk Modified: projects/bmake/share/mk/bsd.own.mk ============================================================================== --- projects/bmake/share/mk/bsd.own.mk Sat Oct 12 23:42:55 2013 (r256406) +++ projects/bmake/share/mk/bsd.own.mk Sat Oct 12 23:44:50 2013 (r256407) @@ -192,6 +192,9 @@ NLSMODE?= ${NOBINMODE} INCLUDEDIR?= /usr/include +TESTSBASE?= /usr/tests +TESTSDIR?= ${TESTSBASE}/${RELDIR:S,/tests,,} + # # install(1) parameters. # Modified: projects/bmake/share/mk/bsd.test.mk ============================================================================== --- projects/bmake/share/mk/bsd.test.mk Sat Oct 12 23:42:55 2013 (r256406) +++ projects/bmake/share/mk/bsd.test.mk Sat Oct 12 23:44:50 2013 (r256407) @@ -36,9 +36,15 @@ WITHOUT_MAN=yes .endif # tell progs.mk we might want to install things -PROG_VARS+= BINDIR +BINDIR = ${TESTSDIR} PROGS_TARGETS+= install +.ifdef PROG +# we came here via bsd.progs.mk below +# parent will do staging. +MK_STAGING= no +.endif + .if !empty(PROGS) || !empty(PROGS_CXX) || !empty(SCRIPTS) .include .endif @@ -76,4 +82,20 @@ test: beforetest realtest test: aftertest .endif +.if !defined(PROG) && ${MK_STAGING} != "no" +.if !defined(_SKIP_BUILD) +# this will handle staging if needed +_SKIP_STAGING= no +# but we don't want it to build anything +_SKIP_BUILD= +.endif +.if !empty(PROGS) +stage_files.prog: ${PROGS} +.endif + +.include + +.endif +.if !target(objwarn) .include +.endif From owner-svn-src-projects@FreeBSD.ORG Sat Oct 12 23:46:41 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id B4471532; Sat, 12 Oct 2013 23:46:41 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 86FE826CF; Sat, 12 Oct 2013 23:46:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9CNkfst044908; Sat, 12 Oct 2013 23:46:41 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9CNkfTX044907; Sat, 12 Oct 2013 23:46:41 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201310122346.r9CNkfTX044907@svn.freebsd.org> From: "Simon J. Gerraty" Date: Sat, 12 Oct 2013 23:46:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256408 - projects/bmake/share/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Oct 2013 23:46:41 -0000 Author: sjg Date: Sat Oct 12 23:46:41 2013 New Revision: 256408 URL: http://svnweb.freebsd.org/changeset/base/256408 Log: Some cleanup and re-org. Also update CFLAGS_LAST.clang to match new compiler version. Add BOOT_MACHINE_DIR (so we can stick to unqualified Makefile.depend) Modified: projects/bmake/share/mk/local.sys.mk Modified: projects/bmake/share/mk/local.sys.mk ============================================================================== --- projects/bmake/share/mk/local.sys.mk Sat Oct 12 23:44:50 2013 (r256407) +++ projects/bmake/share/mk/local.sys.mk Sat Oct 12 23:46:41 2013 (r256408) @@ -51,15 +51,19 @@ TARGET_ARCHES_mips?= mipsel mips mips TARGET_ARCHES_powerpc?= powerpc powerpc64 TARGET_ARCHES_pc98?= i386 +# some corner cases +CSU_DIR.i386 = csu/i386-elf +BOOT_MACHINE_DIR.amd64 = boot/i386 +MACHINE_ARCH.host = ${_HOST_ARCH} + # the list of machines we support ALL_MACHINE_LIST?= amd64 arm i386 ia64 mips pc98 powerpc sparc64 .for m in ${ALL_MACHINE_LIST:O:u} MACHINE_ARCH_LIST.$m?= ${TARGET_ARCHES_${m}:U$m} MACHINE_ARCH.$m?= ${MACHINE_ARCH_LIST.$m:[1]} +BOOT_MACHINE_DIR.$m ?= boot/$m .endfor -.if empty(MACHINE_ARCH) MACHINE_ARCH:= ${TARGET_ARCH:U${MACHINE_ARCH.${MACHINE}}} -.endif .if !defined(_TARGETS) # some things we do only once @@ -196,13 +200,14 @@ LDFLAGS_LAST+= -B${STAGE_LIBDIR} -L${STA CXXFLAGS_LAST += -isystem ${STAGE_OBJTOP}/usr/include/c++/${GCCVER:U4.2} # backward doesn't get searched if -nostdinc CXXFLAGS_LAST += -isystem ${STAGE_OBJTOP}/usr/include/c++/${GCCVER:U4.2}/backward -CFLAGS_LAST.clang += -isystem ${STAGE_OBJTOP}/usr/include/clang/3.2 +CFLAGS_LAST.clang += -isystem ${STAGE_OBJTOP}/usr/include/clang/${CLANGVER:U3.3} CXXFLAGS_LAST += ${CFLAGS_LAST.${COMPILER_TYPE}} .else # if ld suppored sysroot, this would suffice CFLAGS_LAST+= --sysroot=${STAGE_OBJTOP} .endif .endif +LDFLAGS_LAST+= -Wl,-rpath-link,${STAGE_LIBDIR} STAGED_INCLUDE_DIR= ${STAGE_OBJTOP}/usr/include .if ${USE_META:Uyes} == "yes" .include "meta.sys.mk" @@ -227,12 +232,6 @@ UPDATE_DEPENDFILE= NO .MAKE.META.BAILIWICK = ${SB} ${OBJROOT} ${STAGE_ROOT} -# don't rely on MACHINE_ARCH being set or valid - -MACHINE_ARCH.host = ${_HOST_ARCH} -MACHINE_ARCH.${MACHINE} ?= ${MACHINE} -MACHINE_ARCH := ${MACHINE_ARCH.${MACHINE}} - CSU_DIR.i386 = csu/i386-elf CSU_DIR.${MACHINE_ARCH} ?= csu/${MACHINE_ARCH} CSU_DIR := ${CSU_DIR.${MACHINE_ARCH}} From owner-svn-src-projects@FreeBSD.ORG Sat Oct 12 23:48:22 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 410B861E; Sat, 12 Oct 2013 23:48:22 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2EE9F26D6; Sat, 12 Oct 2013 23:48:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9CNmMc6045359; Sat, 12 Oct 2013 23:48:22 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9CNmM5S045358; Sat, 12 Oct 2013 23:48:22 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201310122348.r9CNmM5S045358@svn.freebsd.org> From: "Simon J. Gerraty" Date: Sat, 12 Oct 2013 23:48:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256409 - projects/bmake/share/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Oct 2013 23:48:22 -0000 Author: sjg Date: Sat Oct 12 23:48:21 2013 New Revision: 256409 URL: http://svnweb.freebsd.org/changeset/base/256409 Log: Add more vars we subst into DIRDEPS eg. BOOT_MACHINE_DIR and KERNEL_NAME. Make it easier to add more. Modified: projects/bmake/share/mk/local.gendirdeps.mk Modified: projects/bmake/share/mk/local.gendirdeps.mk ============================================================================== --- projects/bmake/share/mk/local.gendirdeps.mk Sat Oct 12 23:46:41 2013 (r256408) +++ projects/bmake/share/mk/local.gendirdeps.mk Sat Oct 12 23:48:21 2013 (r256409) @@ -1,10 +1,26 @@ -# supress optional dependecies +# supress optional/auto dependecies # local.dirdeps.mk will put them in if necessary -GENDIRDEPS_FILTER+= Ngnu/lib/libssp/libssp_nonshared +GENDIRDEPS_FILTER+= \ + Ngnu/lib/libssp/libssp_nonshared \ + Ncddl/usr.bin/ctf* \ + Npkgs/pseudo/stage* # gendirdeps.mk will turn _{VAR} into ${VAR} which keeps this simple -GENDIRDEPS_FILTER+= ${CSU_DIR:L:@v@S,/${$v},/_{${v}},@} +# order of this list matters! +GENDIRDEPS_FILTER_DIR_VARS+= \ + CSU_DIR \ + BOOT_MACHINE_DIR -# this could easily get confused -GENDIRDEPS_FILTER+= ${MACHINE_CPUARCH MACHINE_CPU MACHINE_ARCH MACHINE:L:@v@S,/${$v}/,/_{${v}}/,@:NS,//,*:u} +# order of this list matters! +GENDIRDEPS_FILTER_VARS+= \ + KERNEL_NAME \ + MACHINE_CPUARCH \ + MACHINE_ARCH \ + MACHINE + +GENDIRDEPS_FILTER+= ${GENDIRDEPS_FILTER_DIR_VARS:@v@S,${$v},_{${v}},@} +GENDIRDEPS_FILTER+= ${GENDIRDEPS_FILTER_VARS:@v@S,/${$v}/,/_{${v}}/,@:NS,//,*:u} + +# handle the non-standard way that gnu/usr.bin/groff/tmac is staged +GENDIRDEPS_FILTER+= C,.*usr/share/tmac.*stage,gnu/usr.bin/groff/tmac, From owner-svn-src-projects@FreeBSD.ORG Sat Oct 12 23:49:27 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 55D177A1; Sat, 12 Oct 2013 23:49:27 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 43EC626E6; Sat, 12 Oct 2013 23:49:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9CNnR55045583; Sat, 12 Oct 2013 23:49:27 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9CNnRM8045582; Sat, 12 Oct 2013 23:49:27 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201310122349.r9CNnRM8045582@svn.freebsd.org> From: "Simon J. Gerraty" Date: Sat, 12 Oct 2013 23:49:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256410 - projects/bmake/share/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Oct 2013 23:49:27 -0000 Author: sjg Date: Sat Oct 12 23:49:26 2013 New Revision: 256410 URL: http://svnweb.freebsd.org/changeset/base/256410 Log: Avoid errors when MACHINE is a pseudo machine like "common". Modified: projects/bmake/share/mk/bsd.compiler.mk Modified: projects/bmake/share/mk/bsd.compiler.mk ============================================================================== --- projects/bmake/share/mk/bsd.compiler.mk Sat Oct 12 23:48:21 2013 (r256409) +++ projects/bmake/share/mk/bsd.compiler.mk Sat Oct 12 23:49:26 2013 (r256410) @@ -1,5 +1,9 @@ # $FreeBSD$ +.if ${MACHINE} == "common" +COMPILER_TYPE= none +.endif + .if !defined(COMPILER_TYPE) . if ${CC:T:Mgcc*} COMPILER_TYPE:= gcc From owner-svn-src-projects@FreeBSD.ORG Sat Oct 12 23:51:00 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A61CA889; Sat, 12 Oct 2013 23:51:00 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 943ED2714; Sat, 12 Oct 2013 23:51:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9CNp0b2048168; Sat, 12 Oct 2013 23:51:00 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9CNp0C9048165; Sat, 12 Oct 2013 23:51:00 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201310122351.r9CNp0C9048165@svn.freebsd.org> From: "Simon J. Gerraty" Date: Sat, 12 Oct 2013 23:51:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256411 - projects/bmake/share/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Oct 2013 23:51:00 -0000 Author: sjg Date: Sat Oct 12 23:51:00 2013 New Revision: 256411 URL: http://svnweb.freebsd.org/changeset/base/256411 Log: Ensure that $PROG isn't make .PHONY Also add some additional control over staging (for use by bsd.test.mk) Modified: projects/bmake/share/mk/bsd.sys.mk Modified: projects/bmake/share/mk/bsd.sys.mk ============================================================================== --- projects/bmake/share/mk/bsd.sys.mk Sat Oct 12 23:49:26 2013 (r256410) +++ projects/bmake/share/mk/bsd.sys.mk Sat Oct 12 23:51:00 2013 (r256411) @@ -143,7 +143,12 @@ PHONY_NOTMAIN = afterdepend afterinstall realinstall regress subdir-all subdir-depend subdir-install \ tags whereobj +.if defined(.PARSEDIR) +# we don't want ${PROG} to be PHONY +.PHONY: ${PHONY_NOTMAIN:N${PROG:U}} +.else .PHONY: ${PHONY_NOTMAIN} +.endif .NOTMAIN: ${PHONY_NOTMAIN} .if !defined(.PARSEDIR) @@ -153,6 +158,9 @@ PHONY_NOTMAIN = afterdepend afterinstall .if ${MK_STAGING} != "no" .if defined(_SKIP_BUILD) || (!make(all) && !make(clean*)) +_SKIP_STAGING?= yes +.endif +.if ${_SKIP_STAGING:Uno} == "yes" staging stage_libs stage_files stage_as stage_links stage_symlinks: .else # allow targets like beforeinstall to be leveraged @@ -168,7 +176,7 @@ staging: beforeinstall .if ${MK_STAGING_PROG} != "no" STAGE_DIR.prog= ${STAGE_OBJTOP}${BINDIR} -.if !empty(PROG) +.if !empty(PROG) || !empty(PROGS) .if defined(PROGNAME) STAGE_AS_SETS+= prog STAGE_AS_${PROG}= ${PROGNAME} @@ -183,6 +191,9 @@ staging: stage_files .if !empty(_LIBS) && !defined(INTERNALLIB) stage_libs: ${_LIBS} +.if defined(SHLIB_NAME) && defined(DEBUG_FLAGS) && target(${SHLIB_NAME}.symbols) +stage_libs: ${SHLIB_NAME}.symbols +.endif .endif .if !empty(INCS) || !empty(INCSGROUPS) && target(buildincludes) @@ -203,6 +214,9 @@ staging: stage_as .if !empty(LINKS) staging: stage_links +.if ${MAKE_VERSION} < 20131001 +stage_links.links: ${_LIBS} ${PROG} +.endif STAGE_SETS+= links STAGE_LINKS.links= ${LINKS} .endif