From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 01:10:06 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id D94D8538; Sun, 24 Aug 2014 01:10:06 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C619332F0; Sun, 24 Aug 2014 01:10:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7O1A6Qv062582; Sun, 24 Aug 2014 01:10:06 GMT (envelope-from neel@FreeBSD.org) Received: (from neel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7O1A67G062581; Sun, 24 Aug 2014 01:10:06 GMT (envelope-from neel@FreeBSD.org) Message-Id: <201408240110.s7O1A67G062581@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: neel set sender to neel@FreeBSD.org using -f From: Neel Natu Date: Sun, 24 Aug 2014 01:10:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270437 - head/sys/amd64/vmm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 01:10:07 -0000 Author: neel Date: Sun Aug 24 01:10:06 2014 New Revision: 270437 URL: http://svnweb.freebsd.org/changeset/base/270437 Log: Add "hw.vmm.topology.threads_per_core" and "hw.vmm.topology.cores_per_package" tunables to modify the default cpu topology advertised by bhyve. Also add a tunable "hw.vmm.topology.cpuid_leaf_b" to disable the CPUID leaf 0xb. This is intended for testing guest behavior when it falls back on using CPUID leaf 0x4 to deduce CPU topology. The default behavior is to advertise each vcpu as a core in a separate soket. Modified: head/sys/amd64/vmm/x86.c Modified: head/sys/amd64/vmm/x86.c ============================================================================== --- head/sys/amd64/vmm/x86.c Sat Aug 23 22:44:31 2014 (r270436) +++ head/sys/amd64/vmm/x86.c Sun Aug 24 01:10:06 2014 (r270437) @@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -45,20 +46,49 @@ __FBSDID("$FreeBSD$"); #include "vmm_host.h" #include "x86.h" +SYSCTL_DECL(_hw_vmm); +static SYSCTL_NODE(_hw_vmm, OID_AUTO, topology, CTLFLAG_RD, 0, NULL); + #define CPUID_VM_HIGH 0x40000000 static const char bhyve_id[12] = "bhyve bhyve "; static uint64_t bhyve_xcpuids; +/* + * The default CPU topology is a single thread per package. + */ +static u_int threads_per_core = 1; +SYSCTL_UINT(_hw_vmm_topology, OID_AUTO, threads_per_core, CTLFLAG_RDTUN, + &threads_per_core, 0, NULL); + +static u_int cores_per_package = 1; +SYSCTL_UINT(_hw_vmm_topology, OID_AUTO, cores_per_package, CTLFLAG_RDTUN, + &cores_per_package, 0, NULL); + +static int cpuid_leaf_b = 1; +SYSCTL_INT(_hw_vmm_topology, OID_AUTO, cpuid_leaf_b, CTLFLAG_RDTUN, + &cpuid_leaf_b, 0, NULL); + +/* + * Round up to the next power of two, if necessary, and then take log2. + * Returns -1 if argument is zero. + */ +static __inline int +log2(u_int x) +{ + + return (fls(x << (1 - powerof2(x))) - 1); +} + int x86_emulate_cpuid(struct vm *vm, int vcpu_id, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx) { const struct xsave_limits *limits; uint64_t cr4; - int error, enable_invpcid; - unsigned int func, regs[4]; + int error, enable_invpcid, level, width, x2apic_id; + unsigned int func, regs[4], logical_cpus; enum x2apic_state x2apic_state; /* @@ -207,30 +237,31 @@ x86_emulate_cpuid(struct vm *vm, int vcp */ regs[3] &= ~CPUID_DS; - /* - * Disable multi-core. - */ + logical_cpus = threads_per_core * cores_per_package; regs[1] &= ~CPUID_HTT_CORES; - regs[3] &= ~CPUID_HTT; + regs[1] |= (logical_cpus & 0xff) << 16; + regs[3] |= CPUID_HTT; break; case CPUID_0000_0004: cpuid_count(*eax, *ecx, regs); - /* - * Do not expose topology. - * - * The maximum number of processor cores in - * this physical processor package and the - * maximum number of threads sharing this - * cache are encoded with "plus 1" encoding. - * Adding one to the value in this register - * field to obtains the actual value. - * - * Therefore 0 for both indicates 1 core per - * package and no cache sharing. - */ - regs[0] &= 0x3ff; + if (regs[0] || regs[1] || regs[2] || regs[3]) { + regs[0] &= 0x3ff; + regs[0] |= (cores_per_package - 1) << 26; + /* + * Cache topology: + * - L1 and L2 are shared only by the logical + * processors in a single core. + * - L3 and above are shared by all logical + * processors in the package. + */ + logical_cpus = threads_per_core; + level = (regs[0] >> 5) & 0x7; + if (level >= 3) + logical_cpus *= cores_per_package; + regs[0] |= (logical_cpus - 1) << 14; + } break; case CPUID_0000_0007: @@ -284,10 +315,32 @@ x86_emulate_cpuid(struct vm *vm, int vcp /* * Processor topology enumeration */ - regs[0] = 0; - regs[1] = 0; - regs[2] = *ecx & 0xff; - regs[3] = vcpu_id; + if (*ecx == 0) { + logical_cpus = threads_per_core; + width = log2(logical_cpus); + level = CPUID_TYPE_SMT; + x2apic_id = vcpu_id; + } + + if (*ecx == 1) { + logical_cpus = threads_per_core * + cores_per_package; + width = log2(logical_cpus); + level = CPUID_TYPE_CORE; + x2apic_id = vcpu_id; + } + + if (!cpuid_leaf_b || *ecx >= 2) { + width = 0; + logical_cpus = 0; + level = 0; + x2apic_id = 0; + } + + regs[0] = width & 0x1f; + regs[1] = logical_cpus & 0xffff; + regs[2] = (level << 8) | (*ecx & 0xff); + regs[3] = x2apic_id; break; case CPUID_0000_000D: From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 02:07:35 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 5EB52D9F; Sun, 24 Aug 2014 02:07:35 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4B39A370E; Sun, 24 Aug 2014 02:07:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7O27Zka090042; Sun, 24 Aug 2014 02:07:35 GMT (envelope-from grehan@FreeBSD.org) Received: (from grehan@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7O27ZUr090041; Sun, 24 Aug 2014 02:07:35 GMT (envelope-from grehan@FreeBSD.org) Message-Id: <201408240207.s7O27ZUr090041@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: grehan set sender to grehan@FreeBSD.org using -f From: Peter Grehan Date: Sun, 24 Aug 2014 02:07:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270438 - head/sys/amd64/include X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 02:07:35 -0000 Author: grehan Date: Sun Aug 24 02:07:34 2014 New Revision: 270438 URL: http://svnweb.freebsd.org/changeset/base/270438 Log: Change __inline style to be consistent with FreeBSD usage, and also fix gcc build (on STABLE, when MFCd). PR: 192880 Reviewed by: neel Reported by: ngie MFC after: 1 day Modified: head/sys/amd64/include/vmm.h Modified: head/sys/amd64/include/vmm.h ============================================================================== --- head/sys/amd64/include/vmm.h Sun Aug 24 01:10:06 2014 (r270437) +++ head/sys/amd64/include/vmm.h Sun Aug 24 02:07:34 2014 (r270438) @@ -587,25 +587,25 @@ struct vm_exit { void vm_inject_fault(void *vm, int vcpuid, int vector, int errcode_valid, int errcode); -static void __inline +static __inline void vm_inject_ud(void *vm, int vcpuid) { vm_inject_fault(vm, vcpuid, IDT_UD, 0, 0); } -static void __inline +static __inline void vm_inject_gp(void *vm, int vcpuid) { vm_inject_fault(vm, vcpuid, IDT_GP, 1, 0); } -static void __inline +static __inline void vm_inject_ac(void *vm, int vcpuid, int errcode) { vm_inject_fault(vm, vcpuid, IDT_AC, 1, errcode); } -static void __inline +static __inline void vm_inject_ss(void *vm, int vcpuid, int errcode) { vm_inject_fault(vm, vcpuid, IDT_SS, 1, errcode); From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 07:53:17 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 52ECB2D1; Sun, 24 Aug 2014 07:53:17 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3AC413325; Sun, 24 Aug 2014 07:53:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7O7rHL4051833; Sun, 24 Aug 2014 07:53:17 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7O7rFxL051819; Sun, 24 Aug 2014 07:53:15 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201408240753.s7O7rFxL051819@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sun, 24 Aug 2014 07:53:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270439 - in stable/10/sys: amd64/amd64 arm/arm i386/i386 i386/xen ia64/ia64 mips/mips powerpc/aim powerpc/booke powerpc/include powerpc/powerpc sparc64/sparc64 vm X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 07:53:17 -0000 Author: kib Date: Sun Aug 24 07:53:15 2014 New Revision: 270439 URL: http://svnweb.freebsd.org/changeset/base/270439 Log: Merge the changes to pmap_enter(9) for sleep-less operation (requested by flag). The ia64 pmap.c changes are direct commit, since ia64 is removed on head. MFC r269368 (by alc): Retire PVO_EXECUTABLE. MFC r269728: Change pmap_enter(9) interface to take flags parameter and superpage mapping size (currently unused). MFC r269759 (by alc): Update the text of a KASSERT() to reflect the changes in r269728. MFC r269822 (by alc): Change {_,}pmap_allocpte() so that they look for the flag PMAP_ENTER_NOSLEEP instead of M_NOWAIT/M_WAITOK when deciding whether to sleep on page table page allocation. MFC r270151 (by alc): Replace KASSERT that no PV list locks are held with a conditional unlock. Reviewed by: alc Approved by: re (gjb) Sponsored by: The FreeBSD Foundation Modified: stable/10/sys/amd64/amd64/pmap.c stable/10/sys/arm/arm/pmap-v6.c stable/10/sys/arm/arm/pmap.c stable/10/sys/i386/i386/pmap.c stable/10/sys/i386/xen/pmap.c stable/10/sys/ia64/ia64/pmap.c stable/10/sys/mips/mips/pmap.c stable/10/sys/powerpc/aim/mmu_oea.c stable/10/sys/powerpc/aim/mmu_oea64.c stable/10/sys/powerpc/booke/pmap.c stable/10/sys/powerpc/include/pmap.h stable/10/sys/powerpc/powerpc/mmu_if.m stable/10/sys/powerpc/powerpc/pmap_dispatch.c stable/10/sys/sparc64/sparc64/pmap.c stable/10/sys/vm/pmap.h stable/10/sys/vm/vm_fault.c stable/10/sys/vm/vm_kern.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/amd64/amd64/pmap.c ============================================================================== --- stable/10/sys/amd64/amd64/pmap.c Sun Aug 24 02:07:34 2014 (r270438) +++ stable/10/sys/amd64/amd64/pmap.c Sun Aug 24 07:53:15 2014 (r270439) @@ -4116,9 +4116,9 @@ setpte: * or lose information. That is, this routine must actually * insert this page into the given map NOW. */ -void -pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m, - vm_prot_t prot, boolean_t wired) +int +pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, + u_int flags, int8_t psind __unused) { struct rwlock *lock; pd_entry_t *pde; @@ -4127,6 +4127,7 @@ pmap_enter(pmap_t pmap, vm_offset_t va, pv_entry_t pv; vm_paddr_t opa, pa; vm_page_t mpte, om; + boolean_t nosleep; PG_A = pmap_accessed_bit(pmap); PG_G = pmap_global_bit(pmap); @@ -4143,18 +4144,18 @@ pmap_enter(pmap_t pmap, vm_offset_t va, va >= kmi.clean_eva, ("pmap_enter: managed mapping within the clean submap")); if ((m->oflags & VPO_UNMANAGED) == 0 && !vm_page_xbusied(m)) - VM_OBJECT_ASSERT_WLOCKED(m->object); + VM_OBJECT_ASSERT_LOCKED(m->object); pa = VM_PAGE_TO_PHYS(m); newpte = (pt_entry_t)(pa | PG_A | PG_V); - if ((access & VM_PROT_WRITE) != 0) + if ((flags & VM_PROT_WRITE) != 0) newpte |= PG_M; if ((prot & VM_PROT_WRITE) != 0) newpte |= PG_RW; KASSERT((newpte & (PG_M | PG_RW)) != PG_M, - ("pmap_enter: access includes VM_PROT_WRITE but prot doesn't")); + ("pmap_enter: flags includes VM_PROT_WRITE but prot doesn't")); if ((prot & VM_PROT_EXECUTE) == 0) newpte |= pg_nx; - if (wired) + if ((flags & PMAP_ENTER_WIRED) != 0) newpte |= PG_W; if (va < VM_MAXUSER_ADDRESS) newpte |= PG_U; @@ -4196,7 +4197,16 @@ retry: * Here if the pte page isn't mapped, or if it has been * deallocated. */ - mpte = _pmap_allocpte(pmap, pmap_pde_pindex(va), &lock); + nosleep = (flags & PMAP_ENTER_NOSLEEP) != 0; + mpte = _pmap_allocpte(pmap, pmap_pde_pindex(va), + nosleep ? NULL : &lock); + if (mpte == NULL && nosleep) { + if (lock != NULL) + rw_wunlock(lock); + rw_runlock(&pvh_global_lock); + PMAP_UNLOCK(pmap); + return (KERN_RESOURCE_SHORTAGE); + } goto retry; } else panic("pmap_enter: invalid page directory va=%#lx", va); @@ -4328,6 +4338,7 @@ unchanged: rw_wunlock(lock); rw_runlock(&pvh_global_lock); PMAP_UNLOCK(pmap); + return (KERN_SUCCESS); } /* Modified: stable/10/sys/arm/arm/pmap-v6.c ============================================================================== --- stable/10/sys/arm/arm/pmap-v6.c Sun Aug 24 02:07:34 2014 (r270438) +++ stable/10/sys/arm/arm/pmap-v6.c Sun Aug 24 07:53:15 2014 (r270439) @@ -231,8 +231,8 @@ static boolean_t pmap_pv_insert_section( static struct pv_entry *pmap_remove_pv(struct vm_page *, pmap_t, vm_offset_t); static int pmap_pvh_wired_mappings(struct md_page *, int); -static void pmap_enter_locked(pmap_t, vm_offset_t, vm_prot_t, - vm_page_t, vm_prot_t, boolean_t, int); +static int pmap_enter_locked(pmap_t, vm_offset_t, vm_page_t, + vm_prot_t, u_int); static vm_paddr_t pmap_extract_locked(pmap_t pmap, vm_offset_t va); static void pmap_alloc_l1(pmap_t); static void pmap_free_l1(pmap_t); @@ -2944,35 +2944,38 @@ pmap_protect(pmap_t pmap, vm_offset_t sv * insert this page into the given map NOW. */ -void -pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m, - vm_prot_t prot, boolean_t wired) +int +pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, + u_int flags, int8_t psind __unused) { struct l2_bucket *l2b; + int rv; rw_wlock(&pvh_global_lock); PMAP_LOCK(pmap); - pmap_enter_locked(pmap, va, access, m, prot, wired, M_WAITOK); - /* - * If both the l2b_occupancy and the reservation are fully - * populated, then attempt promotion. - */ - l2b = pmap_get_l2_bucket(pmap, va); - if ((l2b != NULL) && (l2b->l2b_occupancy == L2_PTE_NUM_TOTAL) && - sp_enabled && (m->flags & PG_FICTITIOUS) == 0 && - vm_reserv_level_iffullpop(m) == 0) - pmap_promote_section(pmap, va); - + rv = pmap_enter_locked(pmap, va, m, prot, flags); + if (rv == KERN_SUCCESS) { + /* + * If both the l2b_occupancy and the reservation are fully + * populated, then attempt promotion. + */ + l2b = pmap_get_l2_bucket(pmap, va); + if (l2b != NULL && l2b->l2b_occupancy == L2_PTE_NUM_TOTAL && + sp_enabled && (m->flags & PG_FICTITIOUS) == 0 && + vm_reserv_level_iffullpop(m) == 0) + pmap_promote_section(pmap, va); + } PMAP_UNLOCK(pmap); rw_wunlock(&pvh_global_lock); + return (rv); } /* * The pvh global and pmap locks must be held. */ -static void -pmap_enter_locked(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m, - vm_prot_t prot, boolean_t wired, int flags) +static int +pmap_enter_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, + u_int flags) { struct l2_bucket *l2b = NULL; struct vm_page *om; @@ -2990,9 +2993,8 @@ pmap_enter_locked(pmap_t pmap, vm_offset pa = systempage.pv_pa; m = NULL; } else { - KASSERT((m->oflags & VPO_UNMANAGED) != 0 || - vm_page_xbusied(m) || (flags & M_NOWAIT) != 0, - ("pmap_enter_locked: page %p is not busy", m)); + if ((m->oflags & VPO_UNMANAGED) == 0 && !vm_page_xbusied(m)) + VM_OBJECT_ASSERT_LOCKED(m->object); pa = VM_PAGE_TO_PHYS(m); } @@ -3013,12 +3015,12 @@ pmap_enter_locked(pmap_t pmap, vm_offset if (prot & VM_PROT_WRITE) nflags |= PVF_WRITE; - if (wired) + if ((flags & PMAP_ENTER_WIRED) != 0) nflags |= PVF_WIRED; PDEBUG(1, printf("pmap_enter: pmap = %08x, va = %08x, m = %08x, " - "prot = %x, wired = %x\n", (uint32_t) pmap, va, (uint32_t) m, - prot, wired)); + "prot = %x, flags = %x\n", (uint32_t) pmap, va, (uint32_t) m, + prot, flags)); if (pmap == pmap_kernel()) { l2b = pmap_get_l2_bucket(pmap, va); @@ -3028,7 +3030,7 @@ pmap_enter_locked(pmap_t pmap, vm_offset do_l2b_alloc: l2b = pmap_alloc_l2_bucket(pmap, va); if (l2b == NULL) { - if (flags & M_WAITOK) { + if ((flags & PMAP_ENTER_NOSLEEP) == 0) { PMAP_UNLOCK(pmap); rw_wunlock(&pvh_global_lock); VM_WAIT; @@ -3036,7 +3038,7 @@ do_l2b_alloc: PMAP_LOCK(pmap); goto do_l2b_alloc; } - return; + return (KERN_RESOURCE_SHORTAGE); } } @@ -3195,6 +3197,7 @@ validate: if ((pmap != pmap_kernel()) && (pmap == &curproc->p_vmspace->vm_pmap)) cpu_icache_sync_range(va, PAGE_SIZE); + return (KERN_SUCCESS); } /* @@ -3216,13 +3219,12 @@ pmap_enter_object(pmap_t pmap, vm_offset vm_offset_t va; vm_page_t m; vm_pindex_t diff, psize; - vm_prot_t access; VM_OBJECT_ASSERT_LOCKED(m_start->object); psize = atop(end - start); m = m_start; - access = prot = prot & (VM_PROT_READ | VM_PROT_EXECUTE); + prot &= VM_PROT_READ | VM_PROT_EXECUTE; rw_wlock(&pvh_global_lock); PMAP_LOCK(pmap); while (m != NULL && (diff = m->pindex - m_start->pindex) < psize) { @@ -3232,8 +3234,8 @@ pmap_enter_object(pmap_t pmap, vm_offset pmap_enter_section(pmap, va, m, prot)) m = &m[L1_S_SIZE / PAGE_SIZE - 1]; else - pmap_enter_locked(pmap, va, access, m, prot, - FALSE, M_NOWAIT); + pmap_enter_locked(pmap, va, m, prot, + PMAP_ENTER_NOSLEEP); m = TAILQ_NEXT(m, listq); } PMAP_UNLOCK(pmap); @@ -3252,12 +3254,11 @@ pmap_enter_object(pmap_t pmap, vm_offset void pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot) { - vm_prot_t access; - access = prot = prot & (VM_PROT_READ | VM_PROT_EXECUTE); + prot &= VM_PROT_READ | VM_PROT_EXECUTE; rw_wlock(&pvh_global_lock); PMAP_LOCK(pmap); - pmap_enter_locked(pmap, va, access, m, prot, FALSE, M_NOWAIT); + pmap_enter_locked(pmap, va, m, prot, PMAP_ENTER_NOSLEEP); PMAP_UNLOCK(pmap); rw_wunlock(&pvh_global_lock); } @@ -3488,8 +3489,8 @@ pmap_pinit(pmap_t pmap) pmap->pm_stats.resident_count = 1; if (vector_page < KERNBASE) { pmap_enter(pmap, vector_page, - VM_PROT_READ, PHYS_TO_VM_PAGE(systempage.pv_pa), - VM_PROT_READ, 1); + PHYS_TO_VM_PAGE(systempage.pv_pa), VM_PROT_READ, + PMAP_ENTER_WIRED, 0); } return (1); } Modified: stable/10/sys/arm/arm/pmap.c ============================================================================== --- stable/10/sys/arm/arm/pmap.c Sun Aug 24 02:07:34 2014 (r270438) +++ stable/10/sys/arm/arm/pmap.c Sun Aug 24 07:53:15 2014 (r270439) @@ -199,8 +199,8 @@ extern int last_fault_code; static void pmap_free_pv_entry (pv_entry_t); static pv_entry_t pmap_get_pv_entry(void); -static void pmap_enter_locked(pmap_t, vm_offset_t, vm_page_t, - vm_prot_t, boolean_t, int); +static int pmap_enter_locked(pmap_t, vm_offset_t, vm_page_t, + vm_prot_t, u_int); static vm_paddr_t pmap_extract_locked(pmap_t pmap, vm_offset_t va); static void pmap_fix_cache(struct vm_page *, pmap_t, vm_offset_t); static void pmap_alloc_l1(pmap_t); @@ -3204,24 +3204,26 @@ pmap_protect(pmap_t pm, vm_offset_t sva, * insert this page into the given map NOW. */ -void -pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m, - vm_prot_t prot, boolean_t wired) +int +pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, + u_int flags, int8_t psind __unused) { + int rv; rw_wlock(&pvh_global_lock); PMAP_LOCK(pmap); - pmap_enter_locked(pmap, va, m, prot, wired, M_WAITOK); + rv = pmap_enter_locked(pmap, va, m, prot, flags); rw_wunlock(&pvh_global_lock); PMAP_UNLOCK(pmap); + return (rv); } /* * The pvh global and pmap locks must be held. */ -static void +static int pmap_enter_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, - boolean_t wired, int flags) + u_int flags) { struct l2_bucket *l2b = NULL; struct vm_page *opg; @@ -3237,9 +3239,8 @@ pmap_enter_locked(pmap_t pmap, vm_offset pa = systempage.pv_pa; m = NULL; } else { - KASSERT((m->oflags & VPO_UNMANAGED) != 0 || - vm_page_xbusied(m) || (flags & M_NOWAIT) != 0, - ("pmap_enter_locked: page %p is not busy", m)); + if ((m->oflags & VPO_UNMANAGED) == 0 && !vm_page_xbusied(m)) + VM_OBJECT_ASSERT_LOCKED(m->object); pa = VM_PAGE_TO_PHYS(m); } nflags = 0; @@ -3247,10 +3248,10 @@ pmap_enter_locked(pmap_t pmap, vm_offset nflags |= PVF_WRITE; if (prot & VM_PROT_EXECUTE) nflags |= PVF_EXEC; - if (wired) + if ((flags & PMAP_ENTER_WIRED) != 0) nflags |= PVF_WIRED; PDEBUG(1, printf("pmap_enter: pmap = %08x, va = %08x, m = %08x, prot = %x, " - "wired = %x\n", (uint32_t) pmap, va, (uint32_t) m, prot, wired)); + "flags = %x\n", (uint32_t) pmap, va, (uint32_t) m, prot, flags)); if (pmap == pmap_kernel()) { l2b = pmap_get_l2_bucket(pmap, va); @@ -3260,7 +3261,7 @@ pmap_enter_locked(pmap_t pmap, vm_offset do_l2b_alloc: l2b = pmap_alloc_l2_bucket(pmap, va); if (l2b == NULL) { - if (flags & M_WAITOK) { + if ((flags & PMAP_ENTER_NOSLEEP) == 0) { PMAP_UNLOCK(pmap); rw_wunlock(&pvh_global_lock); VM_WAIT; @@ -3268,7 +3269,7 @@ do_l2b_alloc: PMAP_LOCK(pmap); goto do_l2b_alloc; } - return; + return (KERN_RESOURCE_SHORTAGE); } } @@ -3482,6 +3483,7 @@ do_l2b_alloc: if (m) pmap_fix_cache(m, pmap, va); } + return (KERN_SUCCESS); } /* @@ -3511,7 +3513,7 @@ pmap_enter_object(pmap_t pmap, vm_offset PMAP_LOCK(pmap); while (m != NULL && (diff = m->pindex - m_start->pindex) < psize) { pmap_enter_locked(pmap, start + ptoa(diff), m, prot & - (VM_PROT_READ | VM_PROT_EXECUTE), FALSE, M_NOWAIT); + (VM_PROT_READ | VM_PROT_EXECUTE), PMAP_ENTER_NOSLEEP); m = TAILQ_NEXT(m, listq); } rw_wunlock(&pvh_global_lock); @@ -3534,7 +3536,7 @@ pmap_enter_quick(pmap_t pmap, vm_offset_ rw_wlock(&pvh_global_lock); PMAP_LOCK(pmap); pmap_enter_locked(pmap, va, m, prot & (VM_PROT_READ | VM_PROT_EXECUTE), - FALSE, M_NOWAIT); + PMAP_ENTER_NOSLEEP); rw_wunlock(&pvh_global_lock); PMAP_UNLOCK(pmap); } @@ -3746,9 +3748,8 @@ pmap_pinit(pmap_t pmap) bzero(&pmap->pm_stats, sizeof pmap->pm_stats); pmap->pm_stats.resident_count = 1; if (vector_page < KERNBASE) { - pmap_enter(pmap, vector_page, - VM_PROT_READ, PHYS_TO_VM_PAGE(systempage.pv_pa), - VM_PROT_READ, 1); + pmap_enter(pmap, vector_page, PHYS_TO_VM_PAGE(systempage.pv_pa), + VM_PROT_READ, PMAP_ENTER_WIRED | VM_PROT_READ, 0); } return (1); } Modified: stable/10/sys/i386/i386/pmap.c ============================================================================== --- stable/10/sys/i386/i386/pmap.c Sun Aug 24 02:07:34 2014 (r270438) +++ stable/10/sys/i386/i386/pmap.c Sun Aug 24 07:53:15 2014 (r270439) @@ -331,9 +331,9 @@ static void pmap_update_pde(pmap_t pmap, pd_entry_t newpde); static void pmap_update_pde_invalidate(vm_offset_t va, pd_entry_t newpde); -static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va, int flags); +static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va, u_int flags); -static vm_page_t _pmap_allocpte(pmap_t pmap, u_int ptepindex, int flags); +static vm_page_t _pmap_allocpte(pmap_t pmap, u_int ptepindex, u_int flags); static void _pmap_unwire_ptp(pmap_t pmap, vm_page_t m, struct spglist *free); static pt_entry_t *pmap_pte_quick(pmap_t pmap, vm_offset_t va); static void pmap_pte_release(pt_entry_t *pte); @@ -1818,21 +1818,17 @@ pmap_pinit(pmap_t pmap) * mapped correctly. */ static vm_page_t -_pmap_allocpte(pmap_t pmap, u_int ptepindex, int flags) +_pmap_allocpte(pmap_t pmap, u_int ptepindex, u_int flags) { vm_paddr_t ptepa; vm_page_t m; - KASSERT((flags & (M_NOWAIT | M_WAITOK)) == M_NOWAIT || - (flags & (M_NOWAIT | M_WAITOK)) == M_WAITOK, - ("_pmap_allocpte: flags is neither M_NOWAIT nor M_WAITOK")); - /* * Allocate a page table page. */ if ((m = vm_page_alloc(NULL, ptepindex, VM_ALLOC_NOOBJ | VM_ALLOC_WIRED | VM_ALLOC_ZERO)) == NULL) { - if (flags & M_WAITOK) { + if ((flags & PMAP_ENTER_NOSLEEP) == 0) { PMAP_UNLOCK(pmap); rw_wunlock(&pvh_global_lock); VM_WAIT; @@ -1864,16 +1860,12 @@ _pmap_allocpte(pmap_t pmap, u_int ptepin } static vm_page_t -pmap_allocpte(pmap_t pmap, vm_offset_t va, int flags) +pmap_allocpte(pmap_t pmap, vm_offset_t va, u_int flags) { u_int ptepindex; pd_entry_t ptepa; vm_page_t m; - KASSERT((flags & (M_NOWAIT | M_WAITOK)) == M_NOWAIT || - (flags & (M_NOWAIT | M_WAITOK)) == M_WAITOK, - ("pmap_allocpte: flags is neither M_NOWAIT nor M_WAITOK")); - /* * Calculate pagetable page index */ @@ -1906,7 +1898,7 @@ retry: * been deallocated. */ m = _pmap_allocpte(pmap, ptepindex, flags); - if (m == NULL && (flags & M_WAITOK)) + if (m == NULL && (flags & PMAP_ENTER_NOSLEEP) == 0) goto retry; } return (m); @@ -3458,9 +3450,9 @@ setpte: * or lose information. That is, this routine must actually * insert this page into the given map NOW. */ -void -pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m, - vm_prot_t prot, boolean_t wired) +int +pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, + u_int flags, int8_t psind) { pd_entry_t *pde; pt_entry_t *pte; @@ -3468,17 +3460,18 @@ pmap_enter(pmap_t pmap, vm_offset_t va, pv_entry_t pv; vm_paddr_t opa, pa; vm_page_t mpte, om; - boolean_t invlva; + boolean_t invlva, wired; va = trunc_page(va); + mpte = NULL; + wired = (flags & PMAP_ENTER_WIRED) != 0; + KASSERT(va <= VM_MAX_KERNEL_ADDRESS, ("pmap_enter: toobig")); KASSERT(va < UPT_MIN_ADDRESS || va >= UPT_MAX_ADDRESS, ("pmap_enter: invalid to pmap_enter page table pages (va: 0x%x)", va)); if ((m->oflags & VPO_UNMANAGED) == 0 && !vm_page_xbusied(m)) - VM_OBJECT_ASSERT_WLOCKED(m->object); - - mpte = NULL; + VM_OBJECT_ASSERT_LOCKED(m->object); rw_wlock(&pvh_global_lock); PMAP_LOCK(pmap); @@ -3489,7 +3482,15 @@ pmap_enter(pmap_t pmap, vm_offset_t va, * resident, we are creating it here. */ if (va < VM_MAXUSER_ADDRESS) { - mpte = pmap_allocpte(pmap, va, M_WAITOK); + mpte = pmap_allocpte(pmap, va, flags); + if (mpte == NULL) { + KASSERT((flags & PMAP_ENTER_NOSLEEP) != 0, + ("pmap_allocpte failed with sleep allowed")); + sched_unpin(); + rw_wunlock(&pvh_global_lock); + PMAP_UNLOCK(pmap); + return (KERN_RESOURCE_SHORTAGE); + } } pde = pmap_pde(pmap, va); @@ -3607,7 +3608,7 @@ validate: */ if ((origpte & ~(PG_M|PG_A)) != newpte) { newpte |= PG_A; - if ((access & VM_PROT_WRITE) != 0) + if ((flags & VM_PROT_WRITE) != 0) newpte |= PG_M; if (origpte & PG_V) { invlva = FALSE; @@ -3652,6 +3653,7 @@ validate: sched_unpin(); rw_wunlock(&pvh_global_lock); PMAP_UNLOCK(pmap); + return (KERN_SUCCESS); } /* @@ -3817,7 +3819,7 @@ pmap_enter_quick_locked(pmap_t pmap, vm_ mpte->wire_count++; } else { mpte = _pmap_allocpte(pmap, ptepindex, - M_NOWAIT); + PMAP_ENTER_NOSLEEP); if (mpte == NULL) return (mpte); } @@ -4102,7 +4104,7 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pm */ if ((ptetemp & PG_MANAGED) != 0) { dstmpte = pmap_allocpte(dst_pmap, addr, - M_NOWAIT); + PMAP_ENTER_NOSLEEP); if (dstmpte == NULL) goto out; dst_pte = pmap_pte_quick(dst_pmap, addr); Modified: stable/10/sys/i386/xen/pmap.c ============================================================================== --- stable/10/sys/i386/xen/pmap.c Sun Aug 24 02:07:34 2014 (r270438) +++ stable/10/sys/i386/xen/pmap.c Sun Aug 24 07:53:15 2014 (r270439) @@ -298,9 +298,9 @@ static void pmap_remove_entry(struct pma static boolean_t pmap_try_insert_pv_entry(pmap_t pmap, vm_offset_t va, vm_page_t m); -static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va, int flags); +static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va, u_int flags); -static vm_page_t _pmap_allocpte(pmap_t pmap, u_int ptepindex, int flags); +static vm_page_t _pmap_allocpte(pmap_t pmap, u_int ptepindex, u_int flags); static void _pmap_unwire_ptp(pmap_t pmap, vm_page_t m, vm_page_t *free); static pt_entry_t *pmap_pte_quick(pmap_t pmap, vm_offset_t va); static void pmap_pte_release(pt_entry_t *pte); @@ -1546,21 +1546,17 @@ pmap_pinit(pmap_t pmap) * mapped correctly. */ static vm_page_t -_pmap_allocpte(pmap_t pmap, u_int ptepindex, int flags) +_pmap_allocpte(pmap_t pmap, u_int ptepindex, u_int flags) { vm_paddr_t ptema; vm_page_t m; - KASSERT((flags & (M_NOWAIT | M_WAITOK)) == M_NOWAIT || - (flags & (M_NOWAIT | M_WAITOK)) == M_WAITOK, - ("_pmap_allocpte: flags is neither M_NOWAIT nor M_WAITOK")); - /* * Allocate a page table page. */ if ((m = vm_page_alloc(NULL, ptepindex, VM_ALLOC_NOOBJ | VM_ALLOC_WIRED | VM_ALLOC_ZERO)) == NULL) { - if (flags & M_WAITOK) { + if ((flags & PMAP_ENTER_NOSLEEP) == 0) { PMAP_UNLOCK(pmap); rw_wunlock(&pvh_global_lock); VM_WAIT; @@ -1595,16 +1591,12 @@ _pmap_allocpte(pmap_t pmap, u_int ptepin } static vm_page_t -pmap_allocpte(pmap_t pmap, vm_offset_t va, int flags) +pmap_allocpte(pmap_t pmap, vm_offset_t va, u_int flags) { u_int ptepindex; pd_entry_t ptema; vm_page_t m; - KASSERT((flags & (M_NOWAIT | M_WAITOK)) == M_NOWAIT || - (flags & (M_NOWAIT | M_WAITOK)) == M_WAITOK, - ("pmap_allocpte: flags is neither M_NOWAIT nor M_WAITOK")); - /* * Calculate pagetable page index */ @@ -1644,7 +1636,7 @@ retry: CTR3(KTR_PMAP, "pmap_allocpte: pmap=%p va=0x%08x flags=0x%x", pmap, va, flags); m = _pmap_allocpte(pmap, ptepindex, flags); - if (m == NULL && (flags & M_WAITOK)) + if (m == NULL && (flags & PMAP_ENTER_NOSLEEP) == 0) goto retry; KASSERT(pmap->pm_pdir[ptepindex], ("ptepindex=%d did not get mapped", ptepindex)); @@ -2643,9 +2635,9 @@ retry: * or lose information. That is, this routine must actually * insert this page into the given map NOW. */ -void -pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m, - vm_prot_t prot, boolean_t wired) +int +pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, + u_int flags, int8_t psind __unused) { pd_entry_t *pde; pt_entry_t *pte; @@ -2653,19 +2645,21 @@ pmap_enter(pmap_t pmap, vm_offset_t va, pv_entry_t pv; vm_paddr_t opa, pa; vm_page_t mpte, om; - boolean_t invlva; + boolean_t invlva, wired; - CTR6(KTR_PMAP, "pmap_enter: pmap=%08p va=0x%08x access=0x%x ma=0x%08x prot=0x%x wired=%d", - pmap, va, access, VM_PAGE_TO_MACH(m), prot, wired); + CTR5(KTR_PMAP, + "pmap_enter: pmap=%08p va=0x%08x ma=0x%08x prot=0x%x flags=0x%x", + pmap, va, VM_PAGE_TO_MACH(m), prot, flags); va = trunc_page(va); KASSERT(va <= VM_MAX_KERNEL_ADDRESS, ("pmap_enter: toobig")); KASSERT(va < UPT_MIN_ADDRESS || va >= UPT_MAX_ADDRESS, ("pmap_enter: invalid to pmap_enter page table pages (va: 0x%x)", va)); if ((m->oflags & VPO_UNMANAGED) == 0 && !vm_page_xbusied(m)) - VM_OBJECT_ASSERT_WLOCKED(m->object); + VM_OBJECT_ASSERT_LOCKED(m->object); mpte = NULL; + wired = (flags & PMAP_ENTER_WIRED) != 0; rw_wlock(&pvh_global_lock); PMAP_LOCK(pmap); @@ -2676,7 +2670,15 @@ pmap_enter(pmap_t pmap, vm_offset_t va, * resident, we are creating it here. */ if (va < VM_MAXUSER_ADDRESS) { - mpte = pmap_allocpte(pmap, va, M_WAITOK); + mpte = pmap_allocpte(pmap, va, flags); + if (mpte == NULL) { + KASSERT((flags & PMAP_ENTER_NOSLEEP) != 0, + ("pmap_allocpte failed with sleep allowed")); + sched_unpin(); + rw_wunlock(&pvh_global_lock); + PMAP_UNLOCK(pmap); + return (KERN_RESOURCE_SHORTAGE); + } } pde = pmap_pde(pmap, va); @@ -2842,6 +2844,7 @@ validate: sched_unpin(); rw_wunlock(&pvh_global_lock); PMAP_UNLOCK(pmap); + return (KERN_SUCCESS); } /* @@ -2996,7 +2999,7 @@ pmap_enter_quick_locked(multicall_entry_ mpte->wire_count++; } else { mpte = _pmap_allocpte(pmap, ptepindex, - M_NOWAIT); + PMAP_ENTER_NOSLEEP); if (mpte == NULL) return (mpte); } @@ -3287,7 +3290,7 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pm */ if ((ptetemp & PG_MANAGED) != 0) { dstmpte = pmap_allocpte(dst_pmap, addr, - M_NOWAIT); + PMAP_ENTER_NOSLEEP); if (dstmpte == NULL) goto out; dst_pte = pmap_pte_quick(dst_pmap, addr); Modified: stable/10/sys/ia64/ia64/pmap.c ============================================================================== --- stable/10/sys/ia64/ia64/pmap.c Sun Aug 24 02:07:34 2014 (r270438) +++ stable/10/sys/ia64/ia64/pmap.c Sun Aug 24 07:53:15 2014 (r270439) @@ -1692,20 +1692,21 @@ pmap_protect(pmap_t pmap, vm_offset_t sv * or lose information. That is, this routine must actually * insert this page into the given map NOW. */ -void -pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m, - vm_prot_t prot, boolean_t wired) +int +pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, + u_int flags, int8_t psind __unused) { pmap_t oldpmap; vm_offset_t pa; vm_offset_t opa; struct ia64_lpte origpte; struct ia64_lpte *pte; - boolean_t icache_inval, managed; + boolean_t icache_inval, managed, wired; - CTR6(KTR_PMAP, "pmap_enter(pm=%p, va=%#lx, acc=%#x, m=%p, prot=%#x, " - "wired=%u)", pmap, va, access, m, prot, wired); + CTR5(KTR_PMAP, "pmap_enter(pm=%p, va=%#lx, m=%p, prot=%#x, " + "flags=%u)", pmap, va, m, prot, flags); + wired = (flags & PMAP_ENTER_WIRED) != 0; rw_wlock(&pvh_global_lock); PMAP_LOCK(pmap); oldpmap = pmap_switch(pmap); @@ -1722,6 +1723,8 @@ pmap_enter(pmap_t pmap, vm_offset_t va, pmap_switch(oldpmap); PMAP_UNLOCK(pmap); rw_wunlock(&pvh_global_lock); + if ((flags & PMAP_ENTER_NOSLEEP) != 0) + return (KERN_RESOURCE_SHORTAGE); VM_WAIT; rw_wlock(&pvh_global_lock); PMAP_LOCK(pmap); @@ -1815,6 +1818,7 @@ validate: rw_wunlock(&pvh_global_lock); pmap_switch(oldpmap); PMAP_UNLOCK(pmap); + return (KERN_SUCCESS); } /* Modified: stable/10/sys/mips/mips/pmap.c ============================================================================== --- stable/10/sys/mips/mips/pmap.c Sun Aug 24 02:07:34 2014 (r270438) +++ stable/10/sys/mips/mips/pmap.c Sun Aug 24 07:53:15 2014 (r270439) @@ -177,8 +177,8 @@ static void pmap_invalidate_all(pmap_t p static void pmap_invalidate_page(pmap_t pmap, vm_offset_t va); static void _pmap_unwire_ptp(pmap_t pmap, vm_offset_t va, vm_page_t m); -static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va, int flags); -static vm_page_t _pmap_allocpte(pmap_t pmap, unsigned ptepindex, int flags); +static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va, u_int flags); +static vm_page_t _pmap_allocpte(pmap_t pmap, unsigned ptepindex, u_int flags); static int pmap_unuse_pt(pmap_t, vm_offset_t, pd_entry_t); static pt_entry_t init_pte_prot(vm_page_t m, vm_prot_t access, vm_prot_t prot); @@ -1094,20 +1094,16 @@ pmap_pinit(pmap_t pmap) * mapped correctly. */ static vm_page_t -_pmap_allocpte(pmap_t pmap, unsigned ptepindex, int flags) +_pmap_allocpte(pmap_t pmap, unsigned ptepindex, u_int flags) { vm_offset_t pageva; vm_page_t m; - KASSERT((flags & (M_NOWAIT | M_WAITOK)) == M_NOWAIT || - (flags & (M_NOWAIT | M_WAITOK)) == M_WAITOK, - ("_pmap_allocpte: flags is neither M_NOWAIT nor M_WAITOK")); - /* * Find or fabricate a new pagetable page */ if ((m = pmap_alloc_direct_page(ptepindex, VM_ALLOC_NORMAL)) == NULL) { - if (flags & M_WAITOK) { + if ((flags & PMAP_ENTER_NOSLEEP) == 0) { PMAP_UNLOCK(pmap); rw_wunlock(&pvh_global_lock); pmap_grow_direct_page_cache(); @@ -1164,16 +1160,12 @@ _pmap_allocpte(pmap_t pmap, unsigned pte } static vm_page_t -pmap_allocpte(pmap_t pmap, vm_offset_t va, int flags) +pmap_allocpte(pmap_t pmap, vm_offset_t va, u_int flags) { unsigned ptepindex; pd_entry_t *pde; vm_page_t m; - KASSERT((flags & (M_NOWAIT | M_WAITOK)) == M_NOWAIT || - (flags & (M_NOWAIT | M_WAITOK)) == M_WAITOK, - ("pmap_allocpte: flags is neither M_NOWAIT nor M_WAITOK")); - /* * Calculate pagetable page index */ @@ -1197,7 +1189,7 @@ retry: * deallocated. */ m = _pmap_allocpte(pmap, ptepindex, flags); - if (m == NULL && (flags & M_WAITOK)) + if (m == NULL && (flags & PMAP_ENTER_NOSLEEP) == 0) goto retry; } return (m); @@ -1994,9 +1986,9 @@ pmap_protect(pmap_t pmap, vm_offset_t sv * or lose information. That is, this routine must actually * insert this page into the given map NOW. */ -void -pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m, - vm_prot_t prot, boolean_t wired) +int +pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, + u_int flags, int8_t psind __unused) { vm_paddr_t pa, opa; pt_entry_t *pte; @@ -2009,11 +2001,11 @@ pmap_enter(pmap_t pmap, vm_offset_t va, KASSERT((m->oflags & VPO_UNMANAGED) != 0 || va < kmi.clean_sva || va >= kmi.clean_eva, ("pmap_enter: managed mapping within the clean submap")); - KASSERT((m->oflags & VPO_UNMANAGED) != 0 || vm_page_xbusied(m), - ("pmap_enter: page %p is not busy", m)); + if ((m->oflags & VPO_UNMANAGED) == 0 && !vm_page_xbusied(m)) + VM_OBJECT_ASSERT_LOCKED(m->object); pa = VM_PAGE_TO_PHYS(m); - newpte = TLBLO_PA_TO_PFN(pa) | init_pte_prot(m, access, prot); - if (wired) + newpte = TLBLO_PA_TO_PFN(pa) | init_pte_prot(m, flags, prot); + if ((flags & PMAP_ENTER_WIRED) != 0) newpte |= PTE_W; if (is_kernel_pmap(pmap)) newpte |= PTE_G; @@ -2032,7 +2024,14 @@ pmap_enter(pmap_t pmap, vm_offset_t va, * creating it here. */ if (va < VM_MAXUSER_ADDRESS) { - mpte = pmap_allocpte(pmap, va, M_WAITOK); + mpte = pmap_allocpte(pmap, va, flags); + if (mpte == NULL) { + KASSERT((flags & PMAP_ENTER_NOSLEEP) != 0, + ("pmap_allocpte failed with sleep allowed")); + rw_wunlock(&pvh_global_lock); + PMAP_UNLOCK(pmap); + return (KERN_RESOURCE_SHORTAGE); + } } pte = pmap_pte(pmap, va); @@ -2057,9 +2056,10 @@ pmap_enter(pmap_t pmap, vm_offset_t va, * are valid mappings in them. Hence, if a user page is * wired, the PT page will be also. */ - if (wired && !pte_test(&origpte, PTE_W)) + if (pte_test(&newpte, PTE_W) && !pte_test(&origpte, PTE_W)) pmap->pm_stats.wired_count++; - else if (!wired && pte_test(&origpte, PTE_W)) + else if (!pte_test(&newpte, PTE_W) && pte_test(&origpte, + PTE_W)) pmap->pm_stats.wired_count--; KASSERT(!pte_test(&origpte, PTE_D | PTE_RO), @@ -2123,7 +2123,7 @@ pmap_enter(pmap_t pmap, vm_offset_t va, /* * Increment counters */ - if (wired) + if (pte_test(&newpte, PTE_W)) pmap->pm_stats.wired_count++; validate: @@ -2170,6 +2170,7 @@ validate: } rw_wunlock(&pvh_global_lock); PMAP_UNLOCK(pmap); + return (KERN_SUCCESS); } /* @@ -2235,7 +2236,7 @@ pmap_enter_quick_locked(pmap_t pmap, vm_ mpte->wire_count++; } else { mpte = _pmap_allocpte(pmap, ptepindex, - M_NOWAIT); + PMAP_ENTER_NOSLEEP); if (mpte == NULL) return (mpte); } Modified: stable/10/sys/powerpc/aim/mmu_oea.c ============================================================================== --- stable/10/sys/powerpc/aim/mmu_oea.c Sun Aug 24 02:07:34 2014 (r270438) +++ stable/10/sys/powerpc/aim/mmu_oea.c Sun Aug 24 07:53:15 2014 (r270439) @@ -258,8 +258,8 @@ static struct pte *moea_pvo_to_pte(const /* * Utility routines. */ -static void moea_enter_locked(pmap_t, vm_offset_t, vm_page_t, - vm_prot_t, boolean_t); +static int moea_enter_locked(pmap_t, vm_offset_t, vm_page_t, + vm_prot_t, u_int, int8_t); static void moea_syncicache(vm_offset_t, vm_size_t); static boolean_t moea_query_bit(vm_page_t, int); static u_int moea_clear_bit(vm_page_t, int); @@ -274,7 +274,8 @@ void moea_clear_modify(mmu_t, vm_page_t) void moea_copy_page(mmu_t, vm_page_t, vm_page_t); void moea_copy_pages(mmu_t mmu, vm_page_t *ma, vm_offset_t a_offset, vm_page_t *mb, vm_offset_t b_offset, int xfersize); -void moea_enter(mmu_t, pmap_t, vm_offset_t, vm_page_t, vm_prot_t, boolean_t); +int moea_enter(mmu_t, pmap_t, vm_offset_t, vm_page_t, vm_prot_t, u_int, + int8_t); void moea_enter_object(mmu_t, pmap_t, vm_offset_t, vm_offset_t, vm_page_t, vm_prot_t); void moea_enter_quick(mmu_t, pmap_t, vm_offset_t, vm_page_t, vm_prot_t); @@ -1104,16 +1105,25 @@ moea_zero_page_idle(mmu_t mmu, vm_page_t * target pmap with the protection requested. If specified the page * will be wired down. */ -void +int moea_enter(mmu_t mmu, pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, - boolean_t wired) + u_int flags, int8_t psind) { + int error; - rw_wlock(&pvh_global_lock); - PMAP_LOCK(pmap); - moea_enter_locked(pmap, va, m, prot, wired); - rw_wunlock(&pvh_global_lock); - PMAP_UNLOCK(pmap); + for (;;) { + rw_wlock(&pvh_global_lock); + PMAP_LOCK(pmap); + error = moea_enter_locked(pmap, va, m, prot, flags, psind); + rw_wunlock(&pvh_global_lock); + PMAP_UNLOCK(pmap); + if (error != ENOMEM) + return (KERN_SUCCESS); + if ((flags & PMAP_ENTER_NOSLEEP) != 0) + return (KERN_RESOURCE_SHORTAGE); + VM_OBJECT_ASSERT_UNLOCKED(m->object); + VM_WAIT; + } } /* @@ -1123,9 +1133,9 @@ moea_enter(mmu_t mmu, pmap_t pmap, vm_of * * The page queues and pmap must be locked. */ -static void +static int moea_enter_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, - boolean_t wired) + u_int flags, int8_t psind __unused) { struct pvo_head *pvo_head; uma_zone_t zone; @@ -1167,10 +1177,7 @@ moea_enter_locked(pmap_t pmap, vm_offset } else pte_lo |= PTE_BR; - if (prot & VM_PROT_EXECUTE) - pvo_flags |= PVO_EXECUTABLE; - - if (wired) + if ((flags & PMAP_ENTER_WIRED) != 0) pvo_flags |= PVO_WIRED; error = moea_pvo_enter(pmap, zone, pvo_head, va, VM_PAGE_TO_PHYS(m), @@ -1185,6 +1192,8 @@ moea_enter_locked(pmap_t pmap, vm_offset if (pmap != kernel_pmap && error == ENOENT && (pte_lo & (PTE_I | PTE_G)) == 0) moea_syncicache(VM_PAGE_TO_PHYS(m), PAGE_SIZE); + + return (error); } /* @@ -1214,7 +1223,7 @@ moea_enter_object(mmu_t mmu, pmap_t pm, PMAP_LOCK(pm); while (m != NULL && (diff = m->pindex - m_start->pindex) < psize) { moea_enter_locked(pm, start + ptoa(diff), m, prot & - (VM_PROT_READ | VM_PROT_EXECUTE), FALSE); + (VM_PROT_READ | VM_PROT_EXECUTE), 0, 0); m = TAILQ_NEXT(m, listq); } rw_wunlock(&pvh_global_lock); @@ -1229,7 +1238,7 @@ moea_enter_quick(mmu_t mmu, pmap_t pm, v rw_wlock(&pvh_global_lock); PMAP_LOCK(pm); moea_enter_locked(pm, va, m, prot & (VM_PROT_READ | VM_PROT_EXECUTE), - FALSE); + 0, 0); rw_wunlock(&pvh_global_lock); PMAP_UNLOCK(pm); } @@ -1725,8 +1734,6 @@ moea_protect(mmu_t mmu, pmap_t pm, vm_of for (pvo = RB_NFIND(pvo_tree, &pm->pmap_pvo, &key); pvo != NULL && PVO_VADDR(pvo) < eva; pvo = tpvo) { tpvo = RB_NEXT(pvo_tree, &pm->pmap_pvo, pvo); - if ((prot & VM_PROT_EXECUTE) == 0) - pvo->pvo_vaddr &= ~PVO_EXECUTABLE; /* * Grab the PTE pointer before we diddle with the cached PTE @@ -1968,8 +1975,6 @@ moea_pvo_enter(pmap_t pm, uma_zone_t zon pvo->pvo_pmap = pm; LIST_INSERT_HEAD(&moea_pvo_table[ptegidx], pvo, pvo_olink); pvo->pvo_vaddr &= ~ADDR_POFF; - if (flags & VM_PROT_EXECUTE) - pvo->pvo_vaddr |= PVO_EXECUTABLE; if (flags & PVO_WIRED) pvo->pvo_vaddr |= PVO_WIRED; if (pvo_head != &moea_pvo_kunmanaged) Modified: stable/10/sys/powerpc/aim/mmu_oea64.c ============================================================================== --- stable/10/sys/powerpc/aim/mmu_oea64.c Sun Aug 24 02:07:34 2014 (r270438) +++ stable/10/sys/powerpc/aim/mmu_oea64.c Sun Aug 24 07:53:15 2014 (r270439) @@ -267,7 +267,7 @@ int moea64_large_page_shift = 0; * PVO calls. */ static int moea64_pvo_enter(mmu_t, pmap_t, uma_zone_t, struct pvo_head *, - vm_offset_t, vm_offset_t, uint64_t, int); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 07:57:51 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 1BAC540D; Sun, 24 Aug 2014 07:57:51 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 068B03339; Sun, 24 Aug 2014 07:57:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7O7voY2052490; Sun, 24 Aug 2014 07:57:50 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7O7vo48052488; Sun, 24 Aug 2014 07:57:50 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201408240757.s7O7vo48052488@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sun, 24 Aug 2014 07:57:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270440 - stable/10/sys/vm X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 07:57:51 -0000 Author: kib Date: Sun Aug 24 07:57:50 2014 New Revision: 270440 URL: http://svnweb.freebsd.org/changeset/base/270440 Log: MFC r269746: Adapt vm_page_aflag_set(PGA_WRITEABLE) to the locking of pmap_enter(PMAP_ENTER_NOSLEEP). Modified: stable/10/sys/vm/vm_page.c stable/10/sys/vm/vm_page.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/vm/vm_page.c ============================================================================== --- stable/10/sys/vm/vm_page.c Sun Aug 24 07:53:15 2014 (r270439) +++ stable/10/sys/vm/vm_page.c Sun Aug 24 07:57:50 2014 (r270440) @@ -3145,6 +3145,24 @@ vm_page_object_lock_assert(vm_page_t m) if (m->object != NULL && !vm_page_xbusied(m)) VM_OBJECT_ASSERT_WLOCKED(m->object); } + +void +vm_page_assert_pga_writeable(vm_page_t m, uint8_t bits) +{ + + if ((bits & PGA_WRITEABLE) == 0) + return; + + /* + * The PGA_WRITEABLE flag can only be set if the page is + * managed, is exclusively busied or the object is locked. + * Currently, this flag is only set by pmap_enter(). + */ + KASSERT((m->oflags & VPO_UNMANAGED) == 0, + ("PGA_WRITEABLE on unmanaged page")); + if (!vm_page_xbusied(m)) + VM_OBJECT_ASSERT_LOCKED(m->object); +} #endif #include "opt_ddb.h" Modified: stable/10/sys/vm/vm_page.h ============================================================================== --- stable/10/sys/vm/vm_page.h Sun Aug 24 07:53:15 2014 (r270439) +++ stable/10/sys/vm/vm_page.h Sun Aug 24 07:57:50 2014 (r270440) @@ -305,10 +305,10 @@ extern struct mtx_padalign pa_lock[]; * both the MI and MD VM layers. However, kernel loadable modules should not * directly set this flag. They should call vm_page_reference() instead. * - * PGA_WRITEABLE is set exclusively on managed pages by pmap_enter(). When it - * does so, the page must be exclusive busied. The MI VM layer must never - * access this flag directly. Instead, it should call - * pmap_page_is_write_mapped(). + * PGA_WRITEABLE is set exclusively on managed pages by pmap_enter(). + * When it does so, the object must be locked, or the page must be + * exclusive busied. The MI VM layer must never access this flag + * directly. Instead, it should call pmap_page_is_write_mapped(). * * PGA_EXECUTABLE may be set by pmap routines, and indicates that a page has * at least one executable mapping. It is not consumed by the MI VM layer. @@ -536,8 +536,12 @@ void vm_page_lock_assert_KBI(vm_page_t m #ifdef INVARIANTS void vm_page_object_lock_assert(vm_page_t m); #define VM_PAGE_OBJECT_LOCK_ASSERT(m) vm_page_object_lock_assert(m) +void vm_page_assert_pga_writeable(vm_page_t m, uint8_t bits); +#define VM_PAGE_ASSERT_PGA_WRITEABLE(m, bits) \ + vm_page_assert_pga_writeable(m, bits) #else #define VM_PAGE_OBJECT_LOCK_ASSERT(m) (void)0 +#define VM_PAGE_ASSERT_PGA_WRITEABLE(m, bits) (void)0 #endif /* @@ -585,13 +589,7 @@ vm_page_aflag_set(vm_page_t m, uint8_t b { uint32_t *addr, val; - /* - * The PGA_WRITEABLE flag can only be set if the page is managed and - * exclusive busied. Currently, this flag is only set by pmap_enter(). - */ - KASSERT((bits & PGA_WRITEABLE) == 0 || - ((m->oflags & VPO_UNMANAGED) == 0 && vm_page_xbusied(m)), - ("vm_page_aflag_set: PGA_WRITEABLE and not exclusive busy")); + VM_PAGE_ASSERT_PGA_WRITEABLE(m, bits); /* * Access the whole 32-bit word containing the aflags field with an From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 07:59:02 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 2BDD9616; Sun, 24 Aug 2014 07:59:02 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F0BE73343; Sun, 24 Aug 2014 07:59:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7O7x1Co052819; Sun, 24 Aug 2014 07:59:01 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7O7x1Kh052813; Sun, 24 Aug 2014 07:59:01 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201408240759.s7O7x1Kh052813@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sun, 24 Aug 2014 07:59:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270441 - in stable/10/sys: i386/i386 i386/xen sparc64/sparc64 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 07:59:02 -0000 Author: kib Date: Sun Aug 24 07:59:01 2014 New Revision: 270441 URL: http://svnweb.freebsd.org/changeset/base/270441 Log: MFC r270038: Complete r254667, do not destroy pmap lock if KVA allocation failed. Modified: stable/10/sys/i386/i386/pmap.c stable/10/sys/i386/xen/pmap.c stable/10/sys/sparc64/sparc64/pmap.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/i386/i386/pmap.c ============================================================================== --- stable/10/sys/i386/i386/pmap.c Sun Aug 24 07:57:50 2014 (r270440) +++ stable/10/sys/i386/i386/pmap.c Sun Aug 24 07:59:01 2014 (r270441) @@ -1755,10 +1755,8 @@ pmap_pinit(pmap_t pmap) */ if (pmap->pm_pdir == NULL) { pmap->pm_pdir = (pd_entry_t *)kva_alloc(NBPTD); - if (pmap->pm_pdir == NULL) { - PMAP_LOCK_DESTROY(pmap); + if (pmap->pm_pdir == NULL) return (0); - } #ifdef PAE pmap->pm_pdpt = uma_zalloc(pdptzone, M_WAITOK | M_ZERO); KASSERT(((vm_offset_t)pmap->pm_pdpt & Modified: stable/10/sys/i386/xen/pmap.c ============================================================================== --- stable/10/sys/i386/xen/pmap.c Sun Aug 24 07:57:50 2014 (r270440) +++ stable/10/sys/i386/xen/pmap.c Sun Aug 24 07:59:01 2014 (r270441) @@ -1459,7 +1459,6 @@ pmap_pinit(pmap_t pmap) if (pmap->pm_pdir == NULL) { pmap->pm_pdir = (pd_entry_t *)kva_alloc(NBPTD); if (pmap->pm_pdir == NULL) { - PMAP_LOCK_DESTROY(pmap); #ifdef HAMFISTED_LOCKING mtx_unlock(&createdelete_lock); #endif Modified: stable/10/sys/sparc64/sparc64/pmap.c ============================================================================== --- stable/10/sys/sparc64/sparc64/pmap.c Sun Aug 24 07:57:50 2014 (r270440) +++ stable/10/sys/sparc64/sparc64/pmap.c Sun Aug 24 07:59:01 2014 (r270441) @@ -1209,11 +1209,9 @@ pmap_pinit(pmap_t pm) */ if (pm->pm_tsb == NULL) { pm->pm_tsb = (struct tte *)kva_alloc(TSB_BSIZE); - if (pm->pm_tsb == NULL) { - PMAP_LOCK_DESTROY(pm); + if (pm->pm_tsb == NULL) return (0); } - } /* * Allocate an object for it. From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 08:04:00 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 91CE87D4; Sun, 24 Aug 2014 08:04:00 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7C69833E4; Sun, 24 Aug 2014 08:04:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7O840xc056843; Sun, 24 Aug 2014 08:04:00 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7O840sW056842; Sun, 24 Aug 2014 08:04:00 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201408240804.s7O840sW056842@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 24 Aug 2014 08:04:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270442 - stable/10/usr.sbin/nmtree X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 08:04:00 -0000 Author: ngie Date: Sun Aug 24 08:03:59 2014 New Revision: 270442 URL: http://svnweb.freebsd.org/changeset/base/270442 Log: MFC r270180: Add LIBMD and LIBUTIL to DPADD to fix "make checkdpadd" Approved by: jmmv (mentor) Phabric: D633 PR: 192763 Modified: stable/10/usr.sbin/nmtree/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/nmtree/Makefile ============================================================================== --- stable/10/usr.sbin/nmtree/Makefile Sun Aug 24 07:59:01 2014 (r270441) +++ stable/10/usr.sbin/nmtree/Makefile Sun Aug 24 08:03:59 2014 (r270442) @@ -8,6 +8,7 @@ PROG= nmtree MAN= nmtree.8 SRCS= compare.c crc.c create.c excludes.c getid.c misc.c mtree.c \ only.c spec.c specspec.c verify.c +DPADD+= ${LIBMD} ${LIBUTIL} LDADD+= -lmd -lutil CFLAGS+= -I${.CURDIR}/../../contrib/mknod From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 09:02:17 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id B6879F3D; Sun, 24 Aug 2014 09:02:17 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 883AD37E8; Sun, 24 Aug 2014 09:02:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7O92G5U083386; Sun, 24 Aug 2014 09:02:16 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7O92GsJ083385; Sun, 24 Aug 2014 09:02:16 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201408240902.s7O92GsJ083385@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Sun, 24 Aug 2014 09:02:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270443 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 09:02:17 -0000 Author: mjg Date: Sun Aug 24 09:02:16 2014 New Revision: 270443 URL: http://svnweb.freebsd.org/changeset/base/270443 Log: Properly reparent traced processes when the tracer dies. Previously they were uncoditionally reparented to init. In effect it was possible that tracee was never returned to original parent. Reviewed by: kib MFC after: 1 week Modified: head/sys/kern/kern_exit.c Modified: head/sys/kern/kern_exit.c ============================================================================== --- head/sys/kern/kern_exit.c Sun Aug 24 08:03:59 2014 (r270442) +++ head/sys/kern/kern_exit.c Sun Aug 24 09:02:16 2014 (r270443) @@ -156,7 +156,8 @@ sys_sys_exit(struct thread *td, struct s void exit1(struct thread *td, int rv) { - struct proc *p, *nq, *q; + struct proc *p, *nq, *q, *t; + struct thread *tdt; struct vnode *ttyvp = NULL; mtx_assert(&Giant, MA_NOTOWNED); @@ -437,7 +438,9 @@ exit1(struct thread *td, int rv) WITNESS_WARN(WARN_PANIC, NULL, "process (pid %d) exiting", p->p_pid); /* - * Reparent all of our children to init. + * Reparent all children processes: + * - traced ones to the original parent (or init if we are that parent) + * - the rest to init */ sx_xlock(&proctree_lock); q = LIST_FIRST(&p->p_children); @@ -446,15 +449,23 @@ exit1(struct thread *td, int rv) for (; q != NULL; q = nq) { nq = LIST_NEXT(q, p_sibling); PROC_LOCK(q); - proc_reparent(q, initproc); q->p_sigparent = SIGCHLD; - /* - * Traced processes are killed - * since their existence means someone is screwing up. - */ - if (q->p_flag & P_TRACED) { - struct thread *temp; + if (!(q->p_flag & P_TRACED)) { + proc_reparent(q, initproc); + } else { + /* + * Traced processes are killed since their existence + * means someone is screwing up. + */ + t = proc_realparent(q); + if (t == p) { + proc_reparent(q, initproc); + } else { + PROC_LOCK(t); + proc_reparent(q, t); + PROC_UNLOCK(t); + } /* * Since q was found on our children list, the * proc_reparent() call moved q to the orphan @@ -463,8 +474,8 @@ exit1(struct thread *td, int rv) */ clear_orphan(q); q->p_flag &= ~(P_TRACED | P_STOPPED_TRACE); - FOREACH_THREAD_IN_PROC(q, temp) - temp->td_dbgflags &= ~TDB_SUSPEND; + FOREACH_THREAD_IN_PROC(q, tdt) + tdt->td_dbgflags &= ~TDB_SUSPEND; kern_psignal(q, SIGKILL); } PROC_UNLOCK(q); From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 09:04:10 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 37EEF122; Sun, 24 Aug 2014 09:04:10 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0A1CE37F5; Sun, 24 Aug 2014 09:04:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7O949Oc083662; Sun, 24 Aug 2014 09:04:09 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7O949sI083660; Sun, 24 Aug 2014 09:04:09 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201408240904.s7O949sI083660@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Sun, 24 Aug 2014 09:04:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270444 - in head/sys: kern sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 09:04:10 -0000 Author: mjg Date: Sun Aug 24 09:04:09 2014 New Revision: 270444 URL: http://svnweb.freebsd.org/changeset/base/270444 Log: Fix getppid for traced processes. Traced processes always have the tracer set as the parent. Utilize proc_realparent to obtain the right process when needed. Reviewed by: kib MFC after: 1 week Modified: head/sys/kern/kern_prot.c head/sys/sys/syscallsubr.h Modified: head/sys/kern/kern_prot.c ============================================================================== --- head/sys/kern/kern_prot.c Sun Aug 24 09:02:16 2014 (r270443) +++ head/sys/kern/kern_prot.c Sun Aug 24 09:04:09 2014 (r270444) @@ -105,9 +105,7 @@ sys_getpid(struct thread *td, struct get td->td_retval[0] = p->p_pid; #if defined(COMPAT_43) - PROC_LOCK(p); - td->td_retval[1] = p->p_pptr->p_pid; - PROC_UNLOCK(p); + td->td_retval[1] = kern_getppid(td); #endif return (0); } @@ -121,12 +119,31 @@ struct getppid_args { int sys_getppid(struct thread *td, struct getppid_args *uap) { + + td->td_retval[0] = kern_getppid(td); + return (0); +} + +int +kern_getppid(struct thread *td) +{ struct proc *p = td->td_proc; + struct proc *pp; + int ppid; PROC_LOCK(p); - td->td_retval[0] = p->p_pptr->p_pid; - PROC_UNLOCK(p); - return (0); + if (!(p->p_flag & P_TRACED)) { + ppid = p->p_pptr->p_pid; + PROC_UNLOCK(p); + } else { + PROC_UNLOCK(p); + sx_slock(&proctree_lock); + pp = proc_realparent(p); + ppid = pp->p_pid; + sx_sunlock(&proctree_lock); + } + + return (ppid); } /* Modified: head/sys/sys/syscallsubr.h ============================================================================== --- head/sys/sys/syscallsubr.h Sun Aug 24 09:02:16 2014 (r270443) +++ head/sys/sys/syscallsubr.h Sun Aug 24 09:04:09 2014 (r270444) @@ -110,6 +110,7 @@ int kern_getfsstat(struct thread *td, st enum uio_seg bufseg, int flags); int kern_getgroups(struct thread *td, u_int *ngrp, gid_t *groups); int kern_getitimer(struct thread *, u_int, struct itimerval *); +int kern_getppid(struct thread *); int kern_getpeername(struct thread *td, int fd, struct sockaddr **sa, socklen_t *alen); int kern_getrusage(struct thread *td, int who, struct rusage *rup); From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 09:20:31 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 4E3AF8FD; Sun, 24 Aug 2014 09:20:31 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3A312390A; Sun, 24 Aug 2014 09:20:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7O9KV75089883; Sun, 24 Aug 2014 09:20:31 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7O9KVen089882; Sun, 24 Aug 2014 09:20:31 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201408240920.s7O9KVen089882@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Sun, 24 Aug 2014 09:20:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270445 - head/sys/boot/common X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 09:20:31 -0000 Author: ae Date: Sun Aug 24 09:20:30 2014 New Revision: 270445 URL: http://svnweb.freebsd.org/changeset/base/270445 Log: The size of the GPT table can not be less than one sector. Reported by: rodrigc@ MFC after: 1 week Modified: head/sys/boot/common/part.c Modified: head/sys/boot/common/part.c ============================================================================== --- head/sys/boot/common/part.c Sun Aug 24 09:04:09 2014 (r270444) +++ head/sys/boot/common/part.c Sun Aug 24 09:20:30 2014 (r270445) @@ -254,8 +254,8 @@ ptable_gptread(struct ptable *table, voi table->sectorsize); if (phdr != NULL) { /* Read the primary GPT table. */ - size = MIN(MAXTBLSZ, - phdr->hdr_entries * phdr->hdr_entsz / table->sectorsize); + size = MIN(MAXTBLSZ, (phdr->hdr_entries * phdr->hdr_entsz + + table->sectorsize - 1) / table->sectorsize); if (dread(dev, tbl, size, phdr->hdr_lba_table) == 0 && gpt_checktbl(phdr, tbl, size * table->sectorsize, table->sectors - 1) == 0) { @@ -287,8 +287,9 @@ ptable_gptread(struct ptable *table, voi hdr.hdr_entsz != phdr->hdr_entsz || hdr.hdr_crc_table != phdr->hdr_crc_table) { /* Read the backup GPT table. */ - size = MIN(MAXTBLSZ, phdr->hdr_entries * - phdr->hdr_entsz / table->sectorsize); + size = MIN(MAXTBLSZ, (phdr->hdr_entries * + phdr->hdr_entsz + table->sectorsize - 1) / + table->sectorsize); if (dread(dev, tbl, size, phdr->hdr_lba_table) == 0 && gpt_checktbl(phdr, tbl, size * table->sectorsize, table->sectors - 1) == 0) { From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 09:22:04 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 7577BC52; Sun, 24 Aug 2014 09:22:04 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5546239A5; Sun, 24 Aug 2014 09:22:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7O9M4DL093021; Sun, 24 Aug 2014 09:22:04 GMT (envelope-from dumbbell@FreeBSD.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7O9M3I0093019; Sun, 24 Aug 2014 09:22:03 GMT (envelope-from dumbbell@FreeBSD.org) Message-Id: <201408240922.s7O9M3I0093019@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dumbbell set sender to dumbbell@FreeBSD.org using -f From: Jean-Sebastien Pedron Date: Sun, 24 Aug 2014 09:22:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270446 - head/sys/dev/vt X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 09:22:04 -0000 Author: dumbbell Date: Sun Aug 24 09:22:03 2014 New Revision: 270446 URL: http://svnweb.freebsd.org/changeset/base/270446 Log: vt(4): Remove vd_bitbltchr_t It's replaced by vd_bitblt_text_t, which gives more context to the backend and allows it to perform more efficiently when redrawing a given area. MFC after: 1 week Modified: head/sys/dev/vt/vt.h head/sys/dev/vt/vt_core.c Modified: head/sys/dev/vt/vt.h ============================================================================== --- head/sys/dev/vt/vt.h Sun Aug 24 09:20:30 2014 (r270445) +++ head/sys/dev/vt/vt.h Sun Aug 24 09:22:03 2014 (r270446) @@ -294,15 +294,6 @@ typedef int vd_init_t(struct vt_device * typedef int vd_probe_t(struct vt_device *vd); typedef void vd_postswitch_t(struct vt_device *vd); typedef void vd_blank_t(struct vt_device *vd, term_color_t color); -/* - * FIXME: Remove vd_bitblt_t and vd_putchar_t, once vd_bitblt_text_t is - * provided by all drivers. - */ -typedef void vd_bitbltchr_t(struct vt_device *vd, const uint8_t *src, - const uint8_t *mask, int bpl, vt_axis_t top, vt_axis_t left, - unsigned int width, unsigned int height, term_color_t fg, term_color_t bg); -typedef void vd_putchar_t(struct vt_device *vd, term_char_t, - vt_axis_t top, vt_axis_t left, term_color_t fg, term_color_t bg); typedef void vd_bitblt_text_t(struct vt_device *vd, const struct vt_window *vw, const term_rect_t *area); typedef void vd_bitblt_bmp_t(struct vt_device *vd, const struct vt_window *vw, @@ -324,7 +315,6 @@ struct vt_driver { /* Drawing. */ vd_blank_t *vd_blank; - vd_bitbltchr_t *vd_bitbltchr; /* FIXME: Deprecated. */ vd_drawrect_t *vd_drawrect; vd_setpixel_t *vd_setpixel; vd_bitblt_text_t *vd_bitblt_text; @@ -336,9 +326,6 @@ struct vt_driver { /* Framebuffer mmap, if present. */ vd_fb_mmap_t *vd_fb_mmap; - /* Text mode operation. */ - vd_putchar_t *vd_putchar; /* FIXME: Deprecated. */ - /* Update display setting on vt switch. */ vd_postswitch_t *vd_postswitch; Modified: head/sys/dev/vt/vt_core.c ============================================================================== --- head/sys/dev/vt/vt_core.c Sun Aug 24 09:20:30 2014 (r270445) +++ head/sys/dev/vt/vt_core.c Sun Aug 24 09:22:03 2014 (r270446) @@ -888,47 +888,15 @@ vt_mark_mouse_position_as_dirty(struct v #endif static void -vt_bitblt_char(struct vt_device *vd, struct vt_font *vf, term_char_t c, - int iscursor, unsigned int row, unsigned int col) -{ - term_color_t fg, bg; - - vt_determine_colors(c, iscursor, &fg, &bg); - - if (vf != NULL) { - const uint8_t *src; - vt_axis_t top, left; - - src = vtfont_lookup(vf, c); - - /* - * Align the terminal to the centre of the screen. - * Fonts may not always be able to fill the entire - * screen. - */ - top = row * vf->vf_height + vd->vd_curwindow->vw_offset.tp_row; - left = col * vf->vf_width + vd->vd_curwindow->vw_offset.tp_col; - - vd->vd_driver->vd_bitbltchr(vd, src, NULL, 0, top, left, - vf->vf_width, vf->vf_height, fg, bg); - } else { - vd->vd_driver->vd_putchar(vd, TCHAR_CHARACTER(c), - row, col, fg, bg); - } -} - -static void vt_flush(struct vt_device *vd) { struct vt_window *vw; struct vt_font *vf; struct vt_bufmask tmask; - unsigned int row, col; term_rect_t tarea; term_pos_t size; - term_char_t *r; #ifndef SC_NO_CUTPASTE - int cursor_was_shown, cursor_moved, bpl, h, w; + int cursor_was_shown, cursor_moved; #endif vw = vd->vd_curwindow; @@ -992,50 +960,8 @@ vt_flush(struct vt_device *vd) vd->vd_flags &= ~VDF_INVALID; } - if (vd->vd_driver->vd_bitblt_text != NULL) { - if (tarea.tr_begin.tp_col < tarea.tr_end.tp_col) { - vd->vd_driver->vd_bitblt_text(vd, vw, &tarea); - } - } else { - /* - * FIXME: Once all backend drivers expose the - * vd_bitblt_text_t callback, this code can be removed. - */ - for (row = tarea.tr_begin.tp_row; row < tarea.tr_end.tp_row; row++) { - if (!VTBUF_DIRTYROW(&tmask, row)) - continue; - r = VTBUF_GET_ROW(&vw->vw_buf, row); - for (col = tarea.tr_begin.tp_col; - col < tarea.tr_end.tp_col; col++) { - if (!VTBUF_DIRTYCOL(&tmask, col)) - continue; - - vt_bitblt_char(vd, vf, r[col], - VTBUF_ISCURSOR(&vw->vw_buf, row, col), row, col); - } - } - -#ifndef SC_NO_CUTPASTE - if (vd->vd_mshown) { - /* Bytes per source line. */ - bpl = (vd->vd_mcursor->width + 7) >> 3; - w = vd->vd_mcursor->width; - h = vd->vd_mcursor->height; - - if ((vd->vd_mx + vd->vd_mcursor->width) > - (size.tp_col * vf->vf_width)) - w = (size.tp_col * vf->vf_width) - vd->vd_mx - 1; - if ((vd->vd_my + vd->vd_mcursor->height) > - (size.tp_row * vf->vf_height)) - h = (size.tp_row * vf->vf_height) - vd->vd_my - 1; - - vd->vd_driver->vd_bitbltchr(vd, - vd->vd_mcursor->map, vd->vd_mcursor->mask, bpl, - vw->vw_offset.tp_row + vd->vd_my, - vw->vw_offset.tp_col + vd->vd_mx, - w, h, vd->vd_mcursor_fg, vd->vd_mcursor_bg); - } -#endif + if (tarea.tr_begin.tp_col < tarea.tr_end.tp_col) { + vd->vd_driver->vd_bitblt_text(vd, vw, &tarea); } } From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 09:24:37 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id B1E9DD92; Sun, 24 Aug 2014 09:24:37 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9DBD939AD; Sun, 24 Aug 2014 09:24:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7O9Ob6W093361; Sun, 24 Aug 2014 09:24:37 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7O9ObRu093360; Sun, 24 Aug 2014 09:24:37 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201408240924.s7O9ObRu093360@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Sun, 24 Aug 2014 09:24:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270447 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 09:24:37 -0000 Author: mjg Date: Sun Aug 24 09:24:37 2014 New Revision: 270447 URL: http://svnweb.freebsd.org/changeset/base/270447 Log: Use refcount_init in sigacts_alloc. This change is a no-op, but fixes up an inconsistency introduced with r268634. MFC after: 3 days Modified: head/sys/kern/kern_sig.c Modified: head/sys/kern/kern_sig.c ============================================================================== --- head/sys/kern/kern_sig.c Sun Aug 24 09:22:03 2014 (r270446) +++ head/sys/kern/kern_sig.c Sun Aug 24 09:24:37 2014 (r270447) @@ -3429,7 +3429,7 @@ sigacts_alloc(void) struct sigacts *ps; ps = malloc(sizeof(struct sigacts), M_SUBPROC, M_WAITOK | M_ZERO); - ps->ps_refcnt = 1; + refcount_init(&ps->ps_refcnt, 1); mtx_init(&ps->ps_mtx, "sigacts", NULL, MTX_DEF); return (ps); } From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 09:47:40 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 8CC3968D; Sun, 24 Aug 2014 09:47:40 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 783D13B3A; Sun, 24 Aug 2014 09:47:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7O9leFm002971; Sun, 24 Aug 2014 09:47:40 GMT (envelope-from dumbbell@FreeBSD.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7O9leNL002970; Sun, 24 Aug 2014 09:47:40 GMT (envelope-from dumbbell@FreeBSD.org) Message-Id: <201408240947.s7O9leNL002970@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dumbbell set sender to dumbbell@FreeBSD.org using -f From: Jean-Sebastien Pedron Date: Sun, 24 Aug 2014 09:47:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270448 - head/sys/dev/vt X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 09:47:40 -0000 Author: dumbbell Date: Sun Aug 24 09:47:39 2014 New Revision: 270448 URL: http://svnweb.freebsd.org/changeset/base/270448 Log: vt(4): Fix order of arguments (x <-> y) when showing the splash screen MFC after: 1 week Modified: head/sys/dev/vt/vt_core.c Modified: head/sys/dev/vt/vt_core.c ============================================================================== --- head/sys/dev/vt/vt_core.c Sun Aug 24 09:24:37 2014 (r270447) +++ head/sys/dev/vt/vt_core.c Sun Aug 24 09:47:39 2014 (r270448) @@ -1015,7 +1015,7 @@ vtterm_splash(struct vt_device *vd) /* XXX: Unhardcode colors! */ vd->vd_driver->vd_bitblt_bmp(vd, vd->vd_curwindow, vt_logo_image, NULL, vt_logo_width, vt_logo_height, - top, left, TC_WHITE, TC_BLACK); + left, top, TC_WHITE, TC_BLACK); } vd->vd_flags |= VDF_SPLASH; } From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 12:32:27 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 5F108A0B; Sun, 24 Aug 2014 12:32:27 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 30B62386A; Sun, 24 Aug 2014 12:32:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OCWRC0083472; Sun, 24 Aug 2014 12:32:27 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OCWRLq083471; Sun, 24 Aug 2014 12:32:27 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201408241232.s7OCWRLq083471@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Sun, 24 Aug 2014 12:32:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270454 - head/usr.sbin/autofs X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 12:32:27 -0000 Author: trasz Date: Sun Aug 24 12:32:26 2014 New Revision: 270454 URL: http://svnweb.freebsd.org/changeset/base/270454 Log: Fix handling of keys in executable maps. Previously it was broken for keys containing whitespace. PR: 192947 MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Modified: head/usr.sbin/autofs/common.c Modified: head/usr.sbin/autofs/common.c ============================================================================== --- head/usr.sbin/autofs/common.c Sun Aug 24 10:40:13 2014 (r270453) +++ head/usr.sbin/autofs/common.c Sun Aug 24 12:32:26 2014 (r270454) @@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#define _WITH_GETLINE #include #include #include @@ -213,6 +214,7 @@ node_new(struct node *parent, char *key, TAILQ_INIT(&n->n_children); assert(key != NULL); + assert(key[0] != '\0'); n->n_key = key; if (options != NULL) n->n_options = options; @@ -243,6 +245,7 @@ node_new_map(struct node *parent, char * TAILQ_INIT(&n->n_children); assert(key != NULL); + assert(key[0] != '\0'); n->n_key = key; if (options != NULL) n->n_options = options; @@ -565,6 +568,7 @@ node_path_x(const struct node *n, char * return (x); } + assert(n->n_key[0] != '\0'); path = separated_concat(n->n_key, x, '/'); free(x); @@ -857,33 +861,44 @@ again: } /* - * Parse output of a special map called without argument. This is just - * a list of keys. + * Parse output of a special map called without argument. It is a list + * of keys, separated by newlines. They can contain whitespace, so use + * getline(3) instead of lexer used for maps. */ static void parse_map_keys_yyin(struct node *parent, const char *map) { - char *key = NULL; - int ret; + char *line = NULL, *key; + size_t linecap = 0; + ssize_t linelen; lineno = 1; for (;;) { - ret = yylex(); - - if (ret == NEWLINE) - continue; - - if (ret == 0) { + linelen = getline(&line, &linecap, yyin); + if (linelen < 0) { /* * End of file. */ break; } + if (linelen <= 1) { + /* + * Empty line, consisting of just the newline. + */ + continue; + } + + /* + * "-1" to strip the trailing newline. + */ + key = strndup(line, linelen - 1); - key = checked_strdup(yytext); + log_debugx("adding key \"%s\"", key); node_new(parent, key, NULL, NULL, map, lineno); + lineno++; } + free(line); } static bool From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 12:50:51 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 5F6B7D37; Sun, 24 Aug 2014 12:50:51 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4BA1F394F; Sun, 24 Aug 2014 12:50:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OCopsF090445; Sun, 24 Aug 2014 12:50:51 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OCopZe090444; Sun, 24 Aug 2014 12:50:51 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241250.s7OCopZe090444@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 12:50:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270455 - head/release X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 12:50:51 -0000 Author: gjb Date: Sun Aug 24 12:50:50 2014 New Revision: 270455 URL: http://svnweb.freebsd.org/changeset/base/270455 Log: Set OSREL and UNAME_r in release/release.sh when building ports to prevent ports build failures from killing the release build. MFC after: 3 days X-MFC-with: r270417, r270418 Sponsored by: The FreeBSD Foundation Modified: head/release/release.sh Modified: head/release/release.sh ============================================================================== --- head/release/release.sh Sun Aug 24 12:32:26 2014 (r270454) +++ head/release/release.sh Sun Aug 24 12:50:50 2014 (r270455) @@ -255,9 +255,13 @@ if [ -d ${CHROOTDIR}/usr/ports ]; then ## Trick the ports 'run-autotools-fixup' target to do the right thing. _OSVERSION=$(sysctl -n kern.osreldate) + REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release -V REVISION) + BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH) + UNAME_r=${REVISION}-${BRANCH} if [ -d ${CHROOTDIR}/usr/doc ] && [ -z "${NODOC}" ]; then PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes" - PBUILD_FLAGS="${PBUILD_FLAGS}" + PBUILD_FLAGS="${PBUILD_FLAGS} UNAME_r=${UNAME_r}" + PBUILD_FLAGS="${PBUILD_FLAGS} OSREL=${REVISION}" chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \ ${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" install clean distclean fi From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 12:51:13 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id F2F76E6F; Sun, 24 Aug 2014 12:51:12 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C569D3953; Sun, 24 Aug 2014 12:51:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OCpCAh090553; Sun, 24 Aug 2014 12:51:12 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OCpCle090552; Sun, 24 Aug 2014 12:51:12 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201408241251.s7OCpCle090552@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Sun, 24 Aug 2014 12:51:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270456 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 12:51:13 -0000 Author: mjg Date: Sun Aug 24 12:51:12 2014 New Revision: 270456 URL: http://svnweb.freebsd.org/changeset/base/270456 Log: Plug a memory leak in case of failed lookups in capability mode. Put common cnp cleanup into one function and use it for this purpose. MFC after: 1 week Modified: head/sys/kern/vfs_lookup.c Modified: head/sys/kern/vfs_lookup.c ============================================================================== --- head/sys/kern/vfs_lookup.c Sun Aug 24 12:50:50 2014 (r270455) +++ head/sys/kern/vfs_lookup.c Sun Aug 24 12:51:12 2014 (r270456) @@ -119,6 +119,16 @@ SYSCTL_INT(_vfs, OID_AUTO, lookup_shared * if symbolic link, massage name in buffer and continue * } */ +static void +namei_cleanup_cnp(struct componentname *cnp) +{ + uma_zfree(namei_zone, cnp->cn_pnbuf); +#ifdef DIAGNOSTIC + cnp->cn_pnbuf = NULL; + cnp->cn_nameptr = NULL; +#endif +} + int namei(struct nameidata *ndp) { @@ -183,11 +193,7 @@ namei(struct nameidata *ndp) } #endif if (error) { - uma_zfree(namei_zone, cnp->cn_pnbuf); -#ifdef DIAGNOSTIC - cnp->cn_pnbuf = NULL; - cnp->cn_nameptr = NULL; -#endif + namei_cleanup_cnp(cnp); ndp->ni_vp = NULL; return (error); } @@ -254,11 +260,7 @@ namei(struct nameidata *ndp) } } if (error) { - uma_zfree(namei_zone, cnp->cn_pnbuf); -#ifdef DIAGNOSTIC - cnp->cn_pnbuf = NULL; - cnp->cn_nameptr = NULL; -#endif + namei_cleanup_cnp(cnp); return (error); } } @@ -284,6 +286,7 @@ namei(struct nameidata *ndp) if (KTRPOINT(curthread, KTR_CAPFAIL)) ktrcapfail(CAPFAIL_LOOKUP, NULL, NULL); #endif + namei_cleanup_cnp(cnp); return (ENOTCAPABLE); } while (*(cnp->cn_nameptr) == '/') { @@ -296,11 +299,7 @@ namei(struct nameidata *ndp) ndp->ni_startdir = dp; error = lookup(ndp); if (error) { - uma_zfree(namei_zone, cnp->cn_pnbuf); -#ifdef DIAGNOSTIC - cnp->cn_pnbuf = NULL; - cnp->cn_nameptr = NULL; -#endif + namei_cleanup_cnp(cnp); SDT_PROBE(vfs, namei, lookup, return, error, NULL, 0, 0, 0); return (error); @@ -310,11 +309,7 @@ namei(struct nameidata *ndp) */ if ((cnp->cn_flags & ISSYMLINK) == 0) { if ((cnp->cn_flags & (SAVENAME | SAVESTART)) == 0) { - uma_zfree(namei_zone, cnp->cn_pnbuf); -#ifdef DIAGNOSTIC - cnp->cn_pnbuf = NULL; - cnp->cn_nameptr = NULL; -#endif + namei_cleanup_cnp(cnp); } else cnp->cn_flags |= HASBUF; @@ -376,11 +371,7 @@ namei(struct nameidata *ndp) vput(ndp->ni_vp); dp = ndp->ni_dvp; } - uma_zfree(namei_zone, cnp->cn_pnbuf); -#ifdef DIAGNOSTIC - cnp->cn_pnbuf = NULL; - cnp->cn_nameptr = NULL; -#endif + namei_cleanup_cnp(cnp); vput(ndp->ni_vp); ndp->ni_vp = NULL; vrele(ndp->ni_dvp); From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 12:51:35 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 5DE19FAA; Sun, 24 Aug 2014 12:51:35 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4A14239D1; Sun, 24 Aug 2014 12:51:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OCpZ9o092429; Sun, 24 Aug 2014 12:51:35 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OCpZ0T092428; Sun, 24 Aug 2014 12:51:35 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241251.s7OCpZ0T092428@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 12:51:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270457 - head/release X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 12:51:35 -0000 Author: gjb Date: Sun Aug 24 12:51:34 2014 New Revision: 270457 URL: http://svnweb.freebsd.org/changeset/base/270457 Log: Wrap a long line. MFC after: 3 days X-MFC-with: r270417, r270418, r270455 Sponsored by: The FreeBSD Foundation Modified: head/release/release.sh Modified: head/release/release.sh ============================================================================== --- head/release/release.sh Sun Aug 24 12:51:12 2014 (r270456) +++ head/release/release.sh Sun Aug 24 12:51:34 2014 (r270457) @@ -263,7 +263,8 @@ if [ -d ${CHROOTDIR}/usr/ports ]; then PBUILD_FLAGS="${PBUILD_FLAGS} UNAME_r=${UNAME_r}" PBUILD_FLAGS="${PBUILD_FLAGS} OSREL=${REVISION}" chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \ - ${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" install clean distclean + ${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" \ + install clean distclean fi fi From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 13:03:52 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 178892C4; Sun, 24 Aug 2014 13:03:52 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 029AE3A92; Sun, 24 Aug 2014 13:03:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OD3pnr097303; Sun, 24 Aug 2014 13:03:51 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OD3p3c097302; Sun, 24 Aug 2014 13:03:51 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201408241303.s7OD3p3c097302@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sun, 24 Aug 2014 13:03:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r270458 - stable/9/sys/dev/e1000 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 13:03:52 -0000 Author: rmacklem Date: Sun Aug 24 13:03:51 2014 New Revision: 270458 URL: http://svnweb.freebsd.org/changeset/base/270458 Log: MFC: r268726 Move the "retry:" label so that the calls to m_pullup() are not done after the call to m_defrag(). This fixes a problem where m_pullup() would prepend an mbuf to the list created by m_defrag() making the chain greater than 32 again. Modified: stable/9/sys/dev/e1000/if_em.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) stable/9/sys/dev/e1000/ (props changed) Modified: stable/9/sys/dev/e1000/if_em.c ============================================================================== --- stable/9/sys/dev/e1000/if_em.c Sun Aug 24 12:51:34 2014 (r270457) +++ stable/9/sys/dev/e1000/if_em.c Sun Aug 24 13:03:51 2014 (r270458) @@ -1830,7 +1830,6 @@ em_xmit(struct tx_ring *txr, struct mbuf int nsegs, i, j, first, last = 0; int error, do_tso, tso_desc = 0, remap = 1; -retry: m_head = *m_headp; txd_upper = txd_lower = txd_used = txd_saved = 0; do_tso = ((m_head->m_pkthdr.csum_flags & CSUM_TSO) != 0); @@ -1956,6 +1955,7 @@ retry: tx_buffer_mapped = tx_buffer; map = tx_buffer->map; +retry: error = bus_dmamap_load_mbuf_sg(txr->txtag, map, *m_headp, segs, &nsegs, BUS_DMA_NOWAIT); From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 13:13:28 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id BA11461B; Sun, 24 Aug 2014 13:13:28 +0000 (UTC) Received: from mx1.stack.nl (relay02.stack.nl [IPv6:2001:610:1108:5010::104]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client CN "mailhost.stack.nl", Issuer "CA Cert Signing Authority" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B59E3B51; Sun, 24 Aug 2014 13:13:28 +0000 (UTC) Received: from snail.stack.nl (snail.stack.nl [IPv6:2001:610:1108:5010::131]) by mx1.stack.nl (Postfix) with ESMTP id 90E1F358C64; Sun, 24 Aug 2014 15:13:24 +0200 (CEST) Received: by snail.stack.nl (Postfix, from userid 1677) id 7360628494; Sun, 24 Aug 2014 15:13:24 +0200 (CEST) Date: Sun, 24 Aug 2014 15:13:24 +0200 From: Jilles Tjoelker To: Konstantin Belousov Subject: Re: svn commit: r265003 - head/secure/usr.sbin/sshd Message-ID: <20140824131324.GA37218@stack.nl> References: <53F4BC9B.3090405@FreeBSD.org> <53F4BEB1.6070000@FreeBSD.org> <53F4C022.5050804@FreeBSD.org> <20140821080541.GE2737@kib.kiev.ua> <53F5D42E.9080908@FreeBSD.org> <20140821123246.GH2737@kib.kiev.ua> <20140822134353.GA21891@stack.nl> <20140822153139.GN2737@kib.kiev.ua> <20140823175244.GA29648@stack.nl> <20140823184221.GV2737@kib.kiev.ua> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20140823184221.GV2737@kib.kiev.ua> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, Roger Pau Monn? , src-committers@freebsd.org, Bryan Drewery X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 13:13:28 -0000 On Sat, Aug 23, 2014 at 09:42:21PM +0300, Konstantin Belousov wrote: > On Sat, Aug 23, 2014 at 07:52:44PM +0200, Jilles Tjoelker wrote: > > On Fri, Aug 22, 2014 at 06:31:39PM +0300, Konstantin Belousov wrote: > > > On Fri, Aug 22, 2014 at 03:43:53PM +0200, Jilles Tjoelker wrote: > > > > This is good and necessary for SA_SIGINFO (because of the type of the > > > > SIG_DFL and SIG_IGN constants, and because POSIX says so in the > > > > description of SA_RESETHAND in the sigaction() page). However, there > > > > seems no reason to clear the other flags, which have no effect when the > > > > disposition is SIG_DFL or SIG_IGN but have historically always been > > > > preserved. (Slight exception: if kernel code erroneously loops on > > > > ERESTART, it will eat CPU time iff SA_RESTART is set, independent of the > > > > signal's disposition.) > > > Well, I already committed the patch with several bugs fixed comparing > > > with what was mailed, before your feedback arrived. > > > Do you consider it is important enough to revert the resetting of other > > > flags ? In particular, your note about the traditional historic > > > behaviour makes me wonder. > > I consider it important enough. Clearing the other flags is not > > POSIX-compliant and might break applications. For example, I can imagine > > an application modifying a struct sigaction with sa_handler == SIG_DFL > > from a sigaction() call. > This feels somewhat strange to me. E.g., I can easily imagine an > implementation which relies on some code executing in the process > user context for default action on some signal. Having the flags, > like SA_ONSTACK or SA_NODEFER to influence the handler is weird. > Such implementation is not unix, but I think it is quite possible > that cygwin or interix do core dumping in userspace. The implementation of SA_ONSTACK and the like could just as well be tied to a user-specified handler function. Anyway, this imaginable application is slightly dumb, since it is either blindly using SA_* flags from its parent or asking the kernel for things it already knows. The latter might be done for "modularity" reasons. > > > I do not see why SA_SIGINFO is so special that it must be reset, > > > while other flags are not. The absence of the cases where the > > > default/ignored disposition is affected by the flags seems rather > > > arbitrary. > > The difference is that SA_SIGINFO changes the disposition field from > > sa_handler to sa_sigaction, and it is not unambiguously clear how > > SIG_DFL and SIG_IGN are represented in sa_sigaction. Note that > > sa_handler and sa_sigaction may or may not share storage, and > > implementations may or may not support (void (*)(int, siginfo_t *, void > > *))SIG_DFL. > > For example, when I wrote system() using posix_spawn() in > > https://lists.freebsd.org/pipermail/freebsd-hackers/2012-July/040065.html > > I needed to know whether SIGINT and SIGQUIT were ignored or not. I wrote > > > > ] if ((intact.sa_flags & SA_SIGINFO) != 0 || > > ] intact.sa_handler != SIG_IGN) > > ] (void)sigaddset(&defmask, SIGINT); > > ] if ((quitact.sa_flags & SA_SIGINFO) != 0 || > > ] quitact.sa_handler != SIG_IGN) > > ] (void)sigaddset(&defmask, SIGQUIT); > > > > in the assumption that there is always an actual handler if SA_SIGINFO > > is set. I did not really like this code and eventually system() was > > changed to use vfork() directly instead of posix_spawn(), but I think it > > is correct. > If the implementation provides separate storage for sa_handler and > sa_sigaction, then isn't it more correct to assume that sa_handler is > NULL when sa_sigaction is valid ? In other words, simple > sa.sa_handler != SIG_IGN > test would be more reasonable. > I see that the SUSv4 is worded in a way that SA_SIGINFO always > accompanies sa_sigaction. Are there any implementations which > separate the storage for sa_handler and sa_sigaction ? SUSv4 doesn't allow making any such assumption. The check for (sa.sa_handler != SIG_IGN) will work fine on most implementations but an application doing it is not POSIX-compliant. I don't know of implementations that do not put sa_handler and sa_sigaction in a union. > > Note that this means that it is sometimes necessary to install a handler > > function that will never be called. Per POSIX, SA_SIGINFO must be set > > for sigwaitinfo() to be guaranteed to return siginfo_t data, and the > > only way to do this is to specify a handler function, even though it > > will never be called because the signal is masked. (A never-called > > handler function also needs to be specified when using sigwait-like > > functions with signals that default to ignore.) > > The other flags do not affect the representation of the disposition, and > > can therefore remain set without problem. > Anyway, below is the patch with reverts the behaviour WRT flags other > than SA_SIGINFO. I like the compactness of sigact_flag_test() calls, > so I kept the function, despite it is only used in non-trivial ways > for SA_SIGINFO flag test in kern_sigaction(). > diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c > index 8810bf3..f73c801 100644 > --- a/sys/kern/kern_sig.c > +++ b/sys/kern/kern_sig.c > @@ -625,9 +625,14 @@ static bool > sigact_flag_test(struct sigaction *act, int flag) > { > > - return ((act->sa_flags & flag) != 0 && > - (__sighandler_t *)act->sa_sigaction != SIG_IGN && > - (__sighandler_t *)act->sa_sigaction != SIG_DFL); > + /* > + * SA_SIGINFO is reset when signal disposition is set to > + * ignore or default. Other flags are kept according to user > + * settings. > + */ > + return ((act->sa_flags & flag) != 0 && (flag != SA_SIGINFO || > + ((__sighandler_t *)act->sa_sigaction != SIG_IGN && > + (__sighandler_t *)act->sa_sigaction != SIG_DFL))); > } > > /* > @@ -916,7 +921,6 @@ siginit(p) > for (i = 1; i <= NSIG; i++) { > if (sigprop(i) & SA_IGNORE && i != SIGCONT) { > SIGADDSET(ps->ps_sigignore, i); > - SIGADDSET(ps->ps_sigintr, i); > } > } > mtx_unlock(&ps->ps_mtx); > @@ -936,10 +940,6 @@ sigdflt(struct sigacts *ps, int sig) > SIGADDSET(ps->ps_sigignore, sig); > ps->ps_sigact[_SIG_IDX(sig)] = SIG_DFL; > SIGDELSET(ps->ps_siginfo, sig); > - SIGADDSET(ps->ps_sigintr, sig); > - SIGDELSET(ps->ps_sigonstack, sig); > - SIGDELSET(ps->ps_sigreset, sig); > - SIGDELSET(ps->ps_signodefer, sig); > } > > /* Looks good to me. -- Jilles Tjoelker From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 14:00:45 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 0F5BC8D9; Sun, 24 Aug 2014 14:00:45 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EEA223FE1; Sun, 24 Aug 2014 14:00:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OE0iA7024893; Sun, 24 Aug 2014 14:00:44 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OE0icC024892; Sun, 24 Aug 2014 14:00:44 GMT (envelope-from des@FreeBSD.org) Message-Id: <201408241400.s7OE0icC024892@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: des set sender to des@FreeBSD.org using -f From: Dag-Erling Smørgrav Date: Sun, 24 Aug 2014 14:00:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r270459 - stable/9/usr.bin/kdump X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 14:00:45 -0000 Author: des Date: Sun Aug 24 14:00:44 2014 New Revision: 270459 URL: http://svnweb.freebsd.org/changeset/base/270459 Log: MFH (r270458): print numeric file mode unless -r was specified Modified: stable/9/usr.bin/kdump/kdump.c Directory Properties: stable/9/usr.bin/kdump/ (props changed) Modified: stable/9/usr.bin/kdump/kdump.c ============================================================================== --- stable/9/usr.bin/kdump/kdump.c Sun Aug 24 13:03:51 2014 (r270458) +++ stable/9/usr.bin/kdump/kdump.c Sun Aug 24 14:00:44 2014 (r270459) @@ -1522,10 +1522,15 @@ ktrstat(struct stat *statp) * buffer exactly sizeof(struct stat) bytes long. */ printf("struct stat {"); - strmode(statp->st_mode, mode); - printf("dev=%ju, ino=%ju, mode=%s, nlink=%ju, ", - (uintmax_t)statp->st_dev, (uintmax_t)statp->st_ino, mode, - (uintmax_t)statp->st_nlink); + printf("dev=%ju, ino=%ju, ", + (uintmax_t)statp->st_dev, (uintmax_t)statp->st_ino); + if (resolv == 0) + printf("mode=0%jo, ", (uintmax_t)statp->st_mode); + else { + strmode(statp->st_mode, mode); + printf("mode=%s, ", mode); + } + printf("nlink=%ju, ", (uintmax_t)statp->st_nlink); if (resolv == 0 || (pwd = getpwuid(statp->st_uid)) == NULL) printf("uid=%ju, ", (uintmax_t)statp->st_uid); else From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 14:04:21 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 061DBAC3; Sun, 24 Aug 2014 14:04:21 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E5795300A; Sun, 24 Aug 2014 14:04:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OE4KcG026258; Sun, 24 Aug 2014 14:04:20 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OE4K20026253; Sun, 24 Aug 2014 14:04:20 GMT (envelope-from des@FreeBSD.org) Message-Id: <201408241404.s7OE4K20026253@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: des set sender to des@FreeBSD.org using -f From: Dag-Erling Smørgrav Date: Sun, 24 Aug 2014 14:04:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270460 - stable/10/lib/libfetch X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 14:04:21 -0000 Author: des Date: Sun Aug 24 14:04:20 2014 New Revision: 270460 URL: http://svnweb.freebsd.org/changeset/base/270460 Log: MFH (r267127): don't send User-Agent if HTTP_USER_AGENT is empty Modified: stable/10/lib/libfetch/fetch.3 stable/10/lib/libfetch/http.c Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libfetch/fetch.3 ============================================================================== --- stable/10/lib/libfetch/fetch.3 Sun Aug 24 14:00:44 2014 (r270459) +++ stable/10/lib/libfetch/fetch.3 Sun Aug 24 14:04:20 2014 (r270460) @@ -627,6 +627,7 @@ the document URL will be used as referre Specifies the User-Agent string to use for HTTP requests. This can be useful when working with HTTP origin or proxy servers that differentiate between user agents. +If defined but empty, no User-Agent header is sent. .It Ev NETRC Specifies a file to use instead of .Pa ~/.netrc Modified: stable/10/lib/libfetch/http.c ============================================================================== --- stable/10/lib/libfetch/http.c Sun Aug 24 14:00:44 2014 (r270459) +++ stable/10/lib/libfetch/http.c Sun Aug 24 14:04:20 2014 (r270460) @@ -1693,10 +1693,15 @@ http_request_body(struct url *URL, const else http_cmd(conn, "Referer: %s", p); } - if ((p = getenv("HTTP_USER_AGENT")) != NULL && *p != '\0') - http_cmd(conn, "User-Agent: %s", p); - else - http_cmd(conn, "User-Agent: %s " _LIBFETCH_VER, getprogname()); + if ((p = getenv("HTTP_USER_AGENT")) != NULL) { + /* no User-Agent if defined but empty */ + if (*p != '\0') + http_cmd(conn, "User-Agent: %s", p); + } else { + /* default User-Agent */ + http_cmd(conn, "User-Agent: %s " _LIBFETCH_VER, + getprogname()); + } if (url->offset > 0) http_cmd(conn, "Range: bytes=%lld-", (long long)url->offset); http_cmd(conn, "Connection: close"); From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 14:04:25 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 65B50BED; Sun, 24 Aug 2014 14:04:25 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B206A300D; Sun, 24 Aug 2014 14:04:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OE4OIW026309; Sun, 24 Aug 2014 14:04:24 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OE4ORp026306; Sun, 24 Aug 2014 14:04:24 GMT (envelope-from des@FreeBSD.org) Message-Id: <201408241404.s7OE4ORp026306@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: des set sender to des@FreeBSD.org using -f From: Dag-Erling Smørgrav Date: Sun, 24 Aug 2014 14:04:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r270461 - stable/9/lib/libfetch X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 14:04:25 -0000 Author: des Date: Sun Aug 24 14:04:23 2014 New Revision: 270461 URL: http://svnweb.freebsd.org/changeset/base/270461 Log: MFH (r267127): don't send User-Agent if HTTP_USER_AGENT is empty Modified: stable/9/lib/libfetch/fetch.3 stable/9/lib/libfetch/http.c Directory Properties: stable/9/lib/libfetch/ (props changed) Modified: stable/9/lib/libfetch/fetch.3 ============================================================================== --- stable/9/lib/libfetch/fetch.3 Sun Aug 24 14:04:20 2014 (r270460) +++ stable/9/lib/libfetch/fetch.3 Sun Aug 24 14:04:23 2014 (r270461) @@ -627,6 +627,7 @@ the document URL will be used as referre Specifies the User-Agent string to use for HTTP requests. This can be useful when working with HTTP origin or proxy servers that differentiate between user agents. +If defined but empty, no User-Agent header is sent. .It Ev NETRC Specifies a file to use instead of .Pa ~/.netrc Modified: stable/9/lib/libfetch/http.c ============================================================================== --- stable/9/lib/libfetch/http.c Sun Aug 24 14:04:20 2014 (r270460) +++ stable/9/lib/libfetch/http.c Sun Aug 24 14:04:23 2014 (r270461) @@ -1693,10 +1693,15 @@ http_request_body(struct url *URL, const else http_cmd(conn, "Referer: %s", p); } - if ((p = getenv("HTTP_USER_AGENT")) != NULL && *p != '\0') - http_cmd(conn, "User-Agent: %s", p); - else - http_cmd(conn, "User-Agent: %s " _LIBFETCH_VER, getprogname()); + if ((p = getenv("HTTP_USER_AGENT")) != NULL) { + /* no User-Agent if defined but empty */ + if (*p != '\0') + http_cmd(conn, "User-Agent: %s", p); + } else { + /* default User-Agent */ + http_cmd(conn, "User-Agent: %s " _LIBFETCH_VER, + getprogname()); + } if (url->offset > 0) http_cmd(conn, "Range: bytes=%lld-", (long long)url->offset); http_cmd(conn, "Connection: close"); From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 14:21:08 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id C7492339; Sun, 24 Aug 2014 14:21:08 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B24093199; Sun, 24 Aug 2014 14:21:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OEL8e3034664; Sun, 24 Aug 2014 14:21:08 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OEL8Ow034663; Sun, 24 Aug 2014 14:21:08 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241421.s7OEL8Ow034663@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 14:21:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270462 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 14:21:08 -0000 Author: gjb Date: Sun Aug 24 14:21:08 2014 New Revision: 270462 URL: http://svnweb.freebsd.org/changeset/base/270462 Log: Document r262855, ATF updated to 0.20. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:04:23 2014 (r270461) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:08 2014 (r270462) @@ -301,6 +301,9 @@ To use a non-default location, set rctl_rules in &man.rc.conf.5; to the location of the file. + The ATF test + suite has been updated to version 0.20. + The &man.ps.1; utility has been updated to include the -J flag, used to filter output by matching &man.jail.8; IDs and names. From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 14:21:10 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id AF9D0413; Sun, 24 Aug 2014 14:21:10 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9B43531A4; Sun, 24 Aug 2014 14:21:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OELA5S034709; Sun, 24 Aug 2014 14:21:10 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OELA17034708; Sun, 24 Aug 2014 14:21:10 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241421.s7OELA17034708@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 14:21:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270463 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 14:21:10 -0000 Author: gjb Date: Sun Aug 24 14:21:10 2014 New Revision: 270463 URL: http://svnweb.freebsd.org/changeset/base/270463 Log: Document r262861, vt(4) merged from head/. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:08 2014 (r270462) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:10 2014 (r270463) @@ -145,6 +145,12 @@ The &man.virtio_scsi.4; driver has been updated to support unmapped I/O. + The &man.vt.4; driver has been merged + from &os;-CURRENT. To enable &man.vt.4;, enter + set kern.vty=vt at the &man.loader.8; prompt + during boot, or add kern.vty=vt to + &man.loader.conf.5; and reboot the system. + The &man.mpr.4; device has been added, providing support for LSI Fusion-MPT 3 12Gb SCSI/SATA From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 14:21:14 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 6AEC3614; Sun, 24 Aug 2014 14:21:14 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5684D31AC; Sun, 24 Aug 2014 14:21:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OELEoG034800; Sun, 24 Aug 2014 14:21:14 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OELEx3034799; Sun, 24 Aug 2014 14:21:14 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241421.s7OELEx3034799@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 14:21:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270465 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 14:21:14 -0000 Author: gjb Date: Sun Aug 24 14:21:13 2014 New Revision: 270465 URL: http://svnweb.freebsd.org/changeset/base/270465 Log: Document r263019, libucl merged from head/. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:11 2014 (r270464) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:13 2014 (r270465) @@ -313,6 +313,10 @@ The ATF test suite has been updated to version 0.20. + The libucl library + (Unified Configuration Library) has been merged from + &os;-CURRENT. + The &man.ps.1; utility has been updated to include the -J flag, used to filter output by matching &man.jail.8; IDs and names. From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 14:21:12 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 89BAB53A; Sun, 24 Aug 2014 14:21:12 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 75BCE31A5; Sun, 24 Aug 2014 14:21:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OELCNT034758; Sun, 24 Aug 2014 14:21:12 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OELC8L034757; Sun, 24 Aug 2014 14:21:12 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241421.s7OELC8L034757@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 14:21:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270464 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 14:21:12 -0000 Author: gjb Date: Sun Aug 24 14:21:11 2014 New Revision: 270464 URL: http://svnweb.freebsd.org/changeset/base/270464 Log: Document r262967, MegaRAID Fury support in mfi(4). Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:10 2014 (r270463) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:11 2014 (r270464) @@ -151,6 +151,9 @@ during boot, or add kern.vty=vt to &man.loader.conf.5; and reboot the system. + Support for MegaRAID Fury cards has been + added to the &man.mfi.4; driver. + The &man.mpr.4; device has been added, providing support for LSI Fusion-MPT 3 12Gb SCSI/SATA From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 14:21:16 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 4BDA373B; Sun, 24 Aug 2014 14:21:16 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3794831B6; Sun, 24 Aug 2014 14:21:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OELGxh034845; Sun, 24 Aug 2014 14:21:16 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OELGsG034844; Sun, 24 Aug 2014 14:21:16 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241421.s7OELGsG034844@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 14:21:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270466 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 14:21:16 -0000 Author: gjb Date: Sun Aug 24 14:21:15 2014 New Revision: 270466 URL: http://svnweb.freebsd.org/changeset/base/270466 Log: Document r263020, pkg(7) synced with head/. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:13 2014 (r270465) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:15 2014 (r270466) @@ -317,6 +317,9 @@ (Unified Configuration Library) has been merged from &os;-CURRENT. + The &man.pkg.7; bootstrapping utility has + been synced with the version in &os;-CURRENT. + The &man.ps.1; utility has been updated to include the -J flag, used to filter output by matching &man.jail.8; IDs and names. From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 14:21:27 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 90D85EAD; Sun, 24 Aug 2014 14:21:27 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7CDEC31D4; Sun, 24 Aug 2014 14:21:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OELR6r035263; Sun, 24 Aug 2014 14:21:27 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OELRgb035262; Sun, 24 Aug 2014 14:21:27 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241421.s7OELRgb035262@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 14:21:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270472 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 14:21:27 -0000 Author: gjb Date: Sun Aug 24 14:21:27 2014 New Revision: 270472 URL: http://svnweb.freebsd.org/changeset/base/270472 Log: Document r263256, fixed panic on urtwn(4) removal. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:25 2014 (r270471) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:27 2014 (r270472) @@ -165,6 +165,9 @@ iBooks ™ has been added to the &man.iicbus.4; driver. + A panic triggered by removing + a &man.urtwn.4; device has been fixed. + The &man.mpr.4; device has been added, providing support for LSI Fusion-MPT 3 12Gb SCSI/SATA From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 14:21:18 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 2EF3683A; Sun, 24 Aug 2014 14:21:18 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 19E7531BE; Sun, 24 Aug 2014 14:21:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OELHYC034893; Sun, 24 Aug 2014 14:21:17 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OELHnZ034892; Sun, 24 Aug 2014 14:21:17 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241421.s7OELHnZ034892@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 14:21:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270467 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 14:21:18 -0000 Author: gjb Date: Sun Aug 24 14:21:17 2014 New Revision: 270467 URL: http://svnweb.freebsd.org/changeset/base/270467 Log: Document r263024, aacraid updated to version 3.2.5. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:15 2014 (r270466) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:17 2014 (r270467) @@ -154,6 +154,9 @@ Support for MegaRAID Fury cards has been added to the &man.mfi.4; driver. + The &man.aacraid.4; driver has been + updated to version 3.2.5. + The &man.mpr.4; device has been added, providing support for LSI Fusion-MPT 3 12Gb SCSI/SATA From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 14:21:23 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id C74C4B6E; Sun, 24 Aug 2014 14:21:23 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B267831C9; Sun, 24 Aug 2014 14:21:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OELNoP035122; Sun, 24 Aug 2014 14:21:23 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OELNFe035120; Sun, 24 Aug 2014 14:21:23 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241421.s7OELNFe035120@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 14:21:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270470 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 14:21:23 -0000 Author: gjb Date: Sun Aug 24 14:21:23 2014 New Revision: 270470 URL: http://svnweb.freebsd.org/changeset/base/270470 Log: Document r263122, hwpmc(4) support for PowerPC 970-class processors. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:21 2014 (r270469) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:23 2014 (r270470) @@ -157,6 +157,9 @@ The &man.aacraid.4; driver has been updated to version 3.2.5. + Support for &man.hwpmc.4; has been added + for &powerpc; 970 class processors. + The &man.mpr.4; device has been added, providing support for LSI Fusion-MPT 3 12Gb SCSI/SATA From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 14:21:20 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 0C2E295A; Sun, 24 Aug 2014 14:21:20 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EC5A631C3; Sun, 24 Aug 2014 14:21:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OELJ06034936; Sun, 24 Aug 2014 14:21:19 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OELJso034935; Sun, 24 Aug 2014 14:21:19 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241421.s7OELJso034935@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 14:21:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270468 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 14:21:20 -0000 Author: gjb Date: Sun Aug 24 14:21:19 2014 New Revision: 270468 URL: http://svnweb.freebsd.org/changeset/base/270468 Log: Document r263028, endianness-awareness in services_mkdb(8). Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:17 2014 (r270467) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:19 2014 (r270468) @@ -385,8 +385,11 @@ Release Engineering and Integration -   - + The &man.services.mkdb.8; utility has + been updated to include endianness awareness, allowing the + services.db database to be created as + part of the release build, regardless of native- or + cross-built releases. From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 14:21:25 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id ADE93CC5; Sun, 24 Aug 2014 14:21:25 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 99A8431CF; Sun, 24 Aug 2014 14:21:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OELPGX035212; Sun, 24 Aug 2014 14:21:25 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OELP5S035211; Sun, 24 Aug 2014 14:21:25 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241421.s7OELP5S035211@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 14:21:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270471 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 14:21:25 -0000 Author: gjb Date: Sun Aug 24 14:21:25 2014 New Revision: 270471 URL: http://svnweb.freebsd.org/changeset/base/270471 Log: Document r263197, iicbus support for ADT7460/ADT7467 fan controllers. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:23 2014 (r270470) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:25 2014 (r270471) @@ -160,6 +160,11 @@ Support for &man.hwpmc.4; has been added for &powerpc; 970 class processors. + Support for ADT7460 and ADT7467 fan + controllers found in newer PowerBooks ™ and + iBooks ™ has been added to the &man.iicbus.4; + driver. + The &man.mpr.4; device has been added, providing support for LSI Fusion-MPT 3 12Gb SCSI/SATA From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 14:21:33 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 4396D2A2; Sun, 24 Aug 2014 14:21:33 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2FD0E31DC; Sun, 24 Aug 2014 14:21:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OELXhJ035397; Sun, 24 Aug 2014 14:21:33 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OELXqS035396; Sun, 24 Aug 2014 14:21:33 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241421.s7OELXqS035396@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 14:21:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270475 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 14:21:33 -0000 Author: gjb Date: Sun Aug 24 14:21:32 2014 New Revision: 270475 URL: http://svnweb.freebsd.org/changeset/base/270475 Log: Add sponsor attribution for r263363. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:30 2014 (r270474) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:32 2014 (r270475) @@ -382,7 +382,8 @@ The &man.xz.1; utility has been updated to a post-5.0.5 snapshot. - The &man.lldb.1; debugging library has + The &man.lldb.1; debugging library has been updated to the r194122 snapshot. OpenSSH has From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 14:21:40 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id A89CA5FE; Sun, 24 Aug 2014 14:21:40 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 94CAF31EA; Sun, 24 Aug 2014 14:21:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OELe2E036131; Sun, 24 Aug 2014 14:21:40 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OELeIk036130; Sun, 24 Aug 2014 14:21:40 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241421.s7OELeIk036130@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 14:21:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270479 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 14:21:40 -0000 Author: gjb Date: Sun Aug 24 14:21:40 2014 New Revision: 270479 URL: http://svnweb.freebsd.org/changeset/base/270479 Log: Document r263403, alises for 'zfs snap' and 'zfs list -t snap' Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:38 2014 (r270478) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:40 2014 (r270479) @@ -337,6 +337,11 @@ The timezone database has been updated to version tzdata2014a. + The &man.zfs.8; userland utility has been + updated to include aliases for snapshot, + which allows use of zfs list -t snap and + zfs snap. + The &man.ps.1; utility has been updated to include the -J flag, used to filter output by matching &man.jail.8; IDs and names. From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 14:21:44 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 66F07920; Sun, 24 Aug 2014 14:21:44 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5165931EF; Sun, 24 Aug 2014 14:21:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OELisu036245; Sun, 24 Aug 2014 14:21:44 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OELi8T036244; Sun, 24 Aug 2014 14:21:44 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241421.s7OELi8T036244@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 14:21:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270481 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 14:21:44 -0000 Author: gjb Date: Sun Aug 24 14:21:43 2014 New Revision: 270481 URL: http://svnweb.freebsd.org/changeset/base/270481 Log: Move timezone database update to 'contrib'. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:41 2014 (r270480) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:43 2014 (r270481) @@ -334,9 +334,6 @@ The &man.pkg.7; bootstrapping utility has been synced with the version in &os;-CURRENT. - The timezone database has been updated to - version tzdata2014a. - The &man.zfs.8; userland utility has been updated to include aliases for snapshot, which allows use of zfs list -t snap and @@ -389,6 +386,9 @@ Contributed Software + The timezone database has been updated to + version tzdata2014a. + The &man.xz.1; utility has been updated to a post-5.0.5 snapshot. From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 14:21:29 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 70CBCFCF; Sun, 24 Aug 2014 14:21:29 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5CCF931D6; Sun, 24 Aug 2014 14:21:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OELTrg035311; Sun, 24 Aug 2014 14:21:29 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OELTv4035310; Sun, 24 Aug 2014 14:21:29 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241421.s7OELTv4035310@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 14:21:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270473 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 14:21:29 -0000 Author: gjb Date: Sun Aug 24 14:21:28 2014 New Revision: 270473 URL: http://svnweb.freebsd.org/changeset/base/270473 Log: Document r263285, xz(1) update. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:27 2014 (r270472) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:28 2014 (r270473) @@ -379,6 +379,9 @@ Contributed Software + The &man.xz.1; utility has been updated + to a post-5.0.5 snapshot. + OpenSSH has been updated to version 6.6p1. From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 14:21:38 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id CB8D359D; Sun, 24 Aug 2014 14:21:38 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B6B9031E7; Sun, 24 Aug 2014 14:21:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OELcwu035738; Sun, 24 Aug 2014 14:21:38 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OELcn6035737; Sun, 24 Aug 2014 14:21:38 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241421.s7OELcn6035737@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 14:21:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270478 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 14:21:38 -0000 Author: gjb Date: Sun Aug 24 14:21:38 2014 New Revision: 270478 URL: http://svnweb.freebsd.org/changeset/base/270478 Log: Update lldb(1) version to reflect r263369. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:36 2014 (r270477) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:38 2014 (r270478) @@ -382,9 +382,9 @@ The &man.xz.1; utility has been updated to a post-5.0.5 snapshot. - The &man.lldb.1; debugging library has - been updated to the r196259 snapshot. + been updated to the r196322 snapshot. OpenSSH has been updated to version 6.6p1. From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 14:21:21 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id E61FCA75; Sun, 24 Aug 2014 14:21:21 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D20B431C6; Sun, 24 Aug 2014 14:21:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OELLZS034980; Sun, 24 Aug 2014 14:21:21 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OELLS1034979; Sun, 24 Aug 2014 14:21:21 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241421.s7OELLS1034979@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 14:21:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270469 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 14:21:22 -0000 Author: gjb Date: Sun Aug 24 14:21:21 2014 New Revision: 270469 URL: http://svnweb.freebsd.org/changeset/base/270469 Log: Document r263046, tzdata2014a. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:19 2014 (r270468) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:21 2014 (r270469) @@ -323,6 +323,9 @@ The &man.pkg.7; bootstrapping utility has been synced with the version in &os;-CURRENT. + The timezone database has been updated to + version tzdata2014a. + The &man.ps.1; utility has been updated to include the -J flag, used to filter output by matching &man.jail.8; IDs and names. From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 14:21:48 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 2F61EB3E; Sun, 24 Aug 2014 14:21:48 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1B26131F8; Sun, 24 Aug 2014 14:21:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OELll0036336; Sun, 24 Aug 2014 14:21:47 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OELloU036335; Sun, 24 Aug 2014 14:21:47 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241421.s7OELloU036335@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 14:21:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270483 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 14:21:48 -0000 Author: gjb Date: Sun Aug 24 14:21:47 2014 New Revision: 270483 URL: http://svnweb.freebsd.org/changeset/base/270483 Log: Document r263508, clang/llvm update to 3.4. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:45 2014 (r270482) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:47 2014 (r270483) @@ -348,6 +348,9 @@ -p, which when specified, prints the output in a parsable format. + The &man.clang.1;/llvm suite has been + updated to version 3.4. + The &man.ps.1; utility has been updated to include the -J flag, used to filter output by matching &man.jail.8; IDs and names. From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 14:21:46 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 7059EA59; Sun, 24 Aug 2014 14:21:46 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5064231F6; Sun, 24 Aug 2014 14:21:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OELkpg036291; Sun, 24 Aug 2014 14:21:46 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OELkhf036290; Sun, 24 Aug 2014 14:21:46 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241421.s7OELkhf036290@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 14:21:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270482 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 14:21:46 -0000 Author: gjb Date: Sun Aug 24 14:21:45 2014 New Revision: 270482 URL: http://svnweb.freebsd.org/changeset/base/270482 Log: Document r263407, zfs bookmarks. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:43 2014 (r270481) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:45 2014 (r270482) @@ -303,6 +303,10 @@ has been added to the &man.fsck.ffs.8; utility. When used, &man.fsck.ffs.8; will restart itself when too many critical errors have been detected. + + The &man.zfs.8; filesystem has been + updated to implement bookmarks. See + &man.zfs.8; for further details. From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 14:21:37 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id F0AF5494; Sun, 24 Aug 2014 14:21:36 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DC56031E5; Sun, 24 Aug 2014 14:21:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OELavu035487; Sun, 24 Aug 2014 14:21:36 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OELaef035486; Sun, 24 Aug 2014 14:21:36 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241421.s7OELaef035486@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 14:21:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270477 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 14:21:37 -0000 Author: gjb Date: Sun Aug 24 14:21:36 2014 New Revision: 270477 URL: http://svnweb.freebsd.org/changeset/base/270477 Log: Update lldb(1) version to reflect r263367. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:34 2014 (r270476) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:36 2014 (r270477) @@ -382,9 +382,9 @@ The &man.xz.1; utility has been updated to a post-5.0.5 snapshot. - The &man.lldb.1; debugging library has - been updated to the r194122 snapshot. + been updated to the r196259 snapshot. OpenSSH has been updated to version 6.6p1. From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 14:21:42 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 8C53B72A; Sun, 24 Aug 2014 14:21:42 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 789B031EC; Sun, 24 Aug 2014 14:21:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OELgwg036194; Sun, 24 Aug 2014 14:21:42 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OELgJ8036192; Sun, 24 Aug 2014 14:21:42 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241421.s7OELgJ8036192@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 14:21:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270480 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 14:21:42 -0000 Author: gjb Date: Sun Aug 24 14:21:41 2014 New Revision: 270480 URL: http://svnweb.freebsd.org/changeset/base/270480 Log: Document r263405, 'zfs list' '-p' flag. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:40 2014 (r270479) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:41 2014 (r270480) @@ -342,6 +342,11 @@ which allows use of zfs list -t snap and zfs snap. + The &man.zfs.8; userland utility has been + updated to include a new flag to zfs list, + -p, which when specified, prints the output + in a parsable format. + The &man.ps.1; utility has been updated to include the -J flag, used to filter output by matching &man.jail.8; IDs and names. From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 14:21:31 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 5BAE0187; Sun, 24 Aug 2014 14:21:31 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 47D9431DA; Sun, 24 Aug 2014 14:21:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OELV3g035355; Sun, 24 Aug 2014 14:21:31 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OELVnT035354; Sun, 24 Aug 2014 14:21:31 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241421.s7OELVnT035354@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 14:21:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270474 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 14:21:31 -0000 Author: gjb Date: Sun Aug 24 14:21:30 2014 New Revision: 270474 URL: http://svnweb.freebsd.org/changeset/base/270474 Log: Document r263363, lldb update. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:28 2014 (r270473) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:30 2014 (r270474) @@ -382,6 +382,9 @@ The &man.xz.1; utility has been updated to a post-5.0.5 snapshot. + The &man.lldb.1; debugging library has + been updated to the r194122 snapshot. + OpenSSH has been updated to version 6.6p1. From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 14:21:35 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 20CCE3A7; Sun, 24 Aug 2014 14:21:35 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0CFBF31E0; Sun, 24 Aug 2014 14:21:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OELYSL035445; Sun, 24 Aug 2014 14:21:34 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OELYMD035444; Sun, 24 Aug 2014 14:21:34 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241421.s7OELYMD035444@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 14:21:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270476 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 14:21:35 -0000 Author: gjb Date: Sun Aug 24 14:21:34 2014 New Revision: 270476 URL: http://svnweb.freebsd.org/changeset/base/270476 Log: Remove space between product and trademark. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:32 2014 (r270475) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:21:34 2014 (r270476) @@ -161,8 +161,8 @@ for &powerpc; 970 class processors. Support for ADT7460 and ADT7467 fan - controllers found in newer PowerBooks ™ and - iBooks ™ has been added to the &man.iicbus.4; + controllers found in newer PowerBooks™ and + iBooks™ has been added to the &man.iicbus.4; driver. A panic triggered by removing From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 14:25:45 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 80D76F5D; Sun, 24 Aug 2014 14:25:45 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 51D47323C; Sun, 24 Aug 2014 14:25:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OEPjTw037547; Sun, 24 Aug 2014 14:25:45 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OEPiqN037544; Sun, 24 Aug 2014 14:25:44 GMT (envelope-from des@FreeBSD.org) Message-Id: <201408241425.s7OEPiqN037544@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: des set sender to des@FreeBSD.org using -f From: Dag-Erling Smørgrav Date: Sun, 24 Aug 2014 14:25:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270484 - in stable/10: gnu/lib/libgcc share/mk X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 14:25:45 -0000 Author: des Date: Sun Aug 24 14:25:44 2014 New Revision: 270484 URL: http://svnweb.freebsd.org/changeset/base/270484 Log: MFH (r264367): add RANLIBFLAGS and set timestamps in static libraries to 0 Modified: stable/10/gnu/lib/libgcc/Makefile stable/10/share/mk/bsd.lib.mk stable/10/share/mk/sys.mk Directory Properties: stable/10/ (props changed) Modified: stable/10/gnu/lib/libgcc/Makefile ============================================================================== --- stable/10/gnu/lib/libgcc/Makefile Sun Aug 24 14:21:47 2014 (r270483) +++ stable/10/gnu/lib/libgcc/Makefile Sun Aug 24 14:25:44 2014 (r270484) @@ -352,7 +352,7 @@ libgcc_eh.a: ${EH_OBJS_T} @${ECHO} building static gcc_eh library @rm -f ${.TARGET} @${AR} ${ARFLAGS} ${.TARGET} `lorder ${EH_OBJS_T} | tsort -q` - ${RANLIB} ${.TARGET} + ${RANLIB} ${RANLIBFLAGS} ${.TARGET} all: libgcc_eh.a @@ -361,7 +361,7 @@ libgcc_eh_p.a: ${EH_OBJS_P} @${ECHO} building profiled gcc_eh library @rm -f ${.TARGET} @${AR} ${ARFLAGS} ${.TARGET} `lorder ${EH_OBJS_P} | tsort -q` - ${RANLIB} ${.TARGET} + ${RANLIB} ${RANLIBFLAGS} ${.TARGET} all: libgcc_eh_p.a .endif Modified: stable/10/share/mk/bsd.lib.mk ============================================================================== --- stable/10/share/mk/bsd.lib.mk Sun Aug 24 14:21:47 2014 (r270483) +++ stable/10/share/mk/bsd.lib.mk Sun Aug 24 14:25:44 2014 (r270484) @@ -173,7 +173,7 @@ lib${LIB}.a: ${OBJS} ${STATICOBJS} .else @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} .endif - ${RANLIB} ${.TARGET} + ${RANLIB} ${RANLIBFLAGS} ${.TARGET} .endif .if !defined(INTERNALLIB) @@ -190,7 +190,7 @@ lib${LIB}_p.a: ${POBJS} .else @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD} .endif - ${RANLIB} ${.TARGET} + ${RANLIB} ${RANLIBFLAGS} ${.TARGET} .endif .if defined(SHLIB_NAME) || \ @@ -247,7 +247,7 @@ lib${LIB}_pic.a: ${SOBJS} @${ECHO} building special pic ${LIB} library @rm -f ${.TARGET} @${AR} ${ARFLAGS} ${.TARGET} ${SOBJS} ${ARADD} - ${RANLIB} ${.TARGET} + ${RANLIB} ${RANLIBFLAGS} ${.TARGET} .endif .if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB) Modified: stable/10/share/mk/sys.mk ============================================================================== --- stable/10/share/mk/sys.mk Sun Aug 24 14:21:47 2014 (r270483) +++ stable/10/share/mk/sys.mk Sun Aug 24 14:25:44 2014 (r270484) @@ -39,9 +39,12 @@ AR ?= ar .if defined(%POSIX) ARFLAGS ?= -rv .else -ARFLAGS ?= cru +ARFLAGS ?= -crD .endif RANLIB ?= ranlib +.if !defined(%POSIX) +RANLIBFLAGS ?= -D +.endif AS ?= as AFLAGS ?= From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 14:39:33 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id CEF16351; Sun, 24 Aug 2014 14:39:33 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A0E0B3335; Sun, 24 Aug 2014 14:39:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OEdXoV042707; Sun, 24 Aug 2014 14:39:33 GMT (envelope-from dumbbell@FreeBSD.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OEdXZ2042706; Sun, 24 Aug 2014 14:39:33 GMT (envelope-from dumbbell@FreeBSD.org) Message-Id: <201408241439.s7OEdXZ2042706@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dumbbell set sender to dumbbell@FreeBSD.org using -f From: Jean-Sebastien Pedron Date: Sun, 24 Aug 2014 14:39:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270485 - head/sys/dev/vt/hw/vga X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 14:39:33 -0000 Author: dumbbell Date: Sun Aug 24 14:39:33 2014 New Revision: 270485 URL: http://svnweb.freebsd.org/changeset/base/270485 Log: vt_vga: Fix the display of the splash screen MFC after: 1 week Modified: head/sys/dev/vt/hw/vga/vt_vga.c Modified: head/sys/dev/vt/hw/vga/vt_vga.c ============================================================================== --- head/sys/dev/vt/hw/vga/vt_vga.c Sun Aug 24 14:25:44 2014 (r270484) +++ head/sys/dev/vt/hw/vga/vt_vga.c Sun Aug 24 14:39:33 2014 (r270485) @@ -431,6 +431,9 @@ vga_copy_bitmap_portion(uint8_t *pattern pattern_2colors[dst_y + i] &= ~mask; pattern_2colors[dst_y + i] |= pattern; + if (pattern_ncolors == NULL) + continue; + /* * Set the same bits in the n-colors array. This one * supports transparency, when a given bit is cleared in @@ -836,7 +839,7 @@ vga_bitblt_bitmap(struct vt_device *vd, unsigned int x, unsigned int y, term_color_t fg, term_color_t bg) { unsigned int x1, y1, x2, y2, i, j, src_x, dst_x, x_count; - uint8_t pattern_2colors, pattern_ncolors; + uint8_t pattern_2colors; /* Align coordinates with the 8-pxels grid. */ x1 = x / VT_VGA_PIXELS_BLOCK * VT_VGA_PIXELS_BLOCK; @@ -848,18 +851,16 @@ vga_bitblt_bitmap(struct vt_device *vd, x2 = min(x2, vd->vd_width - 1); y2 = min(y2, vd->vd_height - 1); - pattern_ncolors = 0; - for (j = y1; j < y2; ++j) { src_x = 0; dst_x = x - x1; x_count = VT_VGA_PIXELS_BLOCK - dst_x; - for (i = x1; i < x2; i += VT_VGA_MEMSIZE) { + for (i = x1; i < x2; i += VT_VGA_PIXELS_BLOCK) { pattern_2colors = 0; vga_copy_bitmap_portion( - &pattern_2colors, &pattern_ncolors, + &pattern_2colors, NULL, pattern, mask, width, src_x, dst_x, x_count, j - y1, 0, 1, fg, bg, 0); @@ -870,7 +871,7 @@ vga_bitblt_bitmap(struct vt_device *vd, src_x += x_count; dst_x = (dst_x + x_count) % VT_VGA_PIXELS_BLOCK; - x_count = min(x + width - i, VT_VGA_PIXELS_BLOCK); + x_count = min(width - src_x, VT_VGA_PIXELS_BLOCK); } } } From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 15:04:46 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id CA6F038B; Sun, 24 Aug 2014 15:04:46 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B2AB735EA; Sun, 24 Aug 2014 15:04:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OF4kwx056700; Sun, 24 Aug 2014 15:04:46 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OF4kUp056699; Sun, 24 Aug 2014 15:04:46 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241504.s7OF4kUp056699@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 15:04:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270486 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 15:04:46 -0000 Author: gjb Date: Sun Aug 24 15:04:46 2014 New Revision: 270486 URL: http://svnweb.freebsd.org/changeset/base/270486 Log: Document r263783, support for $2b$ format in the Blowfish password format. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 14:39:33 2014 (r270485) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 15:04:46 2014 (r270486) @@ -351,6 +351,11 @@ The &man.clang.1;/llvm suite has been updated to version 3.4. + The Blowfish password format + implementation updated. Support for $2b$ has + been added, allowing use of passwords greater than 256 + characters long. + The &man.ps.1; utility has been updated to include the -J flag, used to filter output by matching &man.jail.8; IDs and names. From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 15:04:48 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id ACAE4461; Sun, 24 Aug 2014 15:04:48 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9812D35EB; Sun, 24 Aug 2014 15:04:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OF4mo6056745; Sun, 24 Aug 2014 15:04:48 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OF4mF1056744; Sun, 24 Aug 2014 15:04:48 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241504.s7OF4mF1056744@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 15:04:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270487 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 15:04:48 -0000 Author: gjb Date: Sun Aug 24 15:04:48 2014 New Revision: 270487 URL: http://svnweb.freebsd.org/changeset/base/270487 Log: Document r263799, deadlock fix in usb(4). Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 15:04:46 2014 (r270486) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 15:04:48 2014 (r270487) @@ -168,6 +168,10 @@ A panic triggered by removing a &man.urtwn.4; device has been fixed. + A potential deadlock in the &man.usb.4; + stack triggered by detaching USB devices that create character + devices has been fixed. + The &man.mpr.4; device has been added, providing support for LSI Fusion-MPT 3 12Gb SCSI/SATA From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 15:04:54 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 53C966C8; Sun, 24 Aug 2014 15:04:54 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3F7F335F2; Sun, 24 Aug 2014 15:04:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OF4sgp056876; Sun, 24 Aug 2014 15:04:54 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OF4sX6056875; Sun, 24 Aug 2014 15:04:54 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241504.s7OF4sX6056875@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 15:04:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270490 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 15:04:54 -0000 Author: gjb Date: Sun Aug 24 15:04:53 2014 New Revision: 270490 URL: http://svnweb.freebsd.org/changeset/base/270490 Log: Document r264438, looser ifconfig_IF_aliasN definition requirements. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 15:04:51 2014 (r270489) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 15:04:53 2014 (r270490) @@ -397,8 +397,14 @@ <filename>/etc/rc.d</filename> Scripts -   - + The network.subr + &man.rc.8; script has been updated to loosen the requirement + of listing network aliases in numeric order. Previously, + a network alias of + _alias2 + would not be created if + _alias1 was + not defined. From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 15:04:50 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 8F55F56D; Sun, 24 Aug 2014 15:04:50 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7753835EC; Sun, 24 Aug 2014 15:04:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OF4oW3056790; Sun, 24 Aug 2014 15:04:50 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OF4oJl056789; Sun, 24 Aug 2014 15:04:50 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241504.s7OF4oJl056789@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 15:04:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270488 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 15:04:50 -0000 Author: gjb Date: Sun Aug 24 15:04:49 2014 New Revision: 270488 URL: http://svnweb.freebsd.org/changeset/base/270488 Log: Document r263869, amdtemp(4) support for AMD Family 16h sensor devices. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 15:04:48 2014 (r270487) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 15:04:49 2014 (r270488) @@ -172,6 +172,9 @@ stack triggered by detaching USB devices that create character devices has been fixed. + Support for &amd; Family 16h sensor + devices has been added to &man.amdtemp.4;. + The &man.mpr.4; device has been added, providing support for LSI Fusion-MPT 3 12Gb SCSI/SATA From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 15:04:52 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 70A2466A; Sun, 24 Aug 2014 15:04:52 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5C6DB35EF; Sun, 24 Aug 2014 15:04:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OF4qFX056832; Sun, 24 Aug 2014 15:04:52 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OF4qAc056831; Sun, 24 Aug 2014 15:04:52 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241504.s7OF4qAc056831@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 15:04:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270489 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 15:04:52 -0000 Author: gjb Date: Sun Aug 24 15:04:51 2014 New Revision: 270489 URL: http://svnweb.freebsd.org/changeset/base/270489 Log: Document r263906, tzdata2014b. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 15:04:49 2014 (r270488) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 15:04:51 2014 (r270489) @@ -405,9 +405,6 @@ Contributed Software - The timezone database has been updated to - version tzdata2014a. - The &man.xz.1; utility has been updated to a post-5.0.5 snapshot. @@ -415,6 +412,9 @@ sponsor="&darpa_afrl;">The &man.lldb.1; debugging library has been updated to the r196322 snapshot. + The timezone database has been updated to + version tzdata2014b. + OpenSSH has been updated to version 6.6p1. From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 15:04:56 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 3EA3D7F0; Sun, 24 Aug 2014 15:04:56 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2A19635F4; Sun, 24 Aug 2014 15:04:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OF4uBc056921; Sun, 24 Aug 2014 15:04:56 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OF4uEb056920; Sun, 24 Aug 2014 15:04:56 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241504.s7OF4uEb056920@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 15:04:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270491 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 15:04:56 -0000 Author: gjb Date: Sun Aug 24 15:04:55 2014 New Revision: 270491 URL: http://svnweb.freebsd.org/changeset/base/270491 Log: Document r264497, iconv(3) update. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 15:04:53 2014 (r270490) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 15:04:55 2014 (r270491) @@ -363,6 +363,9 @@ been added, allowing use of passwords greater than 256 characters long. + The &man.iconv.3; library has been + updated to match NetBSD, providing several bug fixes. + The &man.ps.1; utility has been updated to include the -J flag, used to filter output by matching &man.jail.8; IDs and names. From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 15:04:58 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 3BC169E3; Sun, 24 Aug 2014 15:04:58 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1812935F6; Sun, 24 Aug 2014 15:04:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OF4v57056968; Sun, 24 Aug 2014 15:04:57 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OF4vYd056967; Sun, 24 Aug 2014 15:04:57 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241504.s7OF4vYd056967@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 15:04:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270492 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 15:04:58 -0000 Author: gjb Date: Sun Aug 24 15:04:57 2014 New Revision: 270492 URL: http://svnweb.freebsd.org/changeset/base/270492 Log: Document r264522, LUN-based changer support removed from cd(4). Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 15:04:55 2014 (r270491) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 15:04:57 2014 (r270492) @@ -175,6 +175,9 @@ Support for &amd; Family 16h sensor devices has been added to &man.amdtemp.4;. + Support for LUN-based CD changers has been + removed from the &man.cd.4; driver. + The &man.mpr.4; device has been added, providing support for LSI Fusion-MPT 3 12Gb SCSI/SATA From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 15:27:00 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id F13EB714; Sun, 24 Aug 2014 15:26:59 +0000 (UTC) Received: from mail.xcllnt.net (mail.xcllnt.net [50.0.150.214]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C7CA237A1; Sun, 24 Aug 2014 15:26:59 +0000 (UTC) Received: from [192.168.2.22] (atc.xcllnt.net [50.0.150.213]) (authenticated bits=0) by mail.xcllnt.net (8.14.9/8.14.9) with ESMTP id s7OFQwQL004215 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Sun, 24 Aug 2014 08:26:58 -0700 (PDT) (envelope-from marcel@xcllnt.net) Content-Type: multipart/signed; boundary="Apple-Mail=_238AE75E-919B-4456-B4CA-965B79180641"; protocol="application/pgp-signature"; micalg=pgp-sha1 Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Subject: Re: svn commit: r270445 - head/sys/boot/common From: Marcel Moolenaar In-Reply-To: <201408240920.s7O9KVen089882@svn.freebsd.org> Date: Sun, 24 Aug 2014 08:26:56 -0700 Message-Id: <9ED2B7CD-5966-43F1-8F6F-770B182E2123@xcllnt.net> References: <201408240920.s7O9KVen089882@svn.freebsd.org> To: "Andrey V. Elsukov" X-Mailer: Apple Mail (2.1878.6) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 15:27:00 -0000 --Apple-Mail=_238AE75E-919B-4456-B4CA-965B79180641 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii On Aug 24, 2014, at 2:20 AM, Andrey V. Elsukov wrote: > Author: ae > Date: Sun Aug 24 09:20:30 2014 > New Revision: 270445 > URL: http://svnweb.freebsd.org/changeset/base/270445 > > Log: > The size of the GPT table can not be less than one sector. Does this actually fix the qemu problem? Interesting... -- Marcel Moolenaar marcel@xcllnt.net --Apple-Mail=_238AE75E-919B-4456-B4CA-965B79180641 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----- Comment: GPGTools - http://gpgtools.org iEYEARECAAYFAlP6BEAACgkQpgWlLWHuifaJ3wCeO3xl26Rzw7m9cYuNyO6emppm U3cAnRM04JR/vXLjbp75LG+2EeV+YUBC =CjfI -----END PGP SIGNATURE----- --Apple-Mail=_238AE75E-919B-4456-B4CA-965B79180641-- From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 15:59:34 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 3C2A3D17; Sun, 24 Aug 2014 15:59:34 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2702E39C4; Sun, 24 Aug 2014 15:59:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OFxYeC081390; Sun, 24 Aug 2014 15:59:34 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OFxYld081389; Sun, 24 Aug 2014 15:59:34 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241559.s7OFxYld081389@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 15:59:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270493 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 15:59:34 -0000 Author: gjb Date: Sun Aug 24 15:59:33 2014 New Revision: 270493 URL: http://svnweb.freebsd.org/changeset/base/270493 Log: Document r264734, 9th gen HP HBA support in ciss(4). Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 15:04:57 2014 (r270492) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 15:59:33 2014 (r270493) @@ -178,6 +178,9 @@ Support for LUN-based CD changers has been removed from the &man.cd.4; driver. + Support for 9th generation HP host bus + adapter cards has been added to &man.ciss.4;. + The &man.mpr.4; device has been added, providing support for LSI Fusion-MPT 3 12Gb SCSI/SATA From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 15:59:36 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 21945DED; Sun, 24 Aug 2014 15:59:36 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0C95039C5; Sun, 24 Aug 2014 15:59:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OFxZRT081437; Sun, 24 Aug 2014 15:59:35 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OFxZmS081436; Sun, 24 Aug 2014 15:59:35 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241559.s7OFxZmS081436@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 15:59:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270494 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 15:59:36 -0000 Author: gjb Date: Sun Aug 24 15:59:35 2014 New Revision: 270494 URL: http://svnweb.freebsd.org/changeset/base/270494 Log: Document r264866, tx/rx multi-queue support in vmx(4). Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 15:59:33 2014 (r270493) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 15:59:35 2014 (r270494) @@ -277,6 +277,16 @@ The &man.urndis.4; driver has been imported from OpenBSD. + + Support for multiple + transmitter/receiver queues has been added to the + &man.vmx.4; driver. + + + The &os; guest operating system must have + MSIX enabled as a prerequisite for + multiple queues. + From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 15:59:38 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 1338AEE8; Sun, 24 Aug 2014 15:59:38 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F1F5439C6; Sun, 24 Aug 2014 15:59:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OFxbC1081484; Sun, 24 Aug 2014 15:59:37 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OFxbHj081483; Sun, 24 Aug 2014 15:59:37 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241559.s7OFxbHj081483@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 15:59:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270495 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 15:59:38 -0000 Author: gjb Date: Sun Aug 24 15:59:37 2014 New Revision: 270495 URL: http://svnweb.freebsd.org/changeset/base/270495 Log: Document r264911, nc(1) update. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 15:59:35 2014 (r270494) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 15:59:37 2014 (r270495) @@ -443,6 +443,9 @@ OpenSSH has been updated to version 6.6p1. + The &man.nc.1; utility has been updated + to match the version in OpenBSD 5.5. + Sendmail has been updated to 8.14.9. From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 15:59:40 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id F2D04FFA; Sun, 24 Aug 2014 15:59:39 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DE75139C9; Sun, 24 Aug 2014 15:59:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OFxdLM081530; Sun, 24 Aug 2014 15:59:39 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OFxdPr081528; Sun, 24 Aug 2014 15:59:39 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241559.s7OFxdPr081528@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 15:59:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270496 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 15:59:40 -0000 Author: gjb Date: Sun Aug 24 15:59:39 2014 New Revision: 270496 URL: http://svnweb.freebsd.org/changeset/base/270496 Log: Document r265067, loaderdev= u-boot env variable. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 15:59:37 2014 (r270495) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 15:59:39 2014 (r270496) @@ -227,6 +227,12 @@ The WANDBOARD kernel configuration file has been added. + Boot devices may now be specified by + setting a u-boot environment variable. If a boot device is + not specified, the probe mechanism will be used. To specify + the boot device, set the + loaderdev=device + u-boot environment variable. From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 16:26:04 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id F2CEBBD8; Sun, 24 Aug 2014 16:26:03 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DD4913C32; Sun, 24 Aug 2014 16:26:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OGQ3NJ095928; Sun, 24 Aug 2014 16:26:03 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OGQ323095927; Sun, 24 Aug 2014 16:26:03 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241626.s7OGQ323095927@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 16:26:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270497 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 16:26:04 -0000 Author: gjb Date: Sun Aug 24 16:26:03 2014 New Revision: 270497 URL: http://svnweb.freebsd.org/changeset/base/270497 Log: Document r265265, date(1) -R flag. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 15:59:39 2014 (r270496) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 16:26:03 2014 (r270497) @@ -388,6 +388,10 @@ The &man.iconv.3; library has been updated to match NetBSD, providing several bug fixes. + The &man.date.1; utility has been updated + to include a new flag, -R, which prints the + date and time output as specified in RFC 2822. + The &man.ps.1; utility has been updated to include the -J flag, used to filter output by matching &man.jail.8; IDs and names. From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 16:26:05 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id BF6AACAE; Sun, 24 Aug 2014 16:26:05 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AAE583C33; Sun, 24 Aug 2014 16:26:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OGQ5kF095977; Sun, 24 Aug 2014 16:26:05 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OGQ5Ct095976; Sun, 24 Aug 2014 16:26:05 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241626.s7OGQ5Ct095976@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 16:26:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270498 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 16:26:05 -0000 Author: gjb Date: Sun Aug 24 16:26:05 2014 New Revision: 270498 URL: http://svnweb.freebsd.org/changeset/base/270498 Log: Document r265345, Asus USB-N10 NANO support in urtwn(4). Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 16:26:03 2014 (r270497) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 16:26:05 2014 (r270498) @@ -293,6 +293,10 @@ MSIX enabled as a prerequisite for multiple queues. + + Support for the ASUS USB-N10 Nano + wireless card has been added to the &man.urtwn.4; + driver. From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 16:26:07 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id A681DDDA; Sun, 24 Aug 2014 16:26:07 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 91AEB3C34; Sun, 24 Aug 2014 16:26:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OGQ7TG096021; Sun, 24 Aug 2014 16:26:07 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OGQ7tQ096020; Sun, 24 Aug 2014 16:26:07 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241626.s7OGQ7tQ096020@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 16:26:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270499 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 16:26:07 -0000 Author: gjb Date: Sun Aug 24 16:26:07 2014 New Revision: 270499 URL: http://svnweb.freebsd.org/changeset/base/270499 Log: Document r265533, bc(1) update. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 16:26:05 2014 (r270498) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 16:26:07 2014 (r270499) @@ -396,6 +396,9 @@ to include a new flag, -R, which prints the date and time output as specified in RFC 2822. + The &man.bc.1; utility has been updated to + version 1.1, in sync with the version in OpenBSD. + The &man.ps.1; utility has been updated to include the -J flag, used to filter output by matching &man.jail.8; IDs and names. From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 16:26:09 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 836E3ECD; Sun, 24 Aug 2014 16:26:09 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6DB2B3C37; Sun, 24 Aug 2014 16:26:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OGQ9fE096066; Sun, 24 Aug 2014 16:26:09 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OGQ91d096065; Sun, 24 Aug 2014 16:26:09 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241626.s7OGQ91d096065@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 16:26:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270500 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 16:26:09 -0000 Author: gjb Date: Sun Aug 24 16:26:08 2014 New Revision: 270500 URL: http://svnweb.freebsd.org/changeset/base/270500 Log: Document r265536, GEOM_VINUM can be built both as a module or directly into the kernel. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 16:26:07 2014 (r270499) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 16:26:08 2014 (r270500) @@ -186,6 +186,10 @@ providing support for LSI Fusion-MPT 3 12Gb SCSI/SATA controllers. + The GEOM_VINUM option + is now able to be built both directly into the kernel or as + a &man.kldload.8; loadable module. + The &man.mrsas.4; driver has been added, providing support for LSI MegaRAID SAS controllers. The From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 16:26:11 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 63CC9FD8; Sun, 24 Aug 2014 16:26:11 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4EA0B3C38; Sun, 24 Aug 2014 16:26:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OGQBle096111; Sun, 24 Aug 2014 16:26:11 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OGQBGF096110; Sun, 24 Aug 2014 16:26:11 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241626.s7OGQBGF096110@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 16:26:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270501 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 16:26:11 -0000 Author: gjb Date: Sun Aug 24 16:26:10 2014 New Revision: 270501 URL: http://svnweb.freebsd.org/changeset/base/270501 Log: Document r265604, pmcstat(8) '-a' flag. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 16:26:08 2014 (r270500) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 16:26:10 2014 (r270501) @@ -403,6 +403,11 @@ The &man.bc.1; utility has been updated to version 1.1, in sync with the version in OpenBSD. + The &man.pmcstat.8; utility has been + updated to include a new flag, -a, which when + specified, produces a full stack track on the sampled + points. + The &man.ps.1; utility has been updated to include the -J flag, used to filter output by matching &man.jail.8; IDs and names. From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 16:26:13 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 5F7F6141; Sun, 24 Aug 2014 16:26:13 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4AC293C3C; Sun, 24 Aug 2014 16:26:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OGQDC7096162; Sun, 24 Aug 2014 16:26:13 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OGQD8e096160; Sun, 24 Aug 2014 16:26:13 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241626.s7OGQD8e096160@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 16:26:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270502 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 16:26:13 -0000 Author: gjb Date: Sun Aug 24 16:26:12 2014 New Revision: 270502 URL: http://svnweb.freebsd.org/changeset/base/270502 Log: Set vendor attribution for r265604. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 16:26:10 2014 (r270501) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 16:26:12 2014 (r270502) @@ -403,7 +403,8 @@ The &man.bc.1; utility has been updated to version 1.1, in sync with the version in OpenBSD. - The &man.pmcstat.8; utility has been + The &man.pmcstat.8; utility has been updated to include a new flag, -a, which when specified, produces a full stack track on the sampled points. From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 16:26:15 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 2DE94226; Sun, 24 Aug 2014 16:26:15 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 194AF3C3E; Sun, 24 Aug 2014 16:26:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OGQEci096206; Sun, 24 Aug 2014 16:26:14 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OGQEit096205; Sun, 24 Aug 2014 16:26:14 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408241626.s7OGQEit096205@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sun, 24 Aug 2014 16:26:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270503 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 16:26:15 -0000 Author: gjb Date: Sun Aug 24 16:26:14 2014 New Revision: 270503 URL: http://svnweb.freebsd.org/changeset/base/270503 Log: Document r265610, uslcom(4) update. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 16:26:12 2014 (r270502) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Aug 24 16:26:14 2014 (r270503) @@ -190,6 +190,9 @@ is now able to be built both directly into the kernel or as a &man.kldload.8; loadable module. + The &man.uslcom.4; driver has been updated + to support 26 new devices. + The &man.mrsas.4; driver has been added, providing support for LSI MegaRAID SAS controllers. The From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 16:37:50 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id D0E7F7F2; Sun, 24 Aug 2014 16:37:50 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BCBBD3D27; Sun, 24 Aug 2014 16:37:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OGbofh001552; Sun, 24 Aug 2014 16:37:50 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OGbo48001551; Sun, 24 Aug 2014 16:37:50 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201408241637.s7OGbo48001551@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sun, 24 Aug 2014 16:37:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270504 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 16:37:50 -0000 Author: kib Date: Sun Aug 24 16:37:50 2014 New Revision: 270504 URL: http://svnweb.freebsd.org/changeset/base/270504 Log: Revert the handling of all siginfo sa_flags except SA_SIGINFO to the pre-r270321. Namely, the flags are preserved for SIG_DFL and SIG_IGN dispositions. Requested and reviewed by: jilles Sponsored by: The FreeBSD Foundation MFC after: 1 week Modified: head/sys/kern/kern_sig.c Modified: head/sys/kern/kern_sig.c ============================================================================== --- head/sys/kern/kern_sig.c Sun Aug 24 16:26:14 2014 (r270503) +++ head/sys/kern/kern_sig.c Sun Aug 24 16:37:50 2014 (r270504) @@ -625,9 +625,14 @@ static bool sigact_flag_test(struct sigaction *act, int flag) { - return ((act->sa_flags & flag) != 0 && - (__sighandler_t *)act->sa_sigaction != SIG_IGN && - (__sighandler_t *)act->sa_sigaction != SIG_DFL); + /* + * SA_SIGINFO is reset when signal disposition is set to + * ignore or default. Other flags are kept according to user + * settings. + */ + return ((act->sa_flags & flag) != 0 && (flag != SA_SIGINFO || + ((__sighandler_t *)act->sa_sigaction != SIG_IGN && + (__sighandler_t *)act->sa_sigaction != SIG_DFL))); } /* @@ -916,7 +921,6 @@ siginit(p) for (i = 1; i <= NSIG; i++) { if (sigprop(i) & SA_IGNORE && i != SIGCONT) { SIGADDSET(ps->ps_sigignore, i); - SIGADDSET(ps->ps_sigintr, i); } } mtx_unlock(&ps->ps_mtx); @@ -936,10 +940,6 @@ sigdflt(struct sigacts *ps, int sig) SIGADDSET(ps->ps_sigignore, sig); ps->ps_sigact[_SIG_IDX(sig)] = SIG_DFL; SIGDELSET(ps->ps_siginfo, sig); - SIGADDSET(ps->ps_sigintr, sig); - SIGDELSET(ps->ps_sigonstack, sig); - SIGDELSET(ps->ps_sigreset, sig); - SIGDELSET(ps->ps_signodefer, sig); } /* From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 16:40:32 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 52A71C53; Sun, 24 Aug 2014 16:40:32 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3E01D3D58; Sun, 24 Aug 2014 16:40:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OGeVtv003080; Sun, 24 Aug 2014 16:40:31 GMT (envelope-from dteske@FreeBSD.org) Received: (from dteske@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OGeVFa003079; Sun, 24 Aug 2014 16:40:31 GMT (envelope-from dteske@FreeBSD.org) Message-Id: <201408241640.s7OGeVFa003079@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dteske set sender to dteske@FreeBSD.org using -f From: Devin Teske Date: Sun, 24 Aug 2014 16:40:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270505 - head/usr.sbin/bsdconfig/share X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 16:40:32 -0000 Author: dteske Date: Sun Aug 24 16:40:31 2014 New Revision: 270505 URL: http://svnweb.freebsd.org/changeset/base/270505 Log: Optimize f_which() to be slightly faster still. Modified: head/usr.sbin/bsdconfig/share/common.subr Modified: head/usr.sbin/bsdconfig/share/common.subr ============================================================================== --- head/usr.sbin/bsdconfig/share/common.subr Sun Aug 24 16:37:50 2014 (r270504) +++ head/usr.sbin/bsdconfig/share/common.subr Sun Aug 24 16:40:31 2014 (r270505) @@ -263,10 +263,10 @@ f_which() { local __name="$1" __var_to_set="$2" case "$__name" in */*|'') return $FAILURE; esac - local __p IFS=":" __found= + local __p __exec IFS=":" __found= for __p in $PATH; do - local __exec="$__p/$__name" - [ -f "$__exec" -a -x "$__exec" ] && __found=1 && break + __exec="$__p/$__name" + [ -f "$__exec" -a -x "$__exec" ] && __found=1 break done if [ "$__found" ]; then if [ "$__var_to_set" ]; then From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 17:02:27 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id CA947F42; Sun, 24 Aug 2014 17:02:27 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B5CF3300A; Sun, 24 Aug 2014 17:02:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OH2RVc016155; Sun, 24 Aug 2014 17:02:27 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OH2RGA016154; Sun, 24 Aug 2014 17:02:27 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201408241702.s7OH2RGA016154@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Sun, 24 Aug 2014 17:02:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270506 - head/lib/libproc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 17:02:27 -0000 Author: markj Date: Sun Aug 24 17:02:27 2014 New Revision: 270506 URL: http://svnweb.freebsd.org/changeset/base/270506 Log: Fix a bug in r265255: only return NULL if the requested map wasn't found. Submitted by: Luke Chang-Hsien Tsai MFC after: 1 week Modified: head/lib/libproc/proc_sym.c Modified: head/lib/libproc/proc_sym.c ============================================================================== --- head/lib/libproc/proc_sym.c Sun Aug 24 16:40:31 2014 (r270505) +++ head/lib/libproc/proc_sym.c Sun Aug 24 17:02:27 2014 (r270506) @@ -121,10 +121,12 @@ proc_obj2map(struct proc_handle *p, cons break; } } - if (rdl == NULL && strcmp(objname, "a.out") == 0 && p->rdexec != NULL) - rdl = p->rdexec; - else - return (NULL); + if (rdl == NULL) { + if (strcmp(objname, "a.out") == 0 && p->rdexec != NULL) + rdl = p->rdexec; + else + return (NULL); + } if ((map = malloc(sizeof(*map))) == NULL) return (NULL); From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 17:03:52 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id DE9EE21E; Sun, 24 Aug 2014 17:03:52 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C9FDA301B; Sun, 24 Aug 2014 17:03:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OH3qXs016488; Sun, 24 Aug 2014 17:03:52 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OH3qSq016487; Sun, 24 Aug 2014 17:03:52 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201408241703.s7OH3qSq016487@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Sun, 24 Aug 2014 17:03:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270507 - head/sys/fs/autofs X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 17:03:53 -0000 Author: trasz Date: Sun Aug 24 17:03:52 2014 New Revision: 270507 URL: http://svnweb.freebsd.org/changeset/base/270507 Log: Fix bug that, assuming a/ is a root of NFS filesystem mounted on autofs, prevented "mv a/from a/to" from working, while "cd a && mv from to" was ok. PR: 192948 MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Modified: head/sys/fs/autofs/autofs_vnops.c Modified: head/sys/fs/autofs/autofs_vnops.c ============================================================================== --- head/sys/fs/autofs/autofs_vnops.c Sun Aug 24 17:02:27 2014 (r270506) +++ head/sys/fs/autofs/autofs_vnops.c Sun Aug 24 17:03:52 2014 (r270507) @@ -276,9 +276,6 @@ autofs_lookup(struct vop_lookup_args *ap } } - if (cnp->cn_nameiop == RENAME) - return (EOPNOTSUPP); - AUTOFS_LOCK(amp); error = autofs_node_find(anp, cnp->cn_nameptr, cnp->cn_namelen, &child); if (error != 0) { From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 17:10:48 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 5AF9E8A3; Sun, 24 Aug 2014 17:10:48 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4725D3072; Sun, 24 Aug 2014 17:10:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OHAmke020175; Sun, 24 Aug 2014 17:10:48 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OHAmnr020174; Sun, 24 Aug 2014 17:10:48 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201408241710.s7OHAmnr020174@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Sun, 24 Aug 2014 17:10:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270508 - head/sys/cddl/dev/fbt X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 17:10:48 -0000 Author: markj Date: Sun Aug 24 17:10:47 2014 New Revision: 270508 URL: http://svnweb.freebsd.org/changeset/base/270508 Log: Restore the correct value when disabling probes. Otherwise the instrumented tracepoints would continue to generate traps, which would be ignored but could consume noticeable amounts of CPU if, say, all functions in the kernel were instrumented. X-MFC-With: r270067 Modified: head/sys/cddl/dev/fbt/fbt.c Modified: head/sys/cddl/dev/fbt/fbt.c ============================================================================== --- head/sys/cddl/dev/fbt/fbt.c Sun Aug 24 17:03:52 2014 (r270507) +++ head/sys/cddl/dev/fbt/fbt.c Sun Aug 24 17:10:47 2014 (r270508) @@ -121,7 +121,7 @@ fbt_doubletrap(void) fbt = fbt_probetab[i]; for (; fbt != NULL; fbt = fbt->fbtp_next) - *fbt->fbtp_patchpoint = fbt->fbtp_savedval; + fbt_patch_tracepoint(fbt, fbt->fbtp_savedval); } } @@ -253,7 +253,7 @@ fbt_disable(void *arg, dtrace_id_t id, v return; for (; fbt != NULL; fbt = fbt->fbtp_next) - fbt_patch_tracepoint(fbt, fbt->fbtp_patchval); + fbt_patch_tracepoint(fbt, fbt->fbtp_savedval); } static void @@ -268,7 +268,7 @@ fbt_suspend(void *arg, dtrace_id_t id, v return; for (; fbt != NULL; fbt = fbt->fbtp_next) - fbt_patch_tracepoint(fbt, fbt->fbtp_patchval); + fbt_patch_tracepoint(fbt, fbt->fbtp_savedval); } static void From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 19:31:27 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 19F1CA7A; Sun, 24 Aug 2014 19:31:27 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DF7DC3CB7; Sun, 24 Aug 2014 19:31:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OJVQTu089374; Sun, 24 Aug 2014 19:31:26 GMT (envelope-from bryanv@FreeBSD.org) Received: (from bryanv@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OJVQve089373; Sun, 24 Aug 2014 19:31:26 GMT (envelope-from bryanv@FreeBSD.org) Message-Id: <201408241931.s7OJVQve089373@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bryanv set sender to bryanv@FreeBSD.org using -f From: Bryan Venteicher Date: Sun, 24 Aug 2014 19:31:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270509 - stable/10/sys/dev/virtio/network X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 19:31:27 -0000 Author: bryanv Date: Sun Aug 24 19:31:26 2014 New Revision: 270509 URL: http://svnweb.freebsd.org/changeset/base/270509 Log: MFC r270063 (vtnet) The vtnet changes were not originally merged in r270252 since r268480 and r268481 had not been MFC'ed. Modified: stable/10/sys/dev/virtio/network/if_vtnet.c Modified: stable/10/sys/dev/virtio/network/if_vtnet.c ============================================================================== --- stable/10/sys/dev/virtio/network/if_vtnet.c Sun Aug 24 17:10:47 2014 (r270508) +++ stable/10/sys/dev/virtio/network/if_vtnet.c Sun Aug 24 19:31:26 2014 (r270509) @@ -287,6 +287,10 @@ static device_method_t vtnet_methods[] = DEVMETHOD_END }; +#ifdef DEV_NETMAP +#include +#endif /* DEV_NETMAP */ + static driver_t vtnet_driver = { "vtnet", vtnet_methods, @@ -393,6 +397,10 @@ vtnet_attach(device_t dev) goto fail; } +#ifdef DEV_NETMAP + vtnet_netmap_attach(sc); +#endif /* DEV_NETMAP */ + vtnet_start_taskqueues(sc); fail: @@ -422,6 +430,10 @@ vtnet_detach(device_t dev) ether_ifdetach(ifp); } +#ifdef DEV_NETMAP + netmap_detach(ifp); +#endif /* DEV_NETMAP */ + vtnet_free_taskqueues(sc); if (sc->vtnet_vlan_attach != NULL) { @@ -1733,6 +1745,12 @@ vtnet_rxq_eof(struct vtnet_rxq *rxq) VTNET_RXQ_LOCK_ASSERT(rxq); +#ifdef DEV_NETMAP + if (netmap_rx_irq(ifp, 0, &deq)) { + return (FALSE); + } +#endif /* DEV_NETMAP */ + while (count-- > 0) { m = virtqueue_dequeue(vq, &len); if (m == NULL) @@ -2419,6 +2437,13 @@ vtnet_txq_eof(struct vtnet_txq *txq) deq = 0; VTNET_TXQ_LOCK_ASSERT(txq); +#ifdef DEV_NETMAP + if (netmap_tx_irq(txq->vtntx_sc->vtnet_ifp, txq->vtntx_id)) { + virtqueue_disable_intr(vq); // XXX luigi + return 0; // XXX or 1 ? + } +#endif /* DEV_NETMAP */ + while ((txhdr = virtqueue_dequeue(vq, NULL)) != NULL) { m = txhdr->vth_mbuf; deq++; @@ -2893,6 +2918,11 @@ vtnet_init_rx_queues(struct vtnet_softc ("%s: too many rx mbufs %d for %d segments", __func__, sc->vtnet_rx_nmbufs, sc->vtnet_rx_nsegs)); +#ifdef DEV_NETMAP + if (vtnet_netmap_init_rx_buffers(sc)) + return 0; +#endif /* DEV_NETMAP */ + for (i = 0; i < sc->vtnet_act_vq_pairs; i++) { rxq = &sc->vtnet_rxqs[i]; @@ -3045,6 +3075,13 @@ vtnet_init(void *xsc) sc = xsc; +#ifdef DEV_NETMAP + if (!NA(sc->vtnet_ifp)) { + D("try to attach again"); + vtnet_netmap_attach(sc); + } +#endif /* DEV_NETMAP */ + VTNET_CORE_LOCK(sc); vtnet_init_locked(sc); VTNET_CORE_UNLOCK(sc); From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 21:21:55 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 2A25F685; Sun, 24 Aug 2014 21:21:55 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 142523686; Sun, 24 Aug 2014 21:21:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7OLLsYx040522; Sun, 24 Aug 2014 21:21:54 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7OLLsM5040521; Sun, 24 Aug 2014 21:21:54 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <201408242121.s7OLLsM5040521@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Sun, 24 Aug 2014 21:21:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270510 - head X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 21:21:55 -0000 Author: truckman Date: Sun Aug 24 21:21:54 2014 New Revision: 270510 URL: http://svnweb.freebsd.org/changeset/base/270510 Log: Catch up to gcc 3.3 -> 3.4 upgrade. MFC after: 3 days Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Sun Aug 24 19:31:26 2014 (r270509) +++ head/ObsoleteFiles.inc Sun Aug 24 21:21:54 2014 (r270510) @@ -3205,6 +3205,202 @@ OLD_FILES+=lib/geom/geom_concat.so.1 OLD_FILES+=lib/geom/geom_label.so.1 OLD_FILES+=lib/geom/geom_nop.so.1 OLD_FILES+=lib/geom/geom_stripe.so.1 +# 20040728: GCC 3.4.2 +OLD_DIRS+=usr/include/c++/3.3 +OLD_FILES+=usr/include/c++/3.3/FlexLexer.h +OLD_FILES+=usr/include/c++/3.3/algorithm +OLD_FILES+=usr/include/c++/3.3/backward/algo.h +OLD_FILES+=usr/include/c++/3.3/backward/algobase.h +OLD_FILES+=usr/include/c++/3.3/backward/alloc.h +OLD_FILES+=usr/include/c++/3.3/backward/backward_warning.h +OLD_FILES+=usr/include/c++/3.3/backward/bvector.h +OLD_FILES+=usr/include/c++/3.3/backward/complex.h +OLD_FILES+=usr/include/c++/3.3/backward/defalloc.h +OLD_FILES+=usr/include/c++/3.3/backward/deque.h +OLD_FILES+=usr/include/c++/3.3/backward/fstream.h +OLD_FILES+=usr/include/c++/3.3/backward/function.h +OLD_FILES+=usr/include/c++/3.3/backward/hash_map.h +OLD_FILES+=usr/include/c++/3.3/backward/hash_set.h +OLD_FILES+=usr/include/c++/3.3/backward/hashtable.h +OLD_FILES+=usr/include/c++/3.3/backward/heap.h +OLD_FILES+=usr/include/c++/3.3/backward/iomanip.h +OLD_FILES+=usr/include/c++/3.3/backward/iostream.h +OLD_FILES+=usr/include/c++/3.3/backward/istream.h +OLD_FILES+=usr/include/c++/3.3/backward/iterator.h +OLD_FILES+=usr/include/c++/3.3/backward/list.h +OLD_FILES+=usr/include/c++/3.3/backward/map.h +OLD_FILES+=usr/include/c++/3.3/backward/multimap.h +OLD_FILES+=usr/include/c++/3.3/backward/multiset.h +OLD_FILES+=usr/include/c++/3.3/backward/new.h +OLD_FILES+=usr/include/c++/3.3/backward/ostream.h +OLD_FILES+=usr/include/c++/3.3/backward/pair.h +OLD_FILES+=usr/include/c++/3.3/backward/queue.h +OLD_FILES+=usr/include/c++/3.3/backward/rope.h +OLD_FILES+=usr/include/c++/3.3/backward/set.h +OLD_FILES+=usr/include/c++/3.3/backward/slist.h +OLD_FILES+=usr/include/c++/3.3/backward/stack.h +OLD_FILES+=usr/include/c++/3.3/backward/stream.h +OLD_FILES+=usr/include/c++/3.3/backward/streambuf.h +OLD_FILES+=usr/include/c++/3.3/backward/strstream +OLD_FILES+=usr/include/c++/3.3/backward/strstream.h +OLD_FILES+=usr/include/c++/3.3/backward/tempbuf.h +OLD_FILES+=usr/include/c++/3.3/backward/tree.h +OLD_FILES+=usr/include/c++/3.3/backward/vector.h +OLD_DIRS+=usr/include/c++/3.3/backward +OLD_FILES+=usr/include/c++/3.3/bits/atomicity.h +OLD_FILES+=usr/include/c++/3.3/bits/basic_file.h +OLD_FILES+=usr/include/c++/3.3/bits/basic_ios.h +OLD_FILES+=usr/include/c++/3.3/bits/basic_ios.tcc +OLD_FILES+=usr/include/c++/3.3/bits/basic_string.h +OLD_FILES+=usr/include/c++/3.3/bits/basic_string.tcc +OLD_FILES+=usr/include/c++/3.3/bits/boost_concept_check.h +OLD_FILES+=usr/include/c++/3.3/bits/c++config.h +OLD_FILES+=usr/include/c++/3.3/bits/c++io.h +OLD_FILES+=usr/include/c++/3.3/bits/c++locale.h +OLD_FILES+=usr/include/c++/3.3/bits/c++locale_internal.h +OLD_FILES+=usr/include/c++/3.3/bits/char_traits.h +OLD_FILES+=usr/include/c++/3.3/bits/cmath.tcc +OLD_FILES+=usr/include/c++/3.3/bits/codecvt.h +OLD_FILES+=usr/include/c++/3.3/bits/codecvt_specializations.h +OLD_FILES+=usr/include/c++/3.3/bits/concept_check.h +OLD_FILES+=usr/include/c++/3.3/bits/cpp_type_traits.h +OLD_FILES+=usr/include/c++/3.3/bits/ctype_base.h +OLD_FILES+=usr/include/c++/3.3/bits/ctype_inline.h +OLD_FILES+=usr/include/c++/3.3/bits/ctype_noninline.h +OLD_FILES+=usr/include/c++/3.3/bits/deque.tcc +OLD_FILES+=usr/include/c++/3.3/bits/fpos.h +OLD_FILES+=usr/include/c++/3.3/bits/fstream.tcc +OLD_FILES+=usr/include/c++/3.3/bits/functexcept.h +OLD_FILES+=usr/include/c++/3.3/bits/generic_shadow.h +OLD_FILES+=usr/include/c++/3.3/bits/gslice.h +OLD_FILES+=usr/include/c++/3.3/bits/gslice_array.h +OLD_FILES+=usr/include/c++/3.3/bits/gthr-default.h +OLD_FILES+=usr/include/c++/3.3/bits/gthr-posix.h +OLD_FILES+=usr/include/c++/3.3/bits/gthr-single.h +OLD_FILES+=usr/include/c++/3.3/bits/gthr.h +OLD_FILES+=usr/include/c++/3.3/bits/indirect_array.h +OLD_FILES+=usr/include/c++/3.3/bits/ios_base.h +OLD_FILES+=usr/include/c++/3.3/bits/istream.tcc +OLD_FILES+=usr/include/c++/3.3/bits/list.tcc +OLD_FILES+=usr/include/c++/3.3/bits/locale_classes.h +OLD_FILES+=usr/include/c++/3.3/bits/locale_facets.h +OLD_FILES+=usr/include/c++/3.3/bits/locale_facets.tcc +OLD_FILES+=usr/include/c++/3.3/bits/localefwd.h +OLD_FILES+=usr/include/c++/3.3/bits/mask_array.h +OLD_FILES+=usr/include/c++/3.3/bits/messages_members.h +OLD_FILES+=usr/include/c++/3.3/bits/os_defines.h +OLD_FILES+=usr/include/c++/3.3/bits/ostream.tcc +OLD_FILES+=usr/include/c++/3.3/bits/pthread_allocimpl.h +OLD_FILES+=usr/include/c++/3.3/bits/slice.h +OLD_FILES+=usr/include/c++/3.3/bits/slice_array.h +OLD_FILES+=usr/include/c++/3.3/bits/sstream.tcc +OLD_FILES+=usr/include/c++/3.3/bits/stl_algo.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_algobase.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_alloc.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_bvector.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_construct.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_deque.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_function.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_heap.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_iterator.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_iterator_base_funcs.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_iterator_base_types.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_list.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_map.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_multimap.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_multiset.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_numeric.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_pair.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_pthread_alloc.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_queue.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_raw_storage_iter.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_relops.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_set.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_stack.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_tempbuf.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_threads.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_tree.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_uninitialized.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_vector.h +OLD_FILES+=usr/include/c++/3.3/bits/stream_iterator.h +OLD_FILES+=usr/include/c++/3.3/bits/streambuf.tcc +OLD_FILES+=usr/include/c++/3.3/bits/streambuf_iterator.h +OLD_FILES+=usr/include/c++/3.3/bits/stringfwd.h +OLD_FILES+=usr/include/c++/3.3/bits/time_members.h +OLD_FILES+=usr/include/c++/3.3/bits/type_traits.h +OLD_FILES+=usr/include/c++/3.3/bits/valarray_array.h +OLD_FILES+=usr/include/c++/3.3/bits/valarray_array.tcc +OLD_FILES+=usr/include/c++/3.3/bits/valarray_meta.h +OLD_FILES+=usr/include/c++/3.3/bits/vector.tcc +OLD_DIRS+=usr/include/c++/3.3/bits +OLD_FILES+=usr/include/c++/3.3/bitset +OLD_FILES+=usr/include/c++/3.3/cassert +OLD_FILES+=usr/include/c++/3.3/cctype +OLD_FILES+=usr/include/c++/3.3/cerrno +OLD_FILES+=usr/include/c++/3.3/cfloat +OLD_FILES+=usr/include/c++/3.3/ciso646 +OLD_FILES+=usr/include/c++/3.3/climits +OLD_FILES+=usr/include/c++/3.3/clocale +OLD_FILES+=usr/include/c++/3.3/cmath +OLD_FILES+=usr/include/c++/3.3/complex +OLD_FILES+=usr/include/c++/3.3/csetjmp +OLD_FILES+=usr/include/c++/3.3/csignal +OLD_FILES+=usr/include/c++/3.3/cstdarg +OLD_FILES+=usr/include/c++/3.3/cstddef +OLD_FILES+=usr/include/c++/3.3/cstdio +OLD_FILES+=usr/include/c++/3.3/cstdlib +OLD_FILES+=usr/include/c++/3.3/cstring +OLD_FILES+=usr/include/c++/3.3/ctime +OLD_FILES+=usr/include/c++/3.3/cwchar +OLD_FILES+=usr/include/c++/3.3/cwctype +OLD_FILES+=usr/include/c++/3.3/cxxabi.h +OLD_FILES+=usr/include/c++/3.3/deque +OLD_FILES+=usr/include/c++/3.3/exception +OLD_FILES+=usr/include/c++/3.3/exception_defines.h +OLD_FILES+=usr/include/c++/3.3/ext/algorithm +OLD_FILES+=usr/include/c++/3.3/ext/enc_filebuf.h +OLD_FILES+=usr/include/c++/3.3/ext/functional +OLD_FILES+=usr/include/c++/3.3/ext/hash_map +OLD_FILES+=usr/include/c++/3.3/ext/hash_set +OLD_FILES+=usr/include/c++/3.3/ext/iterator +OLD_FILES+=usr/include/c++/3.3/ext/memory +OLD_FILES+=usr/include/c++/3.3/ext/numeric +OLD_FILES+=usr/include/c++/3.3/ext/rb_tree +OLD_FILES+=usr/include/c++/3.3/ext/rope +OLD_FILES+=usr/include/c++/3.3/ext/ropeimpl.h +OLD_FILES+=usr/include/c++/3.3/ext/slist +OLD_FILES+=usr/include/c++/3.3/ext/stdio_filebuf.h +OLD_FILES+=usr/include/c++/3.3/ext/stl_hash_fun.h +OLD_FILES+=usr/include/c++/3.3/ext/stl_hashtable.h +OLD_FILES+=usr/include/c++/3.3/ext/stl_rope.h +OLD_DIRS+=usr/include/c++/3.3/ext +OLD_FILES+=usr/include/c++/3.3/fstream +OLD_FILES+=usr/include/c++/3.3/functional +OLD_FILES+=usr/include/c++/3.3/iomanip +OLD_FILES+=usr/include/c++/3.3/ios +OLD_FILES+=usr/include/c++/3.3/iosfwd +OLD_FILES+=usr/include/c++/3.3/iostream +OLD_FILES+=usr/include/c++/3.3/istream +OLD_FILES+=usr/include/c++/3.3/iterator +OLD_FILES+=usr/include/c++/3.3/limits +OLD_FILES+=usr/include/c++/3.3/list +OLD_FILES+=usr/include/c++/3.3/locale +OLD_FILES+=usr/include/c++/3.3/map +OLD_FILES+=usr/include/c++/3.3/memory +OLD_FILES+=usr/include/c++/3.3/new +OLD_FILES+=usr/include/c++/3.3/numeric +OLD_FILES+=usr/include/c++/3.3/ostream +OLD_FILES+=usr/include/c++/3.3/queue +OLD_FILES+=usr/include/c++/3.3/set +OLD_FILES+=usr/include/c++/3.3/sstream +OLD_FILES+=usr/include/c++/3.3/stack +OLD_FILES+=usr/include/c++/3.3/stdexcept +OLD_FILES+=usr/include/c++/3.3/streambuf +OLD_FILES+=usr/include/c++/3.3/string +OLD_FILES+=usr/include/c++/3.3/typeinfo +OLD_FILES+=usr/include/c++/3.3/utility +OLD_FILES+=usr/include/c++/3.3/valarray +OLD_FILES+=usr/include/c++/3.3/vector # 20040713: fla(4) removed. OLD_FILES+=usr/share/man/man4/fla.4.gz # 200407XX From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 21:44:28 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 0DA10E08; Sun, 24 Aug 2014 21:44:28 +0000 (UTC) Received: from smtp2.wemm.org (smtp2.wemm.org [IPv6:2001:470:67:39d::78]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "smtp2.wemm.org", Issuer "StartCom Class 1 Primary Intermediate Server CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id DB7E5381A; Sun, 24 Aug 2014 21:44:27 +0000 (UTC) Received: from overcee.wemm.org (canning.wemm.org [192.203.228.65]) by smtp2.wemm.org (Postfix) with ESMTP id 0ED39B7E; Sun, 24 Aug 2014 14:44:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wemm.org; s=m20140428; t=1408916667; bh=CGcy66DNmHAY6fxpkbpCjQlnWyMna5rxE38cwVTyisk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=YN740VtzN+FVmdrulaqAS6IWJgOpAwXDPOe0xj3+EM59HogLM0fl2i7/qQo+TXnNG aJGEE7lEGQF/R5GMiSvySSEWMCys/uGiiEHicOtjPnm3hfeI5glJUfUSZJam1EpqUA 6a9pp8YTKHOXWMTjmqspqG5oZHCScze/cX4qMCzw= From: Peter Wemm To: Don Lewis Subject: Re: svn commit: r270510 - head Date: Sun, 24 Aug 2014 14:44:14 -0700 Message-ID: <3882195.X6IdkQZdGy@overcee.wemm.org> User-Agent: KMail/4.12.5 (FreeBSD/11.0-CURRENT; KDE/4.12.5; amd64; ; ) In-Reply-To: <201408242121.s7OLLsM5040521@svn.freebsd.org> References: <201408242121.s7OLLsM5040521@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart2207103.cW1An2ZUTm"; micalg="pgp-sha1"; protocol="application/pgp-signature" Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 21:44:28 -0000 --nextPart2207103.cW1An2ZUTm Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="us-ascii" On Sunday 24 August 2014 21:21:54 Don Lewis wrote: > Author: truckman > Date: Sun Aug 24 21:21:54 2014 > New Revision: 270510 > URL: http://svnweb.freebsd.org/changeset/base/270510 >=20 > Log: > Catch up to gcc 3.3 -> 3.4 upgrade. >=20 > MFC after:=093 days >=20 > Modified: > head/ObsoleteFiles.inc >=20 > Modified: head/ObsoleteFiles.inc > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > =3D=3D --- head/ObsoleteFiles.inc=09Sun Aug 24 19:31:26 2014=09(r2705= 09) > +++ head/ObsoleteFiles.inc=09Sun Aug 24 21:21:54 2014=09(r270510) > @@ -3205,6 +3205,202 @@ OLD_FILES+=3Dlib/geom/geom_concat.so.1 > OLD_FILES+=3Dlib/geom/geom_label.so.1 > OLD_FILES+=3Dlib/geom/geom_nop.so.1 > OLD_FILES+=3Dlib/geom/geom_stripe.so.1 > +# 20040728: GCC 3.4.2 > +OLD_DIRS+=3Dusr/include/c++/3.3 > +OLD_FILES+=3Dusr/include/c++/3.3/FlexLexer.h > +OLD_FILES+=3Dusr/include/c++/3.3/algorithm > +OLD_FILES+=3Dusr/include/c++/3.3/backward/algo.h I suspect that there's a story here that needs to be told.. =2D-=20 Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com; KI= 6FJV UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246 --nextPart2207103.cW1An2ZUTm Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAABAgAGBQJT+ly6AAoJEDXWlwnsgJ4EFwkH/282ir+f2l4UX0IrQkBqZqut t+705rjzAvWHr7v0VmGxBuDoiakR5POkvrVU6ypZde55FwU8xeahs3Pt/haQdtMX ANZKCKvR53s/T3++A1eMIHqHq2JEboxgveLO10s5bUlVVm5HWzBxONS8mnHraY5l /BFEyTFWDnOt/2iOeVd9AD9IrzAhaICyYfigx3riYPCLfPfKDfHIMzAS4JWaG0fb 4lcFOvpub597pneQbldJ3NwZfldoE85NFEDTXDeIS2Yy40swFNUxyQyXMrkkhsj2 DN+dzTvt2ReyCcg3eQV/IP+5LzQF/lWuAu6pALFLQChIZeneKyxndf/tm54BbDw= =x0ZT -----END PGP SIGNATURE----- --nextPart2207103.cW1An2ZUTm-- From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 22:44:09 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 2F112AAE; Sun, 24 Aug 2014 22:44:09 +0000 (UTC) Received: from gw.catspoiler.org (cl-1657.chi-02.us.sixxs.net [IPv6:2001:4978:f:678::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C9C2F3C8E; Sun, 24 Aug 2014 22:44:08 +0000 (UTC) Received: from FreeBSD.org (mousie.catspoiler.org [192.168.101.2]) by gw.catspoiler.org (8.13.3/8.13.3) with ESMTP id s7OMhupO056134; Sun, 24 Aug 2014 15:44:01 -0700 (PDT) (envelope-from truckman@FreeBSD.org) Message-Id: <201408242244.s7OMhupO056134@gw.catspoiler.org> Date: Sun, 24 Aug 2014 15:43:56 -0700 (PDT) From: Don Lewis Subject: Re: svn commit: r270510 - head To: peter@wemm.org In-Reply-To: <3882195.X6IdkQZdGy@overcee.wemm.org> MIME-Version: 1.0 Content-Type: TEXT/plain; charset=us-ascii Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 22:44:09 -0000 On 24 Aug, Peter Wemm wrote: > On Sunday 24 August 2014 21:21:54 Don Lewis wrote: >> Author: truckman >> Date: Sun Aug 24 21:21:54 2014 >> New Revision: 270510 >> URL: http://svnweb.freebsd.org/changeset/base/270510 >> >> Log: >> Catch up to gcc 3.3 -> 3.4 upgrade. >> >> MFC after: 3 days >> >> Modified: >> head/ObsoleteFiles.inc >> >> Modified: head/ObsoleteFiles.inc >> ============================================================================ >> == --- head/ObsoleteFiles.inc Sun Aug 24 19:31:26 2014 (r270509) >> +++ head/ObsoleteFiles.inc Sun Aug 24 21:21:54 2014 (r270510) >> @@ -3205,6 +3205,202 @@ OLD_FILES+=lib/geom/geom_concat.so.1 >> OLD_FILES+=lib/geom/geom_label.so.1 >> OLD_FILES+=lib/geom/geom_nop.so.1 >> OLD_FILES+=lib/geom/geom_stripe.so.1 >> +# 20040728: GCC 3.4.2 >> +OLD_DIRS+=usr/include/c++/3.3 >> +OLD_FILES+=usr/include/c++/3.3/FlexLexer.h >> +OLD_FILES+=usr/include/c++/3.3/algorithm >> +OLD_FILES+=usr/include/c++/3.3/backward/algo.h > > I suspect that there's a story here that needs to be told.. It's just a machine that's been tracking HEAD for a very long time with just source upgrades. It's been through a few dump/restore hdd upgrades and had a few motherboard replacements during that time. It's getting to be about due again. I think it first came to life as a cloned copy of my original home FreeBSD machine which did get a full reinstall at one point. I just noticed this today while debugging a #include_next emulation issue in devel/boost. From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 22:44:36 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id C9F4FBF0; Sun, 24 Aug 2014 22:44:36 +0000 (UTC) Received: from felyko.com (felyko.com [65.49.80.26]) by mx1.freebsd.org (Postfix) with ESMTP id B11293C99; Sun, 24 Aug 2014 22:44:36 +0000 (UTC) Received: from fukuyama.hsd1.ca.comcast.net (unknown [73.162.13.215]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by felyko.com (Postfix) with ESMTPSA id 2C1D334AAC7; Sun, 24 Aug 2014 15:44:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=felyko.com; s=mail; t=1408920270; bh=9sRuHY6+6KElm5l8tOgUNiCeFlZ15F2Nu0TKmehelcw=; h=Subject:From:In-Reply-To:Date:Cc:References:To; b=L70Uc9hMNgc5Gw71Gdg2TJKFyef4SXiJmlEn2Soi8+dyWDxiP47z6Ky0UdFfeNFUD aduNtrghwcevUao1n9RhLwK+BJ/WDk9u5vaHN5llnkID2rCnL6Y9OtLtqypIC+jYAB l/eM+d7YVHIyGRXwGig463MBgHAnsMc1xTJ6SLf0= Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 8.0 \(1973.6\)) Subject: Re: svn commit: r270510 - head From: Rui Paulo In-Reply-To: <3882195.X6IdkQZdGy@overcee.wemm.org> Date: Sun, 24 Aug 2014 15:44:29 -0700 Content-Transfer-Encoding: quoted-printable Message-Id: <61DA1EC8-C938-4AB8-B518-7249307B4379@felyko.com> References: <201408242121.s7OLLsM5040521@svn.freebsd.org> <3882195.X6IdkQZdGy@overcee.wemm.org> To: Peter Wemm X-Mailer: Apple Mail (2.1973.6) Cc: svn-src-head@freebsd.org, Don Lewis , src-committers@freebsd.org, svn-src-all@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 22:44:36 -0000 On Aug 24, 2014, at 14:44, Peter Wemm wrote: >=20 > On Sunday 24 August 2014 21:21:54 Don Lewis wrote: >> Author: truckman >> Date: Sun Aug 24 21:21:54 2014 >> New Revision: 270510 >> URL: http://svnweb.freebsd.org/changeset/base/270510 >>=20 >> Log: >> Catch up to gcc 3.3 -> 3.4 upgrade. >>=20 >> MFC after: 3 days >>=20 >> Modified: >> head/ObsoleteFiles.inc >>=20 >> Modified: head/ObsoleteFiles.inc >> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D >> =3D=3D --- head/ObsoleteFiles.inc Sun Aug 24 19:31:26 2014 = (r270509) >> +++ head/ObsoleteFiles.inc Sun Aug 24 21:21:54 2014 = (r270510) >> @@ -3205,6 +3205,202 @@ OLD_FILES+=3Dlib/geom/geom_concat.so.1 >> OLD_FILES+=3Dlib/geom/geom_label.so.1 >> OLD_FILES+=3Dlib/geom/geom_nop.so.1 >> OLD_FILES+=3Dlib/geom/geom_stripe.so.1 >> +# 20040728: GCC 3.4.2 >> +OLD_DIRS+=3Dusr/include/c++/3.3 >> +OLD_FILES+=3Dusr/include/c++/3.3/FlexLexer.h >> +OLD_FILES+=3Dusr/include/c++/3.3/algorithm >> +OLD_FILES+=3Dusr/include/c++/3.3/backward/algo.h >=20 > I suspect that there's a story here that needs to be told.. Yes, if it hasn't been a problem in 10 years, why do it now? -- Rui Paulo From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 23:01:38 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id BA93FFB2; Sun, 24 Aug 2014 23:01:38 +0000 (UTC) Received: from gw.catspoiler.org (cl-1657.chi-02.us.sixxs.net [IPv6:2001:4978:f:678::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 61D293E39; Sun, 24 Aug 2014 23:01:38 +0000 (UTC) Received: from FreeBSD.org (mousie.catspoiler.org [192.168.101.2]) by gw.catspoiler.org (8.13.3/8.13.3) with ESMTP id s7ON1N51056169; Sun, 24 Aug 2014 16:01:27 -0700 (PDT) (envelope-from truckman@FreeBSD.org) Message-Id: <201408242301.s7ON1N51056169@gw.catspoiler.org> Date: Sun, 24 Aug 2014 16:01:23 -0700 (PDT) From: Don Lewis Subject: Re: svn commit: r270510 - head To: rpaulo@felyko.com In-Reply-To: <61DA1EC8-C938-4AB8-B518-7249307B4379@felyko.com> MIME-Version: 1.0 Content-Type: TEXT/plain; charset=us-ascii Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, peter@wemm.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 23:01:38 -0000 On 24 Aug, Rui Paulo wrote: > On Aug 24, 2014, at 14:44, Peter Wemm wrote: >> >> On Sunday 24 August 2014 21:21:54 Don Lewis wrote: >>> Author: truckman >>> Date: Sun Aug 24 21:21:54 2014 >>> New Revision: 270510 >>> URL: http://svnweb.freebsd.org/changeset/base/270510 >>> >>> Log: >>> Catch up to gcc 3.3 -> 3.4 upgrade. >>> >>> MFC after: 3 days >>> >>> Modified: >>> head/ObsoleteFiles.inc >>> >>> Modified: head/ObsoleteFiles.inc >>> ============================================================================ >>> == --- head/ObsoleteFiles.inc Sun Aug 24 19:31:26 2014 (r270509) >>> +++ head/ObsoleteFiles.inc Sun Aug 24 21:21:54 2014 (r270510) >>> @@ -3205,6 +3205,202 @@ OLD_FILES+=lib/geom/geom_concat.so.1 >>> OLD_FILES+=lib/geom/geom_label.so.1 >>> OLD_FILES+=lib/geom/geom_nop.so.1 >>> OLD_FILES+=lib/geom/geom_stripe.so.1 >>> +# 20040728: GCC 3.4.2 >>> +OLD_DIRS+=usr/include/c++/3.3 >>> +OLD_FILES+=usr/include/c++/3.3/FlexLexer.h >>> +OLD_FILES+=usr/include/c++/3.3/algorithm >>> +OLD_FILES+=usr/include/c++/3.3/backward/algo.h >> >> I suspect that there's a story here that needs to be told.. > > Yes, if it hasn't been a problem in 10 years, why do it now? I found those leftovers on one of my machines. They are probably harmless cruft, but I thought a few other folks might be in the same situation. One could argue that older entries should eventually get pruned. We've got stuff in there dating back to 1996 ... From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 23:03:30 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 167643E1; Sun, 24 Aug 2014 23:03:30 +0000 (UTC) Received: from felyko.com (felyko.com [65.49.80.26]) by mx1.freebsd.org (Postfix) with ESMTP id F1D143E65; Sun, 24 Aug 2014 23:03:29 +0000 (UTC) Received: from fukuyama.hsd1.ca.comcast.net (unknown [73.162.13.215]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by felyko.com (Postfix) with ESMTPSA id 7B7C734A9E4; Sun, 24 Aug 2014 16:03:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=felyko.com; s=mail; t=1408921409; bh=uMxnKTOEPZGkqurr09njcf3TOf1GivJzakX1WG6gKQ0=; h=Subject:From:In-Reply-To:Date:Cc:References:To; b=IMMzLqwAQ2FFbgInec+ShfOM/VEA3+5xWf+f4wePhKD/oE/tWvNkvFnem7DMayLAH cXBFKqDMecqw8kQqRmMokO9pCA/F0wneotx/d74cgD+8GqyEe3vpwA37VpqI89PScu ZQJTSgRbWRNpHriUosObbJM2Diyyncay/D3zcNuU= Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 8.0 \(1973.6\)) Subject: Re: svn commit: r270510 - head From: Rui Paulo In-Reply-To: <201408242301.s7ON1N51056169@gw.catspoiler.org> Date: Sun, 24 Aug 2014 16:03:29 -0700 Content-Transfer-Encoding: quoted-printable Message-Id: <842FF7CC-4851-4F05-96B6-92BB8B3CF28E@felyko.com> References: <201408242301.s7ON1N51056169@gw.catspoiler.org> To: Don Lewis X-Mailer: Apple Mail (2.1973.6) Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, peter@wemm.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 23:03:30 -0000 On Aug 24, 2014, at 16:01, Don Lewis wrote: >=20 > On 24 Aug, Rui Paulo wrote: >> On Aug 24, 2014, at 14:44, Peter Wemm wrote: >>>=20 >>> On Sunday 24 August 2014 21:21:54 Don Lewis wrote: >>>> Author: truckman >>>> Date: Sun Aug 24 21:21:54 2014 >>>> New Revision: 270510 >>>> URL: http://svnweb.freebsd.org/changeset/base/270510 >>>>=20 >>>> Log: >>>> Catch up to gcc 3.3 -> 3.4 upgrade. >>>>=20 >>>> MFC after: 3 days >>>>=20 >>>> Modified: >>>> head/ObsoleteFiles.inc >>>>=20 >>>> Modified: head/ObsoleteFiles.inc >>>> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D >>>> =3D=3D --- head/ObsoleteFiles.inc Sun Aug 24 19:31:26 2014 = (r270509) >>>> +++ head/ObsoleteFiles.inc Sun Aug 24 21:21:54 2014 = (r270510) >>>> @@ -3205,6 +3205,202 @@ OLD_FILES+=3Dlib/geom/geom_concat.so.1 >>>> OLD_FILES+=3Dlib/geom/geom_label.so.1 >>>> OLD_FILES+=3Dlib/geom/geom_nop.so.1 >>>> OLD_FILES+=3Dlib/geom/geom_stripe.so.1 >>>> +# 20040728: GCC 3.4.2 >>>> +OLD_DIRS+=3Dusr/include/c++/3.3 >>>> +OLD_FILES+=3Dusr/include/c++/3.3/FlexLexer.h >>>> +OLD_FILES+=3Dusr/include/c++/3.3/algorithm >>>> +OLD_FILES+=3Dusr/include/c++/3.3/backward/algo.h >>>=20 >>> I suspect that there's a story here that needs to be told.. >>=20 >> Yes, if it hasn't been a problem in 10 years, why do it now? >=20 > I found those leftovers on one of my machines. They are probably > harmless cruft, but I thought a few other folks might be in the same > situation. >=20 > One could argue that older entries should eventually get pruned. = We've > got stuff in there dating back to 1996 ... Right. I don't think we have a policy on this, so I can't argue against = your change.=20 -- Rui Paulo From owner-svn-src-all@FreeBSD.ORG Sun Aug 24 23:08:21 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 23D175E5; Sun, 24 Aug 2014 23:08:21 +0000 (UTC) Received: from mail.soaustin.net (pancho.soaustin.net [76.74.250.40]) by mx1.freebsd.org (Postfix) with ESMTP id 037673E8D; Sun, 24 Aug 2014 23:08:20 +0000 (UTC) Received: by mail.soaustin.net (Postfix, from userid 502) id E48B156168; Sun, 24 Aug 2014 18:08:19 -0500 (CDT) Date: Sun, 24 Aug 2014 18:08:19 -0500 From: Mark Linimon To: Peter Wemm Subject: Re: svn commit: r270510 - head Message-ID: <20140824230819.GB10251@lonesome.com> References: <201408242121.s7OLLsM5040521@svn.freebsd.org> <3882195.X6IdkQZdGy@overcee.wemm.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <3882195.X6IdkQZdGy@overcee.wemm.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@freebsd.org, Don Lewis , src-committers@freebsd.org, svn-src-all@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2014 23:08:21 -0000 On Sun, Aug 24, 2014 at 02:44:14PM -0700, Peter Wemm wrote: > I suspect that there's a story here that needs to be told.. Pull the string! The story must be told! mcl From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 01:04:07 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id EE1612B6; Mon, 25 Aug 2014 01:04:07 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D9D8339F8; Mon, 25 Aug 2014 01:04:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7P147J8040288; Mon, 25 Aug 2014 01:04:07 GMT (envelope-from rodrigc@FreeBSD.org) Received: (from rodrigc@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7P147Si040287; Mon, 25 Aug 2014 01:04:07 GMT (envelope-from rodrigc@FreeBSD.org) Message-Id: <201408250104.s7P147Si040287@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rodrigc set sender to rodrigc@FreeBSD.org using -f From: Craig Rodrigues Date: Mon, 25 Aug 2014 01:04:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270512 - head/share/examples/bhyve X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 01:04:08 -0000 Author: rodrigc Date: Mon Aug 25 01:04:07 2014 New Revision: 270512 URL: http://svnweb.freebsd.org/changeset/base/270512 Log: Add comment which describes the exit status codes returned from /usr/sbin/bhyve. These are in src/usr.sbin/bhyve/bhyverun.c. Reviewed by: neel Modified: head/share/examples/bhyve/vmrun.sh Modified: head/share/examples/bhyve/vmrun.sh ============================================================================== --- head/share/examples/bhyve/vmrun.sh Mon Aug 25 00:58:20 2014 (r270511) +++ head/share/examples/bhyve/vmrun.sh Mon Aug 25 01:04:07 2014 (r270512) @@ -237,6 +237,14 @@ while [ 1 ]; do -l com1,${console} \ ${installer_opt} \ ${vmname} + + # bhyve returns the following status codes: + # 0 - VM has been reset + # 1 - VM has been powered off + # 2 - VM has been halted + # 3 - VM generated a triple fault + # all other non-zero status codes are errors + # if [ $? -ne 0 ]; then break fi From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 01:36:56 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id D880C697; Mon, 25 Aug 2014 01:36:56 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C41F13C3F; Mon, 25 Aug 2014 01:36:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7P1au1c060524; Mon, 25 Aug 2014 01:36:56 GMT (envelope-from rodrigc@FreeBSD.org) Received: (from rodrigc@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7P1audn060523; Mon, 25 Aug 2014 01:36:56 GMT (envelope-from rodrigc@FreeBSD.org) Message-Id: <201408250136.s7P1audn060523@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rodrigc set sender to rodrigc@FreeBSD.org using -f From: Craig Rodrigues Date: Mon, 25 Aug 2014 01:36:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270513 - head/share/examples/bhyve X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 01:36:57 -0000 Author: rodrigc Date: Mon Aug 25 01:36:56 2014 New Revision: 270513 URL: http://svnweb.freebsd.org/changeset/base/270513 Log: If the VM was reset via "/sbin/reboot" or "shutdown -r", then it is no longer necessary to "bhyvectl --destroy" the VM when it reboots. Move the "bhyvectl --destroy" outside of the while loop. Reviewed by: neel Modified: head/share/examples/bhyve/vmrun.sh Modified: head/share/examples/bhyve/vmrun.sh ============================================================================== --- head/share/examples/bhyve/vmrun.sh Mon Aug 25 01:04:07 2014 (r270512) +++ head/share/examples/bhyve/vmrun.sh Mon Aug 25 01:36:56 2014 (r270513) @@ -173,8 +173,9 @@ echo "Launching virtual machine \"$vmnam virtio_diskdev="$disk_dev0" +${BHYVECTL} --vm=${vmname} --destroy > /dev/null 2>&1 + while [ 1 ]; do - ${BHYVECTL} --vm=${vmname} --destroy > /dev/null 2>&1 file ${virtio_diskdev} | grep "boot sector" > /dev/null rc=$? From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 03:00:00 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id E90B44C8; Mon, 25 Aug 2014 02:59:59 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D394932BF; Mon, 25 Aug 2014 02:59:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7P2xx0C099765; Mon, 25 Aug 2014 02:59:59 GMT (envelope-from kevlo@FreeBSD.org) Received: (from kevlo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7P2xxn0099758; Mon, 25 Aug 2014 02:59:59 GMT (envelope-from kevlo@FreeBSD.org) Message-Id: <201408250259.s7P2xxn0099758@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kevlo set sender to kevlo@FreeBSD.org using -f From: Kevin Lo Date: Mon, 25 Aug 2014 02:59:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270514 - in stable/10: share/man/man4 sys/dev/usb sys/dev/usb/wlan X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 03:00:00 -0000 Author: kevlo Date: Mon Aug 25 02:59:58 2014 New Revision: 270514 URL: http://svnweb.freebsd.org/changeset/base/270514 Log: MFC r270165,r270191: - Sort ASUS section and add USB device ID of ASUS USB-AC51. - Add the D-Link DWA-125 rev D1. Modified: stable/10/share/man/man4/urtwn.4 stable/10/sys/dev/usb/usbdevs stable/10/sys/dev/usb/wlan/if_urtwn.c Directory Properties: stable/10/ (props changed) Modified: stable/10/share/man/man4/urtwn.4 ============================================================================== --- stable/10/share/man/man4/urtwn.4 Mon Aug 25 01:36:56 2014 (r270513) +++ stable/10/share/man/man4/urtwn.4 Mon Aug 25 02:59:58 2014 (r270514) @@ -88,6 +88,7 @@ IEEE 802.11b/g/n wireless network adapte .Bl -tag -width Ds -offset indent -compact .It ASUS USB-N10 NANO .It Belkin F7D1102 Surf Wireless Micro +.It D-Link DWA-125 rev D1 .It D-Link DWA-131 .It Edimax EW-7811Un .It Netgear WNA1000M Modified: stable/10/sys/dev/usb/usbdevs ============================================================================== --- stable/10/sys/dev/usb/usbdevs Mon Aug 25 01:36:56 2014 (r270513) +++ stable/10/sys/dev/usb/usbdevs Mon Aug 25 02:59:58 2014 (r270514) @@ -1173,6 +1173,7 @@ product ASIX AX88772B_1 0x7e2b AX88772B /* ASUS products */ product ASUS2 USBN11 0x0b05 USB-N11 +product ASUS RT2570 0x1706 RT2500USB Wireless Adapter product ASUS WL167G 0x1707 WL-167g Wireless Adapter product ASUS WL159G 0x170c WL-159g product ASUS A9T_WIFI 0x171b A9T wireless @@ -1186,17 +1187,17 @@ product ASUS RT2870_3 0x1742 RT2870 product ASUS RT2870_4 0x1760 RT2870 product ASUS RT2870_5 0x1761 RT2870 product ASUS USBN13 0x1784 USB-N13 -product ASUS RT3070_1 0x1790 RT3070 product ASUS USBN10 0x1786 USB-N10 +product ASUS RT3070_1 0x1790 RT3070 +product ASUS RTL8192SU 0x1791 RTL8192SU +product ASUS USB_N53 0x179d ASUS Black Diamond Dual Band USB-N53 product ASUS RTL8192CU 0x17ab RTL8192CU product ASUS USBN66 0x17ad USB-N66 product ASUS USBN10NANO 0x17ba USB-N10 Nano -product ASUS RTL8192SU 0x1791 RTL8192SU +product ASUS USBAC51 0x17d1 USB-AC51 product ASUS A730W 0x4202 ASUS MyPal A730W product ASUS P535 0x420f ASUS P535 PDA -product ASUS GMSC 0x422f ASUS Generic Mass Storage -product ASUS RT2570 0x1706 RT2500USB Wireless Adapter -product ASUS USB_N53 0x179d ASUS Black Diamond Dual Band USB-N53 +product ASUS GMSC 0x422f ASUS Generic Mass Storage /* ATen products */ product ATEN UC1284 0x2001 Parallel printer @@ -1591,6 +1592,7 @@ product DLINK DUBE100 0x1a00 10/100 Eth product DLINK DUBE100C1 0x1a02 DUB-E100 rev C1 product DLINK DSB650TX4 0x200c 10/100 Ethernet product DLINK DWL120E 0x3200 DWL-120 rev E +product DLINK DWA125D1 0x330f DWA-125 rev D1 product DLINK DWL122 0x3700 DWL-122 product DLINK DWLG120 0x3701 DWL-G120 product DLINK DWL120F 0x3702 DWL-120 rev F Modified: stable/10/sys/dev/usb/wlan/if_urtwn.c ============================================================================== --- stable/10/sys/dev/usb/wlan/if_urtwn.c Mon Aug 25 01:36:56 2014 (r270513) +++ stable/10/sys/dev/usb/wlan/if_urtwn.c Mon Aug 25 02:59:58 2014 (r270514) @@ -151,6 +151,7 @@ static const STRUCT_USB_HOST_ID urtwn_de URTWN_DEV(TRENDNET, RTL8192CU), URTWN_DEV(ZYXEL, RTL8192CU), /* URTWN_RTL8188E */ + URTWN_RTL8188E_DEV(DLINK, DWA125D1), URTWN_RTL8188E_DEV(REALTEK, RTL8188ETV), URTWN_RTL8188E_DEV(REALTEK, RTL8188EU), #undef URTWN_RTL8188E_DEV From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 03:02:39 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 4108684A; Mon, 25 Aug 2014 03:02:39 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 12699342A; Mon, 25 Aug 2014 03:02:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7P32cGg004657; Mon, 25 Aug 2014 03:02:38 GMT (envelope-from kevlo@FreeBSD.org) Received: (from kevlo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7P32cAr004656; Mon, 25 Aug 2014 03:02:38 GMT (envelope-from kevlo@FreeBSD.org) Message-Id: <201408250302.s7P32cAr004656@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kevlo set sender to kevlo@FreeBSD.org using -f From: Kevin Lo Date: Mon, 25 Aug 2014 03:02:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270515 - stable/10/sys/dev/usb/wlan X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 03:02:39 -0000 Author: kevlo Date: Mon Aug 25 03:02:38 2014 New Revision: 270515 URL: http://svnweb.freebsd.org/changeset/base/270515 Log: MFC r270192: If eapol packets are sent at the lowest rate, key negotiation will become more reliable. Submitted by: Akinori Furukoshi Modified: stable/10/sys/dev/usb/wlan/if_run.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/usb/wlan/if_run.c ============================================================================== --- stable/10/sys/dev/usb/wlan/if_run.c Mon Aug 25 02:59:58 2014 (r270514) +++ stable/10/sys/dev/usb/wlan/if_run.c Mon Aug 25 03:02:38 2014 (r270515) @@ -3253,13 +3253,13 @@ run_set_tx_desc(struct run_softc *sc, st txwi = (struct rt2860_txwi *)(txd + 1); txwi->len = htole16(m->m_pkthdr.len - pad); if (rt2860_rates[ridx].phy == IEEE80211_T_DS) { - txwi->phy = htole16(RT2860_PHY_CCK); + mcs |= RT2860_PHY_CCK; if (ridx != RT2860_RIDX_CCK1 && (ic->ic_flags & IEEE80211_F_SHPREAMBLE)) mcs |= RT2860_PHY_SHPRE; } else - txwi->phy = htole16(RT2860_PHY_OFDM); - txwi->phy |= htole16(mcs); + mcs |= RT2860_PHY_OFDM; + txwi->phy = htole16(mcs); /* check if RTS/CTS or CTS-to-self protection is required */ if (!IEEE80211_IS_MULTICAST(wh->i_addr1) && @@ -3336,7 +3336,7 @@ run_tx(struct run_softc *sc, struct mbuf /* pickup a rate index */ if (IEEE80211_IS_MULTICAST(wh->i_addr1) || - type != IEEE80211_FC0_TYPE_DATA) { + type != IEEE80211_FC0_TYPE_DATA || m->m_flags & M_EAPOL) { ridx = (ic->ic_curmode == IEEE80211_MODE_11A) ? RT2860_RIDX_OFDM6 : RT2860_RIDX_CCK1; ctl_ridx = rt2860_rates[ridx].ctl_ridx; @@ -4996,7 +4996,7 @@ run_updateprot_cb(void *arg) tmp = RT2860_RTSTH_EN | RT2860_PROT_NAV_SHORT | RT2860_TXOP_ALLOW_ALL; /* setup protection frame rate (MCS code) */ tmp |= (ic->ic_curmode == IEEE80211_MODE_11A) ? - rt2860_rates[RT2860_RIDX_OFDM6].mcs : + rt2860_rates[RT2860_RIDX_OFDM6].mcs | RT2860_PHY_OFDM : rt2860_rates[RT2860_RIDX_CCK11].mcs; /* CCK frames don't require protection */ From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 05:03:11 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 1DE4B566; Mon, 25 Aug 2014 05:03:11 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F2CBC3D52; Mon, 25 Aug 2014 05:03:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7P53AcQ057723; Mon, 25 Aug 2014 05:03:10 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7P53Axo057720; Mon, 25 Aug 2014 05:03:10 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201408250503.s7P53Axo057720@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Mon, 25 Aug 2014 05:03:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270516 - head/sys/dev/drm2/i915 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 05:03:11 -0000 Author: adrian Date: Mon Aug 25 05:03:10 2014 New Revision: 270516 URL: http://svnweb.freebsd.org/changeset/base/270516 Log: i915 driver - enable opregion handle; program CADL. add opregion handling for drm2 - which exposes some ACPI video configuration pieces that some Lenovo laptop models use to flesh out which video device to speak to. This enables the brightness control in ACPI to work these models. The CADL bits are also important - it's used to figure out which ACPI events to hook the brightness buttons into. It doesn't yet seem to work for me, but it does for the OP. Tested: * Lenovo X230 (mine) * OP: ASUS UX51VZ PR: 190186 Submitted by: Henry Hu Reviewed by: dumbbell Modified: head/sys/dev/drm2/i915/i915_drv.h head/sys/dev/drm2/i915/i915_irq.c head/sys/dev/drm2/i915/intel_opregion.c Modified: head/sys/dev/drm2/i915/i915_drv.h ============================================================================== --- head/sys/dev/drm2/i915/i915_drv.h Mon Aug 25 03:02:38 2014 (r270515) +++ head/sys/dev/drm2/i915/i915_drv.h Mon Aug 25 05:03:10 2014 (r270516) @@ -1242,10 +1242,11 @@ extern void intel_iic_reset(struct drm_d /* intel_opregion.c */ int intel_opregion_setup(struct drm_device *dev); -extern int intel_opregion_init(struct drm_device *dev); +extern void intel_opregion_init(struct drm_device *dev); extern void intel_opregion_fini(struct drm_device *dev); -extern void opregion_asle_intr(struct drm_device *dev); -extern void opregion_enable_asle(struct drm_device *dev); +extern void intel_opregion_asle_intr(struct drm_device *dev); +extern void intel_opregion_gse_intr(struct drm_device *dev); +extern void intel_opregion_enable_asle(struct drm_device *dev); /* i915_gem_gtt.c */ int i915_gem_init_aliasing_ppgtt(struct drm_device *dev); Modified: head/sys/dev/drm2/i915/i915_irq.c ============================================================================== --- head/sys/dev/drm2/i915/i915_irq.c Mon Aug 25 03:02:38 2014 (r270515) +++ head/sys/dev/drm2/i915/i915_irq.c Mon Aug 25 05:03:10 2014 (r270516) @@ -537,11 +537,7 @@ ivybridge_irq_handler(void *arg) notify_ring(dev, &dev_priv->rings[BCS]); if (de_iir & DE_GSE_IVB) { -#if 1 - KIB_NOTYET(); -#else intel_opregion_gse_intr(dev); -#endif } if (de_iir & DE_PLANEA_FLIP_DONE_IVB) { @@ -649,11 +645,7 @@ ironlake_irq_handler(void *arg) notify_ring(dev, &dev_priv->rings[BCS]); if (de_iir & DE_GSE) { -#if 1 - KIB_NOTYET(); -#else intel_opregion_gse_intr(dev); -#endif } if (de_iir & DE_PLANEA_FLIP_DONE) { @@ -1055,11 +1047,7 @@ i915_driver_irq_handler(void *arg) if (blc_event || (iir & I915_ASLE_INTERRUPT)) { -#if 1 - KIB_NOTYET(); -#else intel_opregion_asle_intr(dev); -#endif } /* With MSI, interrupts are only generated when iir @@ -1781,11 +1769,7 @@ i915_driver_irq_postinstall(struct drm_d I915_WRITE(PORT_HOTPLUG_EN, hotplug_en); } -#if 1 - KIB_NOTYET(); -#else intel_opregion_enable_asle(dev); -#endif return 0; } Modified: head/sys/dev/drm2/i915/intel_opregion.c ============================================================================== --- head/sys/dev/drm2/i915/intel_opregion.c Mon Aug 25 03:02:38 2014 (r270515) +++ head/sys/dev/drm2/i915/intel_opregion.c Mon Aug 25 05:03:10 2014 (r270516) @@ -32,6 +32,9 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include +#include +#include #define PCI_ASLE 0xe4 #define PCI_ASLS 0xfc @@ -144,7 +147,7 @@ struct opregion_asle { #define ACPI_DIGITAL_OUTPUT (3<<8) #define ACPI_LVDS_OUTPUT (4<<8) -#ifdef CONFIG_ACPI +#if 1 static u32 asle_set_backlight(struct drm_device *dev, u32 bclp) { struct drm_i915_private *dev_priv = dev->dev_private; @@ -289,6 +292,7 @@ void intel_opregion_enable_asle(struct d static struct intel_opregion *system_opregion; +#if 0 static int intel_opregion_video_event(struct notifier_block *nb, unsigned long val, void *data) { @@ -319,6 +323,7 @@ static int intel_opregion_video_event(st static struct notifier_block intel_opregion_notifier = { .notifier_call = intel_opregion_video_event, }; +#endif /* * Initialise the DIDL field in opregion. This passes a list of devices to @@ -326,37 +331,72 @@ static struct notifier_block intel_opreg * (version 3) */ +static int acpi_is_video_device(ACPI_HANDLE devh) { + ACPI_HANDLE h; + if (ACPI_FAILURE(AcpiGetHandle(devh, "_DOD", &h)) || + ACPI_FAILURE(AcpiGetHandle(devh, "_DOS", &h))) { + return 0; + } + return 1; +} + static void intel_didl_outputs(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; struct intel_opregion *opregion = &dev_priv->opregion; struct drm_connector *connector; - acpi_handle handle; - struct acpi_device *acpi_dev, *acpi_cdev, *acpi_video_bus = NULL; - unsigned long long device_id; - acpi_status status; + u32 device_id; + ACPI_HANDLE handle, acpi_video_bus, acpi_cdev; + ACPI_STATUS status; int i = 0; - handle = DEVICE_ACPI_HANDLE(&dev->pdev->dev); - if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &acpi_dev))) + handle = acpi_get_handle(dev->device); + if (!handle) return; - if (acpi_is_video_device(acpi_dev)) - acpi_video_bus = acpi_dev; + if (acpi_is_video_device(handle)) + acpi_video_bus = handle; else { + acpi_cdev = NULL; + acpi_video_bus = NULL; + while (AcpiGetNextObject(ACPI_TYPE_DEVICE, handle, acpi_cdev, + &acpi_cdev) != AE_NOT_FOUND) { + if (acpi_is_video_device(acpi_cdev)) { + acpi_video_bus = acpi_cdev; + break; + } + } +#if 0 list_for_each_entry(acpi_cdev, &acpi_dev->children, node) { if (acpi_is_video_device(acpi_cdev)) { acpi_video_bus = acpi_cdev; break; } } +#endif } if (!acpi_video_bus) { - printk(KERN_WARNING "No ACPI video bus found\n"); + device_printf(dev->device, "No ACPI video bus found\n"); return; } + acpi_cdev = NULL; + while (AcpiGetNextObject(ACPI_TYPE_DEVICE, acpi_video_bus, acpi_cdev, + &acpi_cdev) != AE_NOT_FOUND) { + if (i >= 8) { + device_printf(dev->device, "More than 8 outputs detected\n"); + return; + } + status = acpi_GetInteger(acpi_cdev, "_ADR", &device_id); + if (ACPI_SUCCESS(status)) { + if (!device_id) + goto blind_set; + opregion->acpi->didl[i] = (u32)(device_id & 0x0f0f); + i++; + } + } +#if 0 list_for_each_entry(acpi_cdev, &acpi_video_bus->children, node) { if (i >= 8) { dev_printk(KERN_ERR, &dev->pdev->dev, @@ -373,6 +413,7 @@ static void intel_didl_outputs(struct dr i++; } } +#endif end: /* If fewer than 8 outputs, the list must be null terminated */ @@ -417,6 +458,25 @@ blind_set: goto end; } +static void intel_setup_cadls(struct drm_device *dev) +{ + struct drm_i915_private *dev_priv = dev->dev_private; + struct intel_opregion *opregion = &dev_priv->opregion; + int i = 0; + u32 disp_id; + + /* Initialize the CADL field by duplicating the DIDL values. + * Technically, this is not always correct as display outputs may exist, + * but not active. This initialization is necessary for some Clevo + * laptops that check this field before processing the brightness and + * display switching hotkeys. Just like DIDL, CADL is NULL-terminated if + * there are less than eight devices. */ + do { + disp_id = opregion->acpi->didl[i]; + opregion->acpi->cadl[i] = disp_id; + } while (++i < 8 && disp_id != 0); +} + void intel_opregion_init(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; @@ -426,8 +486,10 @@ void intel_opregion_init(struct drm_devi return; if (opregion->acpi) { - if (drm_core_check_feature(dev, DRIVER_MODESET)) + if (drm_core_check_feature(dev, DRIVER_MODESET)) { intel_didl_outputs(dev); + intel_setup_cadls(dev); + } /* Notify BIOS we are ready to handle ACPI video ext notifs. * Right now, all the events are handled by the ACPI video module. @@ -436,7 +498,9 @@ void intel_opregion_init(struct drm_devi opregion->acpi->drdy = 1; system_opregion = opregion; +#if 0 register_acpi_notifier(&intel_opregion_notifier); +#endif } if (opregion->asle) @@ -455,11 +519,13 @@ void intel_opregion_fini(struct drm_devi opregion->acpi->drdy = 0; system_opregion = NULL; +#if 0 unregister_acpi_notifier(&intel_opregion_notifier); +#endif } /* just clear all opregion memory pointers now */ - iounmap(opregion->header); + pmap_unmapdev((vm_offset_t)opregion->header, OPREGION_SIZE); opregion->header = NULL; opregion->acpi = NULL; opregion->swsci = NULL; From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 05:26:49 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 2973D800; Mon, 25 Aug 2014 05:26:49 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 165BA3F02; Mon, 25 Aug 2014 05:26:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7P5QmtL066934; Mon, 25 Aug 2014 05:26:48 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7P5QmW1066933; Mon, 25 Aug 2014 05:26:48 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201408250526.s7P5QmW1066933@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Mon, 25 Aug 2014 05:26:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270517 - head/tools/tools/ath/athaggrstats X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 05:26:49 -0000 Author: adrian Date: Mon Aug 25 05:26:48 2014 New Revision: 270517 URL: http://svnweb.freebsd.org/changeset/base/270517 Log: Allow it to compile again. Modified: head/tools/tools/ath/athaggrstats/Makefile Modified: head/tools/tools/ath/athaggrstats/Makefile ============================================================================== --- head/tools/tools/ath/athaggrstats/Makefile Mon Aug 25 05:03:10 2014 (r270516) +++ head/tools/tools/ath/athaggrstats/Makefile Mon Aug 25 05:26:48 2014 (r270517) @@ -12,8 +12,8 @@ CLEANFILES+= opt_ah.h CFLAGS+=-DATH_SUPPORT_ANI CFLAGS+=-DATH_SUPPORT_TDMA -USEPRIVATELIB=bsdstat -LDADD= ${LDBSDSTAT} +USEPRIVATELIB= +LDADD=/usr/lib/private/libbsdstat.so.1 opt_ah.h: echo "#define AH_DEBUG 1" > opt_ah.h From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 05:52:06 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 1D4B3CAF; Mon, 25 Aug 2014 05:52:06 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0A5063160; Mon, 25 Aug 2014 05:52:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7P5q5aa079551; Mon, 25 Aug 2014 05:52:05 GMT (envelope-from hiren@FreeBSD.org) Received: (from hiren@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7P5q5rJ079550; Mon, 25 Aug 2014 05:52:05 GMT (envelope-from hiren@FreeBSD.org) Message-Id: <201408250552.s7P5q5rJ079550@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hiren set sender to hiren@FreeBSD.org using -f From: Hiren Panchasara Date: Mon, 25 Aug 2014 05:52:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270518 - head/usr.sbin/wlandebug X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 05:52:06 -0000 Author: hiren Date: Mon Aug 25 05:52:05 2014 New Revision: 270518 URL: http://svnweb.freebsd.org/changeset/base/270518 Log: Fix a typo to catch correct condition. Modified: head/usr.sbin/wlandebug/wlandebug.c Modified: head/usr.sbin/wlandebug/wlandebug.c ============================================================================== --- head/usr.sbin/wlandebug/wlandebug.c Mon Aug 25 05:26:48 2014 (r270517) +++ head/usr.sbin/wlandebug/wlandebug.c Mon Aug 25 05:52:05 2014 (r270518) @@ -177,7 +177,7 @@ main(int argc, char *argv[]) setoid(oid, sizeof(oid), NULL); argc -= 1, argv += 1; } else if (strcmp(argv[1], "-i") == 0) { - if (argc < 2) + if (argc <= 2) errx(1, "missing interface name for -i option"); if (strncmp(argv[2], "wlan", 4) != 0) errx(1, "expecting a wlan interface name"); From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 06:10:04 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 9C6541C3; Mon, 25 Aug 2014 06:10:04 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 89939327E; Mon, 25 Aug 2014 06:10:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7P6A4sW085257; Mon, 25 Aug 2014 06:10:04 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7P6A4Vh085254; Mon, 25 Aug 2014 06:10:04 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201408250610.s7P6A4Vh085254@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Mon, 25 Aug 2014 06:10:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270519 - in head: lib/libc share/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 06:10:04 -0000 Author: ngie Date: Mon Aug 25 06:10:03 2014 New Revision: 270519 URL: http://svnweb.freebsd.org/changeset/base/270519 Log: Fix "make checkdpadd" for lib/libc when MK_SSP != no Add LIBSSP_NONSHARED to bsd.libnames.mk and append LIBSSP_NONSHARED to DPADD in lib/libc when MK_SSP != no Approved by: rpaulo (mentor) MFC after: 3 days Phabric: D675 (as part of a larger diff) PR: 192728 Modified: head/lib/libc/Makefile head/share/mk/bsd.libnames.mk Modified: head/lib/libc/Makefile ============================================================================== --- head/lib/libc/Makefile Mon Aug 25 05:52:05 2014 (r270518) +++ head/lib/libc/Makefile Mon Aug 25 06:10:03 2014 (r270519) @@ -49,6 +49,7 @@ LDFLAGS+= -nodefaultlibs LDADD+= -lcompiler_rt .if ${MK_SSP} != "no" +DPADD+= ${LIBSSP_NONSHARED} LDADD+= -lssp_nonshared .endif Modified: head/share/mk/bsd.libnames.mk ============================================================================== --- head/share/mk/bsd.libnames.mk Mon Aug 25 05:52:05 2014 (r270518) +++ head/share/mk/bsd.libnames.mk Mon Aug 25 06:10:03 2014 (r270519) @@ -132,6 +132,7 @@ LIBSBUF?= ${DESTDIR}${LIBDIR}/libsbuf.a LIBSDP?= ${DESTDIR}${LIBDIR}/libsdp.a LIBSMB?= ${DESTDIR}${LIBDIR}/libsmb.a LIBSSL?= ${DESTDIR}${LIBDIR}/libssl.a +LIBSSP_NONSHARED?= ${DESTDIR}${LIBDIR}/libssp_nonshared.a LIBSTAND?= ${DESTDIR}${LIBDIR}/libstand.a LIBSTDCPLUSPLUS?= ${DESTDIR}${LIBDIR}/libstdc++.a LIBTACPLUS?= ${DESTDIR}${LIBDIR}/libtacplus.a From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 06:14:58 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 1885E53C; Mon, 25 Aug 2014 06:14:58 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 054A2338D; Mon, 25 Aug 2014 06:14:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7P6EvFN089208; Mon, 25 Aug 2014 06:14:57 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7P6EvEA089206; Mon, 25 Aug 2014 06:14:57 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201408250614.s7P6EvEA089206@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Mon, 25 Aug 2014 06:14:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270520 - in head/tools/tools: ath/athaggrstats net80211/wlanstats X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 06:14:58 -0000 Author: adrian Date: Mon Aug 25 06:14:57 2014 New Revision: 270520 URL: http://svnweb.freebsd.org/changeset/base/270520 Log: Update these to make them actually compile! Tested: * cross compilation to MIPS Modified: head/tools/tools/ath/athaggrstats/Makefile head/tools/tools/net80211/wlanstats/Makefile Modified: head/tools/tools/ath/athaggrstats/Makefile ============================================================================== --- head/tools/tools/ath/athaggrstats/Makefile Mon Aug 25 06:10:03 2014 (r270519) +++ head/tools/tools/ath/athaggrstats/Makefile Mon Aug 25 06:14:57 2014 (r270520) @@ -12,8 +12,8 @@ CLEANFILES+= opt_ah.h CFLAGS+=-DATH_SUPPORT_ANI CFLAGS+=-DATH_SUPPORT_TDMA -USEPRIVATELIB= -LDADD=/usr/lib/private/libbsdstat.so.1 +USEPRIVATELIB= bsdstat +LDADD= ${LDBSDSTAT} opt_ah.h: echo "#define AH_DEBUG 1" > opt_ah.h Modified: head/tools/tools/net80211/wlanstats/Makefile ============================================================================== --- head/tools/tools/net80211/wlanstats/Makefile Mon Aug 25 06:10:03 2014 (r270519) +++ head/tools/tools/net80211/wlanstats/Makefile Mon Aug 25 06:14:57 2014 (r270520) @@ -5,10 +5,11 @@ PROG= wlanstats BINDIR= /usr/local/bin MAN= -USEPRIVATELIB= +USEPRIVATELIB= bsdstat +LDADD= ${LDBSDSTAT} SRCS= wlanstats.c main.c -LDADD= -lbsdstat + CFLAGS.clang+= -fbracket-depth=512 .include From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 07:15:15 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 343B549B; Mon, 25 Aug 2014 07:15:15 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 20A013860; Mon, 25 Aug 2014 07:15:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7P7FEss016649; Mon, 25 Aug 2014 07:15:14 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7P7FEoC016648; Mon, 25 Aug 2014 07:15:14 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201408250715.s7P7FEoC016648@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Mon, 25 Aug 2014 07:15:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270521 - head/sys/boot/common X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 07:15:15 -0000 Author: ae Date: Mon Aug 25 07:15:14 2014 New Revision: 270521 URL: http://svnweb.freebsd.org/changeset/base/270521 Log: Since the size of GPT entry may differ from the sizeof(struct gpt_ent), use the size from GPT header to iterate entries. Suggested by: marcel@ MFC after: 1 week Modified: head/sys/boot/common/part.c Modified: head/sys/boot/common/part.c ============================================================================== --- head/sys/boot/common/part.c Mon Aug 25 06:14:57 2014 (r270520) +++ head/sys/boot/common/part.c Mon Aug 25 07:15:14 2014 (r270521) @@ -212,8 +212,8 @@ gpt_checktbl(const struct gpt_hdr *hdr, return (-1); } } - ent = (struct gpt_ent *)tbl; - for (i = 0; i < cnt; i++, ent++) { + for (i = 0; i < cnt; i++) { + ent = (struct gpt_ent *)(tbl + i * hdr->hdr_entsz); uuid_letoh(&ent->ent_type); if (uuid_equal(&ent->ent_type, &gpt_uuid_unused, NULL)) continue; @@ -303,10 +303,10 @@ ptable_gptread(struct ptable *table, voi table->type = PTABLE_NONE; goto out; } - ent = (struct gpt_ent *)tbl; size = MIN(hdr.hdr_entries * hdr.hdr_entsz, MAXTBLSZ * table->sectorsize); - for (i = 0; i < size / hdr.hdr_entsz; i++, ent++) { + for (i = 0; i < size / hdr.hdr_entsz; i++) { + ent = (struct gpt_ent *)(tbl + i * hdr.hdr_entsz); if (uuid_equal(&ent->ent_type, &gpt_uuid_unused, NULL)) continue; entry = malloc(sizeof(*entry)); From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 08:40:37 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 6A09617E; Mon, 25 Aug 2014 08:40:37 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 55FDA3023; Mon, 25 Aug 2014 08:40:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7P8ebha054972; Mon, 25 Aug 2014 08:40:37 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from rdivacky@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7P8ebjJ054971; Mon, 25 Aug 2014 08:40:37 GMT (envelope-from rdivacky@FreeBSD.org) Message-Id: <201408250840.s7P8ebjJ054971@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rdivacky set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky Date: Mon, 25 Aug 2014 08:40:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270522 - head/lib/libc++ X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 08:40:37 -0000 Author: rdivacky Date: Mon Aug 25 08:40:36 2014 New Revision: 270522 URL: http://svnweb.freebsd.org/changeset/base/270522 Log: The standard we compile libc++ with is called c++11 not c++0x. Modified: head/lib/libc++/Makefile Modified: head/lib/libc++/Makefile ============================================================================== --- head/lib/libc++/Makefile Mon Aug 25 07:15:14 2014 (r270521) +++ head/lib/libc++/Makefile Mon Aug 25 08:40:36 2014 (r270522) @@ -57,7 +57,7 @@ cxxrt_${_S}: WARNS= 0 CFLAGS+= -I${HDRDIR} -I${LIBCXXRTDIR} -nostdlib -DLIBCXXRT .if empty(CXXFLAGS:M-std=*) -CXXFLAGS+= -std=c++0x +CXXFLAGS+= -std=c++11 .endif DPADD= ${LIBCXXRT} From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 09:06:42 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id B5ACD88D; Mon, 25 Aug 2014 09:06:42 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A0B1D32CB; Mon, 25 Aug 2014 09:06:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7P96geb067258; Mon, 25 Aug 2014 09:06:42 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7P96gwp067257; Mon, 25 Aug 2014 09:06:42 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408250906.s7P96gwp067257@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 09:06:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270523 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 09:06:42 -0000 Author: gjb Date: Mon Aug 25 09:06:42 2014 New Revision: 270523 URL: http://svnweb.freebsd.org/changeset/base/270523 Log: Document r265701, route(8) and netstat(8) '-4' and '-6' shorthand flags. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 08:40:36 2014 (r270522) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 09:06:42 2014 (r270523) @@ -412,6 +412,12 @@ specified, produces a full stack track on the sampled points. + The &man.netstat.8; and &man.route.8; + utilities have been updated to include a shorthand equivalent + to the -f inet and -f + inet6 address specifiers, -4 and + -6, respectively. + The &man.ps.1; utility has been updated to include the -J flag, used to filter output by matching &man.jail.8; IDs and names. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 09:06:44 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id A6E4B967; Mon, 25 Aug 2014 09:06:44 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8D91632CC; Mon, 25 Aug 2014 09:06:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7P96iwG067300; Mon, 25 Aug 2014 09:06:44 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7P96iBV067299; Mon, 25 Aug 2014 09:06:44 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408250906.s7P96iBV067299@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 09:06:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270524 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 09:06:44 -0000 Author: gjb Date: Mon Aug 25 09:06:44 2014 New Revision: 270524 URL: http://svnweb.freebsd.org/changeset/base/270524 Log: Capitalize titles where needed. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 09:06:42 2014 (r270523) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 09:06:44 2014 (r270524) @@ -216,7 +216,7 @@ Boost ™ enabled has been fixed. - Virtualization support + Virtualization Support Support for µsoft; Hyper-V has been added to &os;/i386 as loadable modules, however @@ -229,7 +229,7 @@ - ARM support + ARM Support The WANDBOARD kernel configuration file has been added. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 09:06:46 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 810789B7; Mon, 25 Aug 2014 09:06:46 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6C37532CD; Mon, 25 Aug 2014 09:06:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7P96kj0067345; Mon, 25 Aug 2014 09:06:46 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7P96kK4067344; Mon, 25 Aug 2014 09:06:46 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408250906.s7P96kK4067344@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 09:06:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270525 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 09:06:46 -0000 Author: gjb Date: Mon Aug 25 09:06:45 2014 New Revision: 270525 URL: http://svnweb.freebsd.org/changeset/base/270525 Log: Wrap a few long lines. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 09:06:44 2014 (r270524) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 09:06:45 2014 (r270525) @@ -8,7 +8,9 @@ %vendor; ]> -
+
+ &os; &release.current; Release Notes @@ -34,7 +36,8 @@ 2012 2013 2014 - The &os; Documentation Project + The &os; Documentation + Project From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 09:06:50 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 4C88FADF; Mon, 25 Aug 2014 09:06:50 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 34A6A32ED; Mon, 25 Aug 2014 09:06:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7P96orc067433; Mon, 25 Aug 2014 09:06:50 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7P96of2067432; Mon, 25 Aug 2014 09:06:50 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408250906.s7P96of2067432@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 09:06:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270527 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 09:06:50 -0000 Author: gjb Date: Mon Aug 25 09:06:49 2014 New Revision: 270527 URL: http://svnweb.freebsd.org/changeset/base/270527 Log: Document r265879, crypt(3) defaults to sha512. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 09:06:47 2014 (r270526) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 09:06:49 2014 (r270527) @@ -430,6 +430,9 @@ inet6 address specifiers, -4 and -6, respectively. + The &man.crypt.3; library now defaults + to SHA512 for password hashing. + The &man.ps.1; utility has been updated to include the -J flag, used to filter output by matching &man.jail.8; IDs and names. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 09:06:54 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 07FCCC0C; Mon, 25 Aug 2014 09:06:54 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E76F732F0; Mon, 25 Aug 2014 09:06:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7P96rgJ067534; Mon, 25 Aug 2014 09:06:53 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7P96rHS067533; Mon, 25 Aug 2014 09:06:53 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408250906.s7P96rHS067533@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 09:06:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270529 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 09:06:54 -0000 Author: gjb Date: Mon Aug 25 09:06:53 2014 New Revision: 270529 URL: http://svnweb.freebsd.org/changeset/base/270529 Log: Document r265912, auto-resize in GEOM_PART. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 09:06:51 2014 (r270528) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 09:06:53 2014 (r270529) @@ -339,6 +339,13 @@ it easier to resize the size of a mirror when all of its components have been replaced. + The &man.geom.8; + GEOM_PART class has been updated to + support automatic partition resizing. Changes to the + partition size are not saved to disk until + gpart commit is run, and prior to saving, + can be reverted with gpart undo. + Support for the disklabel64 partitioning scheme has been added to &man.gpart.8;. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 09:06:55 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id DBC87DC6; Mon, 25 Aug 2014 09:06:55 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C7BA532F4; Mon, 25 Aug 2014 09:06:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7P96tY2067582; Mon, 25 Aug 2014 09:06:55 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7P96tcl067581; Mon, 25 Aug 2014 09:06:55 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408250906.s7P96tcl067581@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 09:06:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270530 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 09:06:56 -0000 Author: gjb Date: Mon Aug 25 09:06:55 2014 New Revision: 270530 URL: http://svnweb.freebsd.org/changeset/base/270530 Log: Document r265946, UDP-Lite support. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 09:06:53 2014 (r270529) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 09:06:55 2014 (r270530) @@ -319,8 +319,9 @@ Network Protocols -   - + Support for the UDP-Lite protocol + (RFC 3828) has been added to the IPv4 and IPv6 + stacks. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 09:06:48 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 5273D9BD; Mon, 25 Aug 2014 09:06:48 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3C6FD32DB; Mon, 25 Aug 2014 09:06:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7P96mH4067384; Mon, 25 Aug 2014 09:06:48 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7P96m31067383; Mon, 25 Aug 2014 09:06:48 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408250906.s7P96m31067383@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 09:06:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270526 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 09:06:48 -0000 Author: gjb Date: Mon Aug 25 09:06:47 2014 New Revision: 270526 URL: http://svnweb.freebsd.org/changeset/base/270526 Log: Re-indent the and following blocks to conform to FDP style conventions. Wrap resulting long lines. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 09:06:45 2014 (r270525) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 09:06:47 2014 (r270526) @@ -11,533 +11,542 @@
- - &os; &release.current; Release Notes + + &os; &release.current; Release Notes - - The &os; Project - - - $FreeBSD$ - - - 2000 - 2001 - 2002 - 2003 - 2004 - 2005 - 2006 - 2007 - 2008 - 2009 - 2010 - 2011 - 2012 - 2013 - 2014 - The &os; Documentation - Project - - - - &tm-attrib.freebsd; - &tm-attrib.ibm; - &tm-attrib.ieee; - &tm-attrib.intel; - &tm-attrib.sparc; - &tm-attrib.general; - - - - The release notes for &os; &release.current; contain - a summary of the changes made to the &os; base system on the - &release.branch; development line. This document lists - applicable security advisories that were issued since the last - release, as well as significant changes to the &os; kernel and - userland. Some brief remarks on upgrading are also - presented. - - - - - Introduction - - This document contains the release notes for &os; - &release.current;. It describes recently added, changed, or - deleted features of &os;. It also provides some notes on - upgrading from previous versions of &os;. - - The &release.type; distribution to which - these release notes apply represents the latest point along the - &release.branch; development branch since &release.branch; was - created. Information regarding pre-built, binary &release.type; - distributions along this branch can be found at &release.url;. - - The &release.type; distribution to - which these release notes apply represents a point along the - &release.branch; development branch between &release.prev; and the - future &release.next;. Information regarding pre-built, binary - &release.type; distributions along this branch can be found at - &release.url;. - - This distribution of &os; - &release.current; is a &release.type; distribution. It can be - found at &release.url; or - any of its mirrors. More information on obtaining this (or other) - &release.type; distributions of &os; can be found in the Obtaining - &os; appendix to the &os; Handbook. - - All users are encouraged to consult the release errata before - installing &os;. The errata document is updated with - late-breaking information discovered late in the - release cycle or after the release. Typically, it contains - information on known bugs, security advisories, and corrections to - documentation. An up-to-date copy of the errata for &os; - &release.current; can be found on the &os; Web site. - - - - What's New - - This section describes the most user-visible new or changed - features in &os; since &release.prev;. - - Typical release note items document recent security advisories - issued after &release.prev;, new drivers or hardware support, new - commands or options, major bug fixes, or contributed software - upgrades. They may also list changes to major ports/packages or - release engineering practices. Clearly the release notes cannot - list every single change made to &os; between releases; this - document focuses primarily on security advisories, user-visible - changes, and major architectural improvements. - - - Security Advisories - -   - - - - - Kernel Changes - - The vfs.zfs.zio.use_uma - &man.sysctl.8; has been re-enabled. On multi-CPU machines with - enough RAM, this can easily double &man.zfs.8; performance or - reduce CPU usage in half. It was originally disabled due to - memory and KVA exhaustion problem reports, - which should be resolved due to several change in the VM - subsystem. - - The - &man.geom.4; RAID driver has been - updated to support unmapped I/O. - - A new &man.sysctl.8;, - kern.panic_reboot_wait_time, has been added, - which allows controlling how long the system will wait after - &man.panic.9; before rebooting. - - The &man.virtio_blk.4; driver has been - updated to support unmapped I/O. - - The &man.virtio_scsi.4; driver has been - updated to support unmapped I/O. - - The &man.vt.4; driver has been merged - from &os;-CURRENT. To enable &man.vt.4;, enter - set kern.vty=vt at the &man.loader.8; prompt - during boot, or add kern.vty=vt to - &man.loader.conf.5; and reboot the system. - - Support for MegaRAID Fury cards has been - added to the &man.mfi.4; driver. - - The &man.aacraid.4; driver has been - updated to version 3.2.5. - - Support for &man.hwpmc.4; has been added - for &powerpc; 970 class processors. - - Support for ADT7460 and ADT7467 fan - controllers found in newer PowerBooks™ and - iBooks™ has been added to the &man.iicbus.4; - driver. - - A panic triggered by removing - a &man.urtwn.4; device has been fixed. - - A potential deadlock in the &man.usb.4; - stack triggered by detaching USB devices that create character - devices has been fixed. - - Support for &amd; Family 16h sensor - devices has been added to &man.amdtemp.4;. - - Support for LUN-based CD changers has been - removed from the &man.cd.4; driver. - - Support for 9th generation HP host bus - adapter cards has been added to &man.ciss.4;. - - The - &man.mpr.4; device has been added, - providing support for LSI Fusion-MPT 3 12Gb SCSI/SATA - controllers. - - The GEOM_VINUM option - is now able to be built both directly into the kernel or as - a &man.kldload.8; loadable module. - - The &man.uslcom.4; driver has been updated - to support 26 new devices. - - The - &man.mrsas.4; driver has been added, - providing support for LSI MegaRAID SAS controllers. The - &man.mfi.4; driver will attach to the controller, by default. - To enable &man.mrsas.4; add - hw.mfi.mrsas_enable=1 to - /boot/loader.conf, which turns off - &man.mfi.4; device probing. - - - At this time, the &man.mfiutil.8; utility and - the &os; version of - MegaCLI and - StorCli do not work with - &man.mrsas.4;. - - - A kernel bug that inhibited proper - functionality of the dev.cpu.0.freq - &man.sysctl.8; on &intel; processors with Turbo - Boost ™ enabled has been fixed. - - - Virtualization Support - - Support for µsoft; Hyper-V - has been added to &os;/i386 as loadable modules, however - not available in the GENERIC kernel - configuration. - - The &man.bhyve.4; hypervisor now - supports soft power-off functionality via the ACPI S5 - state. - - - - ARM Support - - The WANDBOARD - kernel configuration file has been added. - - Boot devices may now be specified by - setting a u-boot environment variable. If a boot device is - not specified, the probe mechanism will be used. To specify - the boot device, set the - loaderdev=device - u-boot environment variable. - - - - Boot Loader Changes - - A kernel selection menu has been added - to &man.loader.8;. If the beastie menu is - enabled, the kernel to boot may be selected from the kernel - selection menu. Additional kernels may be listed in - &man.loader.conf.5; as a comma- or space-separated list. By - default, kernel and - kernel.old are listed. - + + The &os; Project + + + $FreeBSD$ + + + 2000 + 2001 + 2002 + 2003 + 2004 + 2005 + 2006 + 2007 + 2008 + 2009 + 2010 + 2011 + 2012 + 2013 + 2014 + The &os; Documentation + Project + + + + &tm-attrib.freebsd; + &tm-attrib.ibm; + &tm-attrib.ieee; + &tm-attrib.intel; + &tm-attrib.sparc; + &tm-attrib.general; + + + + The release notes for &os; &release.current; contain + a summary of the changes made to the &os; base system on the + &release.branch; development line. This document lists + applicable security advisories that were issued since the last + release, as well as significant changes to the &os; kernel and + userland. Some brief remarks on upgrading are also + presented. + + + + + Introduction + + This document contains the release notes for &os; + &release.current;. It describes recently added, changed, or + deleted features of &os;. It also provides some notes on + upgrading from previous versions of &os;. + + The &release.type; distribution to + which these release notes apply represents the latest point + along the &release.branch; development branch since + &release.branch; was created. Information regarding pre-built, + binary &release.type; distributions along this branch can be + found at &release.url;. + + The &release.type; distribution to + which these release notes apply represents a point along the + &release.branch; development branch between &release.prev; and + the future &release.next;. Information regarding pre-built, + binary &release.type; distributions along this branch can be + found at &release.url;. + + This distribution of &os; + &release.current; is a &release.type; distribution. It can be + found at &release.url; or + any of its mirrors. More information on obtaining this (or + other) &release.type; distributions of &os; can be found in the + Obtaining + &os; appendix to the &os; + Handbook. + + All users are encouraged to consult the release errata + before installing &os;. The errata document is updated with + late-breaking information discovered late in the + release cycle or after the release. Typically, it contains + information on known bugs, security advisories, and corrections + to documentation. An up-to-date copy of the errata for &os; + &release.current; can be found on the &os; Web site. + + + + What's New + + This section describes the most user-visible new or changed + features in &os; since &release.prev;. + + Typical release note items document recent security + advisories issued after &release.prev;, new drivers or hardware + support, new commands or options, major bug fixes, or + contributed software upgrades. They may also list changes to + major ports/packages or release engineering practices. Clearly + the release notes cannot list every single change made to &os; + between releases; this document focuses primarily on security + advisories, user-visible changes, and major architectural + improvements. - - Hardware Support + + Security Advisories   - - Multimedia Support + + + + Kernel Changes + + The + vfs.zfs.zio.use_uma &man.sysctl.8; has been + re-enabled. On multi-CPU machines with enough RAM, this can + easily double &man.zfs.8; performance or reduce CPU usage in + half. It was originally disabled due to memory and + KVA exhaustion problem reports, which + should be resolved due to several change in the VM + subsystem. + + The + &man.geom.4; RAID driver has been + updated to support unmapped I/O. + + A new &man.sysctl.8;, + kern.panic_reboot_wait_time, has been + added, which allows controlling how long the system will wait + after &man.panic.9; before rebooting. + + The &man.virtio_blk.4; driver has been + updated to support unmapped I/O. + + The &man.virtio_scsi.4; driver has been + updated to support unmapped I/O. + + The &man.vt.4; driver has been merged + from &os;-CURRENT. To enable &man.vt.4;, enter + set kern.vty=vt at the &man.loader.8; + prompt during boot, or add kern.vty=vt to + &man.loader.conf.5; and reboot the system. + + Support for MegaRAID Fury cards has been + added to the &man.mfi.4; driver. + + The &man.aacraid.4; driver has been + updated to version 3.2.5. + + Support for &man.hwpmc.4; has been added + for &powerpc; 970 class processors. + + Support for ADT7460 and ADT7467 fan + controllers found in newer PowerBooks™ and + iBooks™ has been added to the &man.iicbus.4; + driver. + + A panic triggered by removing + a &man.urtwn.4; device has been fixed. + + A potential deadlock in the &man.usb.4; + stack triggered by detaching USB devices that create character + devices has been fixed. + + Support for &amd; Family 16h sensor + devices has been added to &man.amdtemp.4;. + + Support for LUN-based CD changers has + been removed from the &man.cd.4; driver. + + Support for 9th generation HP host bus + adapter cards has been added to &man.ciss.4;. + + The + &man.mpr.4; device has been added, + providing support for LSI Fusion-MPT 3 12Gb SCSI/SATA + controllers. + + The GEOM_VINUM option + is now able to be built both directly into the kernel or as + a &man.kldload.8; loadable module. + + The &man.uslcom.4; driver has been + updated to support 26 new devices. + + The + &man.mrsas.4; driver has been added, + providing support for LSI MegaRAID SAS controllers. The + &man.mfi.4; driver will attach to the controller, by default. + To enable &man.mrsas.4; add + hw.mfi.mrsas_enable=1 to + /boot/loader.conf, which turns off + &man.mfi.4; device probing. + + + At this time, the &man.mfiutil.8; utility and + the &os; version of + MegaCLI and + StorCli do not work with + &man.mrsas.4;. + + + A kernel bug that inhibited proper + functionality of the dev.cpu.0.freq + &man.sysctl.8; on &intel; processors with Turbo + Boost ™ enabled has been fixed. + + + Virtualization Support + + Support for µsoft; Hyper-V + has been added to &os;/i386 as loadable modules, however + not available in the GENERIC kernel + configuration. + + The &man.bhyve.4; hypervisor now + supports soft power-off functionality via the ACPI S5 + state. + + + + ARM Support + + The WANDBOARD + kernel configuration file has been added. + + Boot devices may now be specified by + setting a u-boot environment variable. If a boot device is + not specified, the probe mechanism will be used. To specify + the boot device, set the + loaderdev=device + u-boot environment variable. + + + + Boot Loader Changes + + A kernel selection menu has been added + to &man.loader.8;. If the beastie menu is + enabled, the kernel to boot may be selected from the kernel + selection menu. Additional kernels may be listed in + &man.loader.conf.5; as a comma- or space-separated list. By + default, kernel and + kernel.old are listed. + + + + Hardware Support   - + + Multimedia Support + +   + + + + + Network Interface Support + + Support for Ralink RT5370 and + RT5372 chipsets has been added to the &man.run.4; + driver. + + Firmware for the &man.run.4; driver + has been updated to version 0.33. + + Support for the Ralink RT3593 + chipset has been added to the &man.run.4; driver. + + The &man.nve.4; driver is now + deprecated, and the &man.nfe.4; driver should be used + instead. + + Support for the &man.axge.4; driver + has been added. This driver supports the ASIX AX88178A + and AX88179 USB ethernet adapters. The AX88178A supports + USB 2.0, and the AX88179 supports USB 2.0 and 3.0. + + The &man.urndis.4; driver has been + imported from OpenBSD. + + Support for multiple + transmitter/receiver queues has been added to the + &man.vmx.4; driver. + + + The &os; guest operating system must have + MSIX enabled as a prerequisite for + multiple queues. + + + Support for the ASUS USB-N10 Nano + wireless card has been added to the &man.urtwn.4; + driver. + + + + + Network Protocols + +   + + + + + Disks and Storage + + The + &man.geom.8; label class is now aware of + resized partitions. This corrects an issue where + geom resize would resize the partition, + but the label provider in /dev/gptid/ would not be + resized. + + The &man.gmirror.8; + utility now has a resize command, making + it easier to resize the size of a mirror when all of its + components have been replaced. + + Support for the + disklabel64 partitioning scheme has been + added to &man.gpart.8;. + + + + File Systems + + A new flag, -R, + has been added to the &man.fsck.ffs.8; utility. When used, + &man.fsck.ffs.8; will restart itself when too many critical + errors have been detected. + + The &man.zfs.8; filesystem has been + updated to implement bookmarks. See + &man.zfs.8; for further details. + + + + + Userland Changes + + A new flag is added to &man.camcontrol.8;, + -b, which outputs the existing buses and + their parents. + + The &man.newsyslog.8; utility has been + updated to rotate files based on the actual file size instead + of the blocks on disk. This matches the behavior documented + in &man.newsyslog.conf.5;. + + The location of the &man.rctl.8; + configuration file can now be overridden in &man.rc.conf.5;. + To use a non-default location, set + rctl_rules in &man.rc.conf.5; to the + location of the file. + + The ATF test + suite has been updated to version 0.20. + + The libucl library + (Unified Configuration Library) has been merged from + &os;-CURRENT. + + The &man.pkg.7; bootstrapping utility + has been synced with the version in &os;-CURRENT. + + The &man.zfs.8; userland utility has + been updated to include aliases for + snapshot, which allows use of zfs + list -t snap and zfs + snap. + + The &man.zfs.8; userland utility has + been updated to include a new flag to zfs + list, -p, which when specified, + prints the output in a parsable format. + + The &man.clang.1;/llvm suite has been + updated to version 3.4. + + The Blowfish password format + implementation updated. Support for $2b$ has + been added, allowing use of passwords greater than 256 + characters long. + + The &man.iconv.3; library has been + updated to match NetBSD, providing several bug fixes. + + The &man.date.1; utility has been + updated to include a new flag, -R, which + prints the date and time output as specified in RFC + 2822. + + The &man.bc.1; utility has been updated + to version 1.1, in sync with the version in OpenBSD. + + The &man.pmcstat.8; utility has been + updated to include a new flag, -a, which + when specified, produces a full stack track on the sampled + points. + + The &man.netstat.8; and &man.route.8; + utilities have been updated to include a shorthand equivalent + to the -f inet and -f + inet6 address specifiers, -4 + and -6, respectively. + + The &man.ps.1; utility has been + updated to include the -J flag, used to + filter output by matching &man.jail.8; IDs and names. + Additionally, argument 0 can be used to + -J to only list processes running on the + host system. + + The &man.top.1; utility has been updated + to filter by &man.jail.8; ID or name, in followup to the + &man.ps.1; change in r265229. + + The &man.pmcstat.8; utility has been + updated to include a new flag, -l, which + ends event collection after the specified number of + seconds. + + The default &man.newsyslog.conf.5; now + includes files in the + /etc/newsyslog.conf.d/ and + /usr/local/etc/newsyslog.conf.d/ + directories by default for &man.newsyslog.8;. + + A new flag, onifconsole + has been added to /etc/ttys. This allows + the system to provide a login prompt via serial console if the + device is an active kernel console, otherwise it is equivalent + to off. + + The &man.mkimg.1; utility has been + merged from &os;-CURRENT. + + + <filename>/etc/rc.d</filename> Scripts + + The network.subr + &man.rc.8; script has been updated to loosen the requirement + of listing network aliases in numeric order. Previously, + a network alias of + _alias2 + would not be created if + _alias1 was + not defined. + + + + + Contributed Software + + The &man.xz.1; utility has been updated + to a post-5.0.5 snapshot. + + The &man.lldb.1; debugging library has + been updated to the r196322 snapshot. + + The timezone database has been updated + to version tzdata2014b. + + OpenSSH has + been updated to version 6.6p1. + + The &man.nc.1; utility has been updated + to match the version in OpenBSD 5.5. + + Sendmail + has been updated to 8.14.9. + + OpenSSL has + been updated to version 1.0.1h. + + + + Ports/Packages Collection Infrastructure + +   + + - - Network Interface Support + + Release Engineering and Integration - Support for Ralink RT5370 and - RT5372 chipsets has been added to the &man.run.4; - driver. - - Firmware for the &man.run.4; driver - has been updated to version 0.33. - - Support for the Ralink RT3593 - chipset has been added to the &man.run.4; driver. - - The &man.nve.4; driver is now - deprecated, and the &man.nfe.4; driver should be used - instead. - - Support for the &man.axge.4; driver - has been added. This driver supports the ASIX AX88178A and - AX88179 USB ethernet adapters. The AX88178A supports USB - 2.0, and the AX88179 supports USB 2.0 and 3.0. - - The &man.urndis.4; driver has been - imported from OpenBSD. - - Support for multiple - transmitter/receiver queues has been added to the - &man.vmx.4; driver. - - - The &os; guest operating system must have - MSIX enabled as a prerequisite for - multiple queues. - - - Support for the ASUS USB-N10 Nano - wireless card has been added to the &man.urtwn.4; - driver. - - + The &man.services.mkdb.8; utility has + been updated to include endianness awareness, allowing the + services.db database to be created as + part of the release build, regardless of native- or + cross-built releases. + - - Network Protocols + + Documentation   - + + - - Disks and Storage + + Upgrading from Previous Releases of &os; - The &man.geom.8; label class - is now aware of resized partitions. This corrects an issue - where geom resize would resize the - partition, but the label provider in /dev/gptid/ would not be - resized. - - The &man.gmirror.8; - utility now has a resize command, making - it easier to resize the size of a mirror when all of its - components have been replaced. - - Support for the - disklabel64 partitioning scheme has been - added to &man.gpart.8;. - - - - File Systems - - A new flag, -R, - has been added to the &man.fsck.ffs.8; utility. When used, - &man.fsck.ffs.8; will restart itself when too many critical - errors have been detected. - - The &man.zfs.8; filesystem has been - updated to implement bookmarks. See - &man.zfs.8; for further details. - - - - - Userland Changes - - A new flag is added to &man.camcontrol.8;, - -b, which outputs the existing buses and - their parents. - - The &man.newsyslog.8; utility has been - updated to rotate files based on the actual file size instead - of the blocks on disk. This matches the behavior documented in - &man.newsyslog.conf.5;. - - The location of the &man.rctl.8; - configuration file can now be overridden in &man.rc.conf.5;. - To use a non-default location, set rctl_rules - in &man.rc.conf.5; to the location of the file. - - The ATF test - suite has been updated to version 0.20. - - The libucl library - (Unified Configuration Library) has been merged from - &os;-CURRENT. - - The &man.pkg.7; bootstrapping utility has - been synced with the version in &os;-CURRENT. - - The &man.zfs.8; userland utility has been - updated to include aliases for snapshot, - which allows use of zfs list -t snap and - zfs snap. - - The &man.zfs.8; userland utility has been - updated to include a new flag to zfs list, - -p, which when specified, prints the output - in a parsable format. - - The &man.clang.1;/llvm suite has been - updated to version 3.4. - - The Blowfish password format - implementation updated. Support for $2b$ has - been added, allowing use of passwords greater than 256 - characters long. - - The &man.iconv.3; library has been - updated to match NetBSD, providing several bug fixes. - - The &man.date.1; utility has been updated - to include a new flag, -R, which prints the - date and time output as specified in RFC 2822. - - The &man.bc.1; utility has been updated to - version 1.1, in sync with the version in OpenBSD. - - The &man.pmcstat.8; utility has been - updated to include a new flag, -a, which when - specified, produces a full stack track on the sampled - points. - - The &man.netstat.8; and &man.route.8; - utilities have been updated to include a shorthand equivalent - to the -f inet and -f - inet6 address specifiers, -4 and - -6, respectively. - - The &man.ps.1; utility has been - updated to include the -J flag, used to - filter output by matching &man.jail.8; IDs and names. - Additionally, argument 0 can be used to - -J to only list processes running on the - host system. - - The &man.top.1; utility has been updated - to filter by &man.jail.8; ID or name, in followup to the - &man.ps.1; change in r265229. - - The &man.pmcstat.8; utility has been - updated to include a new flag, -l, which - ends event collection after the specified number of - seconds. - - The default &man.newsyslog.conf.5; now - includes files in the - /etc/newsyslog.conf.d/ and - /usr/local/etc/newsyslog.conf.d/ - directories by default for &man.newsyslog.8;. - - A new flag, onifconsole has - been added to /etc/ttys. This allows the - system to provide a login prompt via serial console if the - device is an active kernel console, otherwise it is equivalent - to off. - - The &man.mkimg.1; utility has been merged - from &os;-CURRENT. - - - <filename>/etc/rc.d</filename> Scripts - - The network.subr - &man.rc.8; script has been updated to loosen the requirement - of listing network aliases in numeric order. Previously, - a network alias of - _alias2 - would not be created if - _alias1 was - not defined. - - - - - Contributed Software - - The &man.xz.1; utility has been updated - to a post-5.0.5 snapshot. - - The &man.lldb.1; debugging library has - been updated to the r196322 snapshot. - - The timezone database has been updated to - version tzdata2014b. - - OpenSSH has - been updated to version 6.6p1. - - The &man.nc.1; utility has been updated - to match the version in OpenBSD 5.5. - - Sendmail - has been updated to 8.14.9. - - OpenSSL has - been updated to version 1.0.1h. - - - - Ports/Packages Collection Infrastructure - -   - - - - - Release Engineering and Integration - - The &man.services.mkdb.8; utility has *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 09:06:52 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 28569BBF; Mon, 25 Aug 2014 09:06:52 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 13BED32EE; Mon, 25 Aug 2014 09:06:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7P96p7S067492; Mon, 25 Aug 2014 09:06:51 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7P96pUq067491; Mon, 25 Aug 2014 09:06:51 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408250906.s7P96pUq067491@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 09:06:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270528 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 09:06:52 -0000 Author: gjb Date: Mon Aug 25 09:06:51 2014 New Revision: 270528 URL: http://svnweb.freebsd.org/changeset/base/270528 Log: Remove a non-breaking space between a trademark symbol. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 09:06:49 2014 (r270527) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 09:06:51 2014 (r270528) @@ -222,7 +222,7 @@ A kernel bug that inhibited proper functionality of the dev.cpu.0.freq &man.sysctl.8; on &intel; processors with Turbo - Boost ™ enabled has been fixed. + Boost™ enabled has been fixed. Virtualization Support From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 09:06:57 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id B8943EEE; Mon, 25 Aug 2014 09:06:57 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A41A532F7; Mon, 25 Aug 2014 09:06:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7P96vCr067627; Mon, 25 Aug 2014 09:06:57 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7P96vkI067626; Mon, 25 Aug 2014 09:06:57 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408250906.s7P96vkI067626@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 09:06:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270531 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 09:06:57 -0000 Author: gjb Date: Mon Aug 25 09:06:57 2014 New Revision: 270531 URL: http://svnweb.freebsd.org/changeset/base/270531 Log: Document r265983, tzdata2014c. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 09:06:55 2014 (r270530) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 09:06:57 2014 (r270531) @@ -496,15 +496,15 @@ sponsor="&darpa_afrl;">The &man.lldb.1; debugging library has been updated to the r196322 snapshot. - The timezone database has been updated - to version tzdata2014b. - OpenSSH has been updated to version 6.6p1. The &man.nc.1; utility has been updated to match the version in OpenBSD 5.5. + The timezone database has been updated + to version tzdata2014c. + Sendmail has been updated to 8.14.9. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 09:06:59 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id B9AD6FF; Mon, 25 Aug 2014 09:06:59 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7FEFF32FA; Mon, 25 Aug 2014 09:06:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7P96xK9067674; Mon, 25 Aug 2014 09:06:59 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7P96xfF067673; Mon, 25 Aug 2014 09:06:59 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408250906.s7P96xfF067673@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 09:06:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270532 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 09:06:59 -0000 Author: gjb Date: Mon Aug 25 09:06:59 2014 New Revision: 270532 URL: http://svnweb.freebsd.org/changeset/base/270532 Log: Document r266000, nexus(4) supports FDT for ARM and MIPS, replacing fdtbus(4). Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 09:06:57 2014 (r270531) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 09:06:59 2014 (r270532) @@ -249,6 +249,11 @@ the boot device, set the loaderdev=device u-boot environment variable. + + The nexus(4) driver + has been updated to include Flattened Device + Tree support, replacing the &man.fdtbus.4; driver + in most cases. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 10:43:50 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 02E26E1; Mon, 25 Aug 2014 10:43:50 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E1B903BB6; Mon, 25 Aug 2014 10:43:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PAhnsA014438; Mon, 25 Aug 2014 10:43:49 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PAhnJF014437; Mon, 25 Aug 2014 10:43:49 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251043.s7PAhnJF014437@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 10:43:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270533 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 10:43:50 -0000 Author: gjb Date: Mon Aug 25 10:43:49 2014 New Revision: 270533 URL: http://svnweb.freebsd.org/changeset/base/270533 Log: Document r266014, gvinum(8) '-f' flag changes. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 09:06:59 2014 (r270532) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 10:43:49 2014 (r270533) @@ -446,6 +446,12 @@ The &man.crypt.3; library now defaults to SHA512 for password hashing. + The &man.gvinum.8; utility has been + updated to allow forceful configuration reset with the + -f flag. Additionally, a bug that would + prevent -f from properly creating + a &man.gvinum.8; configuration has been fixed. + The &man.ps.1; utility has been updated to include the -J flag, used to filter output by matching &man.jail.8; IDs and names. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 10:43:51 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id E9A381B7; Mon, 25 Aug 2014 10:43:51 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D582D3BB7; Mon, 25 Aug 2014 10:43:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PAhpOG014480; Mon, 25 Aug 2014 10:43:51 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PAhpph014479; Mon, 25 Aug 2014 10:43:51 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251043.s7PAhpph014479@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 10:43:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270534 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 10:43:52 -0000 Author: gjb Date: Mon Aug 25 10:43:51 2014 New Revision: 270534 URL: http://svnweb.freebsd.org/changeset/base/270534 Log: Document r266029, login.conf(5) precedence over dot-shell files. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 10:43:49 2014 (r270533) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 10:43:51 2014 (r270534) @@ -452,6 +452,15 @@ prevent -f from properly creating a &man.gvinum.8; configuration has been fixed. + The &man.login.conf.5; file now takes + precedence over the shell-specific environment files. In + particular, the PATH, + BLOCKSIZE variables are commented from + /usr/share/skel/dot.profile, and the + path, BLOCKSIZE, and + umask variables have been commented from + /usr/share/skel/dot.cshrc. + The &man.ps.1; utility has been updated to include the -J flag, used to filter output by matching &man.jail.8; IDs and names. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 10:43:53 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id DBFED299; Mon, 25 Aug 2014 10:43:53 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B8BBF3BB8; Mon, 25 Aug 2014 10:43:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PAhrXq014523; Mon, 25 Aug 2014 10:43:53 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PAhroZ014522; Mon, 25 Aug 2014 10:43:53 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251043.s7PAhroZ014522@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 10:43:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270535 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 10:43:54 -0000 Author: gjb Date: Mon Aug 25 10:43:53 2014 New Revision: 270535 URL: http://svnweb.freebsd.org/changeset/base/270535 Log: Document r266105, gpioiic(4) and gpiobus(4) merged from head/. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 10:43:51 2014 (r270534) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 10:43:53 2014 (r270535) @@ -254,6 +254,9 @@ has been updated to include Flattened Device Tree support, replacing the &man.fdtbus.4; driver in most cases. + + The &man.gpioiic.4; and + &man.gpioled.4; have been merged from &os;-CURRENT. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 10:43:55 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id BDE073BB; Mon, 25 Aug 2014 10:43:55 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 96A103BBA; Mon, 25 Aug 2014 10:43:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PAhtI4014570; Mon, 25 Aug 2014 10:43:55 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PAhtmi014569; Mon, 25 Aug 2014 10:43:55 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251043.s7PAhtmi014569@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 10:43:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270536 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 10:43:55 -0000 Author: gjb Date: Mon Aug 25 10:43:55 2014 New Revision: 270536 URL: http://svnweb.freebsd.org/changeset/base/270536 Log: Document r266122, vfs.zfs.min_auto_ashift Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 10:43:53 2014 (r270535) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 10:43:55 2014 (r270536) @@ -372,6 +372,14 @@ The &man.zfs.8; filesystem has been updated to implement bookmarks. See &man.zfs.8; for further details. + + The &man.zfs.8; filesystem has been + updated to allow tuning the minimum ashift + value when creating new top-level virtual devices (vdevs). + To set the minimum ashift value, for example when creating + a &man.zpool.8; on Advanced Format drives, + set the vfs.zfs.min_auto_ashift + &man.sysctl.8; accordingly. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 10:43:59 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 756285F9; Mon, 25 Aug 2014 10:43:59 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 551EA3BBF; Mon, 25 Aug 2014 10:43:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PAhxQI014657; Mon, 25 Aug 2014 10:43:59 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PAhxTf014656; Mon, 25 Aug 2014 10:43:59 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251043.s7PAhxTf014656@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 10:43:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270538 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 10:43:59 -0000 Author: gjb Date: Mon Aug 25 10:43:58 2014 New Revision: 270538 URL: http://svnweb.freebsd.org/changeset/base/270538 Log: Document r266220, geom_uncompress(4) built by default. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 10:43:56 2014 (r270537) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 10:43:58 2014 (r270538) @@ -257,6 +257,11 @@ The &man.gpioiic.4; and &man.gpioled.4; have been merged from &os;-CURRENT. + + The &man.geom.uncompress.4; module is + built by default which, similar to &man.geom.uzip.4;, + provides support for compressed, read-only disk + images. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 10:43:57 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 8F3034DC; Mon, 25 Aug 2014 10:43:57 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 774893BBD; Mon, 25 Aug 2014 10:43:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PAhvru014612; Mon, 25 Aug 2014 10:43:57 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PAhvR0014611; Mon, 25 Aug 2014 10:43:57 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251043.s7PAhvR0014611@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 10:43:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270537 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 10:43:57 -0000 Author: gjb Date: Mon Aug 25 10:43:56 2014 New Revision: 270537 URL: http://svnweb.freebsd.org/changeset/base/270537 Log: Document r266212, RTL8168C/RTL8168CP TX checksum offloading disabled. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 10:43:55 2014 (r270536) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 10:43:56 2014 (r270537) @@ -321,6 +321,12 @@ Support for the ASUS USB-N10 Nano wireless card has been added to the &man.urtwn.4; driver. + + Transmission checksum offloading has + been disabled for the RTL8168C and RTL8168CP chipsets in + the &man.re.4; driver for TCP and UDP frames. This is + due to a report of UDP datagrams with IP options + generating corrupt frames. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 10:44:01 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 60D286E5; Mon, 25 Aug 2014 10:44:01 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 36A143BC2; Mon, 25 Aug 2014 10:44:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PAi1wf014739; Mon, 25 Aug 2014 10:44:01 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PAi1xP014737; Mon, 25 Aug 2014 10:44:01 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251044.s7PAi1xP014737@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 10:44:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270539 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 10:44:01 -0000 Author: gjb Date: Mon Aug 25 10:44:00 2014 New Revision: 270539 URL: http://svnweb.freebsd.org/changeset/base/270539 Log: Document r266272, binmiscctl(8) merged from head/. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 10:43:58 2014 (r270538) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 10:44:00 2014 (r270539) @@ -483,6 +483,10 @@ umask variables have been commented from /usr/share/skel/dot.cshrc. + The &man.binmiscctl.8; userland utility + and related image activator features have been merged from + &os;-CURRENT. + The &man.ps.1; utility has been updated to include the -J flag, used to filter output by matching &man.jail.8; IDs and names. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 10:44:03 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 474627DF; Mon, 25 Aug 2014 10:44:03 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1857C3BC5; Mon, 25 Aug 2014 10:44:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PAi2qD014793; Mon, 25 Aug 2014 10:44:02 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PAi2bQ014792; Mon, 25 Aug 2014 10:44:02 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251044.s7PAi2bQ014792@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 10:44:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270540 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 10:44:03 -0000 Author: gjb Date: Mon Aug 25 10:44:02 2014 New Revision: 270540 URL: http://svnweb.freebsd.org/changeset/base/270540 Log: Move note about geom_uncompress(4), which is not ARM-specific. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 10:44:00 2014 (r270539) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 10:44:02 2014 (r270540) @@ -224,6 +224,11 @@ &man.sysctl.8; on &intel; processors with Turbo Boost™ enabled has been fixed. + The &man.geom.uncompress.4; module is + built by default which, similar to &man.geom.uzip.4;, + provides support for compressed, read-only disk + images. + Virtualization Support @@ -257,11 +262,6 @@ The &man.gpioiic.4; and &man.gpioled.4; have been merged from &os;-CURRENT. - - The &man.geom.uncompress.4; module is - built by default which, similar to &man.geom.uzip.4;, - provides support for compressed, read-only disk - images. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 11:46:28 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 3D0E1665; Mon, 25 Aug 2014 11:46:28 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 283D231C6; Mon, 25 Aug 2014 11:46:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PBkS4A044455; Mon, 25 Aug 2014 11:46:28 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PBkS3S044454; Mon, 25 Aug 2014 11:46:28 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251146.s7PBkS3S044454@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 11:46:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270541 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 11:46:28 -0000 Author: gjb Date: Mon Aug 25 11:46:27 2014 New Revision: 270541 URL: http://svnweb.freebsd.org/changeset/base/270541 Log: Document r266379, ZEDBOARD SMP support. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 10:44:02 2014 (r270540) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 11:46:27 2014 (r270541) @@ -262,6 +262,10 @@ The &man.gpioiic.4; and &man.gpioled.4; have been merged from &os;-CURRENT. + + The ZEDBOARD kernel + configuration file has been updated to include + SMP support. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 11:46:30 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 1FB9773B; Mon, 25 Aug 2014 11:46:30 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0B5F231C7; Mon, 25 Aug 2014 11:46:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PBkTqp044505; Mon, 25 Aug 2014 11:46:29 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PBkTRg044504; Mon, 25 Aug 2014 11:46:29 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251146.s7PBkTRg044504@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 11:46:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270542 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 11:46:30 -0000 Author: gjb Date: Mon Aug 25 11:46:29 2014 New Revision: 270542 URL: http://svnweb.freebsd.org/changeset/base/270542 Log: Document r266436, Intel Lynx Point KT UART AMT support. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 11:46:27 2014 (r270541) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 11:46:29 2014 (r270542) @@ -229,6 +229,10 @@ provides support for compressed, read-only disk images. + The &man.uart.4; driver has been + updated to include support for the &intel; Lynx Point + KT AMT serial port. + Virtualization Support From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 11:46:32 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 0778B868; Mon, 25 Aug 2014 11:46:32 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E730831C8; Mon, 25 Aug 2014 11:46:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PBkVAC044550; Mon, 25 Aug 2014 11:46:31 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PBkV4D044549; Mon, 25 Aug 2014 11:46:31 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251146.s7PBkV4D044549@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 11:46:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270543 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 11:46:32 -0000 Author: gjb Date: Mon Aug 25 11:46:31 2014 New Revision: 270543 URL: http://svnweb.freebsd.org/changeset/base/270543 Log: Document r266578, Realtek RTL8188EUS and RTL8188ETV support in urtwn(4). Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 11:46:29 2014 (r270542) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 11:46:31 2014 (r270543) @@ -340,6 +340,10 @@ the &man.re.4; driver for TCP and UDP frames. This is due to a report of UDP datagrams with IP options generating corrupt frames. + + Preliminary support has been added + to the &man.urtwn.4; driver for the Realtek RTL8188EUS and + RTL8188ETV chipsets. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 11:46:35 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id D1135A6F; Mon, 25 Aug 2014 11:46:35 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B003831CE; Mon, 25 Aug 2014 11:46:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PBkZJk044637; Mon, 25 Aug 2014 11:46:35 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PBkZWS044636; Mon, 25 Aug 2014 11:46:35 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251146.s7PBkZWS044636@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 11:46:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270545 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 11:46:35 -0000 Author: gjb Date: Mon Aug 25 11:46:35 2014 New Revision: 270545 URL: http://svnweb.freebsd.org/changeset/base/270545 Log: Document r266610, gstat(8) '-o' flag. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 11:46:33 2014 (r270544) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 11:46:35 2014 (r270545) @@ -515,6 +515,11 @@ to filter by &man.jail.8; ID or name, in followup to the &man.ps.1; change in r265229. + The &man.gstat.8; utility has been + updated to include a new flag, -o. When + set, &man.gstat.8; will display statistics for operations + such as BIO_FLUSH. + The &man.pmcstat.8; utility has been updated to include a new flag, -l, which ends event collection after the specified number of From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 11:46:37 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id CE96DB75; Mon, 25 Aug 2014 11:46:37 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B070F31D0; Mon, 25 Aug 2014 11:46:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PBkb4x044682; Mon, 25 Aug 2014 11:46:37 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PBkbvY044681; Mon, 25 Aug 2014 11:46:37 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251146.s7PBkbvY044681@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 11:46:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270546 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 11:46:37 -0000 Author: gjb Date: Mon Aug 25 11:46:37 2014 New Revision: 270546 URL: http://svnweb.freebsd.org/changeset/base/270546 Log: Document r266612, libzfs pool threading. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 11:46:35 2014 (r270545) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 11:46:37 2014 (r270546) @@ -408,6 +408,12 @@ a &man.zpool.8; on Advanced Format drives, set the vfs.zfs.min_auto_ashift &man.sysctl.8; accordingly. + + The libzfs thread + pool API has been imported from + OpenSolaris, and adapted for &os;. This change allows + parallel disk scanning, which can reduce &man.zpool.8; + overall import time in some workloads. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 11:46:41 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 68716CD6; Mon, 25 Aug 2014 11:46:41 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5452D31D6; Mon, 25 Aug 2014 11:46:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PBkfxm044773; Mon, 25 Aug 2014 11:46:41 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PBkf8o044772; Mon, 25 Aug 2014 11:46:41 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251146.s7PBkf8o044772@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 11:46:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270548 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 11:46:41 -0000 Author: gjb Date: Mon Aug 25 11:46:40 2014 New Revision: 270548 URL: http://svnweb.freebsd.org/changeset/base/270548 Log: Document r266715, clang/llvm 3.4.1. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 11:46:38 2014 (r270547) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 11:46:40 2014 (r270548) @@ -457,9 +457,6 @@ list, -p, which when specified, prints the output in a parsable format. - The &man.clang.1;/llvm suite has been - updated to version 3.4. - The Blowfish password format implementation updated. Support for $2b$ has been added, allowing use of passwords greater than 256 @@ -532,6 +529,9 @@ before /etc/ssl/. + The &man.clang.1;/llvm suite has been + updated to version 3.4.1. + The &man.pmcstat.8; utility has been updated to include a new flag, -l, which ends event collection after the specified number of From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 11:46:45 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 5E760FAC; Mon, 25 Aug 2014 11:46:45 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0D35A31DA; Mon, 25 Aug 2014 11:46:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PBkixV044871; Mon, 25 Aug 2014 11:46:44 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PBkidJ044870; Mon, 25 Aug 2014 11:46:44 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251146.s7PBkidJ044870@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 11:46:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270550 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 11:46:45 -0000 Author: gjb Date: Mon Aug 25 11:46:44 2014 New Revision: 270550 URL: http://svnweb.freebsd.org/changeset/base/270550 Log: Document r266816, $2b$ crypt format used by default. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 11:46:42 2014 (r270549) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 11:46:44 2014 (r270550) @@ -538,6 +538,9 @@ The &man.clang.1;/llvm suite has been updated to version 3.4.1. + The Blowfish password format + has been changed to $2b$ by default. + The &man.pmcstat.8; utility has been updated to include a new flag, -l, which ends event collection after the specified number of From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 11:46:39 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id AA5A6C5D; Mon, 25 Aug 2014 11:46:39 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 73C8D31D2; Mon, 25 Aug 2014 11:46:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PBkdPc044733; Mon, 25 Aug 2014 11:46:39 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PBkdAt044732; Mon, 25 Aug 2014 11:46:39 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251146.s7PBkdAt044732@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 11:46:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270547 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 11:46:39 -0000 Author: gjb Date: Mon Aug 25 11:46:38 2014 New Revision: 270547 URL: http://svnweb.freebsd.org/changeset/base/270547 Log: Document r266632, fetch(3) looks in /usr/local/etc/ssl/ before /etc/ssl/ for the root CA. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 11:46:37 2014 (r270546) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 11:46:38 2014 (r270547) @@ -526,6 +526,12 @@ set, &man.gstat.8; will display statistics for operations such as BIO_FLUSH. + The &man.fetch.3; library has been + updated to look for root SSL certificates + in /usr/local/etc/ssl/ + before /etc/ssl/. + The &man.pmcstat.8; utility has been updated to include a new flag, -l, which ends event collection after the specified number of From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 11:46:43 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 44CFDDF9; Mon, 25 Aug 2014 11:46:43 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 30B0B31D8; Mon, 25 Aug 2014 11:46:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PBkhTF044818; Mon, 25 Aug 2014 11:46:43 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PBkhfp044817; Mon, 25 Aug 2014 11:46:43 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251146.s7PBkhfp044817@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 11:46:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270549 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 11:46:43 -0000 Author: gjb Date: Mon Aug 25 11:46:42 2014 New Revision: 270549 URL: http://svnweb.freebsd.org/changeset/base/270549 Log: Document r266718, jail(8) source address selection fix when using raw_sockets. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 11:46:40 2014 (r270548) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 11:46:42 2014 (r270549) @@ -233,6 +233,12 @@ updated to include support for the &intel; Lynx Point KT AMT serial port. + A bug that would prevent + a &man.jail.8; from setting the correct IPv4 source address + with some operations that required + security.jail.allow_raw_sockets has been + fixed. + Virtualization Support From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 11:46:33 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id E7526949; Mon, 25 Aug 2014 11:46:33 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D2D5B31CC; Mon, 25 Aug 2014 11:46:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PBkXJv044595; Mon, 25 Aug 2014 11:46:33 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PBkXGj044594; Mon, 25 Aug 2014 11:46:33 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251146.s7PBkXGj044594@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 11:46:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270544 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 11:46:34 -0000 Author: gjb Date: Mon Aug 25 11:46:33 2014 New Revision: 270544 URL: http://svnweb.freebsd.org/changeset/base/270544 Log: Document r266594, 32-bit ioctl(2) support in radeonkms. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 11:46:31 2014 (r270543) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 11:46:33 2014 (r270544) @@ -381,6 +381,11 @@ Support for the disklabel64 partitioning scheme has been added to &man.gpart.8;. + + The radeonkms(4) + driver has been updated to include 32-bit &man.ioctl.2; + support, allowing 32-bit applications to run on a 64-bit + system. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 11:46:47 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 3105B105; Mon, 25 Aug 2014 11:46:47 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E553A31DF; Mon, 25 Aug 2014 11:46:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PBkkHq044937; Mon, 25 Aug 2014 11:46:46 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PBkka4044935; Mon, 25 Aug 2014 11:46:46 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251146.s7PBkka4044935@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 11:46:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270551 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 11:46:47 -0000 Author: gjb Date: Mon Aug 25 11:46:46 2014 New Revision: 270551 URL: http://svnweb.freebsd.org/changeset/base/270551 Log: Document r266888, amount of data collected for hwpmc(4) increased. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 11:46:44 2014 (r270550) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 11:46:46 2014 (r270551) @@ -541,6 +541,10 @@ The Blowfish password format has been changed to $2b$ by default. + The amount of data collected for + &man.hwpmc.4; has been updated to work with modern processors + and larger amounts of available memory. + The &man.pmcstat.8; utility has been updated to include a new flag, -l, which ends event collection after the specified number of From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 12:45:48 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 0948EF3A; Mon, 25 Aug 2014 12:45:48 +0000 (UTC) Received: from mx1.sbone.de (bird.sbone.de [46.4.1.90]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id B09333734; Mon, 25 Aug 2014 12:45:46 +0000 (UTC) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:31::2013:587]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id 314D925D387C; Mon, 25 Aug 2014 12:45:36 +0000 (UTC) Received: from content-filter.sbone.de (content-filter.sbone.de [IPv6:fde9:577b:c1a9:31::2013:2742]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 175F8C77036; Mon, 25 Aug 2014 12:45:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:31::2013:587]) by content-filter.sbone.de (content-filter.sbone.de [fde9:577b:c1a9:31::2013:2742]) (amavisd-new, port 10024) with ESMTP id w6FGKJ1rcJ9p; Mon, 25 Aug 2014 12:45:32 +0000 (UTC) Received: from [IPv6:fde9:577b:c1a9:4420:cabc:c8ff:fe8b:4fe6] (orange-tun0-ula.sbone.de [IPv6:fde9:577b:c1a9:4420:cabc:c8ff:fe8b:4fe6]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 73D7AC22F5A; Mon, 25 Aug 2014 12:45:28 +0000 (UTC) Content-Type: text/plain; charset=windows-1252 Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Subject: Re: svn commit: r270516 - head/sys/dev/drm2/i915 From: "Bjoern A. Zeeb" In-Reply-To: <201408250503.s7P53Axo057720@svn.freebsd.org> Date: Mon, 25 Aug 2014 12:45:23 +0000 Content-Transfer-Encoding: quoted-printable Message-Id: References: <201408250503.s7P53Axo057720@svn.freebsd.org> To: Adrian Chadd X-Mailer: Apple Mail (2.1878.6) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 12:45:48 -0000 On 25 Aug 2014, at 05:03 , Adrian Chadd wrote: > Author: adrian > Date: Mon Aug 25 05:03:10 2014 > New Revision: 270516 > URL: http://svnweb.freebsd.org/changeset/base/270516 >=20 > Log: > i915 driver - enable opregion handle; program CADL. >=20 > add opregion handling for drm2 - which exposes some ACPI video = configuration > pieces that some Lenovo laptop models use to flesh out which video = device > to speak to. This enables the brightness control in ACPI to work = these models. >=20 > The CADL bits are also important - it's used to figure out which ACPI > events to hook the brightness buttons into. It doesn't yet seem to = work > for me, but it does for the OP. >=20 This broke pc98: @/contrib/dev/acpica/include/platform/acfreebsd.h:75:10: fatal error: = 'machine/acpica_machdep.h' file not found > Tested: >=20 > * Lenovo X230 (mine) > * OP: ASUS UX51VZ >=20 > PR: 190186 > Submitted by: Henry Hu > Reviewed by: dumbbell >=20 > Modified: > head/sys/dev/drm2/i915/i915_drv.h > head/sys/dev/drm2/i915/i915_irq.c > head/sys/dev/drm2/i915/intel_opregion.c > =85 > Modified: head/sys/dev/drm2/i915/intel_opregion.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/dev/drm2/i915/intel_opregion.c Mon Aug 25 03:02:38 2014 = (r270515) > +++ head/sys/dev/drm2/i915/intel_opregion.c Mon Aug 25 05:03:10 2014 = (r270516) > @@ -32,6 +32,9 @@ __FBSDID("$FreeBSD$"); > #include > #include > #include > +#include > +#include > +#include >=20 > #define PCI_ASLE 0xe4 > #define PCI_ASLS 0xfc =97=20 Bjoern A. Zeeb "Come on. Learn, goddamn it.", WarGames, 1983 From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 12:49:11 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id E190F3E7; Mon, 25 Aug 2014 12:49:10 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CC33A3761; Mon, 25 Aug 2014 12:49:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PCnA1H076890; Mon, 25 Aug 2014 12:49:10 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PCnAih076888; Mon, 25 Aug 2014 12:49:10 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201408251249.s7PCnAih076888@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Mon, 25 Aug 2014 12:49:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270552 - in stable/10: sbin/geom/class/part sys/geom/part X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 12:49:11 -0000 Author: ae Date: Mon Aug 25 12:49:10 2014 New Revision: 270552 URL: http://svnweb.freebsd.org/changeset/base/270552 Log: MFC r268407 (by gjb): Fix non-version text after .Fx macro usage. MFC r269487 (by issyl0): Add generic list, status, load and unload docs to gpart(8) - In the style of gmirror(8). PR: docs/191534 MFC r269852: Add sysctl and loader tunable kern.geom.part.mbr.enforce_chs that is set by default. It can be used to disable automatic alignment to CHS geometry, that GEOM_PART_MBR does. Modified: stable/10/sbin/geom/class/part/gpart.8 stable/10/sys/geom/part/g_part_mbr.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sbin/geom/class/part/gpart.8 ============================================================================== --- stable/10/sbin/geom/class/part/gpart.8 Mon Aug 25 11:46:46 2014 (r270551) +++ stable/10/sbin/geom/class/part/gpart.8 Mon Aug 25 12:49:10 2014 (r270552) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 1, 2014 +.Dd August 12, 2014 .Dt GPART 8 .Os .Sh NAME @@ -129,6 +129,14 @@ .Op Fl f Ar flags .Ar geom .\" +.Nm +.Cm list +.Nm +.Cm status +.Nm +.Cm load +.Nm +.Cm unload .Sh DESCRIPTION The .Nm @@ -467,6 +475,18 @@ See the section entitled below for a discussion about its use. .El +.It Cm list +See +.Xr geom 8 . +.It Cm status +See +.Xr geom 8 . +.It Cm load +See +.Xr geom 8 . +.It Cm unload +See +.Xr geom 8 . .El .Sh PARTITIONING SCHEMES Several partitioning schemes are supported by the @@ -551,7 +571,8 @@ The utility also allows the user to specify scheme-specific partition types for partition types that do not have symbolic names. Symbolic names currently understood and used by -.Fx are: +.Fx +are: .Bl -tag -width ".Cm dragonfly-disklabel64" .It Cm bios-boot The system partition dedicated to second stage of the boot loader program. @@ -1144,6 +1165,12 @@ If this variable set to 1 each component present as independent partition. .Em NOTE : This may break a mirrored volume and lead to data damage. +.It Va kern.geom.part.mbr.enforce_chs : No 1 +Specify how the Master Boot Record (MBR) module does alignment. +If this variable is set to a non-zero value, the module will automatically +recalculate the user-specified offset and size for alignment with the CHS +geometry. +Otherwise the values will be left unchanged. .El .Sh EXIT STATUS Exit status is 0 on success, and 1 if the command fails. Modified: stable/10/sys/geom/part/g_part_mbr.c ============================================================================== --- stable/10/sys/geom/part/g_part_mbr.c Mon Aug 25 11:46:46 2014 (r270551) +++ stable/10/sys/geom/part/g_part_mbr.c Mon Aug 25 12:49:10 2014 (r270552) @@ -49,6 +49,14 @@ __FBSDID("$FreeBSD$"); FEATURE(geom_part_mbr, "GEOM partitioning class for MBR support"); +SYSCTL_DECL(_kern_geom_part); +static SYSCTL_NODE(_kern_geom_part, OID_AUTO, mbr, CTLFLAG_RW, 0, + "GEOM_PART_MBR Master Boot Record"); + +static u_int enforce_chs = 1; +SYSCTL_UINT(_kern_geom_part_mbr, OID_AUTO, enforce_chs, + CTLFLAG_RWTUN, &enforce_chs, 1, "Enforce alignment to CHS addressing"); + #define MBRSIZE 512 struct g_part_mbr_table { @@ -200,6 +208,8 @@ mbr_align(struct g_part_table *basetable { uint32_t sectors; + if (enforce_chs == 0) + return (0); sectors = basetable->gpt_sectors; if (*size < sectors) return (EINVAL); From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 13:15:15 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 8AD3C9B7; Mon, 25 Aug 2014 13:15:15 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 75E3039F4; Mon, 25 Aug 2014 13:15:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PDFFIq091670; Mon, 25 Aug 2014 13:15:15 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PDFFKm091669; Mon, 25 Aug 2014 13:15:15 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251315.s7PDFFKm091669@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 13:15:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270553 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 13:15:15 -0000 Author: gjb Date: Mon Aug 25 13:15:14 2014 New Revision: 270553 URL: http://svnweb.freebsd.org/changeset/base/270553 Log: Document r266911, Atom Silvermont microarchitecture support in hwpmc(4). Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 12:49:10 2014 (r270552) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 13:15:14 2014 (r270553) @@ -239,6 +239,10 @@ security.jail.allow_raw_sockets has been fixed. + The &man.hwpmc.4; driver has been + updated to support core events from the Atom™ + Silvermont architecture. + Virtualization Support From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 13:15:25 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id EF5C4AE7; Mon, 25 Aug 2014 13:15:24 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DB41239FA; Mon, 25 Aug 2014 13:15:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PDFOGr091855; Mon, 25 Aug 2014 13:15:24 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PDFOqm091854; Mon, 25 Aug 2014 13:15:24 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251315.s7PDFOqm091854@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 13:15:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270557 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 13:15:25 -0000 Author: gjb Date: Mon Aug 25 13:15:24 2014 New Revision: 270557 URL: http://svnweb.freebsd.org/changeset/base/270557 Log: Document r267161, realpath(1): fail on non-directory containing '.' or '..' Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 13:15:21 2014 (r270556) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 13:15:24 2014 (r270557) @@ -575,6 +575,13 @@ /usr/local/etc/newsyslog.conf.d/ directories by default for &man.newsyslog.8;. + The &man.realpath.1; utility has been + updated to return ENOTDIR on paths + components . and .. that are + not directories, such as /dev/null/. or /dev/null/... + A new flag, onifconsole has been added to /etc/ttys. This allows the system to provide a login prompt via serial console if the From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 13:15:18 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 013869B8; Mon, 25 Aug 2014 13:15:17 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E033D39F5; Mon, 25 Aug 2014 13:15:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PDFHDT091719; Mon, 25 Aug 2014 13:15:17 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PDFHAe091718; Mon, 25 Aug 2014 13:15:17 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251315.s7PDFHAe091718@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 13:15:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270554 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 13:15:18 -0000 Author: gjb Date: Mon Aug 25 13:15:17 2014 New Revision: 270554 URL: http://svnweb.freebsd.org/changeset/base/270554 Log: Document r266953, silence error message if there is nothing to compare. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 13:15:14 2014 (r270553) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 13:15:17 2014 (r270554) @@ -554,6 +554,11 @@ ends event collection after the specified number of seconds. + The &man.mergemaster.8; utility has + been updated to avoid printing + /var/tmp/temproot + disappeared if there is nothing to compare. + The default &man.newsyslog.conf.5; now includes files in the /etc/newsyslog.conf.d/ and From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 13:15:29 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id A276EDBD; Mon, 25 Aug 2014 13:15:29 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8E31239FE; Mon, 25 Aug 2014 13:15:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PDFTNH091956; Mon, 25 Aug 2014 13:15:29 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PDFTIh091955; Mon, 25 Aug 2014 13:15:29 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251315.s7PDFTIh091955@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 13:15:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270559 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 13:15:29 -0000 Author: gjb Date: Mon Aug 25 13:15:29 2014 New Revision: 270559 URL: http://svnweb.freebsd.org/changeset/base/270559 Log: Document r267399, FreeBSD/i386 bhyve guest support. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 13:15:26 2014 (r270558) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 13:15:29 2014 (r270559) @@ -246,6 +246,9 @@ The &man.mfi.4; driver has been updated to include support for unmapped I/O. + Support for &os;/i386 guests has been + added to &man.bhyve.4;. + Virtualization Support From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 13:15:38 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 892AE3BD; Mon, 25 Aug 2014 13:15:38 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 74F053A0B; Mon, 25 Aug 2014 13:15:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PDFcOk092176; Mon, 25 Aug 2014 13:15:38 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PDFcPh092175; Mon, 25 Aug 2014 13:15:38 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251315.s7PDFcPh092175@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 13:15:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270563 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 13:15:38 -0000 Author: gjb Date: Mon Aug 25 13:15:37 2014 New Revision: 270563 URL: http://svnweb.freebsd.org/changeset/base/270563 Log: Document r267450, bhyve(8) SMBIOS support and -U flag. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 13:15:35 2014 (r270562) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 13:15:37 2014 (r270563) @@ -602,6 +602,11 @@ PCI devices has been removed from &man.bhyve.8;. + The &man.bhyve.8; userland utility + has been updated to include SMBIOS support. A new flag has + been added, -U, which allows specifying the + UUID of the guest in the System Information structure. + The &man.mkimg.1; utility has been merged from &os;-CURRENT. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 13:15:34 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 417DC122; Mon, 25 Aug 2014 13:15:34 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2CF163A03; Mon, 25 Aug 2014 13:15:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PDFYBP092067; Mon, 25 Aug 2014 13:15:34 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PDFYKS092066; Mon, 25 Aug 2014 13:15:34 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251315.s7PDFYKS092066@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 13:15:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270561 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 13:15:34 -0000 Author: gjb Date: Mon Aug 25 13:15:33 2014 New Revision: 270561 URL: http://svnweb.freebsd.org/changeset/base/270561 Log: Move r267399 note to the virtualization subsection. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 13:15:31 2014 (r270560) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 13:15:33 2014 (r270561) @@ -246,9 +246,6 @@ The &man.mfi.4; driver has been updated to include support for unmapped I/O. - Support for &os;/i386 guests has been - added to &man.bhyve.4;. - Virtualization Support @@ -260,6 +257,9 @@ The &man.bhyve.4; hypervisor now supports soft power-off functionality via the ACPI S5 state. + + Support for &os;/i386 guests has been + added to &man.bhyve.4;. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 13:15:20 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 218D49BE; Mon, 25 Aug 2014 13:15:20 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0CFBC39F6; Mon, 25 Aug 2014 13:15:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PDFJJi091763; Mon, 25 Aug 2014 13:15:19 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PDFJoJ091762; Mon, 25 Aug 2014 13:15:19 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251315.s7PDFJoJ091762@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 13:15:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270555 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 13:15:20 -0000 Author: gjb Date: Mon Aug 25 13:15:19 2014 New Revision: 270555 URL: http://svnweb.freebsd.org/changeset/base/270555 Log: Document r267056, bsdinstall(8) enhancements. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 13:15:17 2014 (r270554) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 13:15:19 2014 (r270555) @@ -559,6 +559,13 @@ /var/tmp/temproot disappeared if there is nothing to compare. + The &os; installer, &man.bsdinstall.8;, + has been updated to include optional + &man.geli.8;-encrypted or &man.gmirror.8;-mirrored swap + devices when installing onto a full &man.zfs.8; filesystem. + Additionally, the parent &man.zfs.8; dataset is now configured + with lz4 compression enabled. + The default &man.newsyslog.conf.5; now includes files in the /etc/newsyslog.conf.d/ and From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 13:15:22 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 73888AAD; Mon, 25 Aug 2014 13:15:22 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5EF5C39F8; Mon, 25 Aug 2014 13:15:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PDFMAT091807; Mon, 25 Aug 2014 13:15:22 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PDFMHM091806; Mon, 25 Aug 2014 13:15:22 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251315.s7PDFMHM091806@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 13:15:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270556 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 13:15:22 -0000 Author: gjb Date: Mon Aug 25 13:15:21 2014 New Revision: 270556 URL: http://svnweb.freebsd.org/changeset/base/270556 Log: Document r267084, unmapped I/O added to mfi(4). Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 13:15:19 2014 (r270555) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 13:15:21 2014 (r270556) @@ -243,6 +243,9 @@ updated to support core events from the Atom™ Silvermont architecture. + The &man.mfi.4; driver has been + updated to include support for unmapped I/O. + Virtualization Support From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 13:15:27 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 3F396C99; Mon, 25 Aug 2014 13:15:27 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 28E3239FB; Mon, 25 Aug 2014 13:15:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PDFRtY091905; Mon, 25 Aug 2014 13:15:27 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PDFR9o091904; Mon, 25 Aug 2014 13:15:27 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251315.s7PDFR9o091904@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 13:15:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270558 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 13:15:27 -0000 Author: gjb Date: Mon Aug 25 13:15:26 2014 New Revision: 270558 URL: http://svnweb.freebsd.org/changeset/base/270558 Log: Document r267341, legacy PCI support removed from bhyve(8). Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 13:15:24 2014 (r270557) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 13:15:26 2014 (r270558) @@ -588,6 +588,10 @@ device is an active kernel console, otherwise it is equivalent to off. + Support for legacy + PCI devices has been removed from + &man.bhyve.8;. + The &man.mkimg.1; utility has been merged from &os;-CURRENT. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 13:15:32 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 00526FB3; Mon, 25 Aug 2014 13:15:31 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C785D3A01; Mon, 25 Aug 2014 13:15:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PDFVTZ092007; Mon, 25 Aug 2014 13:15:31 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PDFVAr092006; Mon, 25 Aug 2014 13:15:31 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251315.s7PDFVAr092006@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 13:15:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270560 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 13:15:32 -0000 Author: gjb Date: Mon Aug 25 13:15:31 2014 New Revision: 270560 URL: http://svnweb.freebsd.org/changeset/base/270560 Log: Fix indentation levels that are wrong, caused from a copy/paste mistake. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 13:15:29 2014 (r270559) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 13:15:31 2014 (r270560) @@ -224,27 +224,27 @@ &man.sysctl.8; on &intel; processors with Turbo Boost™ enabled has been fixed. - The &man.geom.uncompress.4; module is - built by default which, similar to &man.geom.uzip.4;, - provides support for compressed, read-only disk - images. - - The &man.uart.4; driver has been - updated to include support for the &intel; Lynx Point - KT AMT serial port. - - A bug that would prevent - a &man.jail.8; from setting the correct IPv4 source address - with some operations that required - security.jail.allow_raw_sockets has been - fixed. - - The &man.hwpmc.4; driver has been - updated to support core events from the Atom™ - Silvermont architecture. + The &man.geom.uncompress.4; module is + built by default which, similar to &man.geom.uzip.4;, + provides support for compressed, read-only disk + images. + + The &man.uart.4; driver has been + updated to include support for the &intel; Lynx Point + KT AMT serial port. + + A bug that would prevent + a &man.jail.8; from setting the correct IPv4 source address + with some operations that required + security.jail.allow_raw_sockets has been + fixed. + + The &man.hwpmc.4; driver has been + updated to support core events from the Atom™ + Silvermont architecture. - The &man.mfi.4; driver has been - updated to include support for unmapped I/O. + The &man.mfi.4; driver has been + updated to include support for unmapped I/O. Support for &os;/i386 guests has been added to &man.bhyve.4;. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 13:15:42 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id CDDBC5F2; Mon, 25 Aug 2014 13:15:42 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B92E33A13; Mon, 25 Aug 2014 13:15:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PDFge0092273; Mon, 25 Aug 2014 13:15:42 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PDFgUY092272; Mon, 25 Aug 2014 13:15:42 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251315.s7PDFgUY092272@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 13:15:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270565 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 13:15:42 -0000 Author: gjb Date: Mon Aug 25 13:15:42 2014 New Revision: 270565 URL: http://svnweb.freebsd.org/changeset/base/270565 Log: Document r267477, tzdata2014e. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 13:15:40 2014 (r270564) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 13:15:42 2014 (r270565) @@ -643,14 +643,14 @@ The &man.nc.1; utility has been updated to match the version in OpenBSD 5.5. - The timezone database has been updated - to version tzdata2014c. - Sendmail has been updated to 8.14.9. OpenSSL has been updated to version 1.0.1h. + + The timezone database has been updated + to version tzdata2014e. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 13:15:40 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id A3BD94D9; Mon, 25 Aug 2014 13:15:40 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8F8033A11; Mon, 25 Aug 2014 13:15:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PDFetr092224; Mon, 25 Aug 2014 13:15:40 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PDFeJd092223; Mon, 25 Aug 2014 13:15:40 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251315.s7PDFeJd092223@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 13:15:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270564 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 13:15:40 -0000 Author: gjb Date: Mon Aug 25 13:15:40 2014 New Revision: 270564 URL: http://svnweb.freebsd.org/changeset/base/270564 Log: Document r267457, hpt27xx(4) vendor (bug fix) update. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 13:15:37 2014 (r270563) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 13:15:40 2014 (r270564) @@ -246,6 +246,9 @@ The &man.mfi.4; driver has been updated to include support for unmapped I/O. + The &man.hpt27xx.4; driver has been + updated with various vendor-supplied bug fixes. + Virtualization Support From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 13:15:36 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 560422DA; Mon, 25 Aug 2014 13:15:36 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 41ECA3A06; Mon, 25 Aug 2014 13:15:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PDFa4E092132; Mon, 25 Aug 2014 13:15:36 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PDFaTu092131; Mon, 25 Aug 2014 13:15:36 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251315.s7PDFaTu092131@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 13:15:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270562 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 13:15:36 -0000 Author: gjb Date: Mon Aug 25 13:15:35 2014 New Revision: 270562 URL: http://svnweb.freebsd.org/changeset/base/270562 Log: Document r267427, bhyve guest XSAVE support. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 13:15:33 2014 (r270561) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 13:15:35 2014 (r270562) @@ -260,6 +260,13 @@ Support for &os;/i386 guests has been added to &man.bhyve.4;. + + Support for virtualized + XSAVE has been added to &man.bhyve.4;, + allowing guest operating systems to use + XSAVE and + XSAVE-enabled features, such as + AVX. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 14:11:02 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 0E980F14; Mon, 25 Aug 2014 14:11:02 +0000 (UTC) Received: from cell.glebius.int.ru (glebius.int.ru [81.19.69.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "cell.glebius.int.ru", Issuer "cell.glebius.int.ru" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 875C0301A; Mon, 25 Aug 2014 14:11:00 +0000 (UTC) Received: from cell.glebius.int.ru (localhost [127.0.0.1]) by cell.glebius.int.ru (8.14.9/8.14.9) with ESMTP id s7PEAnxc053515 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 25 Aug 2014 18:10:49 +0400 (MSK) (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by cell.glebius.int.ru (8.14.9/8.14.9/Submit) id s7PEAmrh053514; Mon, 25 Aug 2014 18:10:48 +0400 (MSK) (envelope-from glebius@FreeBSD.org) X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to glebius@FreeBSD.org using -f Date: Mon, 25 Aug 2014 18:10:48 +0400 From: Gleb Smirnoff To: Don Lewis Subject: Re: svn commit: r270510 - head Message-ID: <20140825141048.GQ7693@FreeBSD.org> References: <61DA1EC8-C938-4AB8-B518-7249307B4379@felyko.com> <201408242301.s7ON1N51056169@gw.catspoiler.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201408242301.s7ON1N51056169@gw.catspoiler.org> User-Agent: Mutt/1.5.23 (2014-03-12) Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, rpaulo@felyko.com, peter@wemm.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 14:11:02 -0000 On Sun, Aug 24, 2014 at 04:01:23PM -0700, Don Lewis wrote: D> >>> +# 20040728: GCC 3.4.2 D> >>> +OLD_DIRS+=usr/include/c++/3.3 D> >>> +OLD_FILES+=usr/include/c++/3.3/FlexLexer.h D> >>> +OLD_FILES+=usr/include/c++/3.3/algorithm D> >>> +OLD_FILES+=usr/include/c++/3.3/backward/algo.h D> >> D> >> I suspect that there's a story here that needs to be told.. D> > D> > Yes, if it hasn't been a problem in 10 years, why do it now? D> D> I found those leftovers on one of my machines. They are probably D> harmless cruft, but I thought a few other folks might be in the same D> situation. D> D> One could argue that older entries should eventually get pruned. We've D> got stuff in there dating back to 1996 ... IMHO, all stuff from the very beginning should be there. There should be a way to cleanup a source upgraded machine, that had run for years. And carrying this stuff costs us almost nothing. -- Totus tuus, Glebius. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 14:13:23 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 4291C3BB; Mon, 25 Aug 2014 14:13:23 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2D3583055; Mon, 25 Aug 2014 14:13:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PEDNcH022882; Mon, 25 Aug 2014 14:13:23 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PEDNg1022881; Mon, 25 Aug 2014 14:13:23 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251413.s7PEDNg1022881@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 14:13:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270566 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 14:13:23 -0000 Author: gjb Date: Mon Aug 25 14:13:22 2014 New Revision: 270566 URL: http://svnweb.freebsd.org/changeset/base/270566 Log: Document r267694, cxgbe(4) rx buffer recycling fix. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 13:15:42 2014 (r270565) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 14:13:22 2014 (r270566) @@ -370,6 +370,10 @@ Preliminary support has been added to the &man.urtwn.4; driver for the Realtek RTL8188EUS and RTL8188ETV chipsets. + + A bug in the fast receiver buffer + recycle path has been fixed in the &man.cxgbe.4; + driver. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 14:13:25 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 3ED7D497; Mon, 25 Aug 2014 14:13:25 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 295923057; Mon, 25 Aug 2014 14:13:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PEDPIq022926; Mon, 25 Aug 2014 14:13:25 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PEDPZE022925; Mon, 25 Aug 2014 14:13:25 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251413.s7PEDPZE022925@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 14:13:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270567 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 14:13:25 -0000 Author: gjb Date: Mon Aug 25 14:13:24 2014 New Revision: 270567 URL: http://svnweb.freebsd.org/changeset/base/270567 Log: Document r267734, send-pr(1) replaced with stub pointing to bugzilla. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 14:13:22 2014 (r270566) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 14:13:24 2014 (r270567) @@ -617,6 +617,13 @@ The &man.mkimg.1; utility has been merged from &os;-CURRENT. + The &os; Project has migrated + from the GNATS bug tracking system + to Bugzilla. The &man.send-pr.1; + utility used for submitting problem reports has been replaced + with a stub shell script that instructs to use the Bugzilla + web interface. + <filename>/etc/rc.d</filename> Scripts From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 14:13:27 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 33D025B8; Mon, 25 Aug 2014 14:13:27 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1F2AC3058; Mon, 25 Aug 2014 14:13:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PEDQGr022973; Mon, 25 Aug 2014 14:13:26 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PEDQnw022972; Mon, 25 Aug 2014 14:13:26 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251413.s7PEDQnw022972@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 14:13:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270568 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 14:13:27 -0000 Author: gjb Date: Mon Aug 25 14:13:26 2014 New Revision: 270568 URL: http://svnweb.freebsd.org/changeset/base/270568 Log: Document r267747, patch(1) --dry-run alias. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 14:13:24 2014 (r270567) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 14:13:26 2014 (r270568) @@ -624,6 +624,11 @@ with a stub shell script that instructs to use the Bugzilla web interface. + The &man.patch.1; utility has been + updated to include a --dry-run flag, which + is equivalent to --check and + -C. + <filename>/etc/rc.d</filename> Scripts From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 14:13:29 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 306346B2; Mon, 25 Aug 2014 14:13:29 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1AB3F305B; Mon, 25 Aug 2014 14:13:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PEDSuA023071; Mon, 25 Aug 2014 14:13:28 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PEDSJN023070; Mon, 25 Aug 2014 14:13:28 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251413.s7PEDSJN023070@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 14:13:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270569 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 14:13:29 -0000 Author: gjb Date: Mon Aug 25 14:13:28 2014 New Revision: 270569 URL: http://svnweb.freebsd.org/changeset/base/270569 Log: Document r267771, sctp binding bug. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 14:13:26 2014 (r270568) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 14:13:28 2014 (r270569) @@ -383,6 +383,10 @@ Support for the UDP-Lite protocol (RFC 3828) has been added to the IPv4 and IPv6 stacks. + + A bug in &man.sctp.4; that would allow + two listening sockets bound to the same port has been + fixed. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 14:17:15 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 856AA9A2; Mon, 25 Aug 2014 14:17:15 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6FFE6309E; Mon, 25 Aug 2014 14:17:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PEHFRu023854; Mon, 25 Aug 2014 14:17:15 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PEHFCd023852; Mon, 25 Aug 2014 14:17:15 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251417.s7PEHFCd023852@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 14:17:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270570 - in stable/10/release/doc: en_US.ISO8859-1/relnotes share/xml X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 14:17:15 -0000 Author: gjb Date: Mon Aug 25 14:17:14 2014 New Revision: 270570 URL: http://svnweb.freebsd.org/changeset/base/270570 Log: Document r267849, cxgbe(4) T4 and T5 firmwares update. Add Chelsio vendor.ent entry. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml stable/10/release/doc/share/xml/vendor.ent Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 14:13:28 2014 (r270569) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 14:17:14 2014 (r270570) @@ -374,6 +374,11 @@ A bug in the fast receiver buffer recycle path has been fixed in the &man.cxgbe.4; driver. + + The bundled &man.cxgbe.4; firmware for + T4 and T5 cards has been updated to version + 1.11.27.0. Modified: stable/10/release/doc/share/xml/vendor.ent ============================================================================== --- stable/10/release/doc/share/xml/vendor.ent Mon Aug 25 14:13:28 2014 (r270569) +++ stable/10/release/doc/share/xml/vendor.ent Mon Aug 25 14:17:14 2014 (r270570) @@ -7,3 +7,5 @@ Please keep the entity list sorted alphabetically. --> + + From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 14:22:58 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 3D0FAD43; Mon, 25 Aug 2014 14:22:58 +0000 (UTC) Received: from sakura.ccs.furiru.org (sakura.ccs.furiru.org [IPv6:2001:2f0:104:8060::1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DF9AA3171; Mon, 25 Aug 2014 14:22:57 +0000 (UTC) Received: from localhost (authenticated bits=0) by sakura.ccs.furiru.org (unknown) with ESMTP id s7PEMqtG072928; Mon, 25 Aug 2014 23:22:54 +0900 (JST) (envelope-from nyan@FreeBSD.org) Date: Mon, 25 Aug 2014 23:22:52 +0900 (JST) Message-Id: <20140825.232252.808341777512849389.nyan@FreeBSD.org> To: bz@freebsd.org Subject: Re: svn commit: r270516 - head/sys/dev/drm2/i915 From: TAKAHASHI Yoshihiro In-Reply-To: References: <201408250503.s7P53Axo057720@svn.freebsd.org> X-Mailer: Mew version 6.3 on Emacs 24.3 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: svn-src-head@freebsd.org, adrian@freebsd.org, src-committers@freebsd.org, svn-src-all@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 14:22:58 -0000 In article "Bjoern A. Zeeb" writes: >> i915 driver - enable opregion handle; program CADL. > > This broke pc98: > > @/contrib/dev/acpica/include/platform/acfreebsd.h:75:10: fatal error: 'machine/acpica_machdep.h' file not found The devices supported by drm2 don't work for pc98 so we can disable simply building the module on pc98. --- TAKAHASHI Yoshihiro From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 14:55:57 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 837629EB; Mon, 25 Aug 2014 14:55:57 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6E9C134ED; Mon, 25 Aug 2014 14:55:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PEtvbP043468; Mon, 25 Aug 2014 14:55:57 GMT (envelope-from dumbbell@FreeBSD.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PEtvPm043467; Mon, 25 Aug 2014 14:55:57 GMT (envelope-from dumbbell@FreeBSD.org) Message-Id: <201408251455.s7PEtvPm043467@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dumbbell set sender to dumbbell@FreeBSD.org using -f From: Jean-Sebastien Pedron Date: Mon, 25 Aug 2014 14:55:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270571 - head/sys/modules/drm2/i915kms X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 14:55:57 -0000 Author: dumbbell Date: Mon Aug 25 14:55:56 2014 New Revision: 270571 URL: http://svnweb.freebsd.org/changeset/base/270571 Log: drm/i915: Add opt_acpi.h and acpi_if.h to the source files While here, sort the list of generated source files. Modified: head/sys/modules/drm2/i915kms/Makefile Modified: head/sys/modules/drm2/i915kms/Makefile ============================================================================== --- head/sys/modules/drm2/i915kms/Makefile Mon Aug 25 14:17:14 2014 (r270570) +++ head/sys/modules/drm2/i915kms/Makefile Mon Aug 25 14:55:56 2014 (r270571) @@ -34,8 +34,18 @@ SRCS = \ SRCS += i915_ioc32.c .endif -SRCS += device_if.h fb_if.h bus_if.h pci_if.h iicbus_if.h iicbb_if.h \ - opt_drm.h opt_compat.h opt_syscons.h +SRCS += \ + opt_acpi.h \ + opt_compat.h \ + opt_drm.h \ + opt_syscons.h \ + acpi_if.h \ + bus_if.h \ + fb_if.h \ + device_if.h \ + iicbb_if.h \ + iicbus_if.h \ + pci_if.h .include From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 14:58:37 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 6FFDAD59; Mon, 25 Aug 2014 14:58:37 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5BC0D351C; Mon, 25 Aug 2014 14:58:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PEwbot044321; Mon, 25 Aug 2014 14:58:37 GMT (envelope-from dumbbell@FreeBSD.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PEwb9I044320; Mon, 25 Aug 2014 14:58:37 GMT (envelope-from dumbbell@FreeBSD.org) Message-Id: <201408251458.s7PEwb9I044320@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dumbbell set sender to dumbbell@FreeBSD.org using -f From: Jean-Sebastien Pedron Date: Mon, 25 Aug 2014 14:58:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270572 - head/sys/modules/drm2 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 14:58:37 -0000 Author: dumbbell Date: Mon Aug 25 14:58:36 2014 New Revision: 270572 URL: http://svnweb.freebsd.org/changeset/base/270572 Log: drm/i915: Disable the build of i915 on PC98 This module is of no use on this platform and now, i915 depends on ACPI anyway. Suggested by: nyan@ Modified: head/sys/modules/drm2/Makefile Modified: head/sys/modules/drm2/Makefile ============================================================================== --- head/sys/modules/drm2/Makefile Mon Aug 25 14:55:56 2014 (r270571) +++ head/sys/modules/drm2/Makefile Mon Aug 25 14:58:36 2014 (r270572) @@ -4,6 +4,7 @@ SYSDIR?=${.CURDIR}/../.. .include "${SYSDIR}/conf/kern.opts.mk" .if ${MACHINE_CPUARCH} == "amd64" +_i915kms= i915kms _radeonkms= radeonkms . if ${MK_SOURCELESS_UCODE} != "no" _radeonkmsfw= radeonkmsfw @@ -12,6 +13,7 @@ _radeonkmsfw= radeonkmsfw .if ${MACHINE_CPUARCH} == "i386" . if ${MACHINE} != "pc98" +_i915kms= i915kms _radeonkms= radeonkms . if ${MK_SOURCELESS_UCODE} != "no" _radeonkmsfw= radeonkmsfw @@ -21,7 +23,7 @@ _radeonkmsfw= radeonkmsfw SUBDIR = \ drm2 \ - i915kms \ + ${_i915kms} \ ${_radeonkms} \ ${_radeonkmsfw} From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 15:15:59 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id B5916E43; Mon, 25 Aug 2014 15:15:59 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 862EE3708; Mon, 25 Aug 2014 15:15:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PFFxra054377; Mon, 25 Aug 2014 15:15:59 GMT (envelope-from marcel@FreeBSD.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PFFxPO054376; Mon, 25 Aug 2014 15:15:59 GMT (envelope-from marcel@FreeBSD.org) Message-Id: <201408251515.s7PFFxPO054376@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marcel set sender to marcel@FreeBSD.org using -f From: Marcel Moolenaar Date: Mon, 25 Aug 2014 15:15:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270573 - stable/10/sys/ia64/ia64 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 15:15:59 -0000 Author: marcel Date: Mon Aug 25 15:15:59 2014 New Revision: 270573 URL: http://svnweb.freebsd.org/changeset/base/270573 Log: Make sure the psr field in the trapframe (which holds the value of cr.ipsr) is properly synthesized for the EPC syscall. Properly synthesized in this case means that the bank number (BN bitfield) is set to 1. This is needed because the move-from-PSR instruction does copy all bits! In this case the BN bitfield was not copied. While normally this is not a problem, because when we leave the kernel via the EPC syscall path again, we don't actually care about the BN bitfield. We restore PSR with a move-to-PSR instruction, which also doesn't cover the BN bitfield. There is however a scenario where we enter the kernel via the EPC syscall path and leave the kernel via the exception/interrupt path. That path uses the RFI (Return-From-Interrupt) instruction and it restores all bits. What happens in that case is that we don't properly switch to register bank 1 and any exception/interrupt that happens while running in bank 0 clobbers the process' (or kernel's) banked registers. This is because the CPU switches to bank 0 on an exception/interrupt so that there are 16 general registers available for constructing a trapframe and saving the context. Consequently: normal code should always use register bank 1. This bug has been present since 2003 (11 years) and has been the cause for many "unexplained" kernel panics. It says something about how often we hit this problem on the one hand and how tricky it was to find it. Many thanks to: clusteradm@ for enabling me to track this down! Modified: stable/10/sys/ia64/ia64/syscall.S Modified: stable/10/sys/ia64/ia64/syscall.S ============================================================================== --- stable/10/sys/ia64/ia64/syscall.S Mon Aug 25 14:58:36 2014 (r270572) +++ stable/10/sys/ia64/ia64/syscall.S Mon Aug 25 15:15:59 2014 (r270573) @@ -296,7 +296,7 @@ ENTRY_NOPROFILE(epc_syscall, 8) { .mmi st8 [r30]=r19,16 // rnat st8 [r31]=r0,16 // __spare - nop 0 + dep r11=-1,r11,44,1 // Set psr.bn=1 ;; } { .mmi From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 15:29:16 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 8EFF7481; Mon, 25 Aug 2014 15:29:16 +0000 (UTC) Received: from mail.made4.biz (mail.made4.biz [IPv6:2001:41d0:2:c018::1:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 53DED37F7; Mon, 25 Aug 2014 15:29:16 +0000 (UTC) Received: from 141.7.19.93.rev.sfr.net ([93.19.7.141] helo=i915.dumbbell.fr) by mail.made4.biz with esmtpsa (TLSv1.2:DHE-RSA-AES128-SHA:128) (Exim 4.82_1-5b7a7c0-XX (FreeBSD)) (envelope-from ) id 1XLwCn-000ACW-SQ; Mon, 25 Aug 2014 17:29:14 +0200 Message-ID: <53FB5649.8050309@FreeBSD.org> Date: Mon, 25 Aug 2014 17:29:13 +0200 From: =?windows-1252?Q?Jean-S=E9bastien_P=E9dron?= User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.0 MIME-Version: 1.0 To: "Bjoern A. Zeeb" , Adrian Chadd Subject: Re: svn commit: r270516 - head/sys/dev/drm2/i915 References: <201408250503.s7P53Axo057720@svn.freebsd.org> In-Reply-To: Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 8bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 15:29:16 -0000 On 25.08.2014 14:45, Bjoern A. Zeeb wrote: > On 25 Aug 2014, at 05:03 , Adrian Chadd wrote: >> Author: adrian >> Date: Mon Aug 25 05:03:10 2014 >> New Revision: 270516 >> URL: http://svnweb.freebsd.org/changeset/base/270516 >> >> Log: >> i915 driver - enable opregion handle; program CADL. > > This broke pc98: > > @/contrib/dev/acpica/include/platform/acfreebsd.h:75:10: fatal error: 'machine/acpica_machdep.h' file not found r270571 and r270572 fixes the build (broken on amd64 too) and remove i915 on PC98, as suggested by Yoshihiro. -- Jean-Sébastien Pédron From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 15:40:39 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 265727AF; Mon, 25 Aug 2014 15:40:39 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EA13E395C; Mon, 25 Aug 2014 15:40:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PFechg066286; Mon, 25 Aug 2014 15:40:38 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PFec3t066282; Mon, 25 Aug 2014 15:40:38 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201408251540.s7PFec3t066282@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Mon, 25 Aug 2014 15:40:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270574 - in stable/10/sys: net netpfil/pf X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 15:40:39 -0000 Author: glebius Date: Mon Aug 25 15:40:37 2014 New Revision: 270574 URL: http://svnweb.freebsd.org/changeset/base/270574 Log: Merge r269998 from head: - Count global pf(4) statistics in counter(9). - Do not count global number of states and of src_nodes, use uma_zone_get_cur() to obtain values. - Struct pf_status becomes merely an ioctl API structure, and moves to netpfil/pf/pf.h with its constants. - V_pf_status is now of type struct pf_kstatus. Submitted by: Kajetan Staszkiewicz Sponsored by: InnoGames GmbH Modified: stable/10/sys/net/pfvar.h stable/10/sys/netpfil/pf/pf.c stable/10/sys/netpfil/pf/pf.h stable/10/sys/netpfil/pf/pf_ioctl.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/net/pfvar.h ============================================================================== --- stable/10/sys/net/pfvar.h Mon Aug 25 15:15:59 2014 (r270573) +++ stable/10/sys/net/pfvar.h Mon Aug 25 15:40:37 2014 (r270574) @@ -1123,27 +1123,6 @@ struct pf_pdesc { #define PF_DPORT_RANGE 0x01 /* Dest port uses range */ #define PF_RPORT_RANGE 0x02 /* RDR'ed port uses range */ -/* Counters for other things we want to keep track of */ -#define LCNT_STATES 0 /* states */ -#define LCNT_SRCSTATES 1 /* max-src-states */ -#define LCNT_SRCNODES 2 /* max-src-nodes */ -#define LCNT_SRCCONN 3 /* max-src-conn */ -#define LCNT_SRCCONNRATE 4 /* max-src-conn-rate */ -#define LCNT_OVERLOAD_TABLE 5 /* entry added to overload table */ -#define LCNT_OVERLOAD_FLUSH 6 /* state entries flushed */ -#define LCNT_MAX 7 /* total+1 */ - -#define LCNT_NAMES { \ - "max states per rule", \ - "max-src-states", \ - "max-src-nodes", \ - "max-src-conn", \ - "max-src-conn-rate", \ - "overload table insertion", \ - "overload flush states", \ - NULL \ -} - /* UDP state enumeration */ #define PFUDPS_NO_TRAFFIC 0 #define PFUDPS_SINGLE 1 @@ -1172,16 +1151,6 @@ struct pf_pdesc { NULL \ } -#define FCNT_STATE_SEARCH 0 -#define FCNT_STATE_INSERT 1 -#define FCNT_STATE_REMOVALS 2 -#define FCNT_MAX 3 - -#define SCNT_SRC_NODE_SEARCH 0 -#define SCNT_SRC_NODE_INSERT 1 -#define SCNT_SRC_NODE_REMOVALS 2 -#define SCNT_MAX 3 - #define ACTION_SET(a, x) \ do { \ if ((a) != NULL) \ @@ -1193,24 +1162,22 @@ struct pf_pdesc { if ((a) != NULL) \ *(a) = (x); \ if (x < PFRES_MAX) \ - V_pf_status.counters[x]++; \ + counter_u64_add(V_pf_status.counters[x], 1); \ } while (0) -struct pf_status { - u_int64_t counters[PFRES_MAX]; - u_int64_t lcounters[LCNT_MAX]; /* limit counters */ - u_int64_t fcounters[FCNT_MAX]; - u_int64_t scounters[SCNT_MAX]; - u_int64_t pcounters[2][2][3]; - u_int64_t bcounters[2][2]; - u_int32_t running; - u_int32_t states; - u_int32_t src_nodes; - u_int32_t since; - u_int32_t debug; - u_int32_t hostid; +struct pf_kstatus { + counter_u64_t counters[PFRES_MAX]; /* reason for passing/dropping */ + counter_u64_t lcounters[LCNT_MAX]; /* limit counters */ + counter_u64_t fcounters[FCNT_MAX]; /* state operation counters */ + counter_u64_t scounters[SCNT_MAX]; /* src_node operation counters */ + uint32_t states; + uint32_t src_nodes; + uint32_t running; + uint32_t since; + uint32_t debug; + uint32_t hostid; char ifname[IFNAMSIZ]; - u_int8_t pf_chksum[PF_MD5_DIGEST_LENGTH]; + uint8_t pf_chksum[PF_MD5_DIGEST_LENGTH]; }; struct pf_divert { @@ -1706,8 +1673,8 @@ int pf_match_tag(struct mbuf *, struct int pf_tag_packet(struct mbuf *, struct pf_pdesc *, int); void pf_qid2qname(u_int32_t, char *); -VNET_DECLARE(struct pf_status, pf_status); -#define V_pf_status VNET(pf_status) +VNET_DECLARE(struct pf_kstatus, pf_status); +#define V_pf_status VNET(pf_status) struct pf_limit { uma_zone_t zone; Modified: stable/10/sys/netpfil/pf/pf.c ============================================================================== --- stable/10/sys/netpfil/pf/pf.c Mon Aug 25 15:15:59 2014 (r270573) +++ stable/10/sys/netpfil/pf/pf.c Mon Aug 25 15:40:37 2014 (r270574) @@ -109,7 +109,7 @@ VNET_DEFINE(struct pf_altqqueue, pf_alt VNET_DEFINE(struct pf_palist, pf_pabuf); VNET_DEFINE(struct pf_altqqueue *, pf_altqs_active); VNET_DEFINE(struct pf_altqqueue *, pf_altqs_inactive); -VNET_DEFINE(struct pf_status, pf_status); +VNET_DEFINE(struct pf_kstatus, pf_status); VNET_DEFINE(u_int32_t, ticket_altqs_active); VNET_DEFINE(u_int32_t, ticket_altqs_inactive); @@ -470,13 +470,13 @@ pf_src_connlimit(struct pf_state **state if ((*state)->rule.ptr->max_src_conn && (*state)->rule.ptr->max_src_conn < (*state)->src_node->conn) { - V_pf_status.lcounters[LCNT_SRCCONN]++; + counter_u64_add(V_pf_status.lcounters[LCNT_SRCCONN], 1); bad++; } if ((*state)->rule.ptr->max_src_conn_rate.limit && pf_check_threshold(&(*state)->src_node->conn_rate)) { - V_pf_status.lcounters[LCNT_SRCCONNRATE]++; + counter_u64_add(V_pf_status.lcounters[LCNT_SRCCONNRATE], 1); bad++; } @@ -524,7 +524,7 @@ pf_overload_task(void *v, int pending) bzero(&p, sizeof(p)); SLIST_FOREACH(pfoe, &queue, next) { - V_pf_status.lcounters[LCNT_OVERLOAD_TABLE]++; + counter_u64_add(V_pf_status.lcounters[LCNT_OVERLOAD_TABLE], 1); if (V_pf_status.debug >= PF_DEBUG_MISC) { printf("%s: blocking address ", __func__); pf_print_host(&pfoe->addr, 0, pfoe->af); @@ -560,7 +560,8 @@ pf_overload_task(void *v, int pending) SLIST_REMOVE(&queue, pfoe, pf_overload_entry, next); free(pfoe, M_PFTEMP); } else - V_pf_status.lcounters[LCNT_OVERLOAD_FLUSH]++; + counter_u64_add( + V_pf_status.lcounters[LCNT_OVERLOAD_FLUSH], 1); /* If nothing to flush, return. */ if (SLIST_EMPTY(&queue)) { @@ -610,7 +611,7 @@ pf_find_src_node(struct pf_addr *src, st struct pf_srchash *sh; struct pf_src_node *n; - V_pf_status.scounters[SCNT_SRC_NODE_SEARCH]++; + counter_u64_add(V_pf_status.scounters[SCNT_SRC_NODE_SEARCH], 1); sh = &V_pf_srchash[pf_hashsrc(src, af)]; PF_HASHROW_LOCK(sh); @@ -646,7 +647,8 @@ pf_insert_src_node(struct pf_src_node ** counter_u64_fetch(rule->src_nodes) < rule->max_src_nodes) (*sn) = uma_zalloc(V_pf_sources_z, M_NOWAIT | M_ZERO); else - V_pf_status.lcounters[LCNT_SRCNODES]++; + counter_u64_add(V_pf_status.lcounters[LCNT_SRCNODES], + 1); if ((*sn) == NULL) { PF_HASHROW_UNLOCK(sh); return (-1); @@ -665,12 +667,12 @@ pf_insert_src_node(struct pf_src_node ** if ((*sn)->rule.ptr != NULL) counter_u64_add((*sn)->rule.ptr->src_nodes, 1); PF_HASHROW_UNLOCK(sh); - V_pf_status.scounters[SCNT_SRC_NODE_INSERT]++; - V_pf_status.src_nodes++; + counter_u64_add(V_pf_status.scounters[SCNT_SRC_NODE_INSERT], 1); } else { if (rule->max_src_states && (*sn)->states >= rule->max_src_states) { - V_pf_status.lcounters[LCNT_SRCSTATES]++; + counter_u64_add(V_pf_status.lcounters[LCNT_SRCSTATES], + 1); return (-1); } } @@ -689,8 +691,7 @@ pf_unlink_src_node_locked(struct pf_src_ LIST_REMOVE(src, entry); if (src->rule.ptr) counter_u64_add(src->rule.ptr->src_nodes, -1); - V_pf_status.scounters[SCNT_SRC_NODE_REMOVALS]++; - V_pf_status.src_nodes--; + counter_u64_add(V_pf_status.scounters[SCNT_SRC_NODE_REMOVALS], 1); } void @@ -1206,7 +1207,7 @@ pf_state_insert(struct pfi_kif *kif, str /* One for keys, one for ID hash. */ refcount_init(&s->refs, 2); - V_pf_status.fcounters[FCNT_STATE_INSERT]++; + counter_u64_add(V_pf_status.fcounters[FCNT_STATE_INSERT], 1); if (pfsync_insert_state_ptr != NULL) pfsync_insert_state_ptr(s); @@ -1223,7 +1224,7 @@ pf_find_state_byid(uint64_t id, uint32_t struct pf_idhash *ih; struct pf_state *s; - V_pf_status.fcounters[FCNT_STATE_SEARCH]++; + counter_u64_add(V_pf_status.fcounters[FCNT_STATE_SEARCH], 1); ih = &V_pf_idhash[(be64toh(id) % (V_pf_hashmask + 1))]; @@ -1250,7 +1251,7 @@ pf_find_state(struct pfi_kif *kif, struc struct pf_state *s; int idx; - V_pf_status.fcounters[FCNT_STATE_SEARCH]++; + counter_u64_add(V_pf_status.fcounters[FCNT_STATE_SEARCH], 1); kh = &V_pf_keyhash[pf_hashkey((struct pf_state_key *)key)]; @@ -1294,7 +1295,7 @@ pf_find_state_all(struct pf_state_key_cm struct pf_state *s, *ret = NULL; int idx, inout = 0; - V_pf_status.fcounters[FCNT_STATE_SEARCH]++; + counter_u64_add(V_pf_status.fcounters[FCNT_STATE_SEARCH], 1); kh = &V_pf_keyhash[pf_hashkey((struct pf_state_key *)key)]; @@ -1522,6 +1523,8 @@ pf_purge_expired_src_nodes() } pf_free_src_nodes(&freelist); + + V_pf_status.src_nodes = uma_zone_get_cur(V_pf_sources_z); } static void @@ -1616,7 +1619,7 @@ pf_free_state(struct pf_state *cur) pf_normalize_tcp_cleanup(cur); uma_zfree(V_pf_state_z, cur); - V_pf_status.fcounters[FCNT_STATE_REMOVALS]++; + counter_u64_add(V_pf_status.fcounters[FCNT_STATE_REMOVALS], 1); } /* @@ -3457,7 +3460,7 @@ pf_create_state(struct pf_rule *r, struc /* check maximums */ if (r->max_states && (counter_u64_fetch(r->states_cur) >= r->max_states)) { - V_pf_status.lcounters[LCNT_STATES]++; + counter_u64_add(V_pf_status.lcounters[LCNT_STATES], 1); REASON_SET(&reason, PFRES_MAXSTATES); return (PF_DROP); } Modified: stable/10/sys/netpfil/pf/pf.h ============================================================================== --- stable/10/sys/netpfil/pf/pf.h Mon Aug 25 15:15:59 2014 (r270573) +++ stable/10/sys/netpfil/pf/pf.h Mon Aug 25 15:40:37 2014 (r270574) @@ -146,7 +146,57 @@ enum { PF_ADDR_ADDRMASK, PF_ADDR_NOROUTE NULL \ } +/* Counters for other things we want to keep track of */ +#define LCNT_STATES 0 /* states */ +#define LCNT_SRCSTATES 1 /* max-src-states */ +#define LCNT_SRCNODES 2 /* max-src-nodes */ +#define LCNT_SRCCONN 3 /* max-src-conn */ +#define LCNT_SRCCONNRATE 4 /* max-src-conn-rate */ +#define LCNT_OVERLOAD_TABLE 5 /* entry added to overload table */ +#define LCNT_OVERLOAD_FLUSH 6 /* state entries flushed */ +#define LCNT_MAX 7 /* total+1 */ + +#define LCNT_NAMES { \ + "max states per rule", \ + "max-src-states", \ + "max-src-nodes", \ + "max-src-conn", \ + "max-src-conn-rate", \ + "overload table insertion", \ + "overload flush states", \ + NULL \ +} + +/* state operation counters */ +#define FCNT_STATE_SEARCH 0 +#define FCNT_STATE_INSERT 1 +#define FCNT_STATE_REMOVALS 2 +#define FCNT_MAX 3 + +/* src_node operation counters */ +#define SCNT_SRC_NODE_SEARCH 0 +#define SCNT_SRC_NODE_INSERT 1 +#define SCNT_SRC_NODE_REMOVALS 2 +#define SCNT_MAX 3 + #define PF_TABLE_NAME_SIZE 32 #define PF_QNAME_SIZE 64 +struct pf_status { + uint64_t counters[PFRES_MAX]; + uint64_t lcounters[LCNT_MAX]; + uint64_t fcounters[FCNT_MAX]; + uint64_t scounters[SCNT_MAX]; + uint64_t pcounters[2][2][3]; + uint64_t bcounters[2][2]; + uint32_t running; + uint32_t states; + uint32_t src_nodes; + uint32_t since; + uint32_t debug; + uint32_t hostid; + char ifname[IFNAMSIZ]; + uint8_t pf_chksum[PF_MD5_DIGEST_LENGTH]; +}; + #endif /* _NET_PF_H_ */ Modified: stable/10/sys/netpfil/pf/pf_ioctl.c ============================================================================== --- stable/10/sys/netpfil/pf/pf_ioctl.c Mon Aug 25 15:15:59 2014 (r270573) +++ stable/10/sys/netpfil/pf/pf_ioctl.c Mon Aug 25 15:40:37 2014 (r270574) @@ -261,6 +261,15 @@ pfattach(void) /* XXX do our best to avoid a conflict */ V_pf_status.hostid = arc4random(); + for (int i = 0; i < PFRES_MAX; i++) + V_pf_status.counters[i] = counter_u64_alloc(M_WAITOK); + for (int i = 0; i < LCNT_MAX; i++) + V_pf_status.lcounters[i] = counter_u64_alloc(M_WAITOK); + for (int i = 0; i < FCNT_MAX; i++) + V_pf_status.fcounters[i] = counter_u64_alloc(M_WAITOK); + for (int i = 0; i < SCNT_MAX; i++) + V_pf_status.scounters[i] = counter_u64_alloc(M_WAITOK); + if ((error = kproc_create(pf_purge_thread, curvnet, NULL, 0, 0, "pf purge")) != 0) /* XXXGL: leaked all above. */ @@ -1781,8 +1790,32 @@ DIOCGETSTATES_full: case DIOCGETSTATUS: { struct pf_status *s = (struct pf_status *)addr; + PF_RULES_RLOCK(); - bcopy(&V_pf_status, s, sizeof(struct pf_status)); + s->running = V_pf_status.running; + s->since = V_pf_status.since; + s->debug = V_pf_status.debug; + s->hostid = V_pf_status.hostid; + s->states = V_pf_status.states; + s->src_nodes = V_pf_status.src_nodes; + + for (int i = 0; i < PFRES_MAX; i++) + s->counters[i] = + counter_u64_fetch(V_pf_status.counters[i]); + for (int i = 0; i < LCNT_MAX; i++) + s->lcounters[i] = + counter_u64_fetch(V_pf_status.lcounters[i]); + for (int i = 0; i < FCNT_MAX; i++) + s->fcounters[i] = + counter_u64_fetch(V_pf_status.fcounters[i]); + for (int i = 0; i < SCNT_MAX; i++) + s->scounters[i] = + counter_u64_fetch(V_pf_status.scounters[i]); + + bcopy(V_pf_status.ifname, s->ifname, IFNAMSIZ); + bcopy(V_pf_status.pf_chksum, s->pf_chksum, + PF_MD5_DIGEST_LENGTH); + pfi_update_status(s->ifname, s); PF_RULES_RUNLOCK(); break; @@ -1803,9 +1836,12 @@ DIOCGETSTATES_full: case DIOCCLRSTATUS: { PF_RULES_WLOCK(); - bzero(V_pf_status.counters, sizeof(V_pf_status.counters)); - bzero(V_pf_status.fcounters, sizeof(V_pf_status.fcounters)); - bzero(V_pf_status.scounters, sizeof(V_pf_status.scounters)); + for (int i = 0; i < PFRES_MAX; i++) + counter_u64_zero(V_pf_status.counters[i]); + for (int i = 0; i < FCNT_MAX; i++) + counter_u64_zero(V_pf_status.fcounters[i]); + for (int i = 0; i < SCNT_MAX; i++) + counter_u64_zero(V_pf_status.scounters[i]); V_pf_status.since = time_second; if (*V_pf_status.ifname) pfi_update_status(V_pf_status.ifname, NULL); @@ -3151,7 +3187,6 @@ DIOCCHANGEADDR_error: pf_clear_srcnodes(NULL); pf_purge_expired_src_nodes(); - V_pf_status.src_nodes = 0; break; } @@ -3449,6 +3484,15 @@ shutdown_pf(void) counter_u64_free(V_pf_default_rule.states_tot); counter_u64_free(V_pf_default_rule.src_nodes); + for (int i = 0; i < PFRES_MAX; i++) + counter_u64_free(V_pf_status.counters[i]); + for (int i = 0; i < LCNT_MAX; i++) + counter_u64_free(V_pf_status.lcounters[i]); + for (int i = 0; i < FCNT_MAX; i++) + counter_u64_free(V_pf_status.fcounters[i]); + for (int i = 0; i < SCNT_MAX; i++) + counter_u64_free(V_pf_status.scounters[i]); + do { if ((error = pf_begin_rules(&t[0], PF_RULESET_SCRUB, &nn)) != 0) { From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 15:44:52 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id C17CE925; Mon, 25 Aug 2014 15:44:52 +0000 (UTC) Received: from mail-qa0-x230.google.com (mail-qa0-x230.google.com [IPv6:2607:f8b0:400d:c00::230]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 36910397F; Mon, 25 Aug 2014 15:44:52 +0000 (UTC) Received: by mail-qa0-f48.google.com with SMTP id m5so12663500qaj.35 for ; Mon, 25 Aug 2014 08:44:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type:content-transfer-encoding; bh=U/igo1ZLBwhB3jWxkROsccADJMWj9XmSPM1eByVa7KI=; b=0qLBV1ybRa4gpkWPABDg2hYnct6wwXkw+Yl611A4oBifSM5LJpv6vO+AEh3Gx3XFR6 3AxaAYmM65A7MRGH995KYV8G+tmNEwViTvMZ1QrAKI2ETGpCoYS2aoRQ7B86XB7pV9QM W0kLAw/5Q9P72sIcQ04+Ew+0U3sCCS7RAvWpPd4H/bDDZaH87TMbhgRiYtG7gfTl4ZaO taOeXG7tok3AtZmUF/c0JM+RtXiLIsSCN2FClZzvMW8bvZblzOvF5hmLWFbKBJkwNPto vJJv4t6ZkAEG3HvETccbsIckkvFRaeSvj07gplBAL/YLhir7/58k7HRlsu53k+IIiuZY teeQ== MIME-Version: 1.0 X-Received: by 10.224.46.8 with SMTP id h8mr37512027qaf.6.1408981491332; Mon, 25 Aug 2014 08:44:51 -0700 (PDT) Sender: adrian.chadd@gmail.com Received: by 10.224.39.139 with HTTP; Mon, 25 Aug 2014 08:44:51 -0700 (PDT) In-Reply-To: <53FB5649.8050309@FreeBSD.org> References: <201408250503.s7P53Axo057720@svn.freebsd.org> <53FB5649.8050309@FreeBSD.org> Date: Mon, 25 Aug 2014 08:44:51 -0700 X-Google-Sender-Auth: 7Foy73n8iv_BESPYHq5rLmnWKwo Message-ID: Subject: Re: svn commit: r270516 - head/sys/dev/drm2/i915 From: Adrian Chadd To: =?UTF-8?B?SmVhbi1Tw6liYXN0aWVuIFDDqWRyb24=?= Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "Bjoern A. Zeeb" , "src-committers@freebsd.org" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 15:44:52 -0000 On 25 August 2014 08:29, Jean-S=C3=A9bastien P=C3=A9dron wrote: > On 25.08.2014 14:45, Bjoern A. Zeeb wrote: >> >> On 25 Aug 2014, at 05:03 , Adrian Chadd wrote: >>> >>> Author: adrian >>> Date: Mon Aug 25 05:03:10 2014 >>> New Revision: 270516 >>> URL: http://svnweb.freebsd.org/changeset/base/270516 >>> >>> Log: >>> i915 driver - enable opregion handle; program CADL. >> >> >> This broke pc98: >> >> @/contrib/dev/acpica/include/platform/acfreebsd.h:75:10: fatal error: >> 'machine/acpica_machdep.h' file not found > > > r270571 and r270572 fixes the build (broken on amd64 too) and remove i915= on > PC98, as suggested by Yoshihiro. Woo, thanks! Sorry for the breakage. -a From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 15:48:28 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 93EA6A8F; Mon, 25 Aug 2014 15:48:28 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7EC8C39A0; Mon, 25 Aug 2014 15:48:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PFmSm2069873; Mon, 25 Aug 2014 15:48:28 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PFmSUj069872; Mon, 25 Aug 2014 15:48:28 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201408251548.s7PFmSUj069872@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Mon, 25 Aug 2014 15:48:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270575 - stable/10/sys/netpfil/pf X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 15:48:28 -0000 Author: glebius Date: Mon Aug 25 15:48:28 2014 New Revision: 270575 URL: http://svnweb.freebsd.org/changeset/base/270575 Log: Merge 270010 from head: Fix synproxy with IPv6. pf_test6() was missing a check for M_SKIP_FIREWALL. PR: 127920 Submitted by: Kajetan Staszkiewicz Sponsored by: InnoGames GmbH Modified: stable/10/sys/netpfil/pf/pf.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/netpfil/pf/pf.c ============================================================================== --- stable/10/sys/netpfil/pf/pf.c Mon Aug 25 15:40:37 2014 (r270574) +++ stable/10/sys/netpfil/pf/pf.c Mon Aug 25 15:48:28 2014 (r270575) @@ -6069,6 +6069,9 @@ pf_test6(int dir, struct ifnet *ifp, str if (kif->pfik_flags & PFI_IFLAG_SKIP) return (PF_PASS); + if (m->m_flags & M_SKIP_FIREWALL) + return (PF_PASS); + PF_RULES_RLOCK(); /* We do IP header normalization and packet reassembly here */ From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 15:49:42 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id EFD5FBDA; Mon, 25 Aug 2014 15:49:41 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DA8ED39B4; Mon, 25 Aug 2014 15:49:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PFnfNg070146; Mon, 25 Aug 2014 15:49:41 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PFnfv0070144; Mon, 25 Aug 2014 15:49:41 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201408251549.s7PFnfv0070144@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Mon, 25 Aug 2014 15:49:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270576 - stable/10/sys/netpfil/pf X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 15:49:42 -0000 Author: glebius Date: Mon Aug 25 15:49:41 2014 New Revision: 270576 URL: http://svnweb.freebsd.org/changeset/base/270576 Log: Merge r270022 from head: pf_map_addr() can fail and in this case we should drop the packet, otherwise bad consequences including a routing loop can occur. Move pf_set_rt_ifp() earlier in state creation sequence and inline it, cutting some extra code. PR: 183997 Submitted by: Kajetan Staszkiewicz Sponsored by: InnoGames GmbH Modified: stable/10/sys/netpfil/pf/pf.c stable/10/sys/netpfil/pf/pf.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/netpfil/pf/pf.c ============================================================================== --- stable/10/sys/netpfil/pf/pf.c Mon Aug 25 15:48:28 2014 (r270575) +++ stable/10/sys/netpfil/pf/pf.c Mon Aug 25 15:49:41 2014 (r270576) @@ -265,8 +265,6 @@ static u_int16_t pf_get_mss(struct mbuf sa_family_t); static u_int16_t pf_calc_mss(struct pf_addr *, sa_family_t, int, u_int16_t); -static void pf_set_rt_ifp(struct pf_state *, - struct pf_addr *); static int pf_check_proto_cksum(struct mbuf *, int, int, u_int8_t, sa_family_t); static void pf_print_state_parts(struct pf_state *, @@ -2960,31 +2958,6 @@ pf_calc_mss(struct pf_addr *addr, sa_fam return (mss); } -static void -pf_set_rt_ifp(struct pf_state *s, struct pf_addr *saddr) -{ - struct pf_rule *r = s->rule.ptr; - struct pf_src_node *sn = NULL; - - s->rt_kif = NULL; - if (!r->rt || r->rt == PF_FASTROUTE) - return; - switch (s->key[PF_SK_WIRE]->af) { -#ifdef INET - case AF_INET: - pf_map_addr(AF_INET, r, saddr, &s->rt_addr, NULL, &sn); - s->rt_kif = r->rpool.cur->kif; - break; -#endif /* INET */ -#ifdef INET6 - case AF_INET6: - pf_map_addr(AF_INET6, r, saddr, &s->rt_addr, NULL, &sn); - s->rt_kif = r->rpool.cur->kif; - break; -#endif /* INET6 */ - } -} - static u_int32_t pf_tcp_iss(struct pf_pdesc *pd) { @@ -3547,6 +3520,19 @@ pf_create_state(struct pf_rule *r, struc s->timeout = PFTM_OTHER_FIRST_PACKET; } + if (r->rt && r->rt != PF_FASTROUTE) { + struct pf_src_node *sn = NULL; + + if (pf_map_addr(pd->af, r, pd->src, &s->rt_addr, NULL, &sn)) { + REASON_SET(&reason, PFRES_MAPFAILED); + pf_src_tree_remove_state(s); + STATE_DEC_COUNTERS(s); + uma_zfree(V_pf_state_z, s); + goto csfailed; + } + s->rt_kif = r->rpool.cur->kif; + } + s->creation = time_uptime; s->expire = time_uptime; @@ -3612,7 +3598,6 @@ pf_create_state(struct pf_rule *r, struc } else *sm = s; - pf_set_rt_ifp(s, pd->src); /* needs s->state_key set */ if (tag > 0) s->tag = tag; if (pd->proto == IPPROTO_TCP && (th->th_flags & (TH_SYN|TH_ACK)) == Modified: stable/10/sys/netpfil/pf/pf.h ============================================================================== --- stable/10/sys/netpfil/pf/pf.h Mon Aug 25 15:48:28 2014 (r270575) +++ stable/10/sys/netpfil/pf/pf.h Mon Aug 25 15:49:41 2014 (r270576) @@ -125,7 +125,8 @@ enum { PF_ADDR_ADDRMASK, PF_ADDR_NOROUTE #define PFRES_MAXSTATES 12 /* State limit */ #define PFRES_SRCLIMIT 13 /* Source node/conn limit */ #define PFRES_SYNPROXY 14 /* SYN proxy */ -#define PFRES_MAX 15 /* total+1 */ +#define PFRES_MAPFAILED 15 /* pf_map_addr() failed */ +#define PFRES_MAX 16 /* total+1 */ #define PFRES_NAMES { \ "match", \ @@ -143,6 +144,7 @@ enum { PF_ADDR_ADDRMASK, PF_ADDR_NOROUTE "state-limit", \ "src-limit", \ "synproxy", \ + "map-failed", \ NULL \ } From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 15:51:08 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id A82E8D18; Mon, 25 Aug 2014 15:51:08 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 895B53A39; Mon, 25 Aug 2014 15:51:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PFp8Sk073290; Mon, 25 Aug 2014 15:51:08 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PFp8Bp073288; Mon, 25 Aug 2014 15:51:08 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201408251551.s7PFp8Bp073288@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Mon, 25 Aug 2014 15:51:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270577 - stable/10/sys/netpfil/pf X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 15:51:08 -0000 Author: glebius Date: Mon Aug 25 15:51:07 2014 New Revision: 270577 URL: http://svnweb.freebsd.org/changeset/base/270577 Log: Merge r270023 from head: Do not lookup source node twice when pf_map_addr() is used. PR: 184003 Submitted by: Kajetan Staszkiewicz Sponsored by: InnoGames GmbH Modified: stable/10/sys/netpfil/pf/pf.c stable/10/sys/netpfil/pf/pf_lb.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/netpfil/pf/pf.c ============================================================================== --- stable/10/sys/netpfil/pf/pf.c Mon Aug 25 15:49:41 2014 (r270576) +++ stable/10/sys/netpfil/pf/pf.c Mon Aug 25 15:51:07 2014 (r270577) @@ -3521,8 +3521,6 @@ pf_create_state(struct pf_rule *r, struc } if (r->rt && r->rt != PF_FASTROUTE) { - struct pf_src_node *sn = NULL; - if (pf_map_addr(pd->af, r, pd->src, &s->rt_addr, NULL, &sn)) { REASON_SET(&reason, PFRES_MAPFAILED); pf_src_tree_remove_state(s); Modified: stable/10/sys/netpfil/pf/pf_lb.c ============================================================================== --- stable/10/sys/netpfil/pf/pf_lb.c Mon Aug 25 15:49:41 2014 (r270576) +++ stable/10/sys/netpfil/pf/pf_lb.c Mon Aug 25 15:51:07 2014 (r270577) @@ -307,22 +307,30 @@ pf_map_addr(sa_family_t af, struct pf_ru struct pf_pool *rpool = &r->rpool; struct pf_addr *raddr = NULL, *rmask = NULL; + /* Try to find a src_node if none was given and this + is a sticky-address rule. */ if (*sn == NULL && r->rpool.opts & PF_POOL_STICKYADDR && - (r->rpool.opts & PF_POOL_TYPEMASK) != PF_POOL_NONE) { + (r->rpool.opts & PF_POOL_TYPEMASK) != PF_POOL_NONE) *sn = pf_find_src_node(saddr, r, af, 0); - if (*sn != NULL && !PF_AZERO(&(*sn)->raddr, af)) { - PF_ACPY(naddr, &(*sn)->raddr, af); - if (V_pf_status.debug >= PF_DEBUG_MISC) { - printf("pf_map_addr: src tracking maps "); - pf_print_host(saddr, 0, af); - printf(" to "); - pf_print_host(naddr, 0, af); - printf("\n"); - } - return (0); + + /* If a src_node was found or explicitly given and it has a non-zero + route address, use this address. A zeroed address is found if the + src node was created just a moment ago in pf_create_state and it + needs to be filled in with routing decision calculated here. */ + if (*sn != NULL && !PF_AZERO(&(*sn)->raddr, af)) { + PF_ACPY(naddr, &(*sn)->raddr, af); + if (V_pf_status.debug >= PF_DEBUG_MISC) { + printf("pf_map_addr: src tracking maps "); + pf_print_host(saddr, 0, af); + printf(" to "); + pf_print_host(naddr, 0, af); + printf("\n"); } + return (0); } + /* Find the route using chosen algorithm. Store the found route + in src_node if it was given or found. */ if (rpool->cur->addr.type == PF_ADDR_NOROUTE) return (1); if (rpool->cur->addr.type == PF_ADDR_DYNIFTL) { From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 16:02:25 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 21EFD12D; Mon, 25 Aug 2014 16:02:25 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CEF9D3B3D; Mon, 25 Aug 2014 16:02:24 +0000 (UTC) Received: from ralph.baldwin.cx (pool-173-70-85-31.nwrknj.fios.verizon.net [173.70.85.31]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 9DEB8B98D; Mon, 25 Aug 2014 12:02:23 -0400 (EDT) From: John Baldwin To: Adrian Chadd Subject: Re: svn commit: r270516 - head/sys/dev/drm2/i915 Date: Mon, 25 Aug 2014 10:26:58 -0400 Message-ID: <2177184.NMfUXrE71G@ralph.baldwin.cx> User-Agent: KMail/4.10.5 (FreeBSD/10.0-STABLE; KDE/4.10.5; amd64; ; ) In-Reply-To: <201408250503.s7P53Axo057720@svn.freebsd.org> References: <201408250503.s7P53Axo057720@svn.freebsd.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Mon, 25 Aug 2014 12:02:23 -0400 (EDT) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 16:02:25 -0000 On Monday, August 25, 2014 05:03:10 AM Adrian Chadd wrote: > Author: adrian > Date: Mon Aug 25 05:03:10 2014 > New Revision: 270516 > URL: http://svnweb.freebsd.org/changeset/base/270516 > > Log: > i915 driver - enable opregion handle; program CADL. > > add opregion handling for drm2 - which exposes some ACPI video > configuration pieces that some Lenovo laptop models use to flesh out which > video device to speak to. This enables the brightness control in ACPI to > work these models. > > The CADL bits are also important - it's used to figure out which ACPI > events to hook the brightness buttons into. It doesn't yet seem to work > for me, but it does for the OP. We should also look at enabling the opregion notification stuff. Presumably that is part of ACPI-CA itself so it shouldn't be hard to make the equivalent calls for FreeBSD. Also, is leaving around the #if 0'd Linux version something the drm2 code does in general or was that unique to this patch? If the latter, we should remove the duplicate #if 0 code (list_for_each, etc.) -- John Baldwin From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 16:02:25 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id C58FD23A; Mon, 25 Aug 2014 16:02:25 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 86BC93B3E; Mon, 25 Aug 2014 16:02:25 +0000 (UTC) Received: from ralph.baldwin.cx (pool-173-70-85-31.nwrknj.fios.verizon.net [173.70.85.31]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 7A233B917; Mon, 25 Aug 2014 12:02:24 -0400 (EDT) From: John Baldwin To: Mateusz Guzik Subject: Re: svn commit: r270444 - in head/sys: kern sys Date: Mon, 25 Aug 2014 10:23:19 -0400 Message-ID: <1724027.iWxFDWcg2R@ralph.baldwin.cx> User-Agent: KMail/4.10.5 (FreeBSD/10.0-STABLE; KDE/4.10.5; amd64; ; ) In-Reply-To: <201408240904.s7O949sI083660@svn.freebsd.org> References: <201408240904.s7O949sI083660@svn.freebsd.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Mon, 25 Aug 2014 12:02:24 -0400 (EDT) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 16:02:25 -0000 On Sunday, August 24, 2014 09:04:09 AM Mateusz Guzik wrote: > Author: mjg > Date: Sun Aug 24 09:04:09 2014 > New Revision: 270444 > URL: http://svnweb.freebsd.org/changeset/base/270444 > > Log: > Fix getppid for traced processes. > > Traced processes always have the tracer set as the parent. > Utilize proc_realparent to obtain the right process when needed. Are you sure this won't break things? I know of several applications that expect a debugger to be the parent when attached and change behavior as a result (e.g. inserting a breakpoint on an assertion failure rather than generating a core). -- John Baldwin From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 16:08:56 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 344A155A; Mon, 25 Aug 2014 16:08:56 +0000 (UTC) Received: from mail-qg0-x236.google.com (mail-qg0-x236.google.com [IPv6:2607:f8b0:400d:c04::236]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B5FB43B81; Mon, 25 Aug 2014 16:08:55 +0000 (UTC) Received: by mail-qg0-f54.google.com with SMTP id j5so10307270qga.41 for ; Mon, 25 Aug 2014 09:08:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=vETWfzMVepueI7KZI2trHgboCVBZivu1KPyagjq+I8E=; b=yicXPft+lrcLVxRp0vrs1FkM1GpaXexI3Gvk/iNKPCRcWmZXUD48x38k/CQRRWqTtE aq6KwVjI8p12YPfr7CArg4Cq/9/RK7R/zkqp2f0jGkz1L6TaA7RUpYJQMsqypH1CA2Li USRLP7IbGjxRmFdvtEFwp/sVxj1pek7nH3K2I8D4/LN94yTiNWEV8YK1AbvJXNT9XY4R o4ooSHZuo6lmRuUHsCqwCWoO57fL6tRQO9mLtrSagi0guqKVfwfBDro4e4CM0guWCLmj RVtOJJ01E1WtWrQWibhY36R/Wy9AFeq5Q4EntKXuh7vPT/Xka0Y1JIixSAnt3/hNIa8O D2gw== MIME-Version: 1.0 X-Received: by 10.140.19.201 with SMTP id 67mr34226609qgh.28.1408982934788; Mon, 25 Aug 2014 09:08:54 -0700 (PDT) Sender: adrian.chadd@gmail.com Received: by 10.224.39.139 with HTTP; Mon, 25 Aug 2014 09:08:54 -0700 (PDT) In-Reply-To: <2177184.NMfUXrE71G@ralph.baldwin.cx> References: <201408250503.s7P53Axo057720@svn.freebsd.org> <2177184.NMfUXrE71G@ralph.baldwin.cx> Date: Mon, 25 Aug 2014 09:08:54 -0700 X-Google-Sender-Auth: EkfBQp7SYcG37TtQCa4yht37CW4 Message-ID: Subject: Re: svn commit: r270516 - head/sys/dev/drm2/i915 From: Adrian Chadd To: John Baldwin Content-Type: text/plain; charset=UTF-8 Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 16:08:56 -0000 On 25 August 2014 07:26, John Baldwin wrote: > On Monday, August 25, 2014 05:03:10 AM Adrian Chadd wrote: >> Author: adrian >> Date: Mon Aug 25 05:03:10 2014 >> New Revision: 270516 >> URL: http://svnweb.freebsd.org/changeset/base/270516 >> >> Log: >> i915 driver - enable opregion handle; program CADL. >> >> add opregion handling for drm2 - which exposes some ACPI video >> configuration pieces that some Lenovo laptop models use to flesh out which >> video device to speak to. This enables the brightness control in ACPI to >> work these models. >> >> The CADL bits are also important - it's used to figure out which ACPI >> events to hook the brightness buttons into. It doesn't yet seem to work >> for me, but it does for the OP. > > We should also look at enabling the opregion notification stuff. Presumably > that is part of ACPI-CA itself so it shouldn't be hard to make the equivalent > calls for FreeBSD. I agree. Like this was - patches gratefully accepted. :) > Also, is leaving around the #if 0'd Linux version something the drm2 code does > in general or was that unique to this patch? If the latter, we should remove > the duplicate #if 0 code (list_for_each, etc.) Sometimes it is, sometimes it isn't. -a From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 16:09:46 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id CFCF769E; Mon, 25 Aug 2014 16:09:46 +0000 (UTC) Received: from mail.made4.biz (mail.made4.biz [IPv6:2001:41d0:2:c018::1:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 947653B8C; Mon, 25 Aug 2014 16:09:46 +0000 (UTC) Received: from 141.7.19.93.rev.sfr.net ([93.19.7.141] helo=i915.dumbbell.fr) by mail.made4.biz with esmtpsa (TLSv1.2:DHE-RSA-AES128-SHA:128) (Exim 4.82_1-5b7a7c0-XX (FreeBSD)) (envelope-from ) id 1XLwq0-000AgL-RW; Mon, 25 Aug 2014 18:09:45 +0200 Message-ID: <53FB5FC8.4030105@FreeBSD.org> Date: Mon, 25 Aug 2014 18:09:44 +0200 From: =?windows-1252?Q?Jean-S=E9bastien_P=E9dron?= User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.0 MIME-Version: 1.0 To: John Baldwin , Adrian Chadd Subject: Re: svn commit: r270516 - head/sys/dev/drm2/i915 References: <201408250503.s7P53Axo057720@svn.freebsd.org> <2177184.NMfUXrE71G@ralph.baldwin.cx> In-Reply-To: <2177184.NMfUXrE71G@ralph.baldwin.cx> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 8bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 16:09:46 -0000 On 25.08.2014 16:26, John Baldwin wrote: > Also, is leaving around the #if 0'd Linux version something the drm2 code does > in general or was that unique to this patch? If the latter, we should remove > the duplicate #if 0 code (list_for_each, etc.) There's no actual consensus, I guess. In my DRM 3.8 branch, where I try to reduce the diff with Linux, I try to provide wrappers and keep the Linux code. Before that branch is merged, I'm in favor of keeping the Linux code around (but maybe use #ifdef __FreeBSD__) to keep an history of what was originally ported. -- Jean-Sébastien Pédron From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 16:13:44 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 99FE18BA; Mon, 25 Aug 2014 16:13:44 +0000 (UTC) Received: from i3mail.icecube.wisc.edu (i3mail.icecube.wisc.edu [128.104.255.23]) by mx1.freebsd.org (Postfix) with ESMTP id 6BC573C35; Mon, 25 Aug 2014 16:13:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by i3mail.icecube.wisc.edu (Postfix) with ESMTP id E29E23806C; Mon, 25 Aug 2014 11:13:43 -0500 (CDT) X-Virus-Scanned: amavisd-new at icecube.wisc.edu Received: from i3mail.icecube.wisc.edu ([127.0.0.1]) by localhost (i3mail.icecube.wisc.edu [127.0.0.1]) (amavisd-new, port 10030) with ESMTP id 5xRypbfngFuJ; Mon, 25 Aug 2014 11:13:43 -0500 (CDT) Received: from comporellon.tachypleus.net (polaris.tachypleus.net [75.101.50.44]) by i3mail.icecube.wisc.edu (Postfix) with ESMTPSA id 3F2E03806B; Mon, 25 Aug 2014 11:13:43 -0500 (CDT) Message-ID: <53FB60B6.2020106@freebsd.org> Date: Mon, 25 Aug 2014 09:13:42 -0700 From: Nathan Whitehorn User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 MIME-Version: 1.0 To: =?windows-1252?Q?Jean-S=E9bastien_P=E9dron?= , John Baldwin , Adrian Chadd Subject: Re: svn commit: r270516 - head/sys/dev/drm2/i915 References: <201408250503.s7P53Axo057720@svn.freebsd.org> <2177184.NMfUXrE71G@ralph.baldwin.cx> <53FB5FC8.4030105@FreeBSD.org> In-Reply-To: <53FB5FC8.4030105@FreeBSD.org> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 8bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 16:13:44 -0000 On 08/25/14 09:09, Jean-Sébastien Pédron wrote: > On 25.08.2014 16:26, John Baldwin wrote: >> Also, is leaving around the #if 0'd Linux version something the drm2 >> code does >> in general or was that unique to this patch? If the latter, we >> should remove >> the duplicate #if 0 code (list_for_each, etc.) > > There's no actual consensus, I guess. In my DRM 3.8 branch, where I > try to reduce the diff with Linux, I try to provide wrappers and keep > the Linux code. > > Before that branch is merged, I'm in favor of keeping the Linux code > around (but maybe use #ifdef __FreeBSD__) to keep an history of what > was originally ported. > What is the status of that branch right now? It would be really, really, really nice to have actual Haswell graphics. -Nathan From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 16:22:12 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id B47D3C57; Mon, 25 Aug 2014 16:22:12 +0000 (UTC) Received: from mail.made4.biz (mail.made4.biz [IPv6:2001:41d0:2:c018::1:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7827B3D20; Mon, 25 Aug 2014 16:22:12 +0000 (UTC) Received: from 141.7.19.93.rev.sfr.net ([93.19.7.141] helo=i915.dumbbell.fr) by mail.made4.biz with esmtpsa (TLSv1.2:DHE-RSA-AES128-SHA:128) (Exim 4.82_1-5b7a7c0-XX (FreeBSD)) (envelope-from ) id 1XLx22-000Aqk-Nq; Mon, 25 Aug 2014 18:22:10 +0200 Message-ID: <53FB62B2.3020509@FreeBSD.org> Date: Mon, 25 Aug 2014 18:22:10 +0200 From: =?windows-1252?Q?Jean-S=E9bastien_P=E9dron?= User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.0 MIME-Version: 1.0 To: Nathan Whitehorn , John Baldwin , Adrian Chadd Subject: Re: svn commit: r270516 - head/sys/dev/drm2/i915 References: <201408250503.s7P53Axo057720@svn.freebsd.org> <2177184.NMfUXrE71G@ralph.baldwin.cx> <53FB5FC8.4030105@FreeBSD.org> <53FB60B6.2020106@freebsd.org> In-Reply-To: <53FB60B6.2020106@freebsd.org> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 8bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 16:22:12 -0000 On 25.08.2014 18:13, Nathan Whitehorn wrote: > On 08/25/14 09:09, Jean-Sébastien Pédron wrote: >> There's no actual consensus, I guess. In my DRM 3.8 branch, where I >> try to reduce the diff with Linux, I try to provide wrappers and keep >> the Linux code. > > What is the status of that branch right now? It would be really, really, > really nice to have actual Haswell graphics. This branch is only about syncing our DRM generic part (GPU-independent) with Linux 3.8. It doesn't have Haswell support. Konstantin is working on Haswell but I don't know what the status is. -- Jean-Sébastien Pédron From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 16:25:03 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 368E7E54; Mon, 25 Aug 2014 16:25:03 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 20E653D3F; Mon, 25 Aug 2014 16:25:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PGP2KU089422; Mon, 25 Aug 2014 16:25:02 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PGP2Fa089421; Mon, 25 Aug 2014 16:25:02 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251625.s7PGP2Fa089421@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 16:25:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270578 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 16:25:03 -0000 Author: gjb Date: Mon Aug 25 16:25:02 2014 New Revision: 270578 URL: http://svnweb.freebsd.org/changeset/base/270578 Log: Document r267878, bsdgrep(1) pattern matching bug. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 15:51:07 2014 (r270577) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 16:25:02 2014 (r270578) @@ -638,6 +638,10 @@ is equivalent to --check and -C. + A bug in &man.bsdgrep.1; that would + prevent patterns from being matched under certain conditions + has been fixed. + <filename>/etc/rc.d</filename> Scripts From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 16:25:09 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 53D2014D; Mon, 25 Aug 2014 16:25:09 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EC0AE3D43; Mon, 25 Aug 2014 16:25:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PGP8br089569; Mon, 25 Aug 2014 16:25:08 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PGP8BG089567; Mon, 25 Aug 2014 16:25:08 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251625.s7PGP8BG089567@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 16:25:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270581 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 16:25:09 -0000 Author: gjb Date: Mon Aug 25 16:25:08 2014 New Revision: 270581 URL: http://svnweb.freebsd.org/changeset/base/270581 Log: Document r268046, oce(4) vendor updates. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 16:25:06 2014 (r270580) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 16:25:08 2014 (r270581) @@ -249,6 +249,10 @@ The &man.hpt27xx.4; driver has been updated with various vendor-supplied bug fixes. + The &man.oce.4; driver has been updated + with vendor-supplied fixes for big endian support, and 20GB/s + and 25GB/s link speeds. + Virtualization Support From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 16:25:07 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 2DD2DF62; Mon, 25 Aug 2014 16:25:07 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F0C6A3D41; Mon, 25 Aug 2014 16:25:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PGP6Ow089515; Mon, 25 Aug 2014 16:25:06 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PGP62e089514; Mon, 25 Aug 2014 16:25:06 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251625.s7PGP62e089514@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 16:25:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270580 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 16:25:07 -0000 Author: gjb Date: Mon Aug 25 16:25:06 2014 New Revision: 270580 URL: http://svnweb.freebsd.org/changeset/base/270580 Log: Document r268019, sed(1) '-u' flag. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 16:25:04 2014 (r270579) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 16:25:06 2014 (r270580) @@ -656,6 +656,10 @@ individual threads, rather than the entire process. + The &man.sed.1; utility has been + updated to include a new flag, -u, which + enables unbuffered output when specified. + <filename>/etc/rc.d</filename> Scripts From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 16:25:11 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 43D74295; Mon, 25 Aug 2014 16:25:11 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0FE643D45; Mon, 25 Aug 2014 16:25:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PGPAxD089621; Mon, 25 Aug 2014 16:25:10 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PGPAxB089620; Mon, 25 Aug 2014 16:25:10 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251625.s7PGPAxB089620@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 16:25:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270582 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 16:25:11 -0000 Author: gjb Date: Mon Aug 25 16:25:10 2014 New Revision: 270582 URL: http://svnweb.freebsd.org/changeset/base/270582 Log: Document r268098, service(8) directory traversal check. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 16:25:08 2014 (r270581) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 16:25:10 2014 (r270582) @@ -675,6 +675,10 @@ would not be created if _alias1 was not defined. + + The &man.service.8; utility has been + updated to check that the &man.rc.d.8; directory exists + before traversing the directory. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 16:25:05 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 561E4EAD; Mon, 25 Aug 2014 16:25:05 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0A9973D40; Mon, 25 Aug 2014 16:25:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PGP4Kt089466; Mon, 25 Aug 2014 16:25:04 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PGP4c9089465; Mon, 25 Aug 2014 16:25:04 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251625.s7PGP4c9089465@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 16:25:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270579 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 16:25:05 -0000 Author: gjb Date: Mon Aug 25 16:25:04 2014 New Revision: 270579 URL: http://svnweb.freebsd.org/changeset/base/270579 Log: Document r267979, procstat(1) '-r' and '-H' flags. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 16:25:02 2014 (r270578) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 16:25:04 2014 (r270579) @@ -642,6 +642,20 @@ prevent patterns from being matched under certain conditions has been fixed. + The &man.procstat.1; utility has been + updated to include two new flags, -r and + -H. When -r is + specified, &man.procstat.1; will print current resource usage + about the process(es). When -H is + specified, &man.procstat.1; will print information about + threads rather than the process(es). + + + The -H flag is currently only used + with -r to display resource usage for + individual threads, rather than the entire process. + + <filename>/etc/rc.d</filename> Scripts From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 16:25:13 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 25C4A2F9; Mon, 25 Aug 2014 16:25:13 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 103BF3D47; Mon, 25 Aug 2014 16:25:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PGPCTg089663; Mon, 25 Aug 2014 16:25:12 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PGPCMH089662; Mon, 25 Aug 2014 16:25:12 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251625.s7PGPCMH089662@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 16:25:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270583 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 16:25:13 -0000 Author: gjb Date: Mon Aug 25 16:25:12 2014 New Revision: 270583 URL: http://svnweb.freebsd.org/changeset/base/270583 Log: Fix revision sorting for r268161. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 16:25:10 2014 (r270582) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 16:25:12 2014 (r270583) @@ -627,9 +627,6 @@ been added, -U, which allows specifying the UUID of the guest in the System Information structure. - The &man.mkimg.1; utility has been - merged from &os;-CURRENT. - The &os; Project has migrated from the GNATS bug tracking system to Bugzilla. The &man.send-pr.1; @@ -664,6 +661,9 @@ updated to include a new flag, -u, which enables unbuffered output when specified. + The &man.mkimg.1; utility has been + merged from &os;-CURRENT. + <filename>/etc/rc.d</filename> Scripts From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 16:25:17 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 066134A4; Mon, 25 Aug 2014 16:25:17 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E57743D4A; Mon, 25 Aug 2014 16:25:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PGPGtN089752; Mon, 25 Aug 2014 16:25:16 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PGPGQP089751; Mon, 25 Aug 2014 16:25:16 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251625.s7PGPGQP089751@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 16:25:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270585 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 16:25:17 -0000 Author: gjb Date: Mon Aug 25 16:25:16 2014 New Revision: 270585 URL: http://svnweb.freebsd.org/changeset/base/270585 Log: Document r268700, camcontrol(8) 'persist' command. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 16:25:14 2014 (r270584) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 16:25:16 2014 (r270585) @@ -664,6 +664,11 @@ The &man.mkimg.1; utility has been merged from &os;-CURRENT. + The &man.camcontrol.8; has been updated + to include a new persist command, which + allows issuing SCSI PERSISTENT RESERVE IN + and SCSI PERSISTENT RESERVE OUT. + <filename>/etc/rc.d</filename> Scripts From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 16:25:18 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id E3D83696; Mon, 25 Aug 2014 16:25:18 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CF86B3D4C; Mon, 25 Aug 2014 16:25:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PGPIhV089809; Mon, 25 Aug 2014 16:25:18 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PGPIwo089808; Mon, 25 Aug 2014 16:25:18 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251625.s7PGPIwo089808@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 16:25:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270586 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 16:25:19 -0000 Author: gjb Date: Mon Aug 25 16:25:18 2014 New Revision: 270586 URL: http://svnweb.freebsd.org/changeset/base/270586 Log: Document r268791, gstat(8) '-p' flag. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 16:25:16 2014 (r270585) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 16:25:18 2014 (r270586) @@ -669,6 +669,10 @@ allows issuing SCSI PERSISTENT RESERVE IN and SCSI PERSISTENT RESERVE OUT. + The &man.gstat.8; utility has been + updated to include a new flag, -p, which + displays only physical providers when specified. + <filename>/etc/rc.d</filename> Scripts From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 16:25:15 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 1266737F; Mon, 25 Aug 2014 16:25:15 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EFA623D49; Mon, 25 Aug 2014 16:25:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PGPEsk089703; Mon, 25 Aug 2014 16:25:14 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PGPEnF089702; Mon, 25 Aug 2014 16:25:14 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251625.s7PGPEnF089702@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 16:25:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270584 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 16:25:15 -0000 Author: gjb Date: Mon Aug 25 16:25:14 2014 New Revision: 270584 URL: http://svnweb.freebsd.org/changeset/base/270584 Log: Document r268515, file(1) and libmagic(3) update to 5.19. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 16:25:12 2014 (r270583) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 16:25:14 2014 (r270584) @@ -706,6 +706,9 @@ The timezone database has been updated to version tzdata2014e. + + The &man.file.1; utility and + &man.libmagic.3; library have been updated to 5.19. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 16:27:06 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 1033) id 627F2967; Mon, 25 Aug 2014 16:27:06 +0000 (UTC) Date: Mon, 25 Aug 2014 16:27:06 +0000 From: Alexey Dokuchaev To: Nathan Whitehorn Subject: Re: svn commit: r270516 - head/sys/dev/drm2/i915 Message-ID: <20140825162706.GA22843@FreeBSD.org> References: <201408250503.s7P53Axo057720@svn.freebsd.org> <2177184.NMfUXrE71G@ralph.baldwin.cx> <53FB5FC8.4030105@FreeBSD.org> <53FB60B6.2020106@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <53FB60B6.2020106@freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) Cc: Adrian Chadd , src-committers@freebsd.org, John Baldwin , svn-src-all@freebsd.org, svn-src-head@freebsd.org, =?koi8-r?Q?Jean-S=E9bastien_P=E9dron?= X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 16:27:06 -0000 On Mon, Aug 25, 2014 at 09:13:42AM -0700, Nathan Whitehorn wrote: > On 08/25/14 09:09, Jean-Sébastien Pédron wrote: > >There's no actual consensus, I guess. In my DRM 3.8 branch, where I try to > >reduce the diff with Linux, I try to provide wrappers and keep the Linux > >code. > > > >Before that branch is merged, I'm in favor of keeping the Linux code > >around (but maybe use #ifdef __FreeBSD__) to keep an history of what was > >originally ported. > > What is the status of that branch right now? It would be really, really, > really nice to have actual Haswell graphics. I'll shamelessly hijack this thread and ask you Nathan, what's the current state of newcons+hwaccel w/ ATI RV280 on PowerPC found in e.g. Mac mini G4? ./danfe From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 16:38:53 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 1BBA2D0A; Mon, 25 Aug 2014 16:38:53 +0000 (UTC) Received: from mail.made4.biz (mail.made4.biz [IPv6:2001:41d0:2:c018::1:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D31D63EB2; Mon, 25 Aug 2014 16:38:52 +0000 (UTC) Received: from 141.7.19.93.rev.sfr.net ([93.19.7.141] helo=i915.dumbbell.fr) by mail.made4.biz with esmtpsa (TLSv1.2:DHE-RSA-AES128-SHA:128) (Exim 4.82_1-5b7a7c0-XX (FreeBSD)) (envelope-from ) id 1XLxIB-000B2N-2u; Mon, 25 Aug 2014 18:38:51 +0200 Message-ID: <53FB669A.6020604@FreeBSD.org> Date: Mon, 25 Aug 2014 18:38:50 +0200 From: =?UTF-8?B?SmVhbi1Tw6liYXN0aWVuIFDDqWRyb24=?= User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.0 MIME-Version: 1.0 To: Alexey Dokuchaev , Nathan Whitehorn Subject: Re: svn commit: r270516 - head/sys/dev/drm2/i915 References: <201408250503.s7P53Axo057720@svn.freebsd.org> <2177184.NMfUXrE71G@ralph.baldwin.cx> <53FB5FC8.4030105@FreeBSD.org> <53FB60B6.2020106@freebsd.org> <20140825162706.GA22843@FreeBSD.org> In-Reply-To: <20140825162706.GA22843@FreeBSD.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Cc: svn-src-head@freebsd.org, Adrian Chadd , src-committers@freebsd.org, svn-src-all@freebsd.org, John Baldwin X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 16:38:53 -0000 On 25.08.2014 18:27, Alexey Dokuchaev wrote: > I'll shamelessly hijack this thread and ask you Nathan, what's the current > state of newcons+hwaccel w/ ATI RV280 on PowerPC found in e.g. Mac mini G4? I imported Justin Hibbits patches in this DRM 3.8 branch [1] and enabled the build of radeonkms on PowerPC, but it's only built-tested. If you have some time and hardware to test it, that would be great! [1] https://github.com/dumbbell/freebsd/tree/kms-drm-update-38 (branch "kms-drm-update-38", not master) -- Jean-Sébastien Pédron From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 16:40:51 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id A24A8101; Mon, 25 Aug 2014 16:40:51 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 796A23EDE; Mon, 25 Aug 2014 16:40:51 +0000 (UTC) Received: from ralph.baldwin.cx (pool-173-70-85-31.nwrknj.fios.verizon.net [173.70.85.31]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 72BEEB917; Mon, 25 Aug 2014 12:40:50 -0400 (EDT) From: John Baldwin To: Adrian Chadd Subject: Re: svn commit: r270516 - head/sys/dev/drm2/i915 Date: Mon, 25 Aug 2014 12:40:47 -0400 Message-ID: <128105708.pbS1lOrkgx@ralph.baldwin.cx> User-Agent: KMail/4.10.5 (FreeBSD/10.0-STABLE; KDE/4.10.5; amd64; ; ) In-Reply-To: <201408250503.s7P53Axo057720@svn.freebsd.org> References: <201408250503.s7P53Axo057720@svn.freebsd.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Mon, 25 Aug 2014 12:40:50 -0400 (EDT) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 16:40:51 -0000 On Monday, August 25, 2014 05:03:10 AM Adrian Chadd wrote: > Author: adrian > Date: Mon Aug 25 05:03:10 2014 > New Revision: 270516 > URL: http://svnweb.freebsd.org/changeset/base/270516 > > Log: > i915 driver - enable opregion handle; program CADL. > > add opregion handling for drm2 - which exposes some ACPI video > configuration pieces that some Lenovo laptop models use to flesh out which > video device to speak to. This enables the brightness control in ACPI to > work these models. > > The CADL bits are also important - it's used to figure out which ACPI > events to hook the brightness buttons into. It doesn't yet seem to work > for me, but it does for the OP. FWIW, on my Lenovo X220, this completely fixes the brightness buttons both in and out of X once i915kms is loaded. -- John Baldwin From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 16:56:34 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 49005BF4; Mon, 25 Aug 2014 16:56:34 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3465330AE; Mon, 25 Aug 2014 16:56:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PGuYmj005932; Mon, 25 Aug 2014 16:56:34 GMT (envelope-from dumbbell@FreeBSD.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PGuYCM005931; Mon, 25 Aug 2014 16:56:34 GMT (envelope-from dumbbell@FreeBSD.org) Message-Id: <201408251656.s7PGuYCM005931@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dumbbell set sender to dumbbell@FreeBSD.org using -f From: Jean-Sebastien Pedron Date: Mon, 25 Aug 2014 16:56:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270587 - head/sys/dev/vt X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 16:56:34 -0000 Author: dumbbell Date: Mon Aug 25 16:56:33 2014 New Revision: 270587 URL: http://svnweb.freebsd.org/changeset/base/270587 Log: vt(4): Take font offset into account in vt_is_cursor_in_area() This fixes a "General protection fault" in vt_vga, where vt_is_cursor_in_area() erroneously reported that the cursor was over the text. This led to negative integers stored in "unsigned int" and chaos. MFC after: 1 week Modified: head/sys/dev/vt/vt_core.c Modified: head/sys/dev/vt/vt_core.c ============================================================================== --- head/sys/dev/vt/vt_core.c Mon Aug 25 16:25:18 2014 (r270586) +++ head/sys/dev/vt/vt_core.c Mon Aug 25 16:56:33 2014 (r270587) @@ -828,8 +828,8 @@ vt_is_cursor_in_area(const struct vt_dev * We use the cursor position saved during the current refresh, * in case the cursor moved since. */ - mx = vd->vd_mx_drawn; - my = vd->vd_my_drawn; + mx = vd->vd_mx_drawn + vd->vd_curwindow->vw_offset.tp_col; + my = vd->vd_my_drawn + vd->vd_curwindow->vw_offset.tp_row; x1 = area->tr_begin.tp_col; y1 = area->tr_begin.tp_row; From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 17:02:47 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 474C0FEB; Mon, 25 Aug 2014 17:02:47 +0000 (UTC) Received: from mail-wi0-x22a.google.com (mail-wi0-x22a.google.com [IPv6:2a00:1450:400c:c05::22a]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 412D83193; Mon, 25 Aug 2014 17:02:46 +0000 (UTC) Received: by mail-wi0-f170.google.com with SMTP id f8so3993789wiw.5 for ; Mon, 25 Aug 2014 10:02:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=zEBhwwUVGN1kXZlyO+ztYDnCWBnbOHMO+qrQmXy6RjQ=; b=PlEHQQ+lmUgzh2AJqK+n2NToW2v3KDp/pyom4YW0n3zwHVx1awOGoaYg5krCi6lrk8 KptnEmGIi78ugOe42tmOLnue6zH37kvHLKDikQitAnHhEZJhkT++2VQl4ybJxI4Cqf+/ URXP/trC+Or/Zd4iMoQ1MdXN+VzSOlTc4K3pIq3hE1/QBxIwyff3yOUak1M25RVJ3DoS RgrSs5PEyRlchkGmn2aPo4wDzcZhxBQKQKF/6agWXr8p729Qixvzm0t796LvJ5vdMcgb XSkj8qoWzdcfumRyaOKfXgADV8DgbK6GlIY+BarmVuKOmP7495itOtrmpRcFc9zna/Ei cfSA== X-Received: by 10.180.92.73 with SMTP id ck9mr16910639wib.54.1408986164500; Mon, 25 Aug 2014 10:02:44 -0700 (PDT) Received: from dft-labs.eu (n1x0n-1-pt.tunnel.tserv5.lon1.ipv6.he.net. [2001:470:1f08:1f7::2]) by mx.google.com with ESMTPSA id k10sm979336wjb.28.2014.08.25.10.02.43 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 25 Aug 2014 10:02:43 -0700 (PDT) Date: Mon, 25 Aug 2014 19:02:41 +0200 From: Mateusz Guzik To: John Baldwin Subject: Re: svn commit: r270444 - in head/sys: kern sys Message-ID: <20140825170241.GA23088@dft-labs.eu> References: <201408240904.s7O949sI083660@svn.freebsd.org> <1724027.iWxFDWcg2R@ralph.baldwin.cx> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1724027.iWxFDWcg2R@ralph.baldwin.cx> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Mateusz Guzik X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 17:02:47 -0000 On Mon, Aug 25, 2014 at 10:23:19AM -0400, John Baldwin wrote: > On Sunday, August 24, 2014 09:04:09 AM Mateusz Guzik wrote: > > Author: mjg > > Date: Sun Aug 24 09:04:09 2014 > > New Revision: 270444 > > URL: http://svnweb.freebsd.org/changeset/base/270444 > > > > Log: > > Fix getppid for traced processes. > > > > Traced processes always have the tracer set as the parent. > > Utilize proc_realparent to obtain the right process when needed. > > Are you sure this won't break things? I know of several applications that > expect a debugger to be the parent when attached and change behavior as a > result (e.g. inserting a breakpoint on an assertion failure rather than > generating a core). > Well, this is what linux and solaris do. I don't feel strongly about this change. If you really want I'm happy to revert. -- Mateusz Guzik From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 17:05:00 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 2DC342C1; Mon, 25 Aug 2014 17:05:00 +0000 (UTC) Received: from i3mail.icecube.wisc.edu (i3mail.icecube.wisc.edu [128.104.255.23]) by mx1.freebsd.org (Postfix) with ESMTP id F210E31C8; Mon, 25 Aug 2014 17:04:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by i3mail.icecube.wisc.edu (Postfix) with ESMTP id B1CC538075; Mon, 25 Aug 2014 12:04:58 -0500 (CDT) X-Virus-Scanned: amavisd-new at icecube.wisc.edu Received: from i3mail.icecube.wisc.edu ([127.0.0.1]) by localhost (i3mail.icecube.wisc.edu [127.0.0.1]) (amavisd-new, port 10030) with ESMTP id qJo1T75_z8T2; Mon, 25 Aug 2014 12:04:58 -0500 (CDT) Received: from comporellon.tachypleus.net (polaris.tachypleus.net [75.101.50.44]) by i3mail.icecube.wisc.edu (Postfix) with ESMTPSA id DF96038073; Mon, 25 Aug 2014 12:04:57 -0500 (CDT) Message-ID: <53FB6CB9.4010507@freebsd.org> Date: Mon, 25 Aug 2014 10:04:57 -0700 From: Nathan Whitehorn User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 MIME-Version: 1.0 To: =?UTF-8?B?SmVhbi1Tw6liYXN0aWVuIFDDqWRyb24=?= , Alexey Dokuchaev Subject: Re: svn commit: r270516 - head/sys/dev/drm2/i915 References: <201408250503.s7P53Axo057720@svn.freebsd.org> <2177184.NMfUXrE71G@ralph.baldwin.cx> <53FB5FC8.4030105@FreeBSD.org> <53FB60B6.2020106@freebsd.org> <20140825162706.GA22843@FreeBSD.org> <53FB669A.6020604@FreeBSD.org> In-Reply-To: <53FB669A.6020604@FreeBSD.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Cc: svn-src-head@freebsd.org, Adrian Chadd , src-committers@freebsd.org, svn-src-all@freebsd.org, John Baldwin X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 17:05:00 -0000 On 08/25/14 09:38, Jean-Sébastien Pédron wrote: > On 25.08.2014 18:27, Alexey Dokuchaev wrote: >> I'll shamelessly hijack this thread and ask you Nathan, what's the >> current >> state of newcons+hwaccel w/ ATI RV280 on PowerPC found in e.g. Mac >> mini G4? > > I imported Justin Hibbits patches in this DRM 3.8 branch [1] and > enabled the build of radeonkms on PowerPC, but it's only built-tested. > > If you have some time and hardware to test it, that would be great! > > [1] https://github.com/dumbbell/freebsd/tree/kms-drm-update-38 > (branch "kms-drm-update-38", not master) > Does our radeon KMS code support AGP-based Radeons? I vaguely remember this not being the case. -Nathan From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 17:06:19 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 486D34F3; Mon, 25 Aug 2014 17:06:19 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2EF6931E1; Mon, 25 Aug 2014 17:06:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PH6JC5011123; Mon, 25 Aug 2014 17:06:19 GMT (envelope-from davide@FreeBSD.org) Received: (from davide@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PH6Jbi011122; Mon, 25 Aug 2014 17:06:19 GMT (envelope-from davide@FreeBSD.org) Message-Id: <201408251706.s7PH6Jbi011122@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: davide set sender to davide@FreeBSD.org using -f From: Davide Italiano Date: Mon, 25 Aug 2014 17:06:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270588 - head/sys/ufs/ufs X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 17:06:19 -0000 Author: davide Date: Mon Aug 25 17:06:18 2014 New Revision: 270588 URL: http://svnweb.freebsd.org/changeset/base/270588 Log: Rather than using an hardcoded reclaim age, rely on an LRU-like approach for dirhash cache, setting a target percent to reclaim (exposed via SYSCTL). This allows to always make some amount of progress keeping the maximum reclaim age dynamic. Tested by: pho Reviewed by: jhb Modified: head/sys/ufs/ufs/ufs_dirhash.c Modified: head/sys/ufs/ufs/ufs_dirhash.c ============================================================================== --- head/sys/ufs/ufs/ufs_dirhash.c Mon Aug 25 16:56:33 2014 (r270587) +++ head/sys/ufs/ufs/ufs_dirhash.c Mon Aug 25 17:06:18 2014 (r270588) @@ -85,10 +85,10 @@ SYSCTL_INT(_vfs_ufs, OID_AUTO, dirhash_d static int ufs_dirhashlowmemcount = 0; SYSCTL_INT(_vfs_ufs, OID_AUTO, dirhash_lowmemcount, CTLFLAG_RD, &ufs_dirhashlowmemcount, 0, "number of times low memory hook called"); -static int ufs_dirhashreclaimage = 60; -SYSCTL_INT(_vfs_ufs, OID_AUTO, dirhash_reclaimage, CTLFLAG_RW, - &ufs_dirhashreclaimage, 0, - "max time in seconds of hash inactivity before deletion in low VM events"); +static int ufs_dirhash_reclaimperc = 10; +SYSCTL_INT(_vfs_ufs, OID_AUTO, dirhash_reclaimperc, CTLFLAG_RW, + &ufs_dirhash_reclaimperc, 0, + "percentage of dirhash cache to be removed in low VM events"); static int ufsdirhash_hash(struct dirhash *dh, char *name, int namelen); @@ -1247,45 +1247,28 @@ static void ufsdirhash_lowmem() { struct dirhash *dh, *dh_temp; - int memfreed = 0; - /* - * Will free a *minimum* of 10% of the dirhash, but possibly much - * more (depending on dirhashreclaimage). System with large dirhashes - * probably also need a much larger dirhashreclaimage. - * XXX: this percentage may need to be adjusted. - */ - int memwanted = ufs_dirhashmem / 10; + int memfreed, memwanted; ufs_dirhashlowmemcount++; + memfreed = 0; + memwanted = ufs_dirhashmem / ufs_dirhash_reclaimperc; DIRHASHLIST_LOCK(); - /* - * Delete dirhashes not used for more than ufs_dirhashreclaimage - * seconds. If we can't get a lock on the dirhash, it will be skipped. - */ - TAILQ_FOREACH_SAFE(dh, &ufsdirhash_list, dh_list, dh_temp) { - if (!sx_try_xlock(&dh->dh_lock)) - continue; - if (time_second - dh->dh_lastused > ufs_dirhashreclaimage) - memfreed += ufsdirhash_destroy(dh); - /* Unlock if we didn't delete the dirhash */ - else - ufsdirhash_release(dh); - } - /* - * If not enough memory was freed, keep deleting hashes from the head - * of the dirhash list. The ones closest to the head should be the - * oldest. + /* + * Reclaim up to memwanted from the oldest dirhashes. This will allow + * us to make some progress when the system is running out of memory + * without compromising the dinamicity of maximum age. If the situation + * does not improve lowmem will be eventually retriggered and free some + * other entry in the cache. The entries on the head of the list should + * be the oldest. If during list traversal we can't get a lock on the + * dirhash, it will be skipped. */ - if (memfreed < memwanted) { - TAILQ_FOREACH_SAFE(dh, &ufsdirhash_list, dh_list, dh_temp) { - if (!sx_try_xlock(&dh->dh_lock)) - continue; + TAILQ_FOREACH_SAFE(dh, &ufsdirhash_list, dh_list, dh_temp) { + if (sx_try_xlock(&dh->dh_lock)) memfreed += ufsdirhash_destroy(dh); - if (memfreed >= memwanted) - break; - } + if (memfreed >= memwanted) + break; } DIRHASHLIST_UNLOCK(); } From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 17:08:38 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id E5812869; Mon, 25 Aug 2014 17:08:38 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D09AD321A; Mon, 25 Aug 2014 17:08:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PH8cBt011702; Mon, 25 Aug 2014 17:08:38 GMT (envelope-from dumbbell@FreeBSD.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PH8cTp011701; Mon, 25 Aug 2014 17:08:38 GMT (envelope-from dumbbell@FreeBSD.org) Message-Id: <201408251708.s7PH8cTp011701@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dumbbell set sender to dumbbell@FreeBSD.org using -f From: Jean-Sebastien Pedron Date: Mon, 25 Aug 2014 17:08:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270589 - head/sys/dev/vt X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 17:08:39 -0000 Author: dumbbell Date: Mon Aug 25 17:08:38 2014 New Revision: 270589 URL: http://svnweb.freebsd.org/changeset/base/270589 Log: vt(4): The cursor coordinates are relative to the drawn area ... not the whole screen. Don't use font offsets in vt_mark_mouse_position_as_dirty(). This fixes a bug where the mouse position wasn't marked as dirty when approaching the borders of the drawn area. MFC after: 1 week Modified: head/sys/dev/vt/vt_core.c Modified: head/sys/dev/vt/vt_core.c ============================================================================== --- head/sys/dev/vt/vt_core.c Mon Aug 25 17:06:18 2014 (r270588) +++ head/sys/dev/vt/vt_core.c Mon Aug 25 17:08:38 2014 (r270589) @@ -860,16 +860,12 @@ vt_mark_mouse_position_as_dirty(struct v y = vd->vd_my_drawn; if (vf != NULL) { - area.tr_begin.tp_col = (x - vw->vw_offset.tp_col) / - vf->vf_width; - area.tr_begin.tp_row = (y - vw->vw_offset.tp_row) / - vf->vf_height; + area.tr_begin.tp_col = x / vf->vf_width; + area.tr_begin.tp_row = y / vf->vf_height; area.tr_end.tp_col = - ((x + vd->vd_mcursor->width - vw->vw_offset.tp_col) / - vf->vf_width) + 1; + ((x + vd->vd_mcursor->width) / vf->vf_width) + 1; area.tr_end.tp_row = - ((y + vd->vd_mcursor->height - vw->vw_offset.tp_row) / - vf->vf_height) + 1; + ((y + vd->vd_mcursor->height) / vf->vf_height) + 1; } else { /* * No font loaded (ie. vt_vga operating in textmode). From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 17:11:45 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 9937FB99; Mon, 25 Aug 2014 17:11:45 +0000 (UTC) Received: from mail.made4.biz (mail.made4.biz [IPv6:2001:41d0:2:c018::1:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5AC3532FD; Mon, 25 Aug 2014 17:11:45 +0000 (UTC) Received: from 141.7.19.93.rev.sfr.net ([93.19.7.141] helo=i915.dumbbell.fr) by mail.made4.biz with esmtpsa (TLSv1.2:DHE-RSA-AES128-SHA:128) (Exim 4.82_1-5b7a7c0-XX (FreeBSD)) (envelope-from ) id 1XLxnz-000BPv-FJ; Mon, 25 Aug 2014 19:11:43 +0200 Message-ID: <53FB6E4F.9010700@FreeBSD.org> Date: Mon, 25 Aug 2014 19:11:43 +0200 From: =?UTF-8?B?SmVhbi1Tw6liYXN0aWVuIFDDqWRyb24=?= User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.0 MIME-Version: 1.0 To: Nathan Whitehorn , Alexey Dokuchaev Subject: Re: svn commit: r270516 - head/sys/dev/drm2/i915 References: <201408250503.s7P53Axo057720@svn.freebsd.org> <2177184.NMfUXrE71G@ralph.baldwin.cx> <53FB5FC8.4030105@FreeBSD.org> <53FB60B6.2020106@freebsd.org> <20140825162706.GA22843@FreeBSD.org> <53FB669A.6020604@FreeBSD.org> <53FB6CB9.4010507@freebsd.org> In-Reply-To: <53FB6CB9.4010507@freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Cc: svn-src-head@freebsd.org, Adrian Chadd , src-committers@freebsd.org, svn-src-all@freebsd.org, John Baldwin X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 17:11:45 -0000 On 25.08.2014 19:04, Nathan Whitehorn wrote: > Does our radeon KMS code support AGP-based Radeons? I vaguely remember > this not being the case. Unfortunately no, AGP isn't supported. And I currently don't have neither the knowledge nor the hardware to add this. Furthermore, it would be a lower priority compared to more urgent topics in the graphics stack. -- Jean-Sébastien Pédron From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 17:30:16 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id CE3F4DF6; Mon, 25 Aug 2014 17:30:16 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B934A34CE; Mon, 25 Aug 2014 17:30:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PHUGcS023458; Mon, 25 Aug 2014 17:30:16 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PHUGFT023457; Mon, 25 Aug 2014 17:30:16 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251730.s7PHUGFT023457@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 17:30:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270590 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 17:30:16 -0000 Author: gjb Date: Mon Aug 25 17:30:16 2014 New Revision: 270590 URL: http://svnweb.freebsd.org/changeset/base/270590 Log: Document r268899, byacc(1) update to 20140422. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 17:08:38 2014 (r270589) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 17:30:16 2014 (r270590) @@ -718,6 +718,9 @@ The &man.file.1; utility and &man.libmagic.3; library have been updated to 5.19. + + The &man.byacc.1; parser has been + updated to version 20140422. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 17:30:18 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id AFADEDFC; Mon, 25 Aug 2014 17:30:18 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9AE3E34D0; Mon, 25 Aug 2014 17:30:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PHUILY023506; Mon, 25 Aug 2014 17:30:18 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PHUIkB023505; Mon, 25 Aug 2014 17:30:18 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251730.s7PHUIkB023505@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 17:30:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270591 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 17:30:18 -0000 Author: gjb Date: Mon Aug 25 17:30:18 2014 New Revision: 270591 URL: http://svnweb.freebsd.org/changeset/base/270591 Log: Document r268903, kldstat(8) '-q' support when using '-n module.ko' Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 17:30:16 2014 (r270590) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 17:30:18 2014 (r270591) @@ -673,6 +673,11 @@ updated to include a new flag, -p, which displays only physical providers when specified. + The &man.kldstat.8; utility has been + updated to allow -q to be specified when + also specifying -n + module.ko. + <filename>/etc/rc.d</filename> Scripts From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 17:30:20 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id A0A54E47; Mon, 25 Aug 2014 17:30:20 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8C53834D1; Mon, 25 Aug 2014 17:30:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PHUKpB023547; Mon, 25 Aug 2014 17:30:20 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PHUKsn023546; Mon, 25 Aug 2014 17:30:20 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251730.s7PHUKsn023546@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 17:30:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270592 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 17:30:20 -0000 Author: gjb Date: Mon Aug 25 17:30:20 2014 New Revision: 270592 URL: http://svnweb.freebsd.org/changeset/base/270592 Log: Document r268932, bhyve(4) zfs boot Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 17:30:18 2014 (r270591) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 17:30:20 2014 (r270592) @@ -274,6 +274,9 @@ XSAVE and XSAVE-enabled features, such as AVX. + + The &man.bhyve.4; hypervisor now + supports booting from a &man.zfs.8; filesystem. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 17:30:23 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id ACDCCFBA; Mon, 25 Aug 2014 17:30:22 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7404D34D2; Mon, 25 Aug 2014 17:30:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PHUM7p023597; Mon, 25 Aug 2014 17:30:22 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PHUMtH023596; Mon, 25 Aug 2014 17:30:22 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251730.s7PHUMtH023596@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 17:30:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270593 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 17:30:23 -0000 Author: gjb Date: Mon Aug 25 17:30:21 2014 New Revision: 270593 URL: http://svnweb.freebsd.org/changeset/base/270593 Log: Document r268933, virtio_random(4). Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 17:30:20 2014 (r270592) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 17:30:21 2014 (r270593) @@ -277,6 +277,10 @@ The &man.bhyve.4; hypervisor now supports booting from a &man.zfs.8; filesystem. + + A new driver, &man.virtio_random.4;, + has been added, which allows &os; virtual machines to + harvest entropy from the hypervisor. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 17:30:32 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 1D25F6EC; Mon, 25 Aug 2014 17:30:32 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E1847355F; Mon, 25 Aug 2014 17:30:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PHUVxP023844; Mon, 25 Aug 2014 17:30:31 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PHUVGI023843; Mon, 25 Aug 2014 17:30:31 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251730.s7PHUVGI023843@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 17:30:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270598 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 17:30:32 -0000 Author: gjb Date: Mon Aug 25 17:30:31 2014 New Revision: 270598 URL: http://svnweb.freebsd.org/changeset/base/270598 Log: Document r269257, ldns/unbound update. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 17:30:29 2014 (r270597) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 17:30:31 2014 (r270598) @@ -745,6 +745,10 @@ The &man.lldb.1; debugging library has been updated to the r202189 snapshot. + + The &man.unbound.8; caching resolver and + ldns have been updated to version + 1.4.22. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 17:30:34 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id F360E80B; Mon, 25 Aug 2014 17:30:33 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C312C3563; Mon, 25 Aug 2014 17:30:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PHUXAk023888; Mon, 25 Aug 2014 17:30:33 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PHUXbB023887; Mon, 25 Aug 2014 17:30:33 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251730.s7PHUXbB023887@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 17:30:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270599 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 17:30:34 -0000 Author: gjb Date: Mon Aug 25 17:30:33 2014 New Revision: 270599 URL: http://svnweb.freebsd.org/changeset/base/270599 Log: Document r269298, max SCSI ports in ctl(4). Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 17:30:31 2014 (r270598) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 17:30:33 2014 (r270599) @@ -439,6 +439,10 @@ driver has been updated to include 32-bit &man.ioctl.2; support, allowing 32-bit applications to run on a 64-bit system. + + The maximum number of + SCSI ports in the &man.ctl.4; driver has + been increased from 32 to 128. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 17:30:24 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 7C44F1CC; Mon, 25 Aug 2014 17:30:24 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 66B73353A; Mon, 25 Aug 2014 17:30:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PHUOGd023661; Mon, 25 Aug 2014 17:30:24 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PHUO76023660; Mon, 25 Aug 2014 17:30:24 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251730.s7PHUO76023660@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 17:30:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270594 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 17:30:24 -0000 Author: gjb Date: Mon Aug 25 17:30:23 2014 New Revision: 270594 URL: http://svnweb.freebsd.org/changeset/base/270594 Log: Document r269024, lldb update to r202189. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 17:30:21 2014 (r270593) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 17:30:23 2014 (r270594) @@ -709,10 +709,6 @@ The &man.xz.1; utility has been updated to a post-5.0.5 snapshot. - The &man.lldb.1; debugging library has - been updated to the r196322 snapshot. - OpenSSH has been updated to version 6.6p1. @@ -733,6 +729,10 @@ The &man.byacc.1; parser has been updated to version 20140422. + + The &man.lldb.1; debugging library has + been updated to the r202189 snapshot. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 17:30:26 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 5CD8E2DB; Mon, 25 Aug 2014 17:30:26 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 483DF3551; Mon, 25 Aug 2014 17:30:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PHUQV2023705; Mon, 25 Aug 2014 17:30:26 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PHUQk3023704; Mon, 25 Aug 2014 17:30:26 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251730.s7PHUQk3023704@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 17:30:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270595 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 17:30:26 -0000 Author: gjb Date: Mon Aug 25 17:30:25 2014 New Revision: 270595 URL: http://svnweb.freebsd.org/changeset/base/270595 Log: Document r269177, fixed- and dynamically-allocated support in mkimg(1) for VMDK and VHD files. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 17:30:23 2014 (r270594) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 17:30:25 2014 (r270595) @@ -685,6 +685,11 @@ also specifying -n module.ko. + The &man.mkimg.1; utility has been + updated to include support for both fixed- and + dynamically-allocated images for the VHD + and VMDK formats. + <filename>/etc/rc.d</filename> Scripts From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 17:30:28 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 65F8448F; Mon, 25 Aug 2014 17:30:28 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2C2E93555; Mon, 25 Aug 2014 17:30:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PHUSqK023752; Mon, 25 Aug 2014 17:30:28 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PHUSt5023751; Mon, 25 Aug 2014 17:30:28 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251730.s7PHUSt5023751@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 17:30:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270596 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 17:30:28 -0000 Author: gjb Date: Mon Aug 25 17:30:27 2014 New Revision: 270596 URL: http://svnweb.freebsd.org/changeset/base/270596 Log: Document r269196, em(4) update to 7.4.2. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 17:30:25 2014 (r270595) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 17:30:27 2014 (r270596) @@ -390,6 +390,9 @@ vendor="&chelsio;">The bundled &man.cxgbe.4; firmware for T4 and T5 cards has been updated to version 1.11.27.0. + + The &man.em.4; driver has been + updated to version 7.4.2. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 17:30:30 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 323F65C0; Mon, 25 Aug 2014 17:30:30 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0FABB355A; Mon, 25 Aug 2014 17:30:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PHUTn9023801; Mon, 25 Aug 2014 17:30:29 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PHUTP7023800; Mon, 25 Aug 2014 17:30:29 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251730.s7PHUTP7023800@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 17:30:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270597 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 17:30:30 -0000 Author: gjb Date: Mon Aug 25 17:30:29 2014 New Revision: 270597 URL: http://svnweb.freebsd.org/changeset/base/270597 Log: Document r269220, save-entropy.sh no longer harvests entropy within jail(8). Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 17:30:27 2014 (r270596) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 17:30:29 2014 (r270597) @@ -693,6 +693,10 @@ dynamically-allocated images for the VHD and VMDK formats. + The &man.random.4; entropy collection + script, /usr/libexec/save-entropy, no + longer runs within &man.jail.8; environments. + <filename>/etc/rc.d</filename> Scripts From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 17:31:07 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 53A48A46; Mon, 25 Aug 2014 17:31:07 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3F0A43581; Mon, 25 Aug 2014 17:31:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PHV7iJ024236; Mon, 25 Aug 2014 17:31:07 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PHV7K2024235; Mon, 25 Aug 2014 17:31:07 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201408251731.s7PHV7K2024235@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Mon, 25 Aug 2014 17:31:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270600 - stable/10 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 17:31:07 -0000 Author: ian Date: Mon Aug 25 17:31:06 2014 New Revision: 270600 URL: http://svnweb.freebsd.org/changeset/base/270600 Log: Revert r270079 which was MFC of r269688, build libohash while bootstrapping. The changes to split the ohash code out of m4 into its own library haven't been MFC'd, so this change was causing an error during bootstrap when building stable-10. Submitted by: Dai Sieh Pointy hat to: ian Modified: stable/10/Makefile.inc1 Modified: stable/10/Makefile.inc1 ============================================================================== --- stable/10/Makefile.inc1 Mon Aug 25 17:30:33 2014 (r270599) +++ stable/10/Makefile.inc1 Mon Aug 25 17:31:06 2014 (r270600) @@ -1228,8 +1228,7 @@ _sed= usr.bin/sed .endif .if ${BOOTSTRAPPING} < 1000002 -_m4= lib/libohash \ - usr.bin/m4 +_m4= usr.bin/m4 .endif .if ${BOOTSTRAPPING} < 1000013 From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 17:36:52 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 33870EF7; Mon, 25 Aug 2014 17:36:52 +0000 (UTC) Received: from mail-oa0-x22f.google.com (mail-oa0-x22f.google.com [IPv6:2607:f8b0:4003:c02::22f]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BEA2F35DD; Mon, 25 Aug 2014 17:36:51 +0000 (UTC) Received: by mail-oa0-f47.google.com with SMTP id g18so11003206oah.34 for ; Mon, 25 Aug 2014 10:36:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=fp1zCJ15AMGTr/FF5yQ5ny6NKUq5UTHF40RI/sEJqyw=; b=gD/nuAUbGs0uCosBoZyNE+sFzmzFIu+6M6IXAWa2VQVuW/9alALLFgQjBLspuMF4dU B5ILQ7/JpVvq7deSd9OLQez1N0V3zah8yRMRIqWqDJieilLJLYQKlz5RLKvT9WoLyO/T IL4XxhvvXbhvcUzWsfBspVAy3YDB0myDV9eQCDsD9piXObh5qW0sdajGvXUAk0ggijm6 4dM4nRSPWpCkKApHBd89voay4PswsiOucFBsncVAVmXkaPFRoFynjMr57IlRoUJf8vup rXjAquU37Oh0PxqlOhW+HpxMhTPQGMqtfnuGYaoK8WUg4IRhdtNrE1tUNbBm7yB9US11 bIzw== MIME-Version: 1.0 X-Received: by 10.60.47.13 with SMTP id z13mr4107856oem.71.1408988211101; Mon, 25 Aug 2014 10:36:51 -0700 (PDT) Received: by 10.182.98.111 with HTTP; Mon, 25 Aug 2014 10:36:51 -0700 (PDT) In-Reply-To: <20140825141048.GQ7693@FreeBSD.org> References: <61DA1EC8-C938-4AB8-B518-7249307B4379@felyko.com> <201408242301.s7ON1N51056169@gw.catspoiler.org> <20140825141048.GQ7693@FreeBSD.org> Date: Mon, 25 Aug 2014 13:36:51 -0400 Message-ID: Subject: Re: svn commit: r270510 - head From: Benjamin Kaduk To: Gleb Smirnoff Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.18-1 Cc: "src-committers@freebsd.org" , peter@wemm.org, Don Lewis , Rui Paulo , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 17:36:52 -0000 On Mon, Aug 25, 2014 at 10:10 AM, Gleb Smirnoff wrote: > > And carrying this stuff costs us almost nothing. > The cost of having it in the tree is small, yes. But the runtime cost when people actually run delete-old will only keep increasing ... it already feels kind of slow, to me. -Ben From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 17:53:02 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 542AE8F0; Mon, 25 Aug 2014 17:53:02 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3F0CE37C8; Mon, 25 Aug 2014 17:53:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PHr2Da036996; Mon, 25 Aug 2014 17:53:02 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PHr2C0036995; Mon, 25 Aug 2014 17:53:02 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251753.s7PHr2C0036995@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 17:53:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270601 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 17:53:02 -0000 Author: gjb Date: Mon Aug 25 17:53:01 2014 New Revision: 270601 URL: http://svnweb.freebsd.org/changeset/base/270601 Log: Document r269397, vmrun.sh synced with head/. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 17:31:06 2014 (r270600) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 17:53:01 2014 (r270601) @@ -701,6 +701,41 @@ script, /usr/libexec/save-entropy, no longer runs within &man.jail.8; environments. + The &man.bhyve.8; wrapper script, + /usr/share/examples/bhyve/vmrun.sh, + has been synced with &os;-CURRENT. + + This update includes: + + + + A new flag, -e, has been added, + which is used to set &man.loader.8; environment + variables. + + + + A new flag, -C, has been added, + which is used to specify the guest console device. + + + + A new flag, -H, has been added, + which is used to pass the host path to + &man.bhyveload.8;. + + + + Support for multiple disk and &man.tap.4; devices + has been added. + + + + The -I flag has been + removed. + + + <filename>/etc/rc.d</filename> Scripts From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 17:53:04 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 637AF9C8; Mon, 25 Aug 2014 17:53:04 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4EBAC37C9; Mon, 25 Aug 2014 17:53:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PHr4xM037043; Mon, 25 Aug 2014 17:53:04 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PHr48T037041; Mon, 25 Aug 2014 17:53:04 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251753.s7PHr48T037041@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 17:53:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270602 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 17:53:04 -0000 Author: gjb Date: Mon Aug 25 17:53:03 2014 New Revision: 270602 URL: http://svnweb.freebsd.org/changeset/base/270602 Log: Document r269398, NFSv4.1 Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 17:53:01 2014 (r270601) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 17:53:03 2014 (r270602) @@ -736,6 +736,9 @@ + The &man.nfsd.8; server update to 4.1 + has merged from &os;-CURRENT. + <filename>/etc/rc.d</filename> Scripts From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 18:25:43 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 1706AFAB; Mon, 25 Aug 2014 18:25:43 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 028CD3B74; Mon, 25 Aug 2014 18:25:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PIPgkN054023; Mon, 25 Aug 2014 18:25:42 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PIPgen054022; Mon, 25 Aug 2014 18:25:42 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201408251825.s7PIPgen054022@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Mon, 25 Aug 2014 18:25:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-svnadmin@freebsd.org Subject: svn commit: r270603 - svnadmin/conf X-SVN-Group: svnadmin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 18:25:43 -0000 Author: asomers Date: Mon Aug 25 18:25:42 2014 New Revision: 270603 URL: http://svnweb.freebsd.org/changeset/base/270603 Log: Temporarily add myself for a large import to projects/zfsd Modified: svnadmin/conf/sizelimit.conf Modified: svnadmin/conf/sizelimit.conf ============================================================================== --- svnadmin/conf/sizelimit.conf Mon Aug 25 17:53:03 2014 (r270602) +++ svnadmin/conf/sizelimit.conf Mon Aug 25 18:25:42 2014 (r270603) @@ -19,6 +19,7 @@ #kan #lulf # adrian +asomers brooks des dim From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 18:34:24 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 7BE47722; Mon, 25 Aug 2014 18:34:24 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 67EF43C62; Mon, 25 Aug 2014 18:34:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PIYOIZ059911; Mon, 25 Aug 2014 18:34:24 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PIYOH9059910; Mon, 25 Aug 2014 18:34:24 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201408251834.s7PIYOH9059910@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Mon, 25 Aug 2014 18:34:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-svnadmin@freebsd.org Subject: svn commit: r270605 - svnadmin/conf X-SVN-Group: svnadmin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 18:34:24 -0000 Author: asomers Date: Mon Aug 25 18:34:23 2014 New Revision: 270605 URL: http://svnweb.freebsd.org/changeset/base/270605 Log: Dropping priveleges taken in change 270603. Modified: svnadmin/conf/sizelimit.conf Modified: svnadmin/conf/sizelimit.conf ============================================================================== --- svnadmin/conf/sizelimit.conf Mon Aug 25 18:31:19 2014 (r270604) +++ svnadmin/conf/sizelimit.conf Mon Aug 25 18:34:23 2014 (r270605) @@ -19,7 +19,6 @@ #kan #lulf # adrian -asomers brooks des dim From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 18:35:27 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 3A50096D for ; Mon, 25 Aug 2014 18:35:27 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ED9C83C7D for ; Mon, 25 Aug 2014 18:35:26 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PIZQGs057171 for ; Mon, 25 Aug 2014 18:35:26 GMT (envelope-from bdrewery@freefall.freebsd.org) Received: (from bdrewery@localhost) by freefall.freebsd.org (8.14.9/8.14.9/Submit) id s7PIZQbn057167 for svn-src-all@freebsd.org; Mon, 25 Aug 2014 18:35:26 GMT (envelope-from bdrewery) Received: (qmail 83077 invoked from network); 25 Aug 2014 13:35:24 -0500 Received: from unknown (HELO ?10.10.0.24?) (freebsd@shatow.net@10.10.0.24) by sweb.xzibition.com with ESMTPA; 25 Aug 2014 13:35:24 -0500 Message-ID: <53FB81E9.1010407@FreeBSD.org> Date: Mon, 25 Aug 2014 13:35:21 -0500 From: Bryan Drewery Organization: FreeBSD User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.0 MIME-Version: 1.0 To: Benjamin Kaduk , Gleb Smirnoff Subject: Re: svn commit: r270510 - head References: <61DA1EC8-C938-4AB8-B518-7249307B4379@felyko.com> <201408242301.s7ON1N51056169@gw.catspoiler.org> <20140825141048.GQ7693@FreeBSD.org> In-Reply-To: OpenPGP: id=6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="L7kQGKhOEMDDAGalw2X8OiWWnm268lSFa" Cc: "src-committers@freebsd.org" , peter@wemm.org, Don Lewis , Rui Paulo , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 18:35:27 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --L7kQGKhOEMDDAGalw2X8OiWWnm268lSFa Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 8/25/2014 12:36 PM, Benjamin Kaduk wrote: > On Mon, Aug 25, 2014 at 10:10 AM, Gleb Smirnoff > wrote: >=20 >=20 > And carrying this stuff costs us almost nothing. >=20 >=20 > The cost of having it in the tree is small, yes. But the runtime cost > when people actually run delete-old will only keep increasing ... it > already feels kind of slow, to me. >=20 > -Ben=20 This could be fixed by not calling rm(1) for every file but instead using xargs rm so it is called only a few times, when not needing -i. The same goes for the chflags and -f/-L tests. It would be much more manageable if all of the logic moved into a shell script. --=20 Regards, Bryan Drewery --L7kQGKhOEMDDAGalw2X8OiWWnm268lSFa Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (MingW32) iQEcBAEBAgAGBQJT+4HpAAoJEDXXcbtuRpfPlVYH+wRnVhqwbCu7OMvkwPDSOi+o 6YrO/gX7Dnutnpci1xe4D5XLwOTzDqmWoxXHPfbD0WwgFZQkKgP2vpMOJ+5EIrJ8 gMKooR3uXzUnPRNzGFUrSBLZfTUlRix9EMCuADUcVCGTP9LiqEikZ5FAopQJuND4 yKcNJ7ljqbgxtNk38JNYTfjy2eed4ET1u3c8h9xo4NKsHAzWW8F0SRR+wn8UV1Mk PRQZ0JANIctJ6rTMqTn9kgm4UONPApkqQ81wDn5Q28CNCzY18VhOm9myanVeCRLo 1FCqYdLotpU18Tl5ba3u9m1K50vVKQMjmr7aTDHcHn3k9aemqJL9VxbEmbtQMuM= =eH5l -----END PGP SIGNATURE----- --L7kQGKhOEMDDAGalw2X8OiWWnm268lSFa-- From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 18:45:15 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id D69A0E34; Mon, 25 Aug 2014 18:45:15 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C1C613D70; Mon, 25 Aug 2014 18:45:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PIjFbJ064949; Mon, 25 Aug 2014 18:45:15 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PIjFvx064948; Mon, 25 Aug 2014 18:45:15 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201408251845.s7PIjFvx064948@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Mon, 25 Aug 2014 18:45:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270606 - stable/10/contrib/gcc/config/arm X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 18:45:16 -0000 Author: ian Date: Mon Aug 25 18:45:15 2014 New Revision: 270606 URL: http://svnweb.freebsd.org/changeset/base/270606 Log: MFC r268994: C++ exception/unwind handling fix Add FreeBSD to the list of environments that needs to handle R_ARM_TARGET2 relocations in unwind data as pc-relative indirect references. Note that the commit log for r269792 incorrectly claims that it includes this change, but I apparently fumbled it somehow, so this is the real MFC. Modified: stable/10/contrib/gcc/config/arm/unwind-arm.h Directory Properties: stable/10/ (props changed) Modified: stable/10/contrib/gcc/config/arm/unwind-arm.h ============================================================================== --- stable/10/contrib/gcc/config/arm/unwind-arm.h Mon Aug 25 18:34:23 2014 (r270605) +++ stable/10/contrib/gcc/config/arm/unwind-arm.h Mon Aug 25 18:45:15 2014 (r270606) @@ -232,7 +232,7 @@ extern "C" { if (!tmp) return 0; -#if defined(linux) || defined(__NetBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) /* Pc-relative indirect. */ tmp += ptr; tmp = *(_Unwind_Word *) tmp; From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 18:52:42 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 8D5874B2; Mon, 25 Aug 2014 18:52:42 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7836C3E95; Mon, 25 Aug 2014 18:52:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PIqgqu069925; Mon, 25 Aug 2014 18:52:42 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PIqgam069924; Mon, 25 Aug 2014 18:52:42 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251852.s7PIqgam069924@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 18:52:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270607 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 18:52:42 -0000 Author: gjb Date: Mon Aug 25 18:52:41 2014 New Revision: 270607 URL: http://svnweb.freebsd.org/changeset/base/270607 Log: Document r269432, ttyu0 and ttyu1 default to 'onifconsole' on ia64. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 18:45:15 2014 (r270606) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 18:52:41 2014 (r270607) @@ -739,6 +739,12 @@ The &man.nfsd.8; server update to 4.1 has merged from &os;-CURRENT. + The serial terminals + ttyu0 and ttyu1 have + been updated to onifconsole by default in + &man.ttys.5;, which either can be the serial console, + depending on the platform. + <filename>/etc/rc.d</filename> Scripts From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 18:52:44 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 87D59588; Mon, 25 Aug 2014 18:52:44 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 738F13E96; Mon, 25 Aug 2014 18:52:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PIqi1o069969; Mon, 25 Aug 2014 18:52:44 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PIqi4B069968; Mon, 25 Aug 2014 18:52:44 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251852.s7PIqi4B069968@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 18:52:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270608 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 18:52:44 -0000 Author: gjb Date: Mon Aug 25 18:52:43 2014 New Revision: 270608 URL: http://svnweb.freebsd.org/changeset/base/270608 Log: Document r269651, restore(8) fix when restoring UFS dump to ZFS filesystem. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 18:52:41 2014 (r270607) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 18:52:43 2014 (r270608) @@ -471,6 +471,12 @@ OpenSolaris, and adapted for &os;. This change allows parallel disk scanning, which can reduce &man.zpool.8; overall import time in some workloads. + + The &man.restore.8; utility has been + updated to prevent assertion failures when restoring + a UFS filesystem dump to + a ZFS filesystem by writing restored + files in block sizes that are a multiple of 1024. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 18:52:46 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 6F4A96AB; Mon, 25 Aug 2014 18:52:46 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 559BA3E97; Mon, 25 Aug 2014 18:52:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PIqkoM070014; Mon, 25 Aug 2014 18:52:46 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PIqkSY070013; Mon, 25 Aug 2014 18:52:46 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251852.s7PIqkSY070013@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 18:52:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270609 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 18:52:46 -0000 Author: gjb Date: Mon Aug 25 18:52:45 2014 New Revision: 270609 URL: http://svnweb.freebsd.org/changeset/base/270609 Log: Document r269686, OpenSSL update to 1.0.1i. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 18:52:43 2014 (r270608) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 18:52:45 2014 (r270609) @@ -784,9 +784,6 @@ Sendmail has been updated to 8.14.9. - OpenSSL has - been updated to version 1.0.1h. - The timezone database has been updated to version tzdata2014e. @@ -803,6 +800,9 @@ The &man.unbound.8; caching resolver and ldns have been updated to version 1.4.22. + + OpenSSL has + been updated to version 1.0.1i. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 18:52:48 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 5804B79E; Mon, 25 Aug 2014 18:52:48 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 43C843E9B; Mon, 25 Aug 2014 18:52:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PIqmqO070061; Mon, 25 Aug 2014 18:52:48 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PIqmhj070060; Mon, 25 Aug 2014 18:52:48 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251852.s7PIqmhj070060@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 18:52:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270610 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 18:52:48 -0000 Author: gjb Date: Mon Aug 25 18:52:47 2014 New Revision: 270610 URL: http://svnweb.freebsd.org/changeset/base/270610 Log: Document r269774, new zfs(8) sysctls. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 18:52:45 2014 (r270609) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 18:52:47 2014 (r270610) @@ -477,6 +477,27 @@ a UFS filesystem dump to a ZFS filesystem by writing restored files in block sizes that are a multiple of 1024. + + Two &man.sysctl.8;s have been added + to the &man.zfs.8; filesystem: + + + + + vfs.zfs.mg_fragmentation_threshold: The + percentage of the metaslab group size that should be + considered eligible for allocation, unless all metaslab + groups within the metaslab class have also crossed this + threshold. + + + + + vfs.zfs.metaslab.fragmentation_threshold: The + maximum percentage of metaslab fragmentation level to + keep their active state + + From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 18:52:50 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 53E958C6; Mon, 25 Aug 2014 18:52:50 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3F6B53E9D; Mon, 25 Aug 2014 18:52:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PIqol5070114; Mon, 25 Aug 2014 18:52:50 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PIqojC070113; Mon, 25 Aug 2014 18:52:50 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251852.s7PIqojC070113@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 18:52:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270611 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 18:52:50 -0000 Author: gjb Date: Mon Aug 25 18:52:49 2014 New Revision: 270611 URL: http://svnweb.freebsd.org/changeset/base/270611 Log: Document r269800, ping6(8) itimer reset when low interval and small number of packets. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 18:52:47 2014 (r270610) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 18:52:49 2014 (r270611) @@ -772,6 +772,13 @@ &man.ttys.5;, which either can be the serial console, depending on the platform. + The &man.ping6.8; utility has been + updated to reset itimer when the maximum + number of packets to send have been reached. This prevents + &man.ping6.8; from exiting when the interval in set to a small + value and a low number of packets to send has been + specified. + <filename>/etc/rc.d</filename> Scripts From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 18:52:52 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 407579A7; Mon, 25 Aug 2014 18:52:52 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2A2353E9F; Mon, 25 Aug 2014 18:52:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PIqqtM070160; Mon, 25 Aug 2014 18:52:52 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PIqq2d070159; Mon, 25 Aug 2014 18:52:52 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251852.s7PIqq2d070159@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 18:52:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270612 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 18:52:52 -0000 Author: gjb Date: Mon Aug 25 18:52:51 2014 New Revision: 270612 URL: http://svnweb.freebsd.org/changeset/base/270612 Log: Document r269805, extra ifconfig(8) arguments are passable to jail(8) ip4.addr and ip6.addr parameters. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 18:52:49 2014 (r270611) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 18:52:51 2014 (r270612) @@ -779,6 +779,12 @@ value and a low number of packets to send has been specified. + The &man.jail.8; utility has been + updated to support extra &man.ifconfig.8; arguments for the + ip4.addr and ip6.addr + parameters. This change allows &man.carp.4; interfaces to + be used within the &man.jail.8;. + <filename>/etc/rc.d</filename> Scripts From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 19:06:33 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 418CE2B2; Mon, 25 Aug 2014 19:06:33 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2AF803FCC; Mon, 25 Aug 2014 19:06:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PJ6XQG076027; Mon, 25 Aug 2014 19:06:33 GMT (envelope-from dumbbell@FreeBSD.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PJ6Vnq076021; Mon, 25 Aug 2014 19:06:31 GMT (envelope-from dumbbell@FreeBSD.org) Message-Id: <201408251906.s7PJ6Vnq076021@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dumbbell set sender to dumbbell@FreeBSD.org using -f From: Jean-Sebastien Pedron Date: Mon, 25 Aug 2014 19:06:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270613 - in head/sys/dev: fb vt vt/hw/fb vt/hw/ofwfb vt/hw/vga X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 19:06:33 -0000 Author: dumbbell Date: Mon Aug 25 19:06:31 2014 New Revision: 270613 URL: http://svnweb.freebsd.org/changeset/base/270613 Log: vt(4): Store a rectangle for the drawable area, not just the top-left corner This allows backends to verify they do not draw outside of this area. This fixes a bug in vt_vga where the text was happily drawn over the right and bottom margins, when using the Gallant font. MFC after: 1 week Modified: head/sys/dev/fb/creator_vt.c head/sys/dev/vt/hw/fb/vt_fb.c head/sys/dev/vt/hw/ofwfb/ofwfb.c head/sys/dev/vt/hw/vga/vt_vga.c head/sys/dev/vt/vt.h head/sys/dev/vt/vt_core.c Modified: head/sys/dev/fb/creator_vt.c ============================================================================== --- head/sys/dev/fb/creator_vt.c Mon Aug 25 18:52:51 2014 (r270612) +++ head/sys/dev/fb/creator_vt.c Mon Aug 25 19:06:31 2014 (r270613) @@ -236,8 +236,10 @@ creatorfb_bitblt_text(struct vt_device * for (row = area->tr_begin.tp_row; row < area->tr_end.tp_row; ++row) { for (col = area->tr_begin.tp_col; col < area->tr_end.tp_col; ++col) { - x = col * vf->vf_width + vw->vw_offset.tp_col; - y = row * vf->vf_height + vw->vw_offset.tp_row; + x = col * vf->vf_width + + vw->vw_draw_area.tr_begin.tp_col; + y = row * vf->vf_height + + vw->vw_draw_area.tr_begin.tp_row; c = VTBUF_GET_FIELD(&vw->vw_buf, row, col); pattern = vtfont_lookup(vf, c); @@ -257,13 +259,13 @@ creatorfb_bitblt_text(struct vt_device * term_rect_t drawn_area; drawn_area.tr_begin.tp_col = area->tr_begin.tp_col * vf->vf_width + - vw->vw_offset.tp_col; + vw->vw_draw_area.tr_begin.tp_col; drawn_area.tr_begin.tp_row = area->tr_begin.tp_row * vf->vf_height + - vw->vw_offset.tp_row; + vw->vw_draw_area.tr_begin.tp_row; drawn_area.tr_end.tp_col = area->tr_end.tp_col * vf->vf_width + - vw->vw_offset.tp_col; + vw->vw_draw_area.tr_begin.tp_col; drawn_area.tr_end.tp_row = area->tr_end.tp_row * vf->vf_height + - vw->vw_offset.tp_row; + vw->vw_draw_area.tr_begin.tp_row; if (vt_is_cursor_in_area(vd, &drawn_area)) { creatorfb_bitblt_bitmap(vd, vw, Modified: head/sys/dev/vt/hw/fb/vt_fb.c ============================================================================== --- head/sys/dev/vt/hw/fb/vt_fb.c Mon Aug 25 18:52:51 2014 (r270612) +++ head/sys/dev/vt/hw/fb/vt_fb.c Mon Aug 25 19:06:31 2014 (r270613) @@ -331,8 +331,10 @@ vt_fb_bitblt_text(struct vt_device *vd, for (row = area->tr_begin.tp_row; row < area->tr_end.tp_row; ++row) { for (col = area->tr_begin.tp_col; col < area->tr_end.tp_col; ++col) { - x = col * vf->vf_width + vw->vw_offset.tp_col; - y = row * vf->vf_height + vw->vw_offset.tp_row; + x = col * vf->vf_width + + vw->vw_draw_area.tr_begin.tp_col; + y = row * vf->vf_height + + vw->vw_draw_area.tr_begin.tp_row; c = VTBUF_GET_FIELD(&vw->vw_buf, row, col); pattern = vtfont_lookup(vf, c); @@ -352,13 +354,13 @@ vt_fb_bitblt_text(struct vt_device *vd, term_rect_t drawn_area; drawn_area.tr_begin.tp_col = area->tr_begin.tp_col * vf->vf_width + - vw->vw_offset.tp_col; + vw->vw_draw_area.tr_begin.tp_col; drawn_area.tr_begin.tp_row = area->tr_begin.tp_row * vf->vf_height + - vw->vw_offset.tp_row; + vw->vw_draw_area.tr_begin.tp_row; drawn_area.tr_end.tp_col = area->tr_end.tp_col * vf->vf_width + - vw->vw_offset.tp_col; + vw->vw_draw_area.tr_begin.tp_col; drawn_area.tr_end.tp_row = area->tr_end.tp_row * vf->vf_height + - vw->vw_offset.tp_row; + vw->vw_draw_area.tr_begin.tp_row; if (vt_is_cursor_in_area(vd, &drawn_area)) { vt_fb_bitblt_bitmap(vd, vw, Modified: head/sys/dev/vt/hw/ofwfb/ofwfb.c ============================================================================== --- head/sys/dev/vt/hw/ofwfb/ofwfb.c Mon Aug 25 18:52:51 2014 (r270612) +++ head/sys/dev/vt/hw/ofwfb/ofwfb.c Mon Aug 25 19:06:31 2014 (r270613) @@ -209,8 +209,10 @@ ofwfb_bitblt_text(struct vt_device *vd, for (row = area->tr_begin.tp_row; row < area->tr_end.tp_row; ++row) { for (col = area->tr_begin.tp_col; col < area->tr_end.tp_col; ++col) { - x = col * vf->vf_width + vw->vw_offset.tp_col; - y = row * vf->vf_height + vw->vw_offset.tp_row; + x = col * vf->vf_width + + vw->vw_draw_area.tr_begin.tp_col; + y = row * vf->vf_height + + vw->vw_draw_area.tr_begin.tp_row; c = VTBUF_GET_FIELD(&vw->vw_buf, row, col); pattern = vtfont_lookup(vf, c); @@ -230,13 +232,13 @@ ofwfb_bitblt_text(struct vt_device *vd, term_rect_t drawn_area; drawn_area.tr_begin.tp_col = area->tr_begin.tp_col * vf->vf_width + - vw->vw_offset.tp_col; + vw->vw_draw_area.tr_begin.tp_col; drawn_area.tr_begin.tp_row = area->tr_begin.tp_row * vf->vf_height + - vw->vw_offset.tp_row; + vw->vw_draw_area.tr_begin.tp_row; drawn_area.tr_end.tp_col = area->tr_end.tp_col * vf->vf_width + - vw->vw_offset.tp_col; + vw->vw_draw_area.tr_begin.tp_col; drawn_area.tr_end.tp_row = area->tr_end.tp_row * vf->vf_height + - vw->vw_offset.tp_row; + vw->vw_draw_area.tr_begin.tp_row; if (vt_is_cursor_in_area(vd, &drawn_area)) { ofwfb_bitblt_bitmap(vd, vw, Modified: head/sys/dev/vt/hw/vga/vt_vga.c ============================================================================== --- head/sys/dev/vt/hw/vga/vt_vga.c Mon Aug 25 18:52:51 2014 (r270612) +++ head/sys/dev/vt/hw/vga/vt_vga.c Mon Aug 25 19:06:31 2014 (r270613) @@ -556,16 +556,17 @@ vga_bitblt_one_text_pixels_block(struct memset(pattern_2colors, 0, sizeof(pattern_2colors)); memset(pattern_ncolors, 0, sizeof(pattern_ncolors)); - if (i < vw->vw_offset.tp_col) { + if (i < vw->vw_draw_area.tr_begin.tp_col) { /* * i is in the margin used to center the text area on * the screen. */ - i = vw->vw_offset.tp_col; + i = vw->vw_draw_area.tr_begin.tp_col; } - while (i < x + VT_VGA_PIXELS_BLOCK) { + while (i < x + VT_VGA_PIXELS_BLOCK && + i < vw->vw_draw_area.tr_end.tp_col) { /* * Find which character is drawn on this pixel in the * pixels block. @@ -573,8 +574,8 @@ vga_bitblt_one_text_pixels_block(struct * While here, record what colors it uses. */ - col = (i - vw->vw_offset.tp_col) / vf->vf_width; - row = (y - vw->vw_offset.tp_row) / vf->vf_height; + col = (i - vw->vw_draw_area.tr_begin.tp_col) / vf->vf_width; + row = (y - vw->vw_draw_area.tr_begin.tp_row) / vf->vf_height; c = VTBUF_GET_FIELD(vb, row, col); src = vtfont_lookup(vf, c); @@ -605,11 +606,15 @@ vga_bitblt_one_text_pixels_block(struct * character. */ - src_x = i - (col * vf->vf_width + vw->vw_offset.tp_col); - x_count = min( - (col + 1) * vf->vf_width + vw->vw_offset.tp_col, - x + VT_VGA_PIXELS_BLOCK); - x_count -= col * vf->vf_width + vw->vw_offset.tp_col; + src_x = i - + (col * vf->vf_width + vw->vw_draw_area.tr_begin.tp_col); + x_count = min(min( + (col + 1) * vf->vf_width + + vw->vw_draw_area.tr_begin.tp_col, + x + VT_VGA_PIXELS_BLOCK), + vw->vw_draw_area.tr_end.tp_col); + x_count -= col * vf->vf_width + + vw->vw_draw_area.tr_begin.tp_col; x_count -= src_x; /* Copy a portion of the character. */ @@ -643,14 +648,16 @@ vga_bitblt_one_text_pixels_block(struct unsigned int dst_x, src_y, dst_y, y_count; cursor = vd->vd_mcursor; - mx = vd->vd_mx_drawn + vw->vw_offset.tp_col; - my = vd->vd_my_drawn + vw->vw_offset.tp_row; + mx = vd->vd_mx_drawn + vw->vw_draw_area.tr_begin.tp_col; + my = vd->vd_my_drawn + vw->vw_draw_area.tr_begin.tp_row; /* Compute the portion of the cursor we want to copy. */ src_x = x > mx ? x - mx : 0; dst_x = mx > x ? mx - x : 0; - x_count = min( - min(cursor->width - src_x, x + VT_VGA_PIXELS_BLOCK - mx), + x_count = min(min(min( + cursor->width - src_x, + x + VT_VGA_PIXELS_BLOCK - mx), + vw->vw_draw_area.tr_end.tp_col - mx), VT_VGA_PIXELS_BLOCK); /* @@ -725,10 +732,10 @@ vga_bitblt_text_gfxmode(struct vt_device col = area->tr_begin.tp_col; row = area->tr_begin.tp_row; - x1 = (int)((col * vf->vf_width + vw->vw_offset.tp_col) + x1 = (int)((col * vf->vf_width + vw->vw_draw_area.tr_begin.tp_col) / VT_VGA_PIXELS_BLOCK) * VT_VGA_PIXELS_BLOCK; - y1 = row * vf->vf_height + vw->vw_offset.tp_row; + y1 = row * vf->vf_height + vw->vw_draw_area.tr_begin.tp_row; /* * Compute the bottom right pixel position, again, aligned with @@ -740,19 +747,15 @@ vga_bitblt_text_gfxmode(struct vt_device col = area->tr_end.tp_col; row = area->tr_end.tp_row; - x2 = (int)((col * vf->vf_width + vw->vw_offset.tp_col + x2 = (int)((col * vf->vf_width + vw->vw_draw_area.tr_begin.tp_col + VT_VGA_PIXELS_BLOCK - 1) / VT_VGA_PIXELS_BLOCK) * VT_VGA_PIXELS_BLOCK; - y2 = row * vf->vf_height + vw->vw_offset.tp_row; + y2 = row * vf->vf_height + vw->vw_draw_area.tr_begin.tp_row; - /* - * Clip the area to the screen size. - * - * FIXME: Take vw_offset into account. - */ - x2 = min(x2, vd->vd_width - 1); - y2 = min(y2, vd->vd_height - 1); + /* Clip the area to the screen size. */ + x2 = min(x2, vw->vw_draw_area.tr_end.tp_col); + y2 = min(y2, vw->vw_draw_area.tr_end.tp_row); /* * Now, we take care of N pixels line at a time (the first for Modified: head/sys/dev/vt/vt.h ============================================================================== --- head/sys/dev/vt/vt.h Mon Aug 25 18:52:51 2014 (r270612) +++ head/sys/dev/vt/vt.h Mon Aug 25 19:06:31 2014 (r270613) @@ -258,7 +258,7 @@ struct vt_window { struct terminal *vw_terminal; /* (c) Terminal. */ struct vt_buf vw_buf; /* (u) Screen buffer. */ struct vt_font *vw_font; /* (d) Graphical font. */ - term_pos_t vw_offset; /* (?) Pixel offset. */ + term_rect_t vw_draw_area; /* (?) Drawable area. */ unsigned int vw_number; /* (c) Window number. */ int vw_kbdmode; /* (?) Keyboard mode. */ char *vw_kbdsq; /* Escape sequence queue*/ Modified: head/sys/dev/vt/vt_core.c ============================================================================== --- head/sys/dev/vt/vt_core.c Mon Aug 25 18:52:51 2014 (r270612) +++ head/sys/dev/vt/vt_core.c Mon Aug 25 19:06:31 2014 (r270613) @@ -828,8 +828,8 @@ vt_is_cursor_in_area(const struct vt_dev * We use the cursor position saved during the current refresh, * in case the cursor moved since. */ - mx = vd->vd_mx_drawn + vd->vd_curwindow->vw_offset.tp_col; - my = vd->vd_my_drawn + vd->vd_curwindow->vw_offset.tp_row; + mx = vd->vd_mx_drawn + vd->vd_curwindow->vw_draw_area.tr_begin.tp_col; + my = vd->vd_my_drawn + vd->vd_curwindow->vw_draw_area.tr_begin.tp_row; x1 = area->tr_begin.tp_col; y1 = area->tr_begin.tp_row; @@ -1202,8 +1202,8 @@ vt_set_border(struct vt_window *vw, stru x = vd->vd_width - 1; y = vd->vd_height - 1; - off_x = vw->vw_offset.tp_col; - off_y = vw->vw_offset.tp_row; + off_x = vw->vw_draw_area.tr_begin.tp_col; + off_y = vw->vw_draw_area.tr_begin.tp_row; /* Top bar. */ if (off_y > 0) @@ -1257,9 +1257,17 @@ vt_change_font(struct vt_window *vw, str vt_termsize(vd, vf, &size); vt_winsize(vd, vf, &wsz); - /* Save offset to font aligned area. */ - vw->vw_offset.tp_col = (vd->vd_width % vf->vf_width) / 2; - vw->vw_offset.tp_row = (vd->vd_height % vf->vf_height) / 2; + + /* + * Compute the drawable area, so that the text is centered on + * the screen. + */ + vw->vw_draw_area.tr_begin.tp_col = (vd->vd_width % vf->vf_width) / 2; + vw->vw_draw_area.tr_begin.tp_row = (vd->vd_height % vf->vf_height) / 2; + vw->vw_draw_area.tr_end.tp_col = vw->vw_draw_area.tr_begin.tp_col + + vd->vd_width / vf->vf_width * vf->vf_width; + vw->vw_draw_area.tr_end.tp_row = vw->vw_draw_area.tr_begin.tp_row + + vd->vd_height / vf->vf_height * vf->vf_height; /* Grow the screen buffer and terminal. */ terminal_mute(tm, 1); From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 19:39:44 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 9B960708; Mon, 25 Aug 2014 19:39:44 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6E02D3369; Mon, 25 Aug 2014 19:39:44 +0000 (UTC) Received: from ralph.baldwin.cx (pool-173-70-85-31.nwrknj.fios.verizon.net [173.70.85.31]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 3B264B987; Mon, 25 Aug 2014 15:39:43 -0400 (EDT) From: John Baldwin To: Bryan Drewery Subject: Re: svn commit: r270510 - head Date: Mon, 25 Aug 2014 15:17:52 -0400 Message-ID: <3014037.G9yExtHamp@ralph.baldwin.cx> User-Agent: KMail/4.10.5 (FreeBSD/10.0-STABLE; KDE/4.10.5; amd64; ; ) In-Reply-To: <53FB81E9.1010407@FreeBSD.org> References: <61DA1EC8-C938-4AB8-B518-7249307B4379@felyko.com> <53FB81E9.1010407@FreeBSD.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Mon, 25 Aug 2014 15:39:43 -0400 (EDT) Cc: Benjamin Kaduk , "src-committers@freebsd.org" , peter@wemm.org, Don Lewis , Gleb Smirnoff , Rui Paulo , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 19:39:44 -0000 On Monday, August 25, 2014 01:35:21 PM Bryan Drewery wrote: > On 8/25/2014 12:36 PM, Benjamin Kaduk wrote: > > On Mon, Aug 25, 2014 at 10:10 AM, Gleb Smirnoff > > > > wrote: > > And carrying this stuff costs us almost nothing. > > > > The cost of having it in the tree is small, yes. But the runtime cost > > when people actually run delete-old will only keep increasing ... it > > already feels kind of slow, to me. > > > > -Ben > > This could be fixed by not calling rm(1) for every file but instead > using xargs rm so it is called only a few times, when not needing -i. > The same goes for the chflags and -f/-L tests. It would be much more > manageable if all of the logic moved into a shell script. rm -i foo bar still prompts individually for each file, so presumably you could always use 'xargs | rm'? -- John Baldwin From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 19:39:45 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 3880071C; Mon, 25 Aug 2014 19:39:45 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0CBAB336A; Mon, 25 Aug 2014 19:39:45 +0000 (UTC) Received: from ralph.baldwin.cx (pool-173-70-85-31.nwrknj.fios.verizon.net [173.70.85.31]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 0A1CDB98A; Mon, 25 Aug 2014 15:39:44 -0400 (EDT) From: John Baldwin To: Mateusz Guzik Subject: Re: svn commit: r270444 - in head/sys: kern sys Date: Mon, 25 Aug 2014 13:35:58 -0400 Message-ID: <1815651.yxLDiBYvJT@ralph.baldwin.cx> User-Agent: KMail/4.10.5 (FreeBSD/10.0-STABLE; KDE/4.10.5; amd64; ; ) In-Reply-To: <20140825170241.GA23088@dft-labs.eu> References: <201408240904.s7O949sI083660@svn.freebsd.org> <1724027.iWxFDWcg2R@ralph.baldwin.cx> <20140825170241.GA23088@dft-labs.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Mon, 25 Aug 2014 15:39:44 -0400 (EDT) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Mateusz Guzik X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 19:39:45 -0000 On Monday, August 25, 2014 07:02:41 PM Mateusz Guzik wrote: > On Mon, Aug 25, 2014 at 10:23:19AM -0400, John Baldwin wrote: > > On Sunday, August 24, 2014 09:04:09 AM Mateusz Guzik wrote: > > > Author: mjg > > > Date: Sun Aug 24 09:04:09 2014 > > > New Revision: 270444 > > > URL: http://svnweb.freebsd.org/changeset/base/270444 > > > > > > Log: > > > Fix getppid for traced processes. > > > > > > Traced processes always have the tracer set as the parent. > > > Utilize proc_realparent to obtain the right process when needed. > > > > Are you sure this won't break things? I know of several applications that > > expect a debugger to be the parent when attached and change behavior as a > > result (e.g. inserting a breakpoint on an assertion failure rather than > > generating a core). > > Well, this is what linux and solaris do. Interesting. > I don't feel strongly about this change. If you really want I'm happy to > revert. In general I'd like to someday have the debugger-debuggee relationship not override parent-child and this is a step in that direction. However, this will break existing applications, so this needs to be clearly documented in the release notes. In addition, we should probably advertise how a process can correctly determine if it is being run under a debugger (right now you can do 'getppid()' and use strcmp or strstr on the p_comm of that pid so you can do different things for "gdb" vs "gcore", etc. so just checking P_TRACED from kinfo_proc wouldn't be equivalent in functionality) -- John Baldwin From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 19:45:40 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id B743C162; Mon, 25 Aug 2014 19:45:40 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A2085345C; Mon, 25 Aug 2014 19:45:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PJjeWh095765; Mon, 25 Aug 2014 19:45:40 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PJje1T095764; Mon, 25 Aug 2014 19:45:40 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251945.s7PJje1T095764@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 19:45:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270614 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 19:45:40 -0000 Author: gjb Date: Mon Aug 25 19:45:40 2014 New Revision: 270614 URL: http://svnweb.freebsd.org/changeset/base/270614 Log: Document r269846, vfs.zfs.arc_average_blocksize. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 19:06:31 2014 (r270613) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 19:45:40 2014 (r270614) @@ -498,6 +498,18 @@ keep their active state + + The default &man.zfs.8; + ARC hash table size has been increased, + and a new &man.loader.8; tunable, + vfs.zfs.arc_average_blocksize, has been + added. Previously, the hash table could be too small, which + would lead to long hash chains and limit performance for + cached reads. The + vfs.zfs.arc_average_blocksize tunable + allows overriding the default block size. The previous + default was 65536, and default of the new &man.loader.8; + tunable is 8192. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 19:45:42 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id B319623A; Mon, 25 Aug 2014 19:45:42 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9DEDE345E; Mon, 25 Aug 2014 19:45:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PJjgTT095879; Mon, 25 Aug 2014 19:45:42 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PJjgxg095878; Mon, 25 Aug 2014 19:45:42 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251945.s7PJjgxg095878@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 19:45:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270615 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 19:45:42 -0000 Author: gjb Date: Mon Aug 25 19:45:42 2014 New Revision: 270615 URL: http://svnweb.freebsd.org/changeset/base/270615 Log: Document r269847: apr 1.4.8 -> 1.5.1 apr-util 1.5.2 -> 1.5.3 serf 1.3.4 -> 1.3.7 svnlite 1.8.8 -> 1.8.10 Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 19:45:40 2014 (r270614) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 19:45:42 2014 (r270615) @@ -849,6 +849,33 @@ OpenSSL has been updated to version 1.0.1i. + + The lite version of + Subversion included in the + &os; base system and its dependencies have been + updated: + + + + apr has been + updated to version 1.5.1. + + + + apr-util has been + updated to version 1.5.3. + + + + serf has been + updated to version 1.3.7. + + + + svnlite has been + updated to version 1.8.10. + + From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 19:45:46 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id D75AE4FD; Mon, 25 Aug 2014 19:45:46 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 89D5D3462; Mon, 25 Aug 2014 19:45:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PJjkOg096005; Mon, 25 Aug 2014 19:45:46 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PJjkZq096004; Mon, 25 Aug 2014 19:45:46 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251945.s7PJjkZq096004@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 19:45:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270617 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 19:45:47 -0000 Author: gjb Date: Mon Aug 25 19:45:46 2014 New Revision: 270617 URL: http://svnweb.freebsd.org/changeset/base/270617 Log: Document r269975, igxbe(4) tunable renaming. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 19:45:44 2014 (r270616) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 19:45:46 2014 (r270617) @@ -393,6 +393,73 @@ The &man.em.4; driver has been updated to version 7.4.2. + + The &man.ixgbe.4; tunables have been + renamed to match their &man.sysctl.8; counterparts: + + + + + + + + Old Name + New Name + + + + + + hw.ixgbe.enable_aim + hw.ix.enable_aim + + + + hw.ixgbe.max_interrupt_rate + hw.ix.max_interrupt_rate + + + + hw.ixgbe.rx_process_limit + hw.ix.rx_process_limit + + + + hw.ixgbe.tx_process_limit + hw.ix.tx_process_limit + + + + hw.ixgbe.enable_msix + hw.ix.enable_msix + + + + hw.ixgbe.num_queues + hw.ix.num_queues + + + + hw.ixgbe.txd + hw.ix.txd + + + + hw.ixgbe.rxd + hw.ix.rxd + + + + hw.ixgbe.unsupported_sfp + hw.ix.unsupported_sfp + + + + + + Be sure to update &man.loader.conf.5; if using the + old tunables before upgrading to + &os; &release.current;. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 19:45:45 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id CDAD33AE; Mon, 25 Aug 2014 19:45:44 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 83D653460; Mon, 25 Aug 2014 19:45:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PJjipI095955; Mon, 25 Aug 2014 19:45:44 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PJjiHA095954; Mon, 25 Aug 2014 19:45:44 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408251945.s7PJjiHA095954@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 19:45:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270616 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 19:45:45 -0000 Author: gjb Date: Mon Aug 25 19:45:44 2014 New Revision: 270616 URL: http://svnweb.freebsd.org/changeset/base/270616 Log: Document r269968, iscsictl(8) '-M' flag. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 19:45:42 2014 (r270615) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 19:45:44 2014 (r270616) @@ -797,6 +797,12 @@ parameters. This change allows &man.carp.4; interfaces to be used within the &man.jail.8;. + The &man.iscsictl.8; utility has been + updated to include a new flag, -M, which + allows modifying the iSCSI session + parameters without requiring the session to be removed and + added back. + <filename>/etc/rc.d</filename> Scripts From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 19:52:14 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 0992C9C5; Mon, 25 Aug 2014 19:52:14 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E8DAD3552; Mon, 25 Aug 2014 19:52:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PJqDsu000558; Mon, 25 Aug 2014 19:52:13 GMT (envelope-from dumbbell@FreeBSD.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PJqDVZ000557; Mon, 25 Aug 2014 19:52:13 GMT (envelope-from dumbbell@FreeBSD.org) Message-Id: <201408251952.s7PJqDVZ000557@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dumbbell set sender to dumbbell@FreeBSD.org using -f From: Jean-Sebastien Pedron Date: Mon, 25 Aug 2014 19:52:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270618 - head/sys/dev/vt X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 19:52:14 -0000 Author: dumbbell Date: Mon Aug 25 19:52:13 2014 New Revision: 270618 URL: http://svnweb.freebsd.org/changeset/base/270618 Log: vt(4): Intialize drawable area rectangle each time a font is loaded This also fixes a problem where early in boot, the area was zero, leading to nothing displayed for a few seconds. MFC after: 1 week Modified: head/sys/dev/vt/vt_core.c Modified: head/sys/dev/vt/vt_core.c ============================================================================== --- head/sys/dev/vt/vt_core.c Mon Aug 25 19:45:46 2014 (r270617) +++ head/sys/dev/vt/vt_core.c Mon Aug 25 19:52:13 2014 (r270618) @@ -415,6 +415,31 @@ vt_winsize(struct vt_device *vd, struct } } +static inline void +vt_compute_drawable_area(struct vt_window *vw) +{ + struct vt_device *vd; + struct vt_font *vf; + + if (vw->vw_font == NULL) + return; + + vd = vw->vw_device; + vf = vw->vw_font; + + /* + * Compute the drawable area, so that the text is centered on + * the screen. + */ + + vw->vw_draw_area.tr_begin.tp_col = (vd->vd_width % vf->vf_width) / 2; + vw->vw_draw_area.tr_begin.tp_row = (vd->vd_height % vf->vf_height) / 2; + vw->vw_draw_area.tr_end.tp_col = vw->vw_draw_area.tr_begin.tp_col + + vd->vd_width / vf->vf_width * vf->vf_width; + vw->vw_draw_area.tr_end.tp_row = vw->vw_draw_area.tr_begin.tp_row + + vd->vd_height / vf->vf_height * vf->vf_height; +} + static void vt_scroll(struct vt_window *vw, int offset, int whence) { @@ -1067,8 +1092,10 @@ vtterm_cnprobe(struct terminal *tm, stru sprintf(cp->cn_name, "ttyv%r", VT_UNIT(vw)); /* Attach default font if not in TEXTMODE. */ - if ((vd->vd_flags & VDF_TEXTMODE) == 0) + if ((vd->vd_flags & VDF_TEXTMODE) == 0) { vw->vw_font = vtfont_ref(&vt_font_default); + vt_compute_drawable_area(vw); + } vtbuf_init_early(&vw->vw_buf); vt_winsize(vd, vw->vw_font, &wsz); @@ -1258,17 +1285,6 @@ vt_change_font(struct vt_window *vw, str vt_termsize(vd, vf, &size); vt_winsize(vd, vf, &wsz); - /* - * Compute the drawable area, so that the text is centered on - * the screen. - */ - vw->vw_draw_area.tr_begin.tp_col = (vd->vd_width % vf->vf_width) / 2; - vw->vw_draw_area.tr_begin.tp_row = (vd->vd_height % vf->vf_height) / 2; - vw->vw_draw_area.tr_end.tp_col = vw->vw_draw_area.tr_begin.tp_col + - vd->vd_width / vf->vf_width * vf->vf_width; - vw->vw_draw_area.tr_end.tp_row = vw->vw_draw_area.tr_begin.tp_row + - vd->vd_height / vf->vf_height * vf->vf_height; - /* Grow the screen buffer and terminal. */ terminal_mute(tm, 1); vtbuf_grow(&vw->vw_buf, &size, vw->vw_buf.vb_history_size); @@ -1284,6 +1300,7 @@ vt_change_font(struct vt_window *vw, str */ vtfont_unref(vw->vw_font); vw->vw_font = vtfont_ref(vf); + vt_compute_drawable_area(vw); } /* Force a full redraw the next timer tick. */ @@ -2071,8 +2088,10 @@ vt_allocate_window(struct vt_device *vd, vw->vw_number = window; vw->vw_kbdmode = K_XLATE; - if ((vd->vd_flags & VDF_TEXTMODE) == 0) + if ((vd->vd_flags & VDF_TEXTMODE) == 0) { vw->vw_font = vtfont_ref(&vt_font_default); + vt_compute_drawable_area(vw); + } vt_termsize(vd, vw->vw_font, &size); vt_winsize(vd, vw->vw_font, &wsz); @@ -2146,8 +2165,10 @@ vt_resize(struct vt_device *vd) vw = vd->vd_windows[i]; VT_LOCK(vd); /* Assign default font to window, if not textmode. */ - if (!(vd->vd_flags & VDF_TEXTMODE) && vw->vw_font == NULL) + if (!(vd->vd_flags & VDF_TEXTMODE) && vw->vw_font == NULL) { vw->vw_font = vtfont_ref(&vt_font_default); + vt_compute_drawable_area(vw); + } VT_UNLOCK(vd); /* Resize terminal windows */ while (vt_change_font(vw, vw->vw_font) == EBUSY) { From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 20:15:19 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id D58F9920; Mon, 25 Aug 2014 20:15:19 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C053B37AA; Mon, 25 Aug 2014 20:15:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PKFJCg011069; Mon, 25 Aug 2014 20:15:19 GMT (envelope-from dumbbell@FreeBSD.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PKFJn6011068; Mon, 25 Aug 2014 20:15:19 GMT (envelope-from dumbbell@FreeBSD.org) Message-Id: <201408252015.s7PKFJn6011068@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dumbbell set sender to dumbbell@FreeBSD.org using -f From: Jean-Sebastien Pedron Date: Mon, 25 Aug 2014 20:15:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270620 - head/sys/dev/vt/hw/vga X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 20:15:20 -0000 Author: dumbbell Date: Mon Aug 25 20:15:19 2014 New Revision: 270620 URL: http://svnweb.freebsd.org/changeset/base/270620 Log: vt_vga: Use Write Mode 0 to draw group of 8 pixels using 3 or more colors This replaces the method based on Write Mode 3, which required reads from the video memory to load the latches. MFC after: 1 week Modified: head/sys/dev/vt/hw/vga/vt_vga.c Modified: head/sys/dev/vt/hw/vga/vt_vga.c ============================================================================== --- head/sys/dev/vt/hw/vga/vt_vga.c Mon Aug 25 20:06:57 2014 (r270619) +++ head/sys/dev/vt/hw/vga/vt_vga.c Mon Aug 25 20:15:19 2014 (r270620) @@ -54,6 +54,7 @@ struct vga_softc { bus_space_handle_t vga_fb_handle; bus_space_tag_t vga_reg_tag; bus_space_handle_t vga_reg_handle; + int vga_wmode; term_color_t vga_curfg, vga_curbg; }; @@ -115,46 +116,74 @@ static struct vga_softc vga_conssoftc; VT_DRIVER_DECLARE(vt_vga, vt_vga_driver); static inline void -vga_setfg(struct vt_device *vd, term_color_t color) +vga_setwmode(struct vt_device *vd, int wmode) { struct vga_softc *sc = vd->vd_softc; - if (sc->vga_curfg != color) { - REG_WRITE1(sc, VGA_GC_ADDRESS, VGA_GC_SET_RESET); - REG_WRITE1(sc, VGA_GC_DATA, color); - sc->vga_curfg = color; + if (sc->vga_wmode == wmode) + return; + + REG_WRITE1(sc, VGA_GC_ADDRESS, VGA_GC_MODE); + REG_WRITE1(sc, VGA_GC_DATA, wmode); + sc->vga_wmode = wmode; + + switch (wmode) { + case 3: + /* Re-enable all plans. */ + REG_WRITE1(sc, VGA_SEQ_ADDRESS, VGA_SEQ_MAP_MASK); + REG_WRITE1(sc, VGA_SEQ_DATA, VGA_SEQ_MM_EM3 | VGA_SEQ_MM_EM2 | + VGA_SEQ_MM_EM1 | VGA_SEQ_MM_EM0); + break; } } static inline void +vga_setfg(struct vt_device *vd, term_color_t color) +{ + struct vga_softc *sc = vd->vd_softc; + + vga_setwmode(vd, 3); + + if (sc->vga_curfg == color) + return; + + REG_WRITE1(sc, VGA_GC_ADDRESS, VGA_GC_SET_RESET); + REG_WRITE1(sc, VGA_GC_DATA, color); + sc->vga_curfg = color; +} + +static inline void vga_setbg(struct vt_device *vd, term_color_t color) { struct vga_softc *sc = vd->vd_softc; - if (sc->vga_curbg != color) { - REG_WRITE1(sc, VGA_GC_ADDRESS, VGA_GC_SET_RESET); - REG_WRITE1(sc, VGA_GC_DATA, color); + vga_setwmode(vd, 3); - /* - * Write 8 pixels using the background color to an - * off-screen byte in the video memory. - */ - MEM_WRITE1(sc, VT_VGA_BGCOLOR_OFFSET, 0xff); + if (sc->vga_curbg == color) + return; - /* - * Read those 8 pixels back to load the background color - * in the latches register. - */ - MEM_READ1(sc, VT_VGA_BGCOLOR_OFFSET); + REG_WRITE1(sc, VGA_GC_ADDRESS, VGA_GC_SET_RESET); + REG_WRITE1(sc, VGA_GC_DATA, color); - sc->vga_curbg = color; + /* + * Write 8 pixels using the background color to an off-screen + * byte in the video memory. + */ + MEM_WRITE1(sc, VT_VGA_BGCOLOR_OFFSET, 0xff); - /* - * The Set/Reset register doesn't contain the fg color - * anymore, store an invalid color. - */ - sc->vga_curfg = 0xff; - } + /* + * Read those 8 pixels back to load the background color in the + * latches register. + */ + MEM_READ1(sc, VT_VGA_BGCOLOR_OFFSET); + + sc->vga_curbg = color; + + /* + * The Set/Reset register doesn't contain the fg color anymore, + * store an invalid color. + */ + sc->vga_curfg = 0xff; } /* @@ -486,40 +515,75 @@ static void vga_bitblt_pixels_block_ncolors(struct vt_device *vd, const uint8_t *masks, unsigned int x, unsigned int y, unsigned int height) { - unsigned int i, j, offset; + unsigned int i, j, plan, color, offset; struct vga_softc *sc; - uint8_t mask; + uint8_t mask, plans[height * 4]; sc = vd->vd_softc; + memset(plans, 0, sizeof(plans)); + + /* + * To write a group of pixels using 3 or more colors, we select + * Write Mode 0 and write one byte to each plan separately. + */ + /* - * To draw a pixels block with N colors (N > 2), we write each - * color one by one: - * 1. Use the color as the foreground color - * 2. Read the pixels block into the latches - * 3. Draw the calculated mask - * 4. Go back to #1 for subsequent colors. + * We first compute each byte: each plan contains one bit of the + * color code for each of the 8 pixels. + * + * For example, if the 8 pixels are like this: + * GBBBBBBY + * where: + * G (gray) = 0b0111 + * B (black) = 0b0000 + * Y (yellow) = 0b0011 * - * FIXME: Use Write Mode 0 to remove the need to read from video - * memory. + * The corresponding for bytes are: + * GBBBBBBY + * Plan 0: 10000001 = 0x81 + * Plan 1: 10000001 = 0x81 + * Plan 2: 10000000 = 0x80 + * Plan 3: 00000000 = 0x00 + * | | | + * | | +-> 0b0011 (Y) + * | +-----> 0b0000 (B) + * +--------> 0b0111 (G) */ for (i = 0; i < height; ++i) { - for (j = 0; j < 16; ++j) { - mask = masks[i * 16 + j]; - if (mask == 0) + for (color = 0; color < 16; ++color) { + mask = masks[i * 16 + color]; + if (mask == 0x00) continue; - vga_setfg(vd, j); + for (j = 0; j < 8; ++j) { + if (!((mask >> (7 - j)) & 0x1)) + continue; + + /* The pixel "j" uses color "color". */ + for (plan = 0; plan < 4; ++plan) + plans[i * 4 + plan] |= + ((color >> plan) & 0x1) << (7 - j); + } + } + } + + /* + * The bytes are ready: we now switch to Write Mode 0 and write + * all bytes, one plan at a time. + */ + vga_setwmode(vd, 0); - offset = (VT_VGA_WIDTH * (y + i) + x) / 8; - if (mask != 0xff) { - MEM_READ1(sc, offset); + REG_WRITE1(sc, VGA_SEQ_ADDRESS, VGA_SEQ_MAP_MASK); + for (plan = 0; plan < 4; ++plan) { + /* Select plan. */ + REG_WRITE1(sc, VGA_SEQ_DATA, 1 << plan); - /* The bg color was trashed by the reads. */ - sc->vga_curbg = 0xff; - } - MEM_WRITE1(sc, offset, mask); + /* Write all bytes for this plan, from Y to Y+height. */ + for (i = 0; i < height; ++i) { + offset = (VT_VGA_WIDTH * (y + i) + x) / 8; + MEM_WRITE1(sc, offset, plans[i * 4 + plan]); } } } @@ -1102,8 +1166,16 @@ vga_initialize(struct vt_device *vd, int /* Switch to write mode 3, because we'll mainly do bitblt. */ REG_WRITE1(sc, VGA_GC_ADDRESS, VGA_GC_MODE); REG_WRITE1(sc, VGA_GC_DATA, 3); + sc->vga_wmode = 3; + + /* + * In Write Mode 3, Enable Set/Reset is ignored, but we + * use Write Mode 0 to write a group of 8 pixels using + * 3 or more colors. In this case, we want to disable + * Set/Reset: set Enable Set/Reset to 0. + */ REG_WRITE1(sc, VGA_GC_ADDRESS, VGA_GC_ENABLE_SET_RESET); - REG_WRITE1(sc, VGA_GC_DATA, 0x0f); + REG_WRITE1(sc, VGA_GC_DATA, 0x00); /* * Clear the colors we think are loaded into Set/Reset or From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 20:17:04 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 7589BA7B; Mon, 25 Aug 2014 20:17:04 +0000 (UTC) Received: from mailrelay003.isp.belgacom.be (mailrelay003.isp.belgacom.be [195.238.6.53]) by mx1.freebsd.org (Postfix) with ESMTP id ECA2837C0; Mon, 25 Aug 2014 20:17:02 +0000 (UTC) X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ArwIABCZ+1NR8nGf/2dsb2JhbABagw2BIArUIQQCAYEiF3eEBAEFViMQCxgJJQ8qHgYTiEYBv3IXjxkzB4RMAQScSJUNg2A7L4JPAQEB Received: from 159.113-242-81.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([81.242.113.159]) by relay.skynet.be with ESMTP; 25 Aug 2014 22:15:51 +0200 Received: from kalimero.tijl.coosemans.org (kalimero.tijl.coosemans.org [127.0.0.1]) by kalimero.tijl.coosemans.org (8.14.9/8.14.9) with ESMTP id s7PKFouh044587; Mon, 25 Aug 2014 22:15:50 +0200 (CEST) (envelope-from tijl@FreeBSD.org) Date: Mon, 25 Aug 2014 22:15:49 +0200 From: Tijl Coosemans To: =?ISO-8859-1?Q?Jean-S=E9bastien_P=E9dron?= Subject: Re: svn commit: r270516 - head/sys/dev/drm2/i915 Message-ID: <20140825221549.2206a8d6@kalimero.tijl.coosemans.org> In-Reply-To: <53FB6E4F.9010700@FreeBSD.org> References: <201408250503.s7P53Axo057720@svn.freebsd.org> <2177184.NMfUXrE71G@ralph.baldwin.cx> <53FB5FC8.4030105@FreeBSD.org> <53FB60B6.2020106@freebsd.org> <20140825162706.GA22843@FreeBSD.org> <53FB669A.6020604@FreeBSD.org> <53FB6CB9.4010507@freebsd.org> <53FB6E4F.9010700@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: Alexey Dokuchaev , src-committers@freebsd.org, John Baldwin , svn-src-all@freebsd.org, Adrian Chadd , Nathan Whitehorn , svn-src-head@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 20:17:04 -0000 On Mon, 25 Aug 2014 19:11:43 +0200 Jean-S=E9bastien P=E9dron wrote: > On 25.08.2014 19:04, Nathan Whitehorn wrote: >> Does our radeon KMS code support AGP-based Radeons? I vaguely remember >> this not being the case. >=20 > Unfortunately no, AGP isn't supported. And I currently don't have=20 > neither the knowledge nor the hardware to add this. Furthermore, it=20 > would be a lower priority compared to more urgent topics in the graphics= =20 > stack. It's not that they don't work. They fall back to PCI mode. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 20:37:03 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id D6D1F1B5; Mon, 25 Aug 2014 20:37:03 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C1D3B3983; Mon, 25 Aug 2014 20:37:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PKb3HA020481; Mon, 25 Aug 2014 20:37:03 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PKb3jv020480; Mon, 25 Aug 2014 20:37:03 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408252037.s7PKb3jv020480@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 20:37:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270621 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 20:37:04 -0000 Author: gjb Date: Mon Aug 25 20:37:03 2014 New Revision: 270621 URL: http://svnweb.freebsd.org/changeset/base/270621 Log: Document r270026, nvi 2.1.2-c80f493b038 Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 20:15:19 2014 (r270620) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 20:37:03 2014 (r270621) @@ -949,6 +949,9 @@ updated to version 1.8.10. + + The &man.nvi.1; editor has been + update to version 2.1.2-c80f493b038. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 20:37:07 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id AD2423B2; Mon, 25 Aug 2014 20:37:07 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 98C213985; Mon, 25 Aug 2014 20:37:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PKb7mS020572; Mon, 25 Aug 2014 20:37:07 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PKb7bi020571; Mon, 25 Aug 2014 20:37:07 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408252037.s7PKb7bi020571@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 20:37:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270623 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 20:37:07 -0000 Author: gjb Date: Mon Aug 25 20:37:07 2014 New Revision: 270623 URL: http://svnweb.freebsd.org/changeset/base/270623 Log: Document r270043, '-o key=val' pairing for NFS version specification. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 20:37:05 2014 (r270622) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 20:37:07 2014 (r270623) @@ -870,6 +870,13 @@ parameters without requiring the session to be removed and added back. + The &man.mount.nfs.8; utility has been + updated to support specifying the NFS version as + a key=value pair + argument to the -o flag. For example, to + specify NFS version 4, the syntax to use is + -o vers=4. + <filename>/etc/rc.d</filename> Scripts From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 20:37:05 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id C1D2528B; Mon, 25 Aug 2014 20:37:05 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AD5013984; Mon, 25 Aug 2014 20:37:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PKb5mE020527; Mon, 25 Aug 2014 20:37:05 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PKb5pb020526; Mon, 25 Aug 2014 20:37:05 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408252037.s7PKb5pb020526@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 20:37:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270622 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 20:37:05 -0000 Author: gjb Date: Mon Aug 25 20:37:05 2014 New Revision: 270622 URL: http://svnweb.freebsd.org/changeset/base/270622 Log: Document r270031, fparseln(3) update to 1.7. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 20:37:03 2014 (r270621) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 20:37:05 2014 (r270622) @@ -952,6 +952,9 @@ The &man.nvi.1; editor has been update to version 2.1.2-c80f493b038. + + The &man.fparseln.3; library has + been updated to version 1.7. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 20:37:13 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 5E4AB534; Mon, 25 Aug 2014 20:37:13 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4A3FD398B; Mon, 25 Aug 2014 20:37:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PKbDEi020700; Mon, 25 Aug 2014 20:37:13 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PKbDGj020699; Mon, 25 Aug 2014 20:37:13 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408252037.s7PKbDGj020699@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 20:37:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270626 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 20:37:13 -0000 Author: gjb Date: Mon Aug 25 20:37:12 2014 New Revision: 270626 URL: http://svnweb.freebsd.org/changeset/base/270626 Log: Add attribution for r270130 Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 20:37:10 2014 (r270625) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 20:37:12 2014 (r270626) @@ -253,7 +253,8 @@ with vendor-supplied fixes for big endian support, and 20GB/s and 25GB/s link speeds. - Support for unmapped I/O has been added + Support for unmapped I/O has been added to the &man.xen.4; blkfront driver. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 20:37:09 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 90D1A4DA; Mon, 25 Aug 2014 20:37:09 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7C5C53987; Mon, 25 Aug 2014 20:37:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PKb9VI020614; Mon, 25 Aug 2014 20:37:09 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PKb98W020613; Mon, 25 Aug 2014 20:37:09 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408252037.s7PKb98W020613@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 20:37:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270624 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 20:37:09 -0000 Author: gjb Date: Mon Aug 25 20:37:09 2014 New Revision: 270624 URL: http://svnweb.freebsd.org/changeset/base/270624 Log: Document r270061, if__nf10bmac(4) merged from head/. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 20:37:07 2014 (r270623) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 20:37:09 2014 (r270624) @@ -460,6 +460,10 @@ Be sure to update &man.loader.conf.5; if using the old tunables before upgrading to &os; &release.current;. + + The &man.if.nf10bmac.4; driver has + been merged from &os;-CURRENT to support the NetFPGA-10G + Embedded CPU Ethernet Core. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 20:37:11 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 6BBD8527; Mon, 25 Aug 2014 20:37:11 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 571673988; Mon, 25 Aug 2014 20:37:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PKbBgV020656; Mon, 25 Aug 2014 20:37:11 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PKbBqC020655; Mon, 25 Aug 2014 20:37:11 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408252037.s7PKbBqC020655@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 20:37:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270625 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 20:37:11 -0000 Author: gjb Date: Mon Aug 25 20:37:10 2014 New Revision: 270625 URL: http://svnweb.freebsd.org/changeset/base/270625 Log: Document r270130, unmapped I/O in Xen's blkfront driver. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 20:37:09 2014 (r270624) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 20:37:10 2014 (r270625) @@ -253,6 +253,9 @@ with vendor-supplied fixes for big endian support, and 20GB/s and 25GB/s link speeds. + Support for unmapped I/O has been added + to the &man.xen.4; blkfront driver. + Virtualization Support From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 20:49:25 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id EB4FFB8D; Mon, 25 Aug 2014 20:49:25 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D68F13A7C; Mon, 25 Aug 2014 20:49:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PKnP4T025868; Mon, 25 Aug 2014 20:49:25 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PKnPwL025867; Mon, 25 Aug 2014 20:49:25 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201408252049.s7PKnPwL025867@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Mon, 25 Aug 2014 20:49:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270627 - stable/10/sys/vm X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 20:49:26 -0000 Author: kib Date: Mon Aug 25 20:49:25 2014 New Revision: 270627 URL: http://svnweb.freebsd.org/changeset/base/270627 Log: MFC r269978 (by alc): Avoid pointless (but harmless) actions on unmanaged pages. Modified: stable/10/sys/vm/vm_fault.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/vm/vm_fault.c ============================================================================== --- stable/10/sys/vm/vm_fault.c Mon Aug 25 20:37:12 2014 (r270626) +++ stable/10/sys/vm/vm_fault.c Mon Aug 25 20:49:25 2014 (r270627) @@ -856,8 +856,9 @@ vnode_locked: if (hardfault) fs.entry->next_read = fs.pindex + faultcount - reqpage; - if ((prot & VM_PROT_WRITE) != 0 || - (fault_flags & VM_FAULT_DIRTY) != 0) { + if (((prot & VM_PROT_WRITE) != 0 || + (fault_flags & VM_FAULT_DIRTY) != 0) && + (fs.m->oflags & VPO_UNMANAGED) == 0) { vm_object_set_writeable_dirty(fs.object); /* From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 21:16:57 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id BBF6D6B5; Mon, 25 Aug 2014 21:16:57 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A72EF3D47; Mon, 25 Aug 2014 21:16:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PLGvxD039667; Mon, 25 Aug 2014 21:16:57 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PLGvOV039666; Mon, 25 Aug 2014 21:16:57 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201408252116.s7PLGvOV039666@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Mon, 25 Aug 2014 21:16:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270628 - stable/10/sys/vm X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 21:16:58 -0000 Author: kib Date: Mon Aug 25 21:16:57 2014 New Revision: 270628 URL: http://svnweb.freebsd.org/changeset/base/270628 Log: MFC r261412 (by alc): Make prefaulting more aggressive on hard faults. Modified: stable/10/sys/vm/vm_fault.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/vm/vm_fault.c ============================================================================== --- stable/10/sys/vm/vm_fault.c Mon Aug 25 20:49:25 2014 (r270627) +++ stable/10/sys/vm/vm_fault.c Mon Aug 25 21:16:57 2014 (r270628) @@ -104,17 +104,8 @@ __FBSDID("$FreeBSD$"); #define PFBAK 4 #define PFFOR 4 -#define PAGEORDER_SIZE (PFBAK+PFFOR) - -static int prefault_pageorder[] = { - -1 * PAGE_SIZE, 1 * PAGE_SIZE, - -2 * PAGE_SIZE, 2 * PAGE_SIZE, - -3 * PAGE_SIZE, 3 * PAGE_SIZE, - -4 * PAGE_SIZE, 4 * PAGE_SIZE -}; static int vm_fault_additional_pages(vm_page_t, int, int, vm_page_t *, int *); -static void vm_fault_prefault(pmap_t, vm_offset_t, vm_map_entry_t); #define VM_FAULT_READ_BEHIND 8 #define VM_FAULT_READ_MAX (1 + VM_FAULT_READ_AHEAD_MAX) @@ -136,6 +127,8 @@ struct faultstate { }; static void vm_fault_cache_behind(const struct faultstate *fs, int distance); +static void vm_fault_prefault(const struct faultstate *fs, vm_offset_t addra, + int faultcount, int reqpage); static inline void release_page(struct faultstate *fs) @@ -911,7 +904,7 @@ vnode_locked: pmap_enter(fs.map->pmap, vaddr, fs.m, prot, fault_type | (wired ? PMAP_ENTER_WIRED : 0), 0); if ((fault_flags & VM_FAULT_CHANGE_WIRING) == 0 && wired == 0) - vm_fault_prefault(fs.map->pmap, vaddr, fs.entry); + vm_fault_prefault(&fs, vaddr, faultcount, reqpage); VM_OBJECT_WLOCK(fs.object); vm_page_lock(fs.m); @@ -1006,31 +999,49 @@ vm_fault_cache_behind(const struct fault * of mmap time. */ static void -vm_fault_prefault(pmap_t pmap, vm_offset_t addra, vm_map_entry_t entry) +vm_fault_prefault(const struct faultstate *fs, vm_offset_t addra, + int faultcount, int reqpage) { - int i; + pmap_t pmap; + vm_map_entry_t entry; + vm_object_t backing_object, lobject; vm_offset_t addr, starta; vm_pindex_t pindex; vm_page_t m; - vm_object_t object; + int backward, forward, i; + pmap = fs->map->pmap; if (pmap != vmspace_pmap(curthread->td_proc->p_vmspace)) return; - object = entry->object.vm_object; + if (faultcount > 0) { + backward = reqpage; + forward = faultcount - reqpage - 1; + } else { + backward = PFBAK; + forward = PFFOR; + } + entry = fs->entry; - starta = addra - PFBAK * PAGE_SIZE; + starta = addra - backward * PAGE_SIZE; if (starta < entry->start) { starta = entry->start; } else if (starta > addra) { starta = 0; } - for (i = 0; i < PAGEORDER_SIZE; i++) { - vm_object_t backing_object, lobject; - - addr = addra + prefault_pageorder[i]; - if (addr > addra + (PFFOR * PAGE_SIZE)) + /* + * Generate the sequence of virtual addresses that are candidates for + * prefaulting in an outward spiral from the faulting virtual address, + * "addra". Specifically, the sequence is "addra - PAGE_SIZE", "addra + * + PAGE_SIZE", "addra - 2 * PAGE_SIZE", "addra + 2 * PAGE_SIZE", ... + * If the candidate address doesn't have a backing physical page, then + * the loop immediately terminates. + */ + for (i = 0; i < 2 * imax(backward, forward); i++) { + addr = addra + ((i >> 1) + 1) * ((i & 1) == 0 ? -PAGE_SIZE : + PAGE_SIZE); + if (addr > addra + forward * PAGE_SIZE) addr = 0; if (addr < starta || addr >= entry->end) @@ -1040,7 +1051,7 @@ vm_fault_prefault(pmap_t pmap, vm_offset continue; pindex = ((addr - entry->start) + entry->offset) >> PAGE_SHIFT; - lobject = object; + lobject = entry->object.vm_object; VM_OBJECT_RLOCK(lobject); while ((m = vm_page_lookup(lobject, pindex)) == NULL && lobject->type == OBJT_DEFAULT && @@ -1052,9 +1063,6 @@ vm_fault_prefault(pmap_t pmap, vm_offset VM_OBJECT_RUNLOCK(lobject); lobject = backing_object; } - /* - * give-up when a page is not in memory - */ if (m == NULL) { VM_OBJECT_RUNLOCK(lobject); break; From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 21:19:09 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 234579D9; Mon, 25 Aug 2014 21:19:09 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0E7793D74; Mon, 25 Aug 2014 21:19:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PLJ8jm040126; Mon, 25 Aug 2014 21:19:08 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PLJ8Bs040125; Mon, 25 Aug 2014 21:19:08 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201408252119.s7PLJ8Bs040125@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Mon, 25 Aug 2014 21:19:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270629 - stable/10/sys/vm X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 21:19:09 -0000 Author: kib Date: Mon Aug 25 21:19:08 2014 New Revision: 270629 URL: http://svnweb.freebsd.org/changeset/base/270629 Log: MFC r261647 (by alc): Don't call vm_fault_prefault() on zero-fill faults. Modified: stable/10/sys/vm/vm_fault.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/vm/vm_fault.c ============================================================================== --- stable/10/sys/vm/vm_fault.c Mon Aug 25 21:16:57 2014 (r270628) +++ stable/10/sys/vm/vm_fault.c Mon Aug 25 21:19:08 2014 (r270629) @@ -656,6 +656,8 @@ vnode_locked: } PCPU_INC(cnt.v_zfod); fs.m->valid = VM_PAGE_BITS_ALL; + /* Don't try to prefault neighboring pages. */ + faultcount = 1; break; /* break to PAGE HAS BEEN FOUND */ } else { KASSERT(fs.object != next_object, @@ -903,7 +905,8 @@ vnode_locked: */ pmap_enter(fs.map->pmap, vaddr, fs.m, prot, fault_type | (wired ? PMAP_ENTER_WIRED : 0), 0); - if ((fault_flags & VM_FAULT_CHANGE_WIRING) == 0 && wired == 0) + if (faultcount != 1 && (fault_flags & VM_FAULT_CHANGE_WIRING) == 0 && + wired == 0) vm_fault_prefault(&fs, vaddr, faultcount, reqpage); VM_OBJECT_WLOCK(fs.object); vm_page_lock(fs.m); From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 21:21:30 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 6D90DCA7; Mon, 25 Aug 2014 21:21:30 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D9B43E54; Mon, 25 Aug 2014 21:21:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PLLUaN043684; Mon, 25 Aug 2014 21:21:30 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PLLUlC043683; Mon, 25 Aug 2014 21:21:30 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201408252121.s7PLLUlC043683@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Mon, 25 Aug 2014 21:21:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270630 - stable/10/sys/vm X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 21:21:30 -0000 Author: kib Date: Mon Aug 25 21:21:29 2014 New Revision: 270630 URL: http://svnweb.freebsd.org/changeset/base/270630 Log: MFC r270011: Implement 'fast path' for the vm page fault handler. MFC r270387 (by alc): Relax one of the conditions for mapping a page on the fast path. Approved by: re (gjb) Modified: stable/10/sys/vm/vm_fault.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/vm/vm_fault.c ============================================================================== --- stable/10/sys/vm/vm_fault.c Mon Aug 25 21:19:08 2014 (r270629) +++ stable/10/sys/vm/vm_fault.c Mon Aug 25 21:21:29 2014 (r270630) @@ -237,6 +237,7 @@ vm_fault_hold(vm_map_t map, vm_offset_t int hardfault; struct faultstate fs; struct vnode *vp; + vm_page_t m; int locked, error; hardfault = 0; @@ -290,6 +291,56 @@ RetryFault:; goto RetryFault; } + if (wired) + fault_type = prot | (fault_type & VM_PROT_COPY); + + if (fs.vp == NULL /* avoid locked vnode leak */ && + (fault_flags & (VM_FAULT_CHANGE_WIRING | VM_FAULT_DIRTY)) == 0 && + /* avoid calling vm_object_set_writeable_dirty() */ + ((prot & VM_PROT_WRITE) == 0 || + fs.first_object->type != OBJT_VNODE || + (fs.first_object->flags & OBJ_MIGHTBEDIRTY) != 0)) { + VM_OBJECT_RLOCK(fs.first_object); + if ((prot & VM_PROT_WRITE) != 0 && + fs.first_object->type == OBJT_VNODE && + (fs.first_object->flags & OBJ_MIGHTBEDIRTY) == 0) + goto fast_failed; + m = vm_page_lookup(fs.first_object, fs.first_pindex); + /* A busy page can be mapped for read|execute access. */ + if (m == NULL || ((prot & VM_PROT_WRITE) != 0 && + vm_page_busied(m)) || m->valid != VM_PAGE_BITS_ALL) + goto fast_failed; + result = pmap_enter(fs.map->pmap, vaddr, m, prot, + fault_type | PMAP_ENTER_NOSLEEP | (wired ? PMAP_ENTER_WIRED : + 0), 0); + if (result != KERN_SUCCESS) + goto fast_failed; + if (m_hold != NULL) { + *m_hold = m; + vm_page_lock(m); + vm_page_hold(m); + vm_page_unlock(m); + } + if ((fault_type & VM_PROT_WRITE) != 0 && + (m->oflags & VPO_UNMANAGED) == 0) { + vm_page_dirty(m); + vm_pager_page_unswapped(m); + } + VM_OBJECT_RUNLOCK(fs.first_object); + if (!wired) + vm_fault_prefault(&fs, vaddr, 0, 0); + vm_map_lookup_done(fs.map, fs.entry); + curthread->td_ru.ru_minflt++; + return (KERN_SUCCESS); +fast_failed: + if (!VM_OBJECT_TRYUPGRADE(fs.first_object)) { + VM_OBJECT_RUNLOCK(fs.first_object); + VM_OBJECT_WLOCK(fs.first_object); + } + } else { + VM_OBJECT_WLOCK(fs.first_object); + } + /* * Make a reference to this object to prevent its disposal while we * are messing with it. Once we have the reference, the map is free @@ -300,15 +351,11 @@ RetryFault:; * truncation operations) during I/O. This must be done after * obtaining the vnode lock in order to avoid possible deadlocks. */ - VM_OBJECT_WLOCK(fs.first_object); vm_object_reference_locked(fs.first_object); vm_object_pip_add(fs.first_object, 1); fs.lookup_still_valid = TRUE; - if (wired) - fault_type = prot | (fault_type & VM_PROT_COPY); - fs.first_m = NULL; /* From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 22:04:30 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 514485DA; Mon, 25 Aug 2014 22:04:30 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3A21F31ED; Mon, 25 Aug 2014 22:04:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PM4UII062615; Mon, 25 Aug 2014 22:04:30 GMT (envelope-from jfv@FreeBSD.org) Received: (from jfv@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PM4Tgi062611; Mon, 25 Aug 2014 22:04:29 GMT (envelope-from jfv@FreeBSD.org) Message-Id: <201408252204.s7PM4Tgi062611@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jfv set sender to jfv@FreeBSD.org using -f From: Jack F Vogel Date: Mon, 25 Aug 2014 22:04:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270631 - in stable/10/sys: conf dev/ixl modules/ixl modules/ixlv X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 22:04:30 -0000 Author: jfv Date: Mon Aug 25 22:04:29 2014 New Revision: 270631 URL: http://svnweb.freebsd.org/changeset/base/270631 Log: MFC of the Intel Base driver for the Intel XL710 Ethernet Controller Family - It was decided to change the driver name to if_ixl for FreeBSD - This release adds the VF Driver to the tree, it can be built into the kernel or as the if_ixlv module - The VF driver is independent for the first time, this will be desireable when full SRIOV capability is added to the OS. Submitted by: jack.vogel@intel.com and eric.joyner@intel.com Added: stable/10/sys/dev/ixl/ stable/10/sys/dev/ixl/README (contents, props changed) stable/10/sys/dev/ixl/i40e_adminq.c (contents, props changed) stable/10/sys/dev/ixl/i40e_adminq.h (contents, props changed) stable/10/sys/dev/ixl/i40e_adminq_cmd.h (contents, props changed) stable/10/sys/dev/ixl/i40e_alloc.h (contents, props changed) stable/10/sys/dev/ixl/i40e_common.c (contents, props changed) stable/10/sys/dev/ixl/i40e_hmc.c (contents, props changed) stable/10/sys/dev/ixl/i40e_hmc.h (contents, props changed) stable/10/sys/dev/ixl/i40e_lan_hmc.c (contents, props changed) stable/10/sys/dev/ixl/i40e_lan_hmc.h (contents, props changed) stable/10/sys/dev/ixl/i40e_nvm.c (contents, props changed) stable/10/sys/dev/ixl/i40e_osdep.c (contents, props changed) stable/10/sys/dev/ixl/i40e_osdep.h (contents, props changed) stable/10/sys/dev/ixl/i40e_prototype.h (contents, props changed) stable/10/sys/dev/ixl/i40e_register.h (contents, props changed) stable/10/sys/dev/ixl/i40e_register_x710_int.h (contents, props changed) stable/10/sys/dev/ixl/i40e_status.h (contents, props changed) stable/10/sys/dev/ixl/i40e_type.h (contents, props changed) stable/10/sys/dev/ixl/i40e_virtchnl.h (contents, props changed) stable/10/sys/dev/ixl/if_ixl.c (contents, props changed) stable/10/sys/dev/ixl/if_ixlv.c (contents, props changed) stable/10/sys/dev/ixl/ixl.h (contents, props changed) stable/10/sys/dev/ixl/ixl_pf.h (contents, props changed) stable/10/sys/dev/ixl/ixl_txrx.c (contents, props changed) stable/10/sys/dev/ixl/ixlv.h (contents, props changed) stable/10/sys/dev/ixl/ixlvc.c (contents, props changed) stable/10/sys/modules/ixl/ stable/10/sys/modules/ixl/Makefile (contents, props changed) stable/10/sys/modules/ixlv/ stable/10/sys/modules/ixlv/Makefile (contents, props changed) Modified: stable/10/sys/conf/files Modified: stable/10/sys/conf/files ============================================================================== --- stable/10/sys/conf/files Mon Aug 25 21:21:29 2014 (r270630) +++ stable/10/sys/conf/files Mon Aug 25 22:04:29 2014 (r270631) @@ -1729,6 +1729,26 @@ dev/ixgbe/ixgbe_dcb_82598.c optional ixg compile-with "${NORMAL_C} -I$S/dev/ixgbe" dev/ixgbe/ixgbe_dcb_82599.c optional ixgbe inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe" +dev/ixl/if_ixl.c optional ixl inet \ + compile-with "${NORMAL_C} -I$S/dev/ixl" +dev/ixl/if_ixlv.c optional ixlv inet \ + compile-with "${NORMAL_C} -I$S/dev/ixl" +dev/ixl/ixlvc.c optional ixlv inet \ + compile-with "${NORMAL_C} -I$S/dev/ixl" +dev/ixl/ixl_txrx.c optional ixl ixlv inet \ + compile-with "${NORMAL_C} -I$S/dev/ixl" +dev/ixl/i40e_osdep.c optional ixl ixlv inet \ + compile-with "${NORMAL_C} -I$S/dev/ixl" +dev/ixl/i40e_lan_hmc.c optional ixl ixlv inet \ + compile-with "${NORMAL_C} -I$S/dev/ixl" +dev/ixl/i40e_hmc.c optional ixl ixlv inet \ + compile-with "${NORMAL_C} -I$S/dev/ixl" +dev/ixl/i40e_common.c optional ixl ixlv inet \ + compile-with "${NORMAL_C} -I$S/dev/ixl" +dev/ixl/i40e_nvm.c optional ixl ixlv inet \ + compile-with "${NORMAL_C} -I$S/dev/ixl" +dev/ixl/i40e_adminq.c optional ixl ixlv inet \ + compile-with "${NORMAL_C} -I$S/dev/ixl" dev/jme/if_jme.c optional jme pci dev/joy/joy.c optional joy dev/joy/joy_isa.c optional joy isa Added: stable/10/sys/dev/ixl/README ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/sys/dev/ixl/README Mon Aug 25 22:04:29 2014 (r270631) @@ -0,0 +1,342 @@ +ixl FreeBSD* Base Driver for the Intel® XL710 Ethernet Controller Family + +/*$FreeBSD$*/ +================================================================ + +July 21, 2014 + + +Contents +======== + +- Overview +- Supported Adapters +- Building and Installation +- Additional Configurations +- Known Limitations + + +Overview +======== + +This file describes the IXL FreeBSD* Base driver for the XL710 Ethernet Family of Adapters. The Driver has been developed for use with FreeBSD 10.0 or later, but should be compatible with any supported release. + +For questions related to hardware requirements, refer to the documentation supplied with your Intel XL710 adapter. All hardware requirements listed apply for use with FreeBSD. + + +Supported Adapters +================== + +The driver in this release is compatible with XL710 and X710-based Intel Ethernet Network Connections. + + +SFP+ Devices with Pluggable Optics +---------------------------------- + +SR Modules +---------- + Intel DUAL RATE 1G/10G SFP+ SR (bailed) FTLX8571D3BCV-IT + Intel DUAL RATE 1G/10G SFP+ SR (bailed) AFBR-703SDZ-IN2 + +LR Modules +---------- + Intel DUAL RATE 1G/10G SFP+ LR (bailed) FTLX1471D3BCV-IT + Intel DUAL RATE 1G/10G SFP+ LR (bailed) AFCT-701SDZ-IN2 + +QSFP+ Modules +------------- + Intel TRIPLE RATE 1G/10G/40G QSFP+ SR (bailed) E40GQSFPSR + Intel TRIPLE RATE 1G/10G/40G QSFP+ LR (bailed) E40GQSFPLR + QSFP+ 1G speed is not supported on XL710 based devices. + +X710/XL710 Based SFP+ adapters support all passive and active limiting direct attach cables that comply with SFF-8431 v4.1 and SFF-8472 v10.4 specifications. + + +Building and Installation +========================= + +NOTE: You must have kernel sources installed to compile the driver module. + +In the instructions below, x.x.x is the driver version +as indicated in thename of the driver tar. + +1. Move the base driver tar file to the directory of your choice. For example, use /home/username/ixl or /usr/local/src/ixl. + +2. Untar/unzip the archive: + tar xfz ixl-x.x.x.tar.gz + +3. To install man page: + cd ixl-x.x.x + gzip -c ixl.4 > /usr/share/man/man4/ixl.4.gz + +4. To load the driver onto a running system: + cd ixl-x.x.x/src + make load + +5. To assign an IP address to the interface, enter the following: + ifconfig ixl + +6. Verify that the interface works. Enter the following, where is the IP address for another machine on the same subnet as the interface that is being tested: + + ping + +7. If you want the driver to load automatically when the system is booted: + + cd ixl-x.x.x/src + make + make install + + Edit /boot/loader.conf, and add the following line: + if_ixl_load="YES" + + Edit /etc/rc.conf, and create the appropriate + ifconfig_ixl entry: + + ifconfig_ixl="" + + Example usage: + + ifconfig_ixl0="inet 192.168.10.1 netmask 255.255.255.0" + + NOTE: For assistance, see the ifconfig man page. + + + +Configuration and Tuning +========================= + +The driver supports Transmit/Receive Checksum Offload for IPv4 and IPv6, +TSO forIPv4 and IPv6, LRO, and Jumbo Frames on all 40 Gigabit adapters. + + Jumbo Frames + ------------ + To enable Jumbo Frames, use the ifconfig utility to increase + the MTU beyond 1500 bytes. + + - The Jumbo Frames setting on the switch must be set to at least + 22 byteslarger than that of the adapter. + + - The maximum MTU setting for Jumbo Frames is 9706. This value + coincides with the maximum jumbo frames size of 9728. + To modify the setting, enter the following: + + ifconfig ixl mtu 9000 + + - To confirm an interface's MTU value, use the ifconfig command. + To confirm the MTU used between two specific devices, use: + + route get + + VLANs + ----- + To create a new VLAN pseudo-interface: + + ifconfig create + + To associate the VLAN pseudo-interface with a physical interface + and assign a VLAN ID, IP address, and netmask: + + ifconfig netmask vlan + vlandev + + Example: + + ifconfig vlan10 10.0.0.1 netmask 255.255.255.0 vlan 10 vlandev ixl0 + + In this example, all packets will be marked on egress with + 802.1Q VLAN tags, specifying a VLAN ID of 10. + + To remove a VLAN pseudo-interface: + + ifconfig destroy + + + Checksum Offload + ---------------- + + Checksum offloading supports IPv4 and IPv6 with TCP and UDP packets + and is supported for both transmit and receive. Checksum offloading + for transmit and recieve is enabled by default for both IPv4 and IPv6. + + Checksum offloading can be enabled or disabled using ifconfig. + Transmit and receive offloading for IPv4 and Ipv6 are enabled + and disabled seperately. + + NOTE: TSO requires Tx checksum, so when Tx checksum + is disabled, TSO will also be disabled. + + To enable Tx checksum offloading for ipv4: + + ifconfig ixl txcsum4 + + To disable Tx checksum offloading for ipv4: + + ifconfig ixl -txcsum4 + (NOTE: This will disable TSO4) + + To enable Rx checksum offloading for ipv6: + + ifconfig ixl rxcsum6 + + To disable Rx checksum offloading for ipv6: + + ifconfig ixl -rxcsum6 + (NOTE: This will disable TSO6) + + + To confirm the current settings: + + ifconfig ixl + + + TSO + --- + + TSO supports both IPv4 and IPv6 and is enabled by default. TSO can + be disabled and enabled using the ifconfig utility. + + NOTE: TSO requires Tx checksum, so when Tx checksum is + disabled, TSO will also be disabled. + + To disable TSO IPv4: + + ifconfig ixl -tso4 + + To enable TSO IPv4: + + ifconfig ixl tso4 + + To disable TSO IPv6: + + ifconfig ixl -tso6 + + To enable TSO IPv6: + + ifconfig ixl tso6 + + To disable BOTH TSO IPv4 and IPv6: + + ifconfig ixl -tso + + To enable BOTH TSO IPv4 and IPv6: + + ifconfig ixl tso + + + LRO + --- + + Large Receive Offload is enabled by default. It can be enabled + or disabled by using the ifconfig utility. + + NOTE: LRO should be disabled when forwarding packets. + + To disable LRO: + + ifconfig ixl -lro + + To enable LRO: + + ifconfig ixl lro + + +Flow Control +------------ +Flow control is disabled by default. To change flow control settings use sysctl. + +To enable flow control to Rx pause frames: + + sysctl dev.ixl..fc=1 + +To enable flow control to Tx pause frames: + + sysctl dev.ixl..fc=2 + +To enable flow control to Rx and Tx pause frames: + + sysctl dev.ixl..fc=3 + +To disable flow control: + + sysctl dev.ixl..fc=0 + + +NOTE: You must have a flow control capable link partner. + + + + Important system configuration changes: + ======================================= + + +-Change the file /etc/sysctl.conf, and add the line: + + hw.intr_storm_threshold: 0 (the default is 1000) + +-Best throughput results are seen with a large MTU; use 9706 if possible. + +-The default number of descriptors per ring is 1024, increasing this may improve performance depending on the use case. + + +Known Limitations +================= + +Network Memory Buffer allocation +-------------------------------- + FreeBSD may have a low number of network memory buffers (mbufs) by default. Ifyour mbuf value is too low, it may cause the driver to fail to initialize and/orcause the system to become unresponsive. You can check to see if the system is mbuf-starved by running 'netstat -m'. Increase the number of mbufs by editing the lines below in /etc/sysctl.conf: + + kern.ipc.nmbclusters + kern.ipc.nmbjumbop + kern.ipc.nmbjumbo9 + kern.ipc.nmbjumbo16 + kern.ipc.nmbufs + +The amount of memory that you allocate is system specific, and may require some trial and error. + +Also, increasing the follwing in /etc/sysctl.conf could help increase network performance: + + kern.ipc.maxsockbuf + net.inet.tcp.sendspace + net.inet.tcp.recvspace + net.inet.udp.maxdgram + net.inet.udp.recvspace + + +UDP Stress Test Dropped Packet Issue +------------------------------------ + Under small packet UDP stress test with the ixl driver, the FreeBSD system will drop UDP packets due to the fullness of socket buffers. You may want to change the driver's Flow Control variables to the minimum value for controlling packet reception. + + +Disable LRO when routing/bridging +--------------------------------- +LRO must be turned off when forwarding traffic. + + +Lower than expected performance +------------------------------- + Some PCIe x8 slots are actually configured as x4 slots. These slots have insufficient bandwidth for full line rate with dual port and quad port devices. In addition, if you put a PCIe Generation 3-capable adapter into a PCIe Generation 2 slot, you cannot get full bandwidth. The driver detects this situation and writes the following message in the system log: + + "PCI-Express bandwidth available for this card is not sufficient for optimal performance. For optimal performance a x8 PCI-Express slot is required." + +If this error occurs, moving your adapter to a true PCIe Generation 3 x8 slot will resolve the issue. + + +Support +======= + +For general information and support, go to the Intel support website at: + + http://support.intel.com + +If an issue is identified with the released source code on the supported kernel with a supported adapter, email the specific information related to the issue tofreebsdnic@mailbox.intel.com. + + +License +======= + +This software program is released under the terms of a license agreement betweenyou ('Licensee') and Intel. Do not use or load this software or any associated materials (collectively, the 'Software') until you have carefully read the full terms and conditions of the LICENSE located in this software package. By loadingor using the Software, you agree to the terms of this Agreement. If you do not +agree with the terms of this Agreement, do not install or use the Software. + +* Other names and brands may be claimed as the property of others. + + Added: stable/10/sys/dev/ixl/i40e_adminq.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/sys/dev/ixl/i40e_adminq.c Mon Aug 25 22:04:29 2014 (r270631) @@ -0,0 +1,1070 @@ +/****************************************************************************** + + Copyright (c) 2013-2014, Intel 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. + + 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. + + 3. Neither the name of the Intel Corporation nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + + 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 MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER 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$*/ + +#include "i40e_status.h" +#include "i40e_type.h" +#include "i40e_register.h" +#include "i40e_adminq.h" +#include "i40e_prototype.h" + +/** + * i40e_is_nvm_update_op - return TRUE if this is an NVM update operation + * @desc: API request descriptor + **/ +static INLINE bool i40e_is_nvm_update_op(struct i40e_aq_desc *desc) +{ + return (desc->opcode == CPU_TO_LE16(i40e_aqc_opc_nvm_erase) || + desc->opcode == CPU_TO_LE16(i40e_aqc_opc_nvm_update)); +} + +/** + * i40e_adminq_init_regs - Initialize AdminQ registers + * @hw: pointer to the hardware structure + * + * This assumes the alloc_asq and alloc_arq functions have already been called + **/ +static void i40e_adminq_init_regs(struct i40e_hw *hw) +{ + /* set head and tail registers in our local struct */ + if (i40e_is_vf(hw)) { + hw->aq.asq.tail = I40E_VF_ATQT1; + hw->aq.asq.head = I40E_VF_ATQH1; + hw->aq.asq.len = I40E_VF_ATQLEN1; + hw->aq.asq.bal = I40E_VF_ATQBAL1; + hw->aq.asq.bah = I40E_VF_ATQBAH1; + hw->aq.arq.tail = I40E_VF_ARQT1; + hw->aq.arq.head = I40E_VF_ARQH1; + hw->aq.arq.len = I40E_VF_ARQLEN1; + hw->aq.arq.bal = I40E_VF_ARQBAL1; + hw->aq.arq.bah = I40E_VF_ARQBAH1; + } else { + hw->aq.asq.tail = I40E_PF_ATQT; + hw->aq.asq.head = I40E_PF_ATQH; + hw->aq.asq.len = I40E_PF_ATQLEN; + hw->aq.asq.bal = I40E_PF_ATQBAL; + hw->aq.asq.bah = I40E_PF_ATQBAH; + hw->aq.arq.tail = I40E_PF_ARQT; + hw->aq.arq.head = I40E_PF_ARQH; + hw->aq.arq.len = I40E_PF_ARQLEN; + hw->aq.arq.bal = I40E_PF_ARQBAL; + hw->aq.arq.bah = I40E_PF_ARQBAH; + } +} + +/** + * i40e_alloc_adminq_asq_ring - Allocate Admin Queue send rings + * @hw: pointer to the hardware structure + **/ +enum i40e_status_code i40e_alloc_adminq_asq_ring(struct i40e_hw *hw) +{ + enum i40e_status_code ret_code; + + ret_code = i40e_allocate_dma_mem(hw, &hw->aq.asq.desc_buf, + i40e_mem_atq_ring, + (hw->aq.num_asq_entries * + sizeof(struct i40e_aq_desc)), + I40E_ADMINQ_DESC_ALIGNMENT); + if (ret_code) + return ret_code; + + ret_code = i40e_allocate_virt_mem(hw, &hw->aq.asq.cmd_buf, + (hw->aq.num_asq_entries * + sizeof(struct i40e_asq_cmd_details))); + if (ret_code) { + i40e_free_dma_mem(hw, &hw->aq.asq.desc_buf); + return ret_code; + } + + return ret_code; +} + +/** + * i40e_alloc_adminq_arq_ring - Allocate Admin Queue receive rings + * @hw: pointer to the hardware structure + **/ +enum i40e_status_code i40e_alloc_adminq_arq_ring(struct i40e_hw *hw) +{ + enum i40e_status_code ret_code; + + ret_code = i40e_allocate_dma_mem(hw, &hw->aq.arq.desc_buf, + i40e_mem_arq_ring, + (hw->aq.num_arq_entries * + sizeof(struct i40e_aq_desc)), + I40E_ADMINQ_DESC_ALIGNMENT); + + return ret_code; +} + +/** + * i40e_free_adminq_asq - Free Admin Queue send rings + * @hw: pointer to the hardware structure + * + * This assumes the posted send buffers have already been cleaned + * and de-allocated + **/ +void i40e_free_adminq_asq(struct i40e_hw *hw) +{ + i40e_free_dma_mem(hw, &hw->aq.asq.desc_buf); +} + +/** + * i40e_free_adminq_arq - Free Admin Queue receive rings + * @hw: pointer to the hardware structure + * + * This assumes the posted receive buffers have already been cleaned + * and de-allocated + **/ +void i40e_free_adminq_arq(struct i40e_hw *hw) +{ + i40e_free_dma_mem(hw, &hw->aq.arq.desc_buf); +} + +/** + * i40e_alloc_arq_bufs - Allocate pre-posted buffers for the receive queue + * @hw: pointer to the hardware structure + **/ +static enum i40e_status_code i40e_alloc_arq_bufs(struct i40e_hw *hw) +{ + enum i40e_status_code ret_code; + struct i40e_aq_desc *desc; + struct i40e_dma_mem *bi; + int i; + + /* We'll be allocating the buffer info memory first, then we can + * allocate the mapped buffers for the event processing + */ + + /* buffer_info structures do not need alignment */ + ret_code = i40e_allocate_virt_mem(hw, &hw->aq.arq.dma_head, + (hw->aq.num_arq_entries * sizeof(struct i40e_dma_mem))); + if (ret_code) + goto alloc_arq_bufs; + hw->aq.arq.r.arq_bi = (struct i40e_dma_mem *)hw->aq.arq.dma_head.va; + + /* allocate the mapped buffers */ + for (i = 0; i < hw->aq.num_arq_entries; i++) { + bi = &hw->aq.arq.r.arq_bi[i]; + ret_code = i40e_allocate_dma_mem(hw, bi, + i40e_mem_arq_buf, + hw->aq.arq_buf_size, + I40E_ADMINQ_DESC_ALIGNMENT); + if (ret_code) + goto unwind_alloc_arq_bufs; + + /* now configure the descriptors for use */ + desc = I40E_ADMINQ_DESC(hw->aq.arq, i); + + desc->flags = CPU_TO_LE16(I40E_AQ_FLAG_BUF); + if (hw->aq.arq_buf_size > I40E_AQ_LARGE_BUF) + desc->flags |= CPU_TO_LE16(I40E_AQ_FLAG_LB); + desc->opcode = 0; + /* This is in accordance with Admin queue design, there is no + * register for buffer size configuration + */ + desc->datalen = CPU_TO_LE16((u16)bi->size); + desc->retval = 0; + desc->cookie_high = 0; + desc->cookie_low = 0; + desc->params.external.addr_high = + CPU_TO_LE32(I40E_HI_DWORD(bi->pa)); + desc->params.external.addr_low = + CPU_TO_LE32(I40E_LO_DWORD(bi->pa)); + desc->params.external.param0 = 0; + desc->params.external.param1 = 0; + } + +alloc_arq_bufs: + return ret_code; + +unwind_alloc_arq_bufs: + /* don't try to free the one that failed... */ + i--; + for (; i >= 0; i--) + i40e_free_dma_mem(hw, &hw->aq.arq.r.arq_bi[i]); + i40e_free_virt_mem(hw, &hw->aq.arq.dma_head); + + return ret_code; +} + +/** + * i40e_alloc_asq_bufs - Allocate empty buffer structs for the send queue + * @hw: pointer to the hardware structure + **/ +static enum i40e_status_code i40e_alloc_asq_bufs(struct i40e_hw *hw) +{ + enum i40e_status_code ret_code; + struct i40e_dma_mem *bi; + int i; + + /* No mapped memory needed yet, just the buffer info structures */ + ret_code = i40e_allocate_virt_mem(hw, &hw->aq.asq.dma_head, + (hw->aq.num_asq_entries * sizeof(struct i40e_dma_mem))); + if (ret_code) + goto alloc_asq_bufs; + hw->aq.asq.r.asq_bi = (struct i40e_dma_mem *)hw->aq.asq.dma_head.va; + + /* allocate the mapped buffers */ + for (i = 0; i < hw->aq.num_asq_entries; i++) { + bi = &hw->aq.asq.r.asq_bi[i]; + ret_code = i40e_allocate_dma_mem(hw, bi, + i40e_mem_asq_buf, + hw->aq.asq_buf_size, + I40E_ADMINQ_DESC_ALIGNMENT); + if (ret_code) + goto unwind_alloc_asq_bufs; + } +alloc_asq_bufs: + return ret_code; + +unwind_alloc_asq_bufs: + /* don't try to free the one that failed... */ + i--; + for (; i >= 0; i--) + i40e_free_dma_mem(hw, &hw->aq.asq.r.asq_bi[i]); + i40e_free_virt_mem(hw, &hw->aq.asq.dma_head); + + return ret_code; +} + +/** + * i40e_free_arq_bufs - Free receive queue buffer info elements + * @hw: pointer to the hardware structure + **/ +static void i40e_free_arq_bufs(struct i40e_hw *hw) +{ + int i; + + /* free descriptors */ + for (i = 0; i < hw->aq.num_arq_entries; i++) + i40e_free_dma_mem(hw, &hw->aq.arq.r.arq_bi[i]); + + /* free the descriptor memory */ + i40e_free_dma_mem(hw, &hw->aq.arq.desc_buf); + + /* free the dma header */ + i40e_free_virt_mem(hw, &hw->aq.arq.dma_head); +} + +/** + * i40e_free_asq_bufs - Free send queue buffer info elements + * @hw: pointer to the hardware structure + **/ +static void i40e_free_asq_bufs(struct i40e_hw *hw) +{ + int i; + + /* only unmap if the address is non-NULL */ + for (i = 0; i < hw->aq.num_asq_entries; i++) + if (hw->aq.asq.r.asq_bi[i].pa) + i40e_free_dma_mem(hw, &hw->aq.asq.r.asq_bi[i]); + + /* free the buffer info list */ + i40e_free_virt_mem(hw, &hw->aq.asq.cmd_buf); + + /* free the descriptor memory */ + i40e_free_dma_mem(hw, &hw->aq.asq.desc_buf); + + /* free the dma header */ + i40e_free_virt_mem(hw, &hw->aq.asq.dma_head); +} + +/** + * i40e_config_asq_regs - configure ASQ registers + * @hw: pointer to the hardware structure + * + * Configure base address and length registers for the transmit queue + **/ +static enum i40e_status_code i40e_config_asq_regs(struct i40e_hw *hw) +{ + enum i40e_status_code ret_code = I40E_SUCCESS; + u32 reg = 0; + + /* Clear Head and Tail */ + wr32(hw, hw->aq.asq.head, 0); + wr32(hw, hw->aq.asq.tail, 0); + + /* set starting point */ + wr32(hw, hw->aq.asq.len, (hw->aq.num_asq_entries | + I40E_PF_ATQLEN_ATQENABLE_MASK)); + wr32(hw, hw->aq.asq.bal, I40E_LO_DWORD(hw->aq.asq.desc_buf.pa)); + wr32(hw, hw->aq.asq.bah, I40E_HI_DWORD(hw->aq.asq.desc_buf.pa)); + + /* Check one register to verify that config was applied */ + reg = rd32(hw, hw->aq.asq.bal); + if (reg != I40E_LO_DWORD(hw->aq.asq.desc_buf.pa)) + ret_code = I40E_ERR_ADMIN_QUEUE_ERROR; + + return ret_code; +} + +/** + * i40e_config_arq_regs - ARQ register configuration + * @hw: pointer to the hardware structure + * + * Configure base address and length registers for the receive (event queue) + **/ +static enum i40e_status_code i40e_config_arq_regs(struct i40e_hw *hw) +{ + enum i40e_status_code ret_code = I40E_SUCCESS; + u32 reg = 0; + + /* Clear Head and Tail */ + wr32(hw, hw->aq.arq.head, 0); + wr32(hw, hw->aq.arq.tail, 0); + + /* set starting point */ + wr32(hw, hw->aq.arq.len, (hw->aq.num_arq_entries | + I40E_PF_ARQLEN_ARQENABLE_MASK)); + wr32(hw, hw->aq.arq.bal, I40E_LO_DWORD(hw->aq.arq.desc_buf.pa)); + wr32(hw, hw->aq.arq.bah, I40E_HI_DWORD(hw->aq.arq.desc_buf.pa)); + + /* Update tail in the HW to post pre-allocated buffers */ + wr32(hw, hw->aq.arq.tail, hw->aq.num_arq_entries - 1); + + /* Check one register to verify that config was applied */ + reg = rd32(hw, hw->aq.arq.bal); + if (reg != I40E_LO_DWORD(hw->aq.arq.desc_buf.pa)) + ret_code = I40E_ERR_ADMIN_QUEUE_ERROR; + + return ret_code; +} + +/** + * i40e_init_asq - main initialization routine for ASQ + * @hw: pointer to the hardware structure + * + * This is the main initialization routine for the Admin Send Queue + * Prior to calling this function, drivers *MUST* set the following fields + * in the hw->aq structure: + * - hw->aq.num_asq_entries + * - hw->aq.arq_buf_size + * + * Do *NOT* hold the lock when calling this as the memory allocation routines + * called are not going to be atomic context safe + **/ +enum i40e_status_code i40e_init_asq(struct i40e_hw *hw) +{ + enum i40e_status_code ret_code = I40E_SUCCESS; + + if (hw->aq.asq.count > 0) { + /* queue already initialized */ + ret_code = I40E_ERR_NOT_READY; + goto init_adminq_exit; + } + + /* verify input for valid configuration */ + if ((hw->aq.num_asq_entries == 0) || + (hw->aq.asq_buf_size == 0)) { + ret_code = I40E_ERR_CONFIG; + goto init_adminq_exit; + } + + hw->aq.asq.next_to_use = 0; + hw->aq.asq.next_to_clean = 0; + hw->aq.asq.count = hw->aq.num_asq_entries; + + /* allocate the ring memory */ + ret_code = i40e_alloc_adminq_asq_ring(hw); + if (ret_code != I40E_SUCCESS) + goto init_adminq_exit; + + /* allocate buffers in the rings */ + ret_code = i40e_alloc_asq_bufs(hw); + if (ret_code != I40E_SUCCESS) + goto init_adminq_free_rings; + + /* initialize base registers */ + ret_code = i40e_config_asq_regs(hw); + if (ret_code != I40E_SUCCESS) + goto init_adminq_free_rings; + + /* success! */ + goto init_adminq_exit; + +init_adminq_free_rings: + i40e_free_adminq_asq(hw); + +init_adminq_exit: + return ret_code; +} + +/** + * i40e_init_arq - initialize ARQ + * @hw: pointer to the hardware structure + * + * The main initialization routine for the Admin Receive (Event) Queue. + * Prior to calling this function, drivers *MUST* set the following fields + * in the hw->aq structure: + * - hw->aq.num_asq_entries + * - hw->aq.arq_buf_size + * + * Do *NOT* hold the lock when calling this as the memory allocation routines + * called are not going to be atomic context safe + **/ +enum i40e_status_code i40e_init_arq(struct i40e_hw *hw) +{ + enum i40e_status_code ret_code = I40E_SUCCESS; + + if (hw->aq.arq.count > 0) { + /* queue already initialized */ + ret_code = I40E_ERR_NOT_READY; + goto init_adminq_exit; + } + + /* verify input for valid configuration */ + if ((hw->aq.num_arq_entries == 0) || + (hw->aq.arq_buf_size == 0)) { + ret_code = I40E_ERR_CONFIG; + goto init_adminq_exit; + } + + hw->aq.arq.next_to_use = 0; + hw->aq.arq.next_to_clean = 0; + hw->aq.arq.count = hw->aq.num_arq_entries; + + /* allocate the ring memory */ + ret_code = i40e_alloc_adminq_arq_ring(hw); + if (ret_code != I40E_SUCCESS) + goto init_adminq_exit; + + /* allocate buffers in the rings */ + ret_code = i40e_alloc_arq_bufs(hw); + if (ret_code != I40E_SUCCESS) + goto init_adminq_free_rings; + + /* initialize base registers */ + ret_code = i40e_config_arq_regs(hw); + if (ret_code != I40E_SUCCESS) + goto init_adminq_free_rings; + + /* success! */ + goto init_adminq_exit; + +init_adminq_free_rings: + i40e_free_adminq_arq(hw); + +init_adminq_exit: + return ret_code; +} + +/** + * i40e_shutdown_asq - shutdown the ASQ + * @hw: pointer to the hardware structure + * + * The main shutdown routine for the Admin Send Queue + **/ +enum i40e_status_code i40e_shutdown_asq(struct i40e_hw *hw) +{ + enum i40e_status_code ret_code = I40E_SUCCESS; + + if (hw->aq.asq.count == 0) + return I40E_ERR_NOT_READY; + + /* Stop firmware AdminQ processing */ + wr32(hw, hw->aq.asq.head, 0); + wr32(hw, hw->aq.asq.tail, 0); + wr32(hw, hw->aq.asq.len, 0); + wr32(hw, hw->aq.asq.bal, 0); + wr32(hw, hw->aq.asq.bah, 0); + + /* make sure spinlock is available */ + i40e_acquire_spinlock(&hw->aq.asq_spinlock); + + hw->aq.asq.count = 0; /* to indicate uninitialized queue */ + + /* free ring buffers */ + i40e_free_asq_bufs(hw); + + i40e_release_spinlock(&hw->aq.asq_spinlock); + + return ret_code; +} + +/** + * i40e_shutdown_arq - shutdown ARQ + * @hw: pointer to the hardware structure + * + * The main shutdown routine for the Admin Receive Queue + **/ +enum i40e_status_code i40e_shutdown_arq(struct i40e_hw *hw) +{ + enum i40e_status_code ret_code = I40E_SUCCESS; + + if (hw->aq.arq.count == 0) + return I40E_ERR_NOT_READY; + + /* Stop firmware AdminQ processing */ + wr32(hw, hw->aq.arq.head, 0); + wr32(hw, hw->aq.arq.tail, 0); + wr32(hw, hw->aq.arq.len, 0); + wr32(hw, hw->aq.arq.bal, 0); + wr32(hw, hw->aq.arq.bah, 0); + + /* make sure spinlock is available */ + i40e_acquire_spinlock(&hw->aq.arq_spinlock); + + hw->aq.arq.count = 0; /* to indicate uninitialized queue */ + + /* free ring buffers */ + i40e_free_arq_bufs(hw); + + i40e_release_spinlock(&hw->aq.arq_spinlock); + + return ret_code; +} + +/** + * i40e_init_adminq - main initialization routine for Admin Queue + * @hw: pointer to the hardware structure + * + * Prior to calling this function, drivers *MUST* set the following fields + * in the hw->aq structure: + * - hw->aq.num_asq_entries + * - hw->aq.num_arq_entries + * - hw->aq.arq_buf_size + * - hw->aq.asq_buf_size + **/ +enum i40e_status_code i40e_init_adminq(struct i40e_hw *hw) +{ + enum i40e_status_code ret_code; + u16 eetrack_lo, eetrack_hi; + int retry = 0; + /* verify input for valid configuration */ + if ((hw->aq.num_arq_entries == 0) || + (hw->aq.num_asq_entries == 0) || + (hw->aq.arq_buf_size == 0) || + (hw->aq.asq_buf_size == 0)) { + ret_code = I40E_ERR_CONFIG; + goto init_adminq_exit; + } + + /* initialize spin locks */ + i40e_init_spinlock(&hw->aq.asq_spinlock); + i40e_init_spinlock(&hw->aq.arq_spinlock); + + /* Set up register offsets */ + i40e_adminq_init_regs(hw); + + /* setup ASQ command write back timeout */ + hw->aq.asq_cmd_timeout = I40E_ASQ_CMD_TIMEOUT; + + /* allocate the ASQ */ + ret_code = i40e_init_asq(hw); + if (ret_code != I40E_SUCCESS) + goto init_adminq_destroy_spinlocks; + + /* allocate the ARQ */ + ret_code = i40e_init_arq(hw); + if (ret_code != I40E_SUCCESS) + goto init_adminq_free_asq; + + if (i40e_is_vf(hw)) /* VF has no need of firmware */ + goto init_adminq_exit; + +/* There are some cases where the firmware may not be quite ready + * for AdminQ operations, so we retry the AdminQ setup a few times + * if we see timeouts in this first AQ call. + */ + do { + ret_code = i40e_aq_get_firmware_version(hw, + &hw->aq.fw_maj_ver, + &hw->aq.fw_min_ver, + &hw->aq.api_maj_ver, + &hw->aq.api_min_ver, + NULL); + if (ret_code != I40E_ERR_ADMIN_QUEUE_TIMEOUT) + break; + retry++; + i40e_msec_delay(100); + i40e_resume_aq(hw); + } while (retry < 10); + if (ret_code != I40E_SUCCESS) + goto init_adminq_free_arq; + + /* get the NVM version info */ + i40e_read_nvm_word(hw, I40E_SR_NVM_IMAGE_VERSION, &hw->nvm.version); + i40e_read_nvm_word(hw, I40E_SR_NVM_EETRACK_LO, &eetrack_lo); + i40e_read_nvm_word(hw, I40E_SR_NVM_EETRACK_HI, &eetrack_hi); + hw->nvm.eetrack = (eetrack_hi << 16) | eetrack_lo; + + if (hw->aq.api_maj_ver > I40E_FW_API_VERSION_MAJOR) { + ret_code = I40E_ERR_FIRMWARE_API_VERSION; + goto init_adminq_free_arq; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 22:19:22 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from hub.FreeBSD.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CD47FAAD; Mon, 25 Aug 2014 22:19:21 +0000 (UTC) Date: Mon, 25 Aug 2014 18:19:17 -0400 From: Glen Barber To: Jack F Vogel Subject: Re: svn commit: r270631 - in stable/10/sys: conf dev/ixl modules/ixl modules/ixlv Message-ID: <20140825221917.GF17339@hub.FreeBSD.org> References: <201408252204.s7PM4Tgi062611@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="FeAIMMcddNRN4P4/" Content-Disposition: inline In-Reply-To: <201408252204.s7PM4Tgi062611@svn.freebsd.org> X-Operating-System: FreeBSD 11.0-CURRENT amd64 X-SCUD-Definition: Sudden Completely Unexpected Dataloss X-SULE-Definition: Sudden Unexpected Learning Event User-Agent: Mutt/1.5.23 (2014-03-12) Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-10@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 22:19:23 -0000 --FeAIMMcddNRN4P4/ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Aug 25, 2014 at 10:04:29PM +0000, Jack F Vogel wrote: > Author: jfv > Date: Mon Aug 25 22:04:29 2014 > New Revision: 270631 > URL: http://svnweb.freebsd.org/changeset/base/270631 >=20 > Log: > MFC of the Intel Base driver for the Intel XL710 Ethernet Controller Fa= mily > - It was decided to change the driver name to if_ixl for FreeBSD > - This release adds the VF Driver to the tree, it can be built into > the kernel or as the if_ixlv module > - The VF driver is independent for the first time, this will be > desireable when full SRIOV capability is added to the OS. > =20 > Submitted by: jack.vogel@intel.com and eric.joyner@intel.com >=20 Is there a manual page for ixl to go along with this? Glen --FeAIMMcddNRN4P4/ Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJT+7ZlAAoJELls3eqvi17QPVwQANHZdKmXmjfGDozk9QpgErnt cTAXYpkLd7COgqgOSeLelczK/+4B6RxM5DWBHRrMEtE4OmjJHcqDFXJ2XlJ5sPPe EJVzKWHgf+g1k7LVUC/kHud/frz9hc1+4yFQfLC+jznoAjp2Xqoq8yQSJgg5TRi5 EHiWIYTNgDDjwhnIDA9Mfq+vSZA88gyr7raRwbth73z/KGDDFCmXtfVOZsG8/qy/ MZLJ7hvs64HobWaWM2fcZLCRI7sJBt0ZD6Zmn3LMI7CcygPfEuYdHoATyphUgG8f Mdzs+pEL5JGWGCqEeirSqs/e/Q5btxp1EbOYU1KswFgu08JbrwGmzHdNMBYLDhN1 P+woxrluXr+XhktncsLdZG/VU2V8su2eWvVw11QOiE1eIxX6BRFrCXWuLMoGMh5N y/9ev3+JJJlD6nwTec43UBfOlOKQ3nH5DRWT6D6mQldhoRYmLhokgtxsoJHH5cuK TfDnKGBV6g8AU2m1sBegsuYnKpg/tZwVBGbM57PhDDaPks0rY/CsPlyY+LOZZPg3 xUMOdQCBgVlvPLYM0aDc/cK7hjcCtLOC4/tV45NpybMTLTpIxoi7WqCeKD5PdYGz 0ovazRKjO8o8df7DCOmnbyR+j0IKqxZ2qFFZGpf7Y9VqAmPPDU74eOssyKuEihkJ VbRqVLKscEJeUPnSOUjr =wPvT -----END PGP SIGNATURE----- --FeAIMMcddNRN4P4/-- From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 22:19:49 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 3ACFAC0D; Mon, 25 Aug 2014 22:19:49 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 25BB33373; Mon, 25 Aug 2014 22:19:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PMJnDe068157; Mon, 25 Aug 2014 22:19:49 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PMJnvT068156; Mon, 25 Aug 2014 22:19:49 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408252219.s7PMJnvT068156@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 22:19:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270632 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 22:19:49 -0000 Author: gjb Date: Mon Aug 25 22:19:48 2014 New Revision: 270632 URL: http://svnweb.freebsd.org/changeset/base/270632 Log: Document r270157, FFS multithreaded soft updates. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 22:04:29 2014 (r270631) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 22:19:48 2014 (r270632) @@ -585,6 +585,12 @@ allows overriding the default block size. The previous default was 65536, and default of the new &man.loader.8; tunable is 8192. + + The Fast File System + (FFS) has been updated to support + multi-threaded soft updates. Previously, soft updates were + handled by a single thread, and as of this change, now have + one thread per FFS mountpoint. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 22:19:51 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 68969CE9; Mon, 25 Aug 2014 22:19:51 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3A6A83375; Mon, 25 Aug 2014 22:19:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PMJp7L068206; Mon, 25 Aug 2014 22:19:51 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PMJpDe068205; Mon, 25 Aug 2014 22:19:51 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408252219.s7PMJpDe068205@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 22:19:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270633 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 22:19:51 -0000 Author: gjb Date: Mon Aug 25 22:19:50 2014 New Revision: 270633 URL: http://svnweb.freebsd.org/changeset/base/270633 Log: Document r270159, various bhyve(4) enhancements. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 22:19:48 2014 (r270632) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 22:19:50 2014 (r270633) @@ -285,6 +285,46 @@ A new driver, &man.virtio_random.4;, has been added, which allows &os; virtual machines to harvest entropy from the hypervisor. + + The &man.bhyve.4; hypervisor has been + synced with the version in &os;-CURRENT. + + A number of enhancements have been added, and several + bug fixes, including: + + + + Post-mortem debugging has been added when + a guest virtual machine exits with an + EPT Misconfiguration + error. + + + + The hypervisor &man.virtio.4; API + has been expanded from 32- to 64-bit. + + + + Support for identifying capabilities of the virtual + CPU has been added. + + + + Support for emulating legacy x86 task + switching has been added. + + + + Support to list the VT-x features in base kernel + &man.dmesg.8; has been added. + + + + Support for extended PCI configuration space + has been added. + + From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 22:19:53 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 5AB18E14; Mon, 25 Aug 2014 22:19:53 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 464F43378; Mon, 25 Aug 2014 22:19:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PMJrCA068248; Mon, 25 Aug 2014 22:19:53 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PMJrqv068247; Mon, 25 Aug 2014 22:19:53 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408252219.s7PMJrqv068247@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 22:19:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270634 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 22:19:53 -0000 Author: gjb Date: Mon Aug 25 22:19:52 2014 New Revision: 270634 URL: http://svnweb.freebsd.org/changeset/base/270634 Log: Document r270297, native netmap(4) support in cxgbe(4) for the T5 10G/40G card. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 22:19:50 2014 (r270633) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 22:19:52 2014 (r270634) @@ -508,6 +508,10 @@ The &man.if.nf10bmac.4; driver has been merged from &os;-CURRENT to support the NetFPGA-10G Embedded CPU Ethernet Core. + + The &man.cxgbe.4; driver has been + updated to support &man.netmap.4; for the T5 10G/40G + cards. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 22:19:55 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 47A6CF38; Mon, 25 Aug 2014 22:19:55 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 335F0337A; Mon, 25 Aug 2014 22:19:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PMJtuj068296; Mon, 25 Aug 2014 22:19:55 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PMJtS1068295; Mon, 25 Aug 2014 22:19:55 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408252219.s7PMJtS1068295@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 22:19:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270635 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 22:19:55 -0000 Author: gjb Date: Mon Aug 25 22:19:54 2014 New Revision: 270635 URL: http://svnweb.freebsd.org/changeset/base/270635 Log: Document r270401, pam(3) 'account' facility support. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 22:19:52 2014 (r270634) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 22:19:54 2014 (r270635) @@ -935,6 +935,9 @@ specify NFS version 4, the syntax to use is -o vers=4. + Support for the account + facility has been added to &man.pam.3; library. + <filename>/etc/rc.d</filename> Scripts From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 22:19:57 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 39224A0; Mon, 25 Aug 2014 22:19:57 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 24ECF337C; Mon, 25 Aug 2014 22:19:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PMJvT8068342; Mon, 25 Aug 2014 22:19:57 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PMJv8e068341; Mon, 25 Aug 2014 22:19:57 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408252219.s7PMJv8e068341@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 22:19:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270636 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 22:19:57 -0000 Author: gjb Date: Mon Aug 25 22:19:56 2014 New Revision: 270636 URL: http://svnweb.freebsd.org/changeset/base/270636 Log: Document r270415, lukemftpd removal. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 22:19:54 2014 (r270635) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 22:19:56 2014 (r270636) @@ -1023,6 +1023,9 @@ The &man.fparseln.3; library has been updated to version 1.7. + + The lukemftpd + has been removed from the &os; base system. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 22:20:01 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 1A92F2EE; Mon, 25 Aug 2014 22:20:01 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 06A4F3385; Mon, 25 Aug 2014 22:20:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PMK0Qs068489; Mon, 25 Aug 2014 22:20:00 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PMK0fP068488; Mon, 25 Aug 2014 22:20:00 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408252220.s7PMK0fP068488@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 22:20:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270638 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 22:20:01 -0000 Author: gjb Date: Mon Aug 25 22:20:00 2014 New Revision: 270638 URL: http://svnweb.freebsd.org/changeset/base/270638 Log: Document r270514, ASUS USB-AC51 support in urtwn(4). Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 22:19:58 2014 (r270637) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 22:20:00 2014 (r270638) @@ -515,6 +515,9 @@ The &man.vtnet.4; driver has been updated to support &man.netmap.4;. + + The &man.urtwn.4; driver has been + updated to support the ASUS USB-AC51 wireless card. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 22:19:59 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 27C8F188; Mon, 25 Aug 2014 22:19:59 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 11E59337E; Mon, 25 Aug 2014 22:19:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PMJwAi068384; Mon, 25 Aug 2014 22:19:58 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PMJwpF068383; Mon, 25 Aug 2014 22:19:58 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408252219.s7PMJwpF068383@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 22:19:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270637 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 22:19:59 -0000 Author: gjb Date: Mon Aug 25 22:19:58 2014 New Revision: 270637 URL: http://svnweb.freebsd.org/changeset/base/270637 Log: Document r270509, vtnet(4) netmap(4) support. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 22:19:56 2014 (r270636) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 22:19:58 2014 (r270637) @@ -512,6 +512,9 @@ The &man.cxgbe.4; driver has been updated to support &man.netmap.4; for the T5 10G/40G cards. + + The &man.vtnet.4; driver has been + updated to support &man.netmap.4;. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 22:20:05 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 0C1604F6; Mon, 25 Aug 2014 22:20:05 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E1B19338B; Mon, 25 Aug 2014 22:20:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PMK4io068609; Mon, 25 Aug 2014 22:20:04 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PMK4E9068608; Mon, 25 Aug 2014 22:20:04 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408252220.s7PMK4E9068608@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 22:20:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270640 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 22:20:05 -0000 Author: gjb Date: Mon Aug 25 22:20:04 2014 New Revision: 270640 URL: http://svnweb.freebsd.org/changeset/base/270640 Log: Document r270630, vm 'fast path' page fault hander. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 22:20:02 2014 (r270639) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 22:20:04 2014 (r270640) @@ -257,6 +257,10 @@ sponsor="&citrix.rd;">Support for unmapped I/O has been added to the &man.xen.4; blkfront driver. + The &os; virtual memory subsystem + has been updated to implement fast path for + the page fault handler. + Virtualization Support From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 22:20:03 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 19CF4416; Mon, 25 Aug 2014 22:20:03 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 056803388; Mon, 25 Aug 2014 22:20:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PMK2kI068554; Mon, 25 Aug 2014 22:20:02 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PMK2Pj068553; Mon, 25 Aug 2014 22:20:02 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408252220.s7PMK2Pj068553@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 22:20:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270639 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 22:20:03 -0000 Author: gjb Date: Mon Aug 25 22:20:02 2014 New Revision: 270639 URL: http://svnweb.freebsd.org/changeset/base/270639 Log: Document r270552, kern.geom.part.mbr.enforce_chs tunable. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 22:20:00 2014 (r270638) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 22:20:02 2014 (r270639) @@ -568,6 +568,15 @@ The maximum number of SCSI ports in the &man.ctl.4; driver has been increased from 32 to 128. + + A new &man.sysctl.8; and + &man.loader.8; tunable, + kern.geom.part.mbr.enforce_chs has been + added to the &man.geom.8; MBR partition + class. When set to a non-zero value, + GEOM_PART_MBR will automatically + recalculate the user-specified offset and size for alignment + with the disk geometry. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 22:23:03 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id AE12E78A; Mon, 25 Aug 2014 22:23:03 +0000 (UTC) Received: from mail-vc0-x22b.google.com (mail-vc0-x22b.google.com [IPv6:2607:f8b0:400c:c03::22b]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 10865343D; Mon, 25 Aug 2014 22:23:02 +0000 (UTC) Received: by mail-vc0-f171.google.com with SMTP id hq11so16110386vcb.30 for ; Mon, 25 Aug 2014 15:23:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=pnn+93Cj5U38fKJA6CtRJzKlZr+tDrB3Y/eiFkKmmFQ=; b=XDy89jIm0Y/DX0HZNRoqkMsHDrk5EchGsp4xFf9TOAUww7l2Etu/ixDXHrP91bNKXj jWhQRpFP1EOAAFB0TrhurRksonLHUy/Qh3x7Dl3SLSYJbnfSBT8oialkQZvjxJRWhUT+ rJ4BF9ANVDw3+7G/ygXgxSLg3oTqHI+TCWtEnBNJ6nay3gyQ7SQkGnTMIQbG6Y+TdZIw LcJuxC6oD6P51jOuoJw+BsKuilc7vWDdG/Y/SyNb5VGkWyv9HM+0DUaCnbToS7eq6U4O MxzzVbuBzP2YIsh/5z+BQx7d/RioZgy3K8hulbrMkT+/69cVNikuF/LV0b80x1iq8Tm1 5erw== MIME-Version: 1.0 X-Received: by 10.220.30.8 with SMTP id s8mr7697260vcc.58.1409005382218; Mon, 25 Aug 2014 15:23:02 -0700 (PDT) Received: by 10.221.10.210 with HTTP; Mon, 25 Aug 2014 15:23:02 -0700 (PDT) In-Reply-To: <20140825221917.GF17339@hub.FreeBSD.org> References: <201408252204.s7PM4Tgi062611@svn.freebsd.org> <20140825221917.GF17339@hub.FreeBSD.org> Date: Mon, 25 Aug 2014 15:23:02 -0700 Message-ID: Subject: Re: svn commit: r270631 - in stable/10/sys: conf dev/ixl modules/ixl modules/ixlv From: Jack Vogel To: Glen Barber Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.18-1 Cc: Jack F Vogel , svn-src-stable@freebsd.org, "svn-src-all@freebsd.org" , "src-committers@freebsd.org" , svn-src-stable-10@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 22:23:03 -0000 Not yet, only the README, there will be a manual page coming soon I hope. Jack On Mon, Aug 25, 2014 at 3:19 PM, Glen Barber wrote: > On Mon, Aug 25, 2014 at 10:04:29PM +0000, Jack F Vogel wrote: > > Author: jfv > > Date: Mon Aug 25 22:04:29 2014 > > New Revision: 270631 > > URL: http://svnweb.freebsd.org/changeset/base/270631 > > > > Log: > > MFC of the Intel Base driver for the Intel XL710 Ethernet Controller > Family > > - It was decided to change the driver name to if_ixl for FreeBSD > > - This release adds the VF Driver to the tree, it can be built into > > the kernel or as the if_ixlv module > > - The VF driver is independent for the first time, this will be > > desireable when full SRIOV capability is added to the OS. > > > > Submitted by: jack.vogel@intel.com and eric.joyner@intel.com > > > > Is there a manual page for ixl to go along with this? > > Glen > > From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 22:25:57 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id C5441A21; Mon, 25 Aug 2014 22:25:57 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B04913464; Mon, 25 Aug 2014 22:25:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PMPvFN072632; Mon, 25 Aug 2014 22:25:57 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PMPvkY072631; Mon, 25 Aug 2014 22:25:57 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408252225.s7PMPvkY072631@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 22:25:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270641 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 22:25:57 -0000 Author: gjb Date: Mon Aug 25 22:25:57 2014 New Revision: 270641 URL: http://svnweb.freebsd.org/changeset/base/270641 Log: Fix a formatting nit. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 22:20:04 2014 (r270640) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 22:25:57 2014 (r270641) @@ -299,8 +299,8 @@ Post-mortem debugging has been added when - a guest virtual machine exits with an - EPT Misconfiguration + a guest virtual machine exits with an + EPT Misconfiguration error. From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 22:30:36 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 64C36D5C; Mon, 25 Aug 2014 22:30:36 +0000 (UTC) Received: from h2.funkthat.com (gate2.funkthat.com [208.87.223.18]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "funkthat.com", Issuer "funkthat.com" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 2280E3490; Mon, 25 Aug 2014 22:30:35 +0000 (UTC) Received: from h2.funkthat.com (localhost [127.0.0.1]) by h2.funkthat.com (8.14.3/8.14.3) with ESMTP id s7PMUYh4009355 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 25 Aug 2014 15:30:34 -0700 (PDT) (envelope-from jmg@h2.funkthat.com) Received: (from jmg@localhost) by h2.funkthat.com (8.14.3/8.14.3/Submit) id s7PMUYCm009354; Mon, 25 Aug 2014 15:30:34 -0700 (PDT) (envelope-from jmg) Date: Mon, 25 Aug 2014 15:30:34 -0700 From: John-Mark Gurney To: John Baldwin Subject: Re: svn commit: r270444 - in head/sys: kern sys Message-ID: <20140825223034.GE71691@funkthat.com> References: <201408240904.s7O949sI083660@svn.freebsd.org> <1724027.iWxFDWcg2R@ralph.baldwin.cx> <20140825170241.GA23088@dft-labs.eu> <1815651.yxLDiBYvJT@ralph.baldwin.cx> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1815651.yxLDiBYvJT@ralph.baldwin.cx> User-Agent: Mutt/1.4.2.3i X-Operating-System: FreeBSD 7.2-RELEASE i386 X-PGP-Fingerprint: 54BA 873B 6515 3F10 9E88 9322 9CB1 8F74 6D3F A396 X-Files: The truth is out there X-URL: http://resnet.uoregon.edu/~gurney_j/ X-Resume: http://resnet.uoregon.edu/~gurney_j/resume.html X-TipJar: bitcoin:13Qmb6AeTgQecazTWph4XasEsP7nGRbAPE X-to-the-FBI-CIA-and-NSA: HI! HOW YA DOIN? can i haz chizburger? X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.2 (h2.funkthat.com [127.0.0.1]); Mon, 25 Aug 2014 15:30:34 -0700 (PDT) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, Mateusz Guzik , src-committers@freebsd.org, Mateusz Guzik X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 22:30:36 -0000 John Baldwin wrote this message on Mon, Aug 25, 2014 at 13:35 -0400: > On Monday, August 25, 2014 07:02:41 PM Mateusz Guzik wrote: > > On Mon, Aug 25, 2014 at 10:23:19AM -0400, John Baldwin wrote: > > > On Sunday, August 24, 2014 09:04:09 AM Mateusz Guzik wrote: > > > > Author: mjg > > > > Date: Sun Aug 24 09:04:09 2014 > > > > New Revision: 270444 > > > > URL: http://svnweb.freebsd.org/changeset/base/270444 > > > > > > > > Log: > > > > Fix getppid for traced processes. > > > > > > > > Traced processes always have the tracer set as the parent. > > > > Utilize proc_realparent to obtain the right process when needed. > > > > > > Are you sure this won't break things? I know of several applications that > > > expect a debugger to be the parent when attached and change behavior as a > > > result (e.g. inserting a breakpoint on an assertion failure rather than > > > generating a core). > > > > Well, this is what linux and solaris do. > > Interesting. > > > I don't feel strongly about this change. If you really want I'm happy to > > revert. > > In general I'd like to someday have the debugger-debuggee relationship not > override parent-child and this is a step in that direction. However, this > will break existing applications, so this needs to be clearly documented in > the release notes. In addition, we should probably advertise how a process > can correctly determine if it is being run under a debugger (right now you can > do 'getppid()' and use strcmp or strstr on the p_comm of that pid so you can > do different things for "gdb" vs "gcore", etc. so just checking P_TRACED from > kinfo_proc wouldn't be equivalent in functionality) But what about when you attach gdb to a running process... That doesn't magicly make the now debugged process a child of gdb does it? -- John-Mark Gurney Voice: +1 415 225 5579 "All that I will do, has been done, All that I have, has not." From owner-svn-src-all@FreeBSD.ORG Mon Aug 25 22:31:05 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 4D1F5E96; Mon, 25 Aug 2014 22:31:05 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 38A5C3494; Mon, 25 Aug 2014 22:31:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PMV5RL074913; Mon, 25 Aug 2014 22:31:05 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PMV5SX074912; Mon, 25 Aug 2014 22:31:05 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408252231.s7PMV5SX074912@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 25 Aug 2014 22:31:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270642 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Aug 2014 22:31:05 -0000 Author: gjb Date: Mon Aug 25 22:31:04 2014 New Revision: 270642 URL: http://svnweb.freebsd.org/changeset/base/270642 Log: Document r270631, ixlv(4) merged from head/. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 22:25:57 2014 (r270641) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Aug 25 22:31:04 2014 (r270642) @@ -522,6 +522,10 @@ The &man.urtwn.4; driver has been updated to support the ASUS USB-AC51 wireless card. + + The &intel; XL710 ethernet + controller driver, ixlv(4), has been + merged from &os;-CURRENT. From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 01:28:23 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 7745420D; Tue, 26 Aug 2014 01:28:23 +0000 (UTC) Received: from mail-wi0-x232.google.com (mail-wi0-x232.google.com [IPv6:2a00:1450:400c:c05::232]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 69B2A336D; Tue, 26 Aug 2014 01:28:22 +0000 (UTC) Received: by mail-wi0-f178.google.com with SMTP id hi2so3370764wib.11 for ; Mon, 25 Aug 2014 18:28:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=d0Ff50Z5ZJaGepqDyFJNLNoAeQK6RIP4NUR7AxrBa4E=; b=Ece/dA/gDl+ZXRMBKLqjDULjqufxIjzuGLoMNsjLii/Dy3MAz59qa/dUafe1KMIShs TSSXclRo/FMQ7qyrT238cU8DM8RCEINW0F1qtumvWrxjBNXUgGUVhewg4cjMLJh9EHI0 OU3qUVkX2u25E6g/ISOpHW0+svdJUC+25Z+GdoQnblfRI/RAIyuiUfJCO673hbr8Yamj +VikvoZBt/AIZ9aBJQ7qzD1veHGNi4UoHxa/+81Fla5FwoXIm6y/e5dr8b/qSFr2qR7z MiQlzntiPiue+rAzGHw70EYgNapktFBslDqkUHyej1fw4/dDGaj8oyqpqr5D0Cmp+6eJ 2Hew== X-Received: by 10.180.73.139 with SMTP id l11mr18562736wiv.30.1409016500183; Mon, 25 Aug 2014 18:28:20 -0700 (PDT) Received: from dft-labs.eu (n1x0n-1-pt.tunnel.tserv5.lon1.ipv6.he.net. [2001:470:1f08:1f7::2]) by mx.google.com with ESMTPSA id bk6sm3914218wjb.26.2014.08.25.18.28.18 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 25 Aug 2014 18:28:18 -0700 (PDT) Date: Tue, 26 Aug 2014 03:28:16 +0200 From: Mateusz Guzik To: John Baldwin Subject: Re: svn commit: r270444 - in head/sys: kern sys Message-ID: <20140826012816.GC23088@dft-labs.eu> References: <201408240904.s7O949sI083660@svn.freebsd.org> <1724027.iWxFDWcg2R@ralph.baldwin.cx> <20140825170241.GA23088@dft-labs.eu> <1815651.yxLDiBYvJT@ralph.baldwin.cx> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1815651.yxLDiBYvJT@ralph.baldwin.cx> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Mateusz Guzik X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 01:28:23 -0000 On Mon, Aug 25, 2014 at 01:35:58PM -0400, John Baldwin wrote: > On Monday, August 25, 2014 07:02:41 PM Mateusz Guzik wrote: > > On Mon, Aug 25, 2014 at 10:23:19AM -0400, John Baldwin wrote: > > > On Sunday, August 24, 2014 09:04:09 AM Mateusz Guzik wrote: > > > > Author: mjg > > > > Date: Sun Aug 24 09:04:09 2014 > > > > New Revision: 270444 > > > > URL: http://svnweb.freebsd.org/changeset/base/270444 > > > > > > > > Log: > > > > Fix getppid for traced processes. > > > > > > > > Traced processes always have the tracer set as the parent. > > > > Utilize proc_realparent to obtain the right process when needed. > > > > > > Are you sure this won't break things? I know of several applications that > > > expect a debugger to be the parent when attached and change behavior as a > > > result (e.g. inserting a breakpoint on an assertion failure rather than > > > generating a core). > > > > Well, this is what linux and solaris do. > > Interesting. > > > I don't feel strongly about this change. If you really want I'm happy to > > revert. > > In general I'd like to someday have the debugger-debuggee relationship not > override parent-child and this is a step in that direction. However, this > will break existing applications, so this needs to be clearly documented in > the release notes. In addition, we should probably advertise how a process > can correctly determine if it is being run under a debugger (right now you can > do 'getppid()' and use strcmp or strstr on the p_comm of that pid so you can > do different things for "gdb" vs "gcore", etc. so just checking P_TRACED from > kinfo_proc wouldn't be equivalent in functionality) > Is any of programs you mentioned opensource or at least publicly available? In linux they provide TracerPid in /proc//status. We could add a specific sysctl or extend kinfo with the same data. -- Mateusz Guzik From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 02:20:38 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 067D51AB; Tue, 26 Aug 2014 02:20:38 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E5C0C380D; Tue, 26 Aug 2014 02:20:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7Q2KbQH081961; Tue, 26 Aug 2014 02:20:37 GMT (envelope-from kevlo@FreeBSD.org) Received: (from kevlo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7Q2KbmB081960; Tue, 26 Aug 2014 02:20:37 GMT (envelope-from kevlo@FreeBSD.org) Message-Id: <201408260220.s7Q2KbmB081960@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kevlo set sender to kevlo@FreeBSD.org using -f From: Kevin Lo Date: Tue, 26 Aug 2014 02:20:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270643 - head/sys/dev/usb/wlan X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 02:20:38 -0000 Author: kevlo Date: Tue Aug 26 02:20:37 2014 New Revision: 270643 URL: http://svnweb.freebsd.org/changeset/base/270643 Log: Fix typo: s/mac_rev/mac_ver/ Submitted by: Stefan Sperling Modified: head/sys/dev/usb/wlan/if_run.c Modified: head/sys/dev/usb/wlan/if_run.c ============================================================================== --- head/sys/dev/usb/wlan/if_run.c Mon Aug 25 22:31:04 2014 (r270642) +++ head/sys/dev/usb/wlan/if_run.c Tue Aug 26 02:20:37 2014 (r270643) @@ -5490,7 +5490,7 @@ run_rt3070_rf_init(struct run_softc *sc) run_rt3070_rf_write(sc, 17, rf); } - if (sc->mac_rev == 0x3071) { + if (sc->mac_ver == 0x3071) { run_rt3070_rf_read(sc, 1, &rf); rf &= ~(RT3070_RX0_PD | RT3070_TX0_PD); rf |= RT3070_RF_BLOCK | RT3070_RX1_PD | RT3070_TX1_PD; From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 02:31:38 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 5DD5C3BF; Tue, 26 Aug 2014 02:31:38 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 485D93862; Tue, 26 Aug 2014 02:31:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7Q2Vcx7087621; Tue, 26 Aug 2014 02:31:38 GMT (envelope-from thompsa@FreeBSD.org) Received: (from thompsa@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7Q2VbCW087619; Tue, 26 Aug 2014 02:31:37 GMT (envelope-from thompsa@FreeBSD.org) Message-Id: <201408260231.s7Q2VbCW087619@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: thompsa set sender to thompsa@FreeBSD.org using -f From: Andrew Thompson Date: Tue, 26 Aug 2014 02:31:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270644 - stable/10/usr.sbin/bsdinstall/scripts X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 02:31:38 -0000 Author: thompsa Date: Tue Aug 26 02:31:37 2014 New Revision: 270644 URL: http://svnweb.freebsd.org/changeset/base/270644 Log: MFH (r269653): Give a brief error message Modified: stable/10/usr.sbin/bsdinstall/scripts/auto stable/10/usr.sbin/bsdinstall/scripts/jail Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/bsdinstall/scripts/auto ============================================================================== --- stable/10/usr.sbin/bsdinstall/scripts/auto Tue Aug 26 02:20:37 2014 (r270643) +++ stable/10/usr.sbin/bsdinstall/scripts/auto Tue Aug 26 02:31:37 2014 (r270644) @@ -35,11 +35,15 @@ BSDCFG_SHARE="/usr/share/bsdconfig" ############################################################ FUNCTIONS error() { + local msg + if [ -n "$1" ]; then + msg="$1\n\n" + fi test -n "$DISTDIR_IS_UNIONFS" && umount -f $BSDINSTALL_DISTDIR test -f $PATH_FSTAB && bsdinstall umount dialog --backtitle "FreeBSD Installer" --title "Abort" \ --no-label "Exit" --yes-label "Restart" --yesno \ - "An installation step has been aborted. Would you like to restart the installation or exit the installer?" 0 0 + "${msg}An installation step has been aborted. Would you like to restart the installation or exit the installer?" 0 0 if [ $? -ne 0 ]; then exit 1 else @@ -58,7 +62,7 @@ trap true SIGINT # This section is optio bsdinstall keymap trap error SIGINT # Catch cntrl-C here -bsdinstall hostname || error +bsdinstall hostname || error "Set hostname failed" export DISTRIBUTIONS="base.txz kernel.txz" if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then @@ -95,7 +99,7 @@ if [ -n "$FETCH_DISTRIBUTIONS" ]; then BSDINSTALL_DISTSITE=$(`dirname $0`/mirrorselect 2>&1 1>&3) MIRROR_BUTTON=$? exec 3>&- - test $MIRROR_BUTTON -eq 0 || error + test $MIRROR_BUTTON -eq 0 || error "No mirror selected" export BSDINSTALL_DISTSITE fi @@ -125,8 +129,8 @@ exec 3>&- case "$PARTMODE" in "Guided") # Guided - bsdinstall autopart || error - bsdinstall mount || error + bsdinstall autopart || error "Partitioning error" + bsdinstall mount || error "Failed to mount filesystem" ;; "Shell") # Shell clear @@ -136,18 +140,18 @@ case "$PARTMODE" in "Manual") # Manual if f_isset debugFile; then # Give partedit the path to our logfile so it can append - BSDINSTALL_LOG="${debugFile#+}" bsdinstall partedit || error + BSDINSTALL_LOG="${debugFile#+}" bsdinstall partedit || error "Partitioning error" else - bsdinstall partedit || error + bsdinstall partedit || error "Partitioning error" fi - bsdinstall mount || error + bsdinstall mount || error "Failed to mount filesystem" ;; "ZFS") # ZFS - bsdinstall zfsboot || error - bsdinstall mount || error + bsdinstall zfsboot || error "ZFS setup failed" + bsdinstall mount || error "Failed to mount filesystem" ;; *) - error + error "Unknown partitioning mode" ;; esac @@ -156,7 +160,7 @@ if [ ! -z "$FETCH_DISTRIBUTIONS" ]; then # Download to a directory in the new system as scratch space BSDINSTALL_FETCHDEST="$BSDINSTALL_CHROOT/usr/freebsd-dist" - mkdir -p "$BSDINSTALL_FETCHDEST" || error + mkdir -p "$BSDINSTALL_FETCHDEST" || error "Could not create directory $BSDINSTALL_FETCHDEST" export DISTRIBUTIONS="$FETCH_DISTRIBUTIONS" # Try to use any existing distfiles @@ -169,13 +173,13 @@ if [ ! -z "$FETCH_DISTRIBUTIONS" ]; then fi export FTP_PASSIVE_MODE=YES - bsdinstall distfetch || error + bsdinstall distfetch || error "Failed to fetch distribution" export DISTRIBUTIONS="$ALL_DISTRIBUTIONS" fi -bsdinstall checksum || error -bsdinstall distextract || error -bsdinstall rootpass || error +bsdinstall checksum || error "Distribution checksum failed" +bsdinstall distextract || error "Distribution extract failed" +bsdinstall rootpass || error "Could not set root password" trap true SIGINT # This section is optional if [ "$NETCONFIG_DONE" != yes ]; then @@ -239,7 +243,7 @@ finalconfig() { finalconfig trap error SIGINT # SIGINT is bad again -bsdinstall config || error +bsdinstall config || error "Failed to save config" if [ ! -z "$BSDINSTALL_FETCHDEST" ]; then [ "$BSDINSTALL_FETCHDEST" != "$BSDINSTALL_DISTDIR" ] && \ Modified: stable/10/usr.sbin/bsdinstall/scripts/jail ============================================================================== --- stable/10/usr.sbin/bsdinstall/scripts/jail Tue Aug 26 02:20:37 2014 (r270643) +++ stable/10/usr.sbin/bsdinstall/scripts/jail Tue Aug 26 02:31:37 2014 (r270644) @@ -38,9 +38,13 @@ f_dprintf "Began Installation at %s" "$( export BSDINSTALL_CHROOT=$1 error() { + local msg + if [ -n "$1" ]; then + msg="$1\n\n" + fi dialog --backtitle "FreeBSD Installer" --title "Abort" \ --no-label "Exit" --yes-label "Restart" --yesno \ - "An installation step has been aborted. Would you like to restart the installation or exit the installer?" 0 0 + "${msg}An installation step has been aborted. Would you like to restart the installation or exit the installer?" 0 0 if [ $? -ne 0 ]; then exit else @@ -51,7 +55,7 @@ error() { rm -rf $BSDINSTALL_TMPETC mkdir $BSDINSTALL_TMPETC -mkdir -p $1 || error +mkdir -p $1 || error "mkdir failed for $1" test ! -d $BSDINSTALL_DISTDIR && mkdir -p $BSDINSTALL_DISTDIR @@ -60,9 +64,9 @@ if [ ! -f $BSDINSTALL_DISTDIR/MANIFEST - BSDINSTALL_DISTSITE=$(`dirname $0`/mirrorselect 2>&1 1>&3) MIRROR_BUTTON=$? exec 3>&- - test $MIRROR_BUTTON -eq 0 || error + test $MIRROR_BUTTON -eq 0 || error "No mirror selected" export BSDINSTALL_DISTSITE - fetch -o $BSDINSTALL_DISTDIR/MANIFEST $BSDINSTALL_DISTSITE/MANIFEST || error + fetch -o $BSDINSTALL_DISTDIR/MANIFEST $BSDINSTALL_DISTSITE/MANIFEST || error "Could not download $BSDINSTALL_DISTSITE/MANIFEST" fi export DISTRIBUTIONS="base.txz" @@ -94,17 +98,17 @@ if [ -n "$FETCH_DISTRIBUTIONS" -a -z "$B BSDINSTALL_DISTSITE=`bsdinstall mirrorselect 2>&1 1>&3` MIRROR_BUTTON=$? exec 3>&- - test $MIRROR_BUTTON -eq 0 || error + test $MIRROR_BUTTON -eq 0 || error "No mirror selected" export BSDINSTALL_DISTSITE fi if [ ! -z "$FETCH_DISTRIBUTIONS" ]; then - bsdinstall distfetch || error + bsdinstall distfetch || error "Failed to fetch distribution" fi -bsdinstall checksum || error -bsdinstall distextract || error -bsdinstall rootpass || error +bsdinstall checksum || error "Distribution checksum failed" +bsdinstall distextract || error "Distribution extract failed" +bsdinstall rootpass || error "Could not set root password" trap true SIGINT # This section is optional bsdinstall services @@ -114,7 +118,7 @@ dialog --backtitle "FreeBSD Installer" - bsdinstall adduser trap error SIGINT # SIGINT is bad again -bsdinstall config || error +bsdinstall config || error "Failed to save config" cp /etc/resolv.conf $1/etc cp /etc/localtime $1/etc From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 03:45:55 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 61D43D60; Tue, 26 Aug 2014 03:45:55 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 41B4C3046; Tue, 26 Aug 2014 03:45:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7Q3jtSQ022312; Tue, 26 Aug 2014 03:45:55 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7Q3jtVO022311; Tue, 26 Aug 2014 03:45:55 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201408260345.s7Q3jtVO022311@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Tue, 26 Aug 2014 03:45:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270645 - stable/10/sys/cam/ata X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 03:45:55 -0000 Author: imp Date: Tue Aug 26 03:45:54 2014 New Revision: 270645 URL: http://svnweb.freebsd.org/changeset/base/270645 Log: Merge SETAN changes from head: r270327 | imp | 2014-08-22 07:15:59 -0600 (Fri, 22 Aug 2014) | 6 lines We should never enter the PROBE_SETAN phase if we're not ATAPI, since that's ATAPI specific. Instead, skip to PROBE_SET_MULTI instead for non ATAPI protocols. The prior code incorrectly terminated the probe with a break, rather than arranging for probedone to get called. This caused panics or worse on some systems. r270249 | imp | 2014-08-20 16:58:12 -0600 (Wed, 20 Aug 2014) | 13 lines Turns out that IDENTIFY DEVICE and IDENTIFY PACKET DEVICE return data that's only mostly similar. Specifically word 78 bits are defined for IDENTIFY DEVICE as 5 Supports Hardware Feature Control while a IDENTIFY PACKET DEVICE defines them as 5 Asynchronous notification supported Therefore, only pay attention to bit 5 when we're talking to ATAPI devices (we don't use the hardware feature control at this time). Ignore it for ATA devices. Remove kludge that papered over this issue for Samsung SATA SSDs, since Micron drives also have the bit set and the error was caused by this bad interpretation of the spec (which is quite easy to do, since bits aren't normally overlapping like this). Sponsored by: Netflix (the merge and the original work) Modified: stable/10/sys/cam/ata/ata_xpt.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/cam/ata/ata_xpt.c ============================================================================== --- stable/10/sys/cam/ata/ata_xpt.c Tue Aug 26 02:31:37 2014 (r270644) +++ stable/10/sys/cam/ata/ata_xpt.c Tue Aug 26 03:45:54 2014 (r270645) @@ -750,14 +750,6 @@ out: goto noerror; /* - * Some Samsung SSDs report supported Asynchronous Notification, - * but return ABORT on attempt to enable it. - */ - } else if (softc->action == PROBE_SETAN && - status == CAM_ATA_STATUS_ERROR) { - goto noerror; - - /* * SES and SAF-TE SEPs have different IDENTIFY commands, * but SATA specification doesn't tell how to identify them. * Until better way found, just try another if first fail. @@ -1059,7 +1051,8 @@ noerror: } /* FALLTHROUGH */ case PROBE_SETDMAAA: - if ((ident_buf->satasupport & ATA_SUPPORT_ASYNCNOTIF) && + if (path->device->protocol != PROTO_ATA && + (ident_buf->satasupport & ATA_SUPPORT_ASYNCNOTIF) && (!(softc->caps & CTS_SATA_CAPS_H_AN)) != (!(ident_buf->sataenabled & ATA_SUPPORT_ASYNCNOTIF))) { PROBE_SET_ACTION(softc, PROBE_SETAN); @@ -1180,7 +1173,7 @@ notsata: else caps = 0; /* Remember what transport thinks about AEN. */ - if (caps & CTS_SATA_CAPS_H_AN) + if ((caps & CTS_SATA_CAPS_H_AN) && path->device->protocol != PROTO_ATA) path->device->inq_flags |= SID_AEN; else path->device->inq_flags &= ~SID_AEN; From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 06:31:52 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id CC38E5DC; Tue, 26 Aug 2014 06:31:52 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B6F543D59; Tue, 26 Aug 2014 06:31:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7Q6VqC7098293; Tue, 26 Aug 2014 06:31:52 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7Q6VqAZ098292; Tue, 26 Aug 2014 06:31:52 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201408260631.s7Q6VqAZ098292@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Tue, 26 Aug 2014 06:31:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r270646 - in stable: 10/contrib/libc++/include 9/contrib/libc++/include X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 06:31:52 -0000 Author: dim Date: Tue Aug 26 06:31:52 2014 New Revision: 270646 URL: http://svnweb.freebsd.org/changeset/base/270646 Log: MFC r270416: In r260015, I renamed several identifiers to avoid -Wsystem-header warnings. In r261283, I imported libc++ 3.4 release, but this contained one identifier that had not been renamed yet, leading to a compilation error when using -std=c++1y. Fix the compilation error by correctly renaming the identifier. Reported by: rcarter@pinyon.org PR: base/192139 Modified: stable/9/contrib/libc++/include/type_traits Directory Properties: stable/9/contrib/libc++/ (props changed) Changes in other areas also in this revision: Modified: stable/10/contrib/libc++/include/type_traits Directory Properties: stable/10/ (props changed) Modified: stable/9/contrib/libc++/include/type_traits ============================================================================== --- stable/9/contrib/libc++/include/type_traits Tue Aug 26 03:45:54 2014 (r270645) +++ stable/9/contrib/libc++/include/type_traits Tue Aug 26 06:31:52 2014 (r270646) @@ -301,7 +301,7 @@ template struct _LIBCPP_TYPE #if _LIBCPP_STD_VER > 11 template struct _LIBCPP_TYPE_VIS_ONLY is_null_pointer - : public ____is_nullptr_t::type> {}; + : public __libcpp___is_nullptr::type> {}; #endif // is_integral From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 06:31:53 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 2940C5DD; Tue, 26 Aug 2014 06:31:53 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 143483D5A; Tue, 26 Aug 2014 06:31:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7Q6Vqi2098299; Tue, 26 Aug 2014 06:31:52 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7Q6VqWL098298; Tue, 26 Aug 2014 06:31:52 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201408260631.s7Q6VqWL098298@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Tue, 26 Aug 2014 06:31:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270646 - in stable: 10/contrib/libc++/include 9/contrib/libc++/include X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 06:31:53 -0000 Author: dim Date: Tue Aug 26 06:31:52 2014 New Revision: 270646 URL: http://svnweb.freebsd.org/changeset/base/270646 Log: MFC r270416: In r260015, I renamed several identifiers to avoid -Wsystem-header warnings. In r261283, I imported libc++ 3.4 release, but this contained one identifier that had not been renamed yet, leading to a compilation error when using -std=c++1y. Fix the compilation error by correctly renaming the identifier. Reported by: rcarter@pinyon.org PR: base/192139 Modified: stable/10/contrib/libc++/include/type_traits Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/9/contrib/libc++/include/type_traits Directory Properties: stable/9/contrib/libc++/ (props changed) Modified: stable/10/contrib/libc++/include/type_traits ============================================================================== --- stable/10/contrib/libc++/include/type_traits Tue Aug 26 03:45:54 2014 (r270645) +++ stable/10/contrib/libc++/include/type_traits Tue Aug 26 06:31:52 2014 (r270646) @@ -301,7 +301,7 @@ template struct _LIBCPP_TYPE #if _LIBCPP_STD_VER > 11 template struct _LIBCPP_TYPE_VIS_ONLY is_null_pointer - : public ____is_nullptr_t::type> {}; + : public __libcpp___is_nullptr::type> {}; #endif // is_integral From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 08:10:36 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id A031F334; Tue, 26 Aug 2014 08:10:36 +0000 (UTC) Received: from cell.glebius.int.ru (glebius.int.ru [81.19.69.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "cell.glebius.int.ru", Issuer "cell.glebius.int.ru" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 0842E3702; Tue, 26 Aug 2014 08:10:34 +0000 (UTC) Received: from cell.glebius.int.ru (localhost [127.0.0.1]) by cell.glebius.int.ru (8.14.9/8.14.9) with ESMTP id s7Q8AVTZ058665 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 26 Aug 2014 12:10:31 +0400 (MSK) (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by cell.glebius.int.ru (8.14.9/8.14.9/Submit) id s7Q8AVRp058664; Tue, 26 Aug 2014 12:10:31 +0400 (MSK) (envelope-from glebius@FreeBSD.org) X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to glebius@FreeBSD.org using -f Date: Tue, 26 Aug 2014 12:10:31 +0400 From: Gleb Smirnoff To: Adrian Chadd , Henry Hu Subject: Re: svn commit: r270516 - head/sys/dev/drm2/i915 Message-ID: <20140826081031.GD7693@FreeBSD.org> References: <201408250503.s7P53Axo057720@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201408250503.s7P53Axo057720@svn.freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 08:10:36 -0000 On Mon, Aug 25, 2014 at 05:03:10AM +0000, Adrian Chadd wrote: A> Author: adrian A> Date: Mon Aug 25 05:03:10 2014 A> New Revision: 270516 A> URL: http://svnweb.freebsd.org/changeset/base/270516 A> A> Log: A> i915 driver - enable opregion handle; program CADL. A> A> add opregion handling for drm2 - which exposes some ACPI video configuration A> pieces that some Lenovo laptop models use to flesh out which video device A> to speak to. This enables the brightness control in ACPI to work these models. A> A> The CADL bits are also important - it's used to figure out which ACPI A> events to hook the brightness buttons into. It doesn't yet seem to work A> for me, but it does for the OP. A> A> Tested: A> A> * Lenovo X230 (mine) A> * OP: ASUS UX51VZ Works on Lenovo X1 Carbon! Thanks a lot, Adrian and Henry!!! -- Totus tuus, Glebius. From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 08:13:32 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 9D1AF5A9; Tue, 26 Aug 2014 08:13:32 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 86A5337AA; Tue, 26 Aug 2014 08:13:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7Q8DWbC043871; Tue, 26 Aug 2014 08:13:32 GMT (envelope-from se@FreeBSD.org) Received: (from se@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7Q8DUhM043859; Tue, 26 Aug 2014 08:13:30 GMT (envelope-from se@FreeBSD.org) Message-Id: <201408260813.s7Q8DUhM043859@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: se set sender to se@FreeBSD.org using -f From: Stefan Esser Date: Tue, 26 Aug 2014 08:13:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270647 - in head: etc/defaults share/man/man4 share/man/man5 share/man/man7 share/man/man8 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 08:13:32 -0000 Author: se Date: Tue Aug 26 08:13:30 2014 New Revision: 270647 URL: http://svnweb.freebsd.org/changeset/base/270647 Log: Add references to vt(4) and the configuration files in /usr7share/vt where appropriate (i.e. where syscons was already mentioned and vt supports the feature). Comments in defaults/rc.conf are updated to match the contents of the modified man-page rc.conf(5). Reviewed by: pluknet, emaste MFC after: 3 days Modified: head/etc/defaults/rc.conf head/share/man/man4/atkbd.4 head/share/man/man4/kbdmux.4 head/share/man/man4/splash.4 head/share/man/man4/ukbd.4 head/share/man/man4/vkbd.4 head/share/man/man4/vt.4 head/share/man/man5/rc.conf.5 head/share/man/man7/hier.7 head/share/man/man8/nanobsd.8 Modified: head/etc/defaults/rc.conf ============================================================================== --- head/etc/defaults/rc.conf Tue Aug 26 06:31:52 2014 (r270646) +++ head/etc/defaults/rc.conf Tue Aug 26 08:13:30 2014 (r270647) @@ -516,15 +516,15 @@ ip6addrctl_policy="AUTO" # A pre-defined ############################################################## keyboard="" # keyboard device to use (default /dev/kbd0). -keymap="NO" # keymap in /usr/share/syscons/keymaps/* (or NO). +keymap="NO" # keymap in /usr/share/{syscons,vt}/keymaps/* (or NO). keyrate="NO" # keyboard rate to: slow, normal, fast (or NO). keybell="NO" # See kbdcontrol(1) for options. Use "off" to disable. keychange="NO" # function keys default values (or NO). cursor="NO" # cursor type {normal|blink|destructive} (or NO). scrnmap="NO" # screen map in /usr/share/syscons/scrnmaps/* (or NO). -font8x16="NO" # font 8x16 from /usr/share/syscons/fonts/* (or NO). -font8x14="NO" # font 8x14 from /usr/share/syscons/fonts/* (or NO). -font8x8="NO" # font 8x8 from /usr/share/syscons/fonts/* (or NO). +font8x16="NO" # font 8x16 from /usr/share/{syscons,vt}/fonts/* (or NO). +font8x14="NO" # font 8x14 from /usr/share/{syscons,vt}/fonts/* (or NO). +font8x8="NO" # font 8x8 from /usr/share/{syscons,vt}/fonts/* (or NO). blanktime="300" # blank time (in seconds) or "NO" to turn it off. saver="NO" # screen saver: Uses /boot/kernel/${saver}_saver.ko moused_nondefault_enable="YES" # Treat non-default mice as enabled unless Modified: head/share/man/man4/atkbd.4 ============================================================================== --- head/share/man/man4/atkbd.4 Tue Aug 26 06:31:52 2014 (r270646) +++ head/share/man/man4/atkbd.4 Tue Aug 26 08:13:30 2014 (r270647) @@ -51,7 +51,9 @@ driver, provides access to the AT 84 key which is connected to the AT keyboard controller. .Pp This driver is required for the console driver -.Xr syscons 4 . +.Xr syscons 4 +or +.Xr vt 4 . .Pp There can be only one .Nm @@ -211,6 +213,7 @@ In both cases, you also need to have fol .Xr atkbdc 4 , .Xr psm 4 , .Xr syscons 4 , +.Xr vt 4 , .Xr kbdmap 5 , .Xr loader 8 .Sh HISTORY Modified: head/share/man/man4/kbdmux.4 ============================================================================== --- head/share/man/man4/kbdmux.4 Tue Aug 26 06:31:52 2014 (r270646) +++ head/share/man/man4/kbdmux.4 Tue Aug 26 08:13:30 2014 (r270647) @@ -34,7 +34,8 @@ utility. .Xr kbdcontrol 1 , .Xr atkbd 4 , .Xr syscons 4 , -.Xr ukbd 4 +.Xr ukbd 4 , +.Xr vt 4 .Sh HISTORY The .Nm Modified: head/share/man/man4/splash.4 ============================================================================== --- head/share/man/man4/splash.4 Tue Aug 26 06:31:52 2014 (r270646) +++ head/share/man/man4/splash.4 Tue Aug 26 08:13:30 2014 (r270647) @@ -245,6 +245,7 @@ bitmap_name="/boot/splash.bin" .Xr vidcontrol 1 , .Xr syscons 4 , .Xr vga 4 , +.Xr vt 4 , .Xr loader.conf 5 , .Xr rc.conf 5 , .Xr kldload 8 , @@ -285,6 +286,8 @@ code. .Sh CAVEATS Both the splash screen and the screen saver work with .Xr syscons 4 + or +.Xr vt 4 only. .Sh BUGS If you load a screen saver while another screen saver has already Modified: head/share/man/man4/ukbd.4 ============================================================================== --- head/share/man/man4/ukbd.4 Tue Aug 26 06:31:52 2014 (r270646) +++ head/share/man/man4/ukbd.4 Tue Aug 26 08:13:30 2014 (r270647) @@ -127,7 +127,9 @@ Make the keyboards available through a c The above lines will put the French ISO keymap in the ukbd driver. You can specify any keymap in .Pa /usr/share/syscons/keymaps -with this option. +or +.Pa /usr/share/vt/keymaps +(depending on the console driver being used) with this option. .Pp .D1 Cd "options KBD_DISABLE_KEYMAP_LOADING" .Pp @@ -151,6 +153,7 @@ driver to the kernel. .Xr syscons 4 , .Xr uhci 4 , .Xr usb 4 , +.Xr vt 4 , .Xr config 8 .Sh AUTHORS .An -nosplit Modified: head/share/man/man4/vkbd.4 ============================================================================== --- head/share/man/man4/vkbd.4 Tue Aug 26 06:31:52 2014 (r270646) +++ head/share/man/man4/vkbd.4 Tue Aug 26 08:13:30 2014 (r270647) @@ -129,7 +129,8 @@ All queued scan codes are thrown away. .Xr kbdcontrol 1 , .Xr atkbdc 4 , .Xr psm 4 , -.Xr syscons 4 +.Xr syscons 4 , +.Xr vt 4 .Sh HISTORY The .Nm Modified: head/share/man/man4/vt.4 ============================================================================== --- head/share/man/man4/vt.4 Tue Aug 26 06:31:52 2014 (r270646) +++ head/share/man/man4/vt.4 Tue Aug 26 08:13:30 2014 (r270647) @@ -211,13 +211,17 @@ Power down. Default is 15, all enabled. .El .Sh FILES -.Bl -tag -width /usr/share/syscons/keymaps/* -compact +.Bl -tag -width /usr/share/vt/keymaps/* -compact .It Pa /dev/console .It Pa /dev/consolectl .It Pa /dev/ttyv* virtual terminals .It Pa /etc/ttys terminal initialization information +.It Pa /usr/share/vt/fonts/*.fnt +console fonts +.It Pa /usr/share/vt/keymaps/*.kbd +keyboard layouts .El .Sh EXAMPLES This example changes the default color of normal text to green on a @@ -243,7 +247,6 @@ on a black background, or black on a bri .Xr splash 4 , .Xr syscons 4 , .Xr ukbd 4 , -.Xr vga 4 , .Xr kbdmap 5 , .Xr rc.conf 5 , .Xr ttys 5 , Modified: head/share/man/man5/rc.conf.5 ============================================================================== --- head/share/man/man5/rc.conf.5 Tue Aug 26 06:31:52 2014 (r270646) +++ head/share/man/man5/rc.conf.5 Tue Aug 26 08:13:30 2014 (r270647) @@ -3111,8 +3111,13 @@ set to this device. If set to .Dq Li NO , no keymap is installed, otherwise the value is used to install -the keymap file in -.Pa /usr/share/syscons/keymaps/ Ns Ao Ar value Ac Ns Pa .kbd . +the keymap file found in +.Pa /usr/share/syscons/keymaps/ Ns Ao Ar value Ac Ns Pa .kbd +(if using +.Xr syscons 4 ) or +.Pa /usr/share/vt/keymaps/ Ns Ao Ar value Ac Ns Pa .kbd +(if using +.Xr vt 4 ) . .It Va keyrate .Pq Vt str The keyboard repeat speed. @@ -3147,6 +3152,9 @@ If set to no screen map is installed, otherwise the value is used to install the screen map file in .Pa /usr/share/syscons/scrnmaps/ Ns Aq Ar value . +This parameter is ignored when using +.Xr vt 4 +as the console driver. .It Va font8x16 .Pq Vt str If set to @@ -3154,7 +3162,9 @@ If set to the default 8x16 font value is used for screen size requests, otherwise the value in .Pa /usr/share/syscons/fonts/ Ns Aq Ar value -is used. +or +.Pa /usr/share/vt/fonts/ Ns Aq Ar value +is used (depending on the console driver being used). .It Va font8x14 .Pq Vt str If set to @@ -3162,7 +3172,9 @@ If set to the default 8x14 font value is used for screen size requests, otherwise the value in .Pa /usr/share/syscons/fonts/ Ns Aq Ar value -is used. +or +.Pa /usr/share/vt/fonts/ Ns Aq Ar value +is used (depending on the console driver being used). .It Va font8x8 .Pq Vt str If set to @@ -3170,7 +3182,9 @@ If set to the default 8x8 font value is used for screen size requests, otherwise the value in .Pa /usr/share/syscons/fonts/ Ns Aq Ar value -is used. +or +.Pa /usr/share/vt/fonts/ Ns Aq Ar value +is used (depending on the console driver being used). .It Va blanktime .Pq Vt int If set to @@ -3377,6 +3391,8 @@ For example, .Dq Fl h Li 200 will set the .Xr syscons 4 +or +.Xr vt 4 scrollback (history) buffer to 200 lines. .It Va cron_enable .Pq Vt bool Modified: head/share/man/man7/hier.7 ============================================================================== --- head/share/man/man7/hier.7 Tue Aug 26 06:31:52 2014 (r270646) +++ head/share/man/man7/hier.7 Tue Aug 26 08:13:30 2014 (r270647) @@ -633,6 +633,26 @@ timezone configuration information; see .Xr tzfile 5 .El +.It Pa vt/ +files used by vt; +see +.Xr vt 4 +.Bl -tag -width ".Pa scrnmaps/" -compact +.It Pa fonts/ +console fonts; +see +.Xr vidcontrol 1 +and +.Xr vidfont 1 +.It Pa keymaps/ +console keyboard maps; +see +.Xr kbdcontrol 1 +and +.Xr kbdmap 1 +.\" .It Pa scrnmaps/ +.\" console screen maps +.El .It Pa src/ .Bx , third-party, and/or local source files Modified: head/share/man/man8/nanobsd.8 ============================================================================== --- head/share/man/man8/nanobsd.8 Tue Aug 26 06:31:52 2014 (r270646) +++ head/share/man/man8/nanobsd.8 Tue Aug 26 08:13:30 2014 (r270647) @@ -277,6 +277,8 @@ Disables .Xr getty 8 on the virtual .Xr syscons 4 +or +.Xr vt 4 terminals .Pq Pa /dev/ttyv* and enables the use of the first serial port as the system From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 08:17:23 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 7A4E1739; Tue, 26 Aug 2014 08:17:23 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5A17E37D2; Tue, 26 Aug 2014 08:17:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7Q8HNAV044458; Tue, 26 Aug 2014 08:17:23 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7Q8HMMT044455; Tue, 26 Aug 2014 08:17:22 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201408260817.s7Q8HMMT044455@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 26 Aug 2014 08:17:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270648 - in head/sys: kern sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 08:17:23 -0000 Author: mjg Date: Tue Aug 26 08:17:22 2014 New Revision: 270648 URL: http://svnweb.freebsd.org/changeset/base/270648 Log: Fix up races with f_seqcount handling. It was possible that the kernel would overwrite user-supplied hint. Abuse vnode lock for this purpose. In collaboration with: kib MFC after: 1 week Modified: head/sys/kern/kern_descrip.c head/sys/kern/vfs_vnops.c head/sys/sys/file.h Modified: head/sys/kern/kern_descrip.c ============================================================================== --- head/sys/kern/kern_descrip.c Tue Aug 26 08:13:30 2014 (r270647) +++ head/sys/kern/kern_descrip.c Tue Aug 26 08:17:22 2014 (r270648) @@ -476,7 +476,6 @@ kern_fcntl(struct thread *td, int fd, in struct vnode *vp; cap_rights_t rights; int error, flg, tmp; - u_int old, new; uint64_t bsize; off_t foffset; @@ -760,26 +759,24 @@ kern_fcntl(struct thread *td, int fd, in error = EBADF; break; } + vp = fp->f_vnode; + /* + * Exclusive lock synchronizes against f_seqcount reads and + * writes in sequential_heuristic(). + */ + error = vn_lock(vp, LK_EXCLUSIVE); + if (error != 0) { + fdrop(fp, td); + break; + } if (arg >= 0) { - vp = fp->f_vnode; - error = vn_lock(vp, LK_SHARED); - if (error != 0) { - fdrop(fp, td); - break; - } bsize = fp->f_vnode->v_mount->mnt_stat.f_iosize; - VOP_UNLOCK(vp, 0); fp->f_seqcount = (arg + bsize - 1) / bsize; - do { - new = old = fp->f_flag; - new |= FRDAHEAD; - } while (!atomic_cmpset_rel_int(&fp->f_flag, old, new)); + atomic_set_int(&fp->f_flag, FRDAHEAD); } else { - do { - new = old = fp->f_flag; - new &= ~FRDAHEAD; - } while (!atomic_cmpset_rel_int(&fp->f_flag, old, new)); + atomic_clear_int(&fp->f_flag, FRDAHEAD); } + VOP_UNLOCK(vp, 0); fdrop(fp, td); break; Modified: head/sys/kern/vfs_vnops.c ============================================================================== --- head/sys/kern/vfs_vnops.c Tue Aug 26 08:13:30 2014 (r270647) +++ head/sys/kern/vfs_vnops.c Tue Aug 26 08:17:22 2014 (r270648) @@ -438,7 +438,8 @@ static int sequential_heuristic(struct uio *uio, struct file *fp) { - if (atomic_load_acq_int(&(fp->f_flag)) & FRDAHEAD) + ASSERT_VOP_LOCKED(fp->f_vnode, __func__); + if (fp->f_flag & FRDAHEAD) return (fp->f_seqcount << IO_SEQSHIFT); /* Modified: head/sys/sys/file.h ============================================================================== --- head/sys/sys/file.h Tue Aug 26 08:13:30 2014 (r270647) +++ head/sys/sys/file.h Tue Aug 26 08:17:22 2014 (r270648) @@ -143,6 +143,7 @@ struct fileops { * * Below is the list of locks that protects members in struct file. * + * (a) f_vnode lock required (shared allows both reads and writes) * (f) protected with mtx_lock(mtx_pool_find(fp)) * (d) cdevpriv_mtx * none not locked @@ -168,7 +169,7 @@ struct file { /* * DTYPE_VNODE specific fields. */ - int f_seqcount; /* Count of sequential accesses. */ + int f_seqcount; /* (a) Count of sequential accesses. */ off_t f_nextoff; /* next expected read/write offset. */ union { struct cdev_privdata *fvn_cdevpriv; From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 08:59:54 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 6FE9C2AF; Tue, 26 Aug 2014 08:59:54 +0000 (UTC) Received: from alchemy.franken.de (alchemy.franken.de [194.94.249.214]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "alchemy.franken.de", Issuer "alchemy.franken.de" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id C65793B9F; Tue, 26 Aug 2014 08:59:53 +0000 (UTC) Received: from alchemy.franken.de (localhost [127.0.0.1]) by alchemy.franken.de (8.14.9/8.14.9/ALCHEMY.FRANKEN.DE) with ESMTP id s7Q8rDSP036529 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 26 Aug 2014 10:53:14 +0200 (CEST) (envelope-from marius@alchemy.franken.de) Received: (from marius@localhost) by alchemy.franken.de (8.14.9/8.14.9/Submit) id s7Q8rDve036528; Tue, 26 Aug 2014 10:53:13 +0200 (CEST) (envelope-from marius) Date: Tue, 26 Aug 2014 10:53:13 +0200 From: Marius Strobl To: Stefan Esser Subject: Re: svn commit: r270647 - in head: etc/defaults share/man/man4 share/man/man5 share/man/man7 share/man/man8 Message-ID: <20140826085313.GC722@alchemy.franken.de> References: <201408260813.s7Q8DUhM043859@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201408260813.s7Q8DUhM043859@svn.freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (alchemy.franken.de [0.0.0.0]); Tue, 26 Aug 2014 10:53:14 +0200 (CEST) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 08:59:54 -0000 On Tue, Aug 26, 2014 at 08:13:30AM +0000, Stefan Esser wrote: > Author: se > Date: Tue Aug 26 08:13:30 2014 > New Revision: 270647 > URL: http://svnweb.freebsd.org/changeset/base/270647 > > Log: > Add references to vt(4) and the configuration files in /usr7share/vt where > appropriate (i.e. where syscons was already mentioned and vt supports the > feature). Comments in defaults/rc.conf are updated to match the contents > of the modified man-page rc.conf(5). > > Reviewed by: pluknet, emaste > MFC after: 3 days > <...> > Modified: head/share/man/man4/splash.4 > ============================================================================== > --- head/share/man/man4/splash.4 Tue Aug 26 06:31:52 2014 (r270646) > +++ head/share/man/man4/splash.4 Tue Aug 26 08:13:30 2014 (r270647) > @@ -245,6 +245,7 @@ bitmap_name="/boot/splash.bin" > .Xr vidcontrol 1 , > .Xr syscons 4 , > .Xr vga 4 , > +.Xr vt 4 , > .Xr loader.conf 5 , > .Xr rc.conf 5 , > .Xr kldload 8 , > @@ -285,6 +286,8 @@ code. > .Sh CAVEATS > Both the splash screen and the screen saver work with > .Xr syscons 4 > + or > +.Xr vt 4 > only. > .Sh BUGS > If you load a screen saver while another screen saver has already > That information is incorrect; vt(4) has only very limited splash screen support and doesn't interface with splash(4) for that. Screen saver support even is entirely nonexistent with vt(4) to date. Marius From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 09:01:11 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id E865D4F9; Tue, 26 Aug 2014 09:01:11 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D45553BB8; Tue, 26 Aug 2014 09:01:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7Q91Bep065639; Tue, 26 Aug 2014 09:01:11 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7Q91B0R065638; Tue, 26 Aug 2014 09:01:11 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201408260901.s7Q91B0R065638@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 26 Aug 2014 09:01:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270649 - head/libexec/rtld-elf/tests/target X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 09:01:12 -0000 Author: ngie Date: Tue Aug 26 09:01:11 2014 New Revision: 270649 URL: http://svnweb.freebsd.org/changeset/base/270649 Log: Fix "make checkdpadd" by "spoofing" DPADD Approved by: jmmv (mentor) Phabric: D631 PR: 192769 Modified: head/libexec/rtld-elf/tests/target/Makefile Modified: head/libexec/rtld-elf/tests/target/Makefile ============================================================================== --- head/libexec/rtld-elf/tests/target/Makefile Tue Aug 26 08:17:22 2014 (r270648) +++ head/libexec/rtld-elf/tests/target/Makefile Tue Aug 26 09:01:11 2014 (r270649) @@ -8,6 +8,7 @@ BINDIR= ${TESTSBASE}/libexec/rtld-elf CFLAGS+= -I${.CURDIR}/../libpythagoras LDFLAGS+= -L${.OBJDIR}/../libpythagoras +DPADD+= ${.OBJDIR}/../libpythagoras/libpythagoras.a LDADD= -lpythagoras MAN= From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 09:10:29 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 9D3D38A1; Tue, 26 Aug 2014 09:10:29 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6E4BA3CB7; Tue, 26 Aug 2014 09:10:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7Q9ATim069436; Tue, 26 Aug 2014 09:10:29 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7Q9ASLA069431; Tue, 26 Aug 2014 09:10:28 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201408260910.s7Q9ASLA069431@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 26 Aug 2014 09:10:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270650 - in head: usr.bin/bc usr.bin/clang/lldb usr.bin/talk usr.sbin/gstat X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 09:10:29 -0000 Author: ngie Date: Tue Aug 26 09:10:28 2014 New Revision: 270650 URL: http://svnweb.freebsd.org/changeset/base/270650 Log: Convert LIBCURSES to LIBNCURSES to fix "make checkdpadd" Also, add a missing LIBPANEL dependency for lldb Approved by: rpaulo (mentor) Suggested by: brooks MFC after: 5 days Phabric: D675 (as part of a larger diff) PR: 192762 Modified: head/usr.bin/bc/Makefile head/usr.bin/clang/lldb/Makefile head/usr.bin/talk/Makefile head/usr.sbin/gstat/Makefile Modified: head/usr.bin/bc/Makefile ============================================================================== --- head/usr.bin/bc/Makefile Tue Aug 26 09:01:11 2014 (r270649) +++ head/usr.bin/bc/Makefile Tue Aug 26 09:10:28 2014 (r270650) @@ -5,8 +5,8 @@ PROG= bc SRCS= bc.y scan.l tty.c CFLAGS+= -I. -I${.CURDIR} -LDADD+= -ledit -lcurses -DPADD+= ${LIBEDIT} ${LIBCURSES} +DPADD+= ${LIBEDIT} ${LIBNCURSESW} +LDADD+= -ledit -lncursesw NO_WMISSING_VARIABLE_DECLARATIONS= Modified: head/usr.bin/clang/lldb/Makefile ============================================================================== --- head/usr.bin/clang/lldb/Makefile Tue Aug 26 09:01:11 2014 (r270649) +++ head/usr.bin/clang/lldb/Makefile Tue Aug 26 09:10:28 2014 (r270650) @@ -16,8 +16,8 @@ SRCS= Driver.cpp \ lldb.1: ln -fs ${LLDB_SRCS}/docs/lldb.1 ${.TARGET} -DPADD= ${LIBEDIT} ${LIBCURSES} ${LIBEXECINFO} -LDADD= -lcurses -ledit -lexecinfo -lpanel +DPADD= ${LIBEDIT} ${LIBNCURSESW} ${LIBEXECINFO} ${LIBPANEL} +LDADD= -ledit -lncursesw -lexecinfo -lpanel LLDB_LIBS=\ lldb \ Modified: head/usr.bin/talk/Makefile ============================================================================== --- head/usr.bin/talk/Makefile Tue Aug 26 09:01:11 2014 (r270649) +++ head/usr.bin/talk/Makefile Tue Aug 26 09:10:28 2014 (r270650) @@ -4,7 +4,7 @@ PROG= talk SRCS= ctl.c ctl_transact.c display.c get_addrs.c get_iface.c get_names.c \ init_disp.c invite.c io.c look_up.c msgs.c talk.c -DPADD= ${LIBCURSESW} -LDADD= -lcursesw +DPADD= ${LIBNCURSESW} +LDADD= -lncursesw .include Modified: head/usr.sbin/gstat/Makefile ============================================================================== --- head/usr.sbin/gstat/Makefile Tue Aug 26 09:01:11 2014 (r270649) +++ head/usr.sbin/gstat/Makefile Tue Aug 26 09:10:28 2014 (r270650) @@ -2,7 +2,7 @@ PROG= gstat MAN= gstat.8 -DPADD= ${LIBDEVSTAT} ${LIBKVM} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} ${LIBEDIT} ${LIBCURSES} -LDADD= -ldevstat -lkvm -lgeom -lbsdxml -lsbuf -ledit -lcurses +DPADD= ${LIBDEVSTAT} ${LIBKVM} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} ${LIBEDIT} ${LIBNCURSESW} +LDADD= -ldevstat -lkvm -lgeom -lbsdxml -lsbuf -ledit -lncursesw .include From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 09:12:42 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 04E81A8A; Tue, 26 Aug 2014 09:12:42 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E4DD83D96; Tue, 26 Aug 2014 09:12:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7Q9CfY5070755; Tue, 26 Aug 2014 09:12:41 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7Q9CfWQ070754; Tue, 26 Aug 2014 09:12:41 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201408260912.s7Q9CfWQ070754@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 26 Aug 2014 09:12:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270651 - head/share/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 09:12:42 -0000 Author: ngie Date: Tue Aug 26 09:12:41 2014 New Revision: 270651 URL: http://svnweb.freebsd.org/changeset/base/270651 Log: Introduce missing definition for LIBTERMCAPW Some Makefiles expect this value to exist Approved by: rpaulo (mentor) MFC after: 5 days Phabric: D675 (as part of a larger diff) PR: 192762 Modified: head/share/mk/bsd.libnames.mk Modified: head/share/mk/bsd.libnames.mk ============================================================================== --- head/share/mk/bsd.libnames.mk Tue Aug 26 09:10:28 2014 (r270650) +++ head/share/mk/bsd.libnames.mk Tue Aug 26 09:12:41 2014 (r270651) @@ -137,6 +137,7 @@ LIBSTAND?= ${DESTDIR}${LIBDIR}/libstand. LIBSTDCPLUSPLUS?= ${DESTDIR}${LIBDIR}/libstdc++.a LIBTACPLUS?= ${DESTDIR}${LIBDIR}/libtacplus.a LIBTERMCAP?= ${DESTDIR}${LIBDIR}/libtermcap.a +LIBTERMCAPW?= ${DESTDIR}${LIBDIR}/libtermcapw.a LIBTERMLIB?= "don't use LIBTERMLIB, use LIBTERMCAP" LIBTINFO?= "don't use LIBTINFO, use LIBNCURSES" LIBUFS?= ${DESTDIR}${LIBDIR}/libufs.a From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 09:37:44 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 027394CE; Tue, 26 Aug 2014 09:37:44 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E22E1300D; Tue, 26 Aug 2014 09:37:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7Q9bhFJ080474; Tue, 26 Aug 2014 09:37:43 GMT (envelope-from se@FreeBSD.org) Received: (from se@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7Q9bhme080473; Tue, 26 Aug 2014 09:37:43 GMT (envelope-from se@FreeBSD.org) Message-Id: <201408260937.s7Q9bhme080473@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: se set sender to se@FreeBSD.org using -f From: Stefan Esser Date: Tue, 26 Aug 2014 09:37:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270652 - head/usr.sbin/kbdcontrol X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 09:37:44 -0000 Author: se Date: Tue Aug 26 09:37:43 2014 New Revision: 270652 URL: http://svnweb.freebsd.org/changeset/base/270652 Log: Remove band.aid that made kbdcontrol lookup keymap files in the syscons path even under vt, which is no longer useful, since the syscons keymap files have been converted and committed for use by vt. Modified: head/usr.sbin/kbdcontrol/kbdcontrol.c Modified: head/usr.sbin/kbdcontrol/kbdcontrol.c ============================================================================== --- head/usr.sbin/kbdcontrol/kbdcontrol.c Tue Aug 26 09:12:41 2014 (r270651) +++ head/usr.sbin/kbdcontrol/kbdcontrol.c Tue Aug 26 09:37:43 2014 (r270652) @@ -800,7 +800,7 @@ load_keymap(char *opt, int dumponly) char *name, *cp; char blank[] = "", keymap_path[] = KEYMAP_PATH; char vt_keymap_path[] = VT_KEYMAP_PATH, dotkbd[] = ".kbd"; - char *prefix[] = {blank, blank, blank, keymap_path, NULL}; + char *prefix[] = {blank, blank, keymap_path, NULL}; char *postfix[] = {blank, dotkbd, NULL}; if (is_vt4()) From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 09:40:15 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id E6028639; Tue, 26 Aug 2014 09:40:14 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C5E8C302B; Tue, 26 Aug 2014 09:40:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7Q9eE4B080888; Tue, 26 Aug 2014 09:40:14 GMT (envelope-from se@FreeBSD.org) Received: (from se@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7Q9eE9r080885; Tue, 26 Aug 2014 09:40:14 GMT (envelope-from se@FreeBSD.org) Message-Id: <201408260940.s7Q9eE9r080885@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: se set sender to se@FreeBSD.org using -f From: Stefan Esser Date: Tue, 26 Aug 2014 09:40:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270653 - head/usr.sbin/kbdcontrol X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 09:40:15 -0000 Author: se Date: Tue Aug 26 09:40:14 2014 New Revision: 270653 URL: http://svnweb.freebsd.org/changeset/base/270653 Log: Update man-pages to correctly refer to changed pathes and naming conventions for systems with vt(4) consoles. MFC after: 3 days Modified: head/usr.sbin/kbdcontrol/kbdcontrol.1 head/usr.sbin/kbdcontrol/kbdmap.5 Modified: head/usr.sbin/kbdcontrol/kbdcontrol.1 ============================================================================== --- head/usr.sbin/kbdcontrol/kbdcontrol.1 Tue Aug 26 09:37:43 2014 (r270652) +++ head/usr.sbin/kbdcontrol/kbdcontrol.1 Tue Aug 26 09:40:14 2014 (r270653) @@ -1,5 +1,5 @@ .\" -.\" kbdcontrol - a utility for manipulating the syscons keyboard driver section +.\" kbdcontrol - a utility for manipulating the syscons or vt keyboard driver section .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -41,6 +41,8 @@ The .Nm command is used to set various keyboard related options for the .Xr syscons 4 +or +.Xr vt 4 console driver and the keyboard drivers, such as key map, keyboard repeat and delay rates, bell characteristics etc. @@ -213,7 +215,9 @@ for details. .Sh FILES .Bl -tag -width /usr/share/syscons/keymaps/foo_bar -compact .It Pa /usr/share/syscons/keymaps/* -keyboard map files +keyboard map files for syscons +.It Pa /usr/share/vt/keymaps/* +keyboard map files for vt .El .Sh EXAMPLES The following command will load the keyboard map file @@ -222,9 +226,19 @@ The following command will load the keyb .Dl kbdcontrol -l /usr/share/syscons/keymaps/ru.koi8-r.kbd .Pp So long as the keyboard map file resides in -.Pa /usr/share/syscons/keymaps , +.Pa /usr/share/syscons/keymaps +(if using +.Xr syscons 4 ) or +.Pa /usr/share/vt/keymaps +(if using +.Xr vt 4 ) , you may abbreviate the file name as .Pa ru.koi8-r . +Since +.Xr vt 4 +uses Unicode, the corresponding keyboard file names omit the encoding +and typically are just a country code, e.g.\& +.Pa ru . .Pp .Dl kbdcontrol -l ru.koi8-r .Pp @@ -268,6 +282,7 @@ kbdcontrol -k /dev/kbdmux0 < /dev/consol .Xr screen 4 , .Xr syscons 4 , .Xr ukbd 4 , +.Xr vt 4 , .Xr kbdmap 5 , .Xr rc.conf 5 .Sh AUTHORS Modified: head/usr.sbin/kbdcontrol/kbdmap.5 ============================================================================== --- head/usr.sbin/kbdcontrol/kbdmap.5 Tue Aug 26 09:37:43 2014 (r270652) +++ head/usr.sbin/kbdcontrol/kbdmap.5 Tue Aug 26 09:40:14 2014 (r270653) @@ -313,13 +313,16 @@ for that vowel with a grave accent. .Sh FILES .Bl -tag -width /usr/share/syscons/keymaps/* -compact .It Pa /usr/share/syscons/keymaps/* -standard keyboard map files +standard keyboard map files for syscons +.It Pa /usr/share/vt/keymaps/* +standard keyboard map files for vt .El .Sh SEE ALSO .Xr kbdcontrol 1 , .Xr kbdmap 1 , .Xr keyboard 4 , .Xr syscons 4 , +.Xr vt 4 , .Xr ascii 7 .Sh HISTORY This manual page first appeared in From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 10:32:09 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 1AB6766C; Tue, 26 Aug 2014 10:32:09 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 062AB35F5; Tue, 26 Aug 2014 10:32:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7QAW89a007322; Tue, 26 Aug 2014 10:32:08 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7QAW87A007320; Tue, 26 Aug 2014 10:32:08 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201408261032.s7QAW87A007320@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Tue, 26 Aug 2014 10:32:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270655 - stable/10/usr.sbin/ndp X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 10:32:09 -0000 Author: ae Date: Tue Aug 26 10:32:08 2014 New Revision: 270655 URL: http://svnweb.freebsd.org/changeset/base/270655 Log: MFC r265778 (by melifaro): Fix ndp(8) -f flag parsing PR: bin/136661 MFC r268827 (by peter): Fix "ndp -d hostname". Modified: stable/10/usr.sbin/ndp/ndp.8 stable/10/usr.sbin/ndp/ndp.c Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/ndp/ndp.8 ============================================================================== --- stable/10/usr.sbin/ndp/ndp.8 Tue Aug 26 10:22:59 2014 (r270654) +++ stable/10/usr.sbin/ndp/ndp.8 Tue Aug 26 10:32:08 2014 (r270655) @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd Jan 10, 2013 +.Dd May 9, 2014 .Dt NDP 8 .Os .\" @@ -136,9 +136,26 @@ seconds. Erase all the NDP entries. .It Fl d Delete specified NDP entry. -.It Fl f -Parse the file specified by -.Ar filename . +.It Fl f Ar filename +Cause the file +.Ar filename +to be read and multiple entries to be set in the +.Tn NDP +table. +Entries +in the file should be of the form +.Pp +.Bd -ragged -offset indent -compact +.Ar hostname ether_addr +.Op Cm temp +.Op Cm proxy +.Ed +.Pp +with argument meanings as given above. +Leading whitespace and empty lines are ignored. +A +.Ql # +character will mark the rest of the line as a comment. .It Fl H Harmonize consistency between the routing table and the default router list; install the top entry of the list into the kernel routing table. Modified: stable/10/usr.sbin/ndp/ndp.c ============================================================================== --- stable/10/usr.sbin/ndp/ndp.c Tue Aug 26 10:22:59 2014 (r270654) +++ stable/10/usr.sbin/ndp/ndp.c Tue Aug 26 10:32:08 2014 (r270655) @@ -97,6 +97,7 @@ #include +#include #include #include #include @@ -131,7 +132,7 @@ char host_buf[NI_MAXHOST]; /* getnamein char ifix_buf[IFNAMSIZ]; /* if_indextoname() */ int main(int, char **); -int file(char *); +static int file(char *); void getsocket(void); int set(int, char **); void get(char *); @@ -194,9 +195,10 @@ main(argc, argv) mode = ch; arg = NULL; break; - case 'd': case 'f': - case 'i' : + exit(file(optarg) ? 1 : 0); + case 'd': + case 'i': if (mode) { usage(); /*NOTREACHED*/ @@ -319,18 +321,16 @@ main(argc, argv) /* * Process a file to set standard ndp entries */ -int +static int file(name) char *name; { FILE *fp; int i, retval; - char line[100], arg[5][50], *args[5]; + char line[100], arg[5][50], *args[5], *p; - if ((fp = fopen(name, "r")) == NULL) { - fprintf(stderr, "ndp: cannot open %s\n", name); - exit(1); - } + if ((fp = fopen(name, "r")) == NULL) + err(1, "cannot open %s", name); args[0] = &arg[0][0]; args[1] = &arg[1][0]; args[2] = &arg[2][0]; @@ -338,10 +338,15 @@ file(name) args[4] = &arg[4][0]; retval = 0; while (fgets(line, sizeof(line), fp) != NULL) { + if ((p = strchr(line, '#')) != NULL) + *p = '\0'; + for (p = line; isblank(*p); p++); + if (*p == '\n' || *p == '\0') + continue; i = sscanf(line, "%49s %49s %49s %49s %49s", arg[0], arg[1], arg[2], arg[3], arg[4]); if (i < 2) { - fprintf(stderr, "ndp: bad line: %s\n", line); + warnx("bad line: %s", line); retval = 1; continue; } From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 10:35:33 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 4D80E971; Tue, 26 Aug 2014 10:35:33 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 38BF43637; Tue, 26 Aug 2014 10:35:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7QAZXk2008043; Tue, 26 Aug 2014 10:35:33 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7QAZWU0008040; Tue, 26 Aug 2014 10:35:32 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201408261035.s7QAZWU0008040@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Tue, 26 Aug 2014 10:35:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r270656 - stable/9/usr.sbin/ndp X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 10:35:33 -0000 Author: ae Date: Tue Aug 26 10:35:32 2014 New Revision: 270656 URL: http://svnweb.freebsd.org/changeset/base/270656 Log: MFC r265778 (by melifaro): Fix ndp(8) -f flag parsing PR: bin/136661 MFC r268827 (by peter): Fix "ndp -d hostname". Modified: stable/9/usr.sbin/ndp/ndp.8 stable/9/usr.sbin/ndp/ndp.c Directory Properties: stable/9/usr.sbin/ndp/ (props changed) Modified: stable/9/usr.sbin/ndp/ndp.8 ============================================================================== --- stable/9/usr.sbin/ndp/ndp.8 Tue Aug 26 10:32:08 2014 (r270655) +++ stable/9/usr.sbin/ndp/ndp.8 Tue Aug 26 10:35:32 2014 (r270656) @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd Jan 10, 2013 +.Dd May 9, 2014 .Dt NDP 8 .Os .\" @@ -136,9 +136,26 @@ seconds. Erase all the NDP entries. .It Fl d Delete specified NDP entry. -.It Fl f -Parse the file specified by -.Ar filename . +.It Fl f Ar filename +Cause the file +.Ar filename +to be read and multiple entries to be set in the +.Tn NDP +table. +Entries +in the file should be of the form +.Pp +.Bd -ragged -offset indent -compact +.Ar hostname ether_addr +.Op Cm temp +.Op Cm proxy +.Ed +.Pp +with argument meanings as given above. +Leading whitespace and empty lines are ignored. +A +.Ql # +character will mark the rest of the line as a comment. .It Fl H Harmonize consistency between the routing table and the default router list; install the top entry of the list into the kernel routing table. Modified: stable/9/usr.sbin/ndp/ndp.c ============================================================================== --- stable/9/usr.sbin/ndp/ndp.c Tue Aug 26 10:32:08 2014 (r270655) +++ stable/9/usr.sbin/ndp/ndp.c Tue Aug 26 10:35:32 2014 (r270656) @@ -97,6 +97,7 @@ #include +#include #include #include #include @@ -131,7 +132,7 @@ char host_buf[NI_MAXHOST]; /* getnamein char ifix_buf[IFNAMSIZ]; /* if_indextoname() */ int main(int, char **); -int file(char *); +static int file(char *); void getsocket(void); int set(int, char **); void get(char *); @@ -194,9 +195,10 @@ main(argc, argv) mode = ch; arg = NULL; break; - case 'd': case 'f': - case 'i' : + exit(file(optarg) ? 1 : 0); + case 'd': + case 'i': if (mode) { usage(); /*NOTREACHED*/ @@ -319,18 +321,16 @@ main(argc, argv) /* * Process a file to set standard ndp entries */ -int +static int file(name) char *name; { FILE *fp; int i, retval; - char line[100], arg[5][50], *args[5]; + char line[100], arg[5][50], *args[5], *p; - if ((fp = fopen(name, "r")) == NULL) { - fprintf(stderr, "ndp: cannot open %s\n", name); - exit(1); - } + if ((fp = fopen(name, "r")) == NULL) + err(1, "cannot open %s", name); args[0] = &arg[0][0]; args[1] = &arg[1][0]; args[2] = &arg[2][0]; @@ -338,10 +338,15 @@ file(name) args[4] = &arg[4][0]; retval = 0; while (fgets(line, sizeof(line), fp) != NULL) { + if ((p = strchr(line, '#')) != NULL) + *p = '\0'; + for (p = line; isblank(*p); p++); + if (*p == '\n' || *p == '\0') + continue; i = sscanf(line, "%49s %49s %49s %49s %49s", arg[0], arg[1], arg[2], arg[3], arg[4]); if (i < 2) { - fprintf(stderr, "ndp: bad line: %s\n", line); + warnx("bad line: %s", line); retval = 1; continue; } From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 10:55:09 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id A9508F1E; Tue, 26 Aug 2014 10:55:09 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9414F37F2; Tue, 26 Aug 2014 10:55:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7QAt920016939; Tue, 26 Aug 2014 10:55:09 GMT (envelope-from se@FreeBSD.org) Received: (from se@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7QAt8Bt016935; Tue, 26 Aug 2014 10:55:08 GMT (envelope-from se@FreeBSD.org) Message-Id: <201408261055.s7QAt8Bt016935@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: se set sender to se@FreeBSD.org using -f From: Stefan Esser Date: Tue, 26 Aug 2014 10:55:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270657 - in head: usr.bin/lock usr.sbin/bsdconfig usr.sbin/bsdinstall usr.sbin/kbdmap X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 10:55:09 -0000 Author: se Date: Tue Aug 26 10:55:08 2014 New Revision: 270657 URL: http://svnweb.freebsd.org/changeset/base/270657 Log: More man pages that need to know about vt in addition to syscons. MFC after: 3 dayS Modified: head/usr.bin/lock/lock.1 head/usr.sbin/bsdconfig/bsdconfig.8 head/usr.sbin/bsdinstall/bsdinstall.8 head/usr.sbin/kbdmap/kbdmap.1 Modified: head/usr.bin/lock/lock.1 ============================================================================== --- head/usr.bin/lock/lock.1 Tue Aug 26 10:35:32 2014 (r270656) +++ head/usr.bin/lock/lock.1 Tue Aug 26 10:55:08 2014 (r270657) @@ -69,11 +69,14 @@ option of and thus has the same restrictions. It is only available if the terminal in question is a .Xr syscons 4 +or +.Xr vt 4 virtual terminal. .El .Sh SEE ALSO .Xr vidcontrol 1 , .Xr syscons 4 +.Xr vt 4 .Sh HISTORY The .Nm Modified: head/usr.sbin/bsdconfig/bsdconfig.8 ============================================================================== --- head/usr.sbin/bsdconfig/bsdconfig.8 Tue Aug 26 10:35:32 2014 (r270656) +++ head/usr.sbin/bsdconfig/bsdconfig.8 Tue Aug 26 10:55:08 2014 (r270657) @@ -172,16 +172,27 @@ Shortcut to the Delete menu under the Vi (startup_rcconf) of startup. .It Cm startup_rcvar Shortcut to the Toggle Startup Services menu under startup. +.\" use neutral name, e.g. console_keymap instead of syscons_keymap? +.\" font (encoding) selection not applicable to vt(4)! .It Cm syscons_font Shortcut to the Font menu under console. +.\" .It Cm console_keymap +.\" Shortcut to the Keymap menu under console. .It Cm syscons_keymap Shortcut to the Keymap menu under console. +.\" .It Cm vt_repeat +.\" Shortcut to the Repeat menu under console. .It Cm syscons_repeat Shortcut to the Repeat menu under console. +.\" .It Cm vt_saver +.\" Shortcut to the Saver menu under console. .It Cm syscons_saver Shortcut to the Saver menu under console. +.\" screenmap (encoding) selection not applicable to vt(4)! .It Cm syscons_screenmap Shortcut to the Screenmap menu under console. +.\" .It Cm vt_syscons_ttys +.\" Shortcut to the Ttys menu under console. .It Cm syscons_ttys Shortcut to the Ttys menu under console. .It Cm timezone Modified: head/usr.sbin/bsdinstall/bsdinstall.8 ============================================================================== --- head/usr.sbin/bsdinstall/bsdinstall.8 Tue Aug 26 10:35:32 2014 (r270656) +++ head/usr.sbin/bsdinstall/bsdinstall.8 Tue Aug 26 10:55:08 2014 (r270657) @@ -95,6 +95,8 @@ for more information on this target. .It Cm keymap If the current controlling TTY is a .Xr syscons 4 +or +.Xr vt 4 console, asks the user to set the current keymap, and saves the result to the new system's .Pa rc.conf . Modified: head/usr.sbin/kbdmap/kbdmap.1 ============================================================================== --- head/usr.sbin/kbdmap/kbdmap.1 Tue Aug 26 10:35:32 2014 (r270656) +++ head/usr.sbin/kbdmap/kbdmap.1 Tue Aug 26 10:55:08 2014 (r270657) @@ -29,7 +29,7 @@ .Sh NAME .Nm kbdmap , .Nm vidfont -.Nd front end for syscons +.Nd front end for syscons and vt .Sh SYNOPSIS .Nm .Op Fl K @@ -106,8 +106,10 @@ preferred language .Sh FILES .Bl -tag -width ".Pa /usr/share/syscons/keymaps/INDEX.keymaps" -compact .It Pa /usr/share/syscons/keymaps/INDEX.keymaps +.It Pa /usr/share/vt/keymaps/INDEX.keymaps database for keymaps .It Pa /usr/share/syscons/fonts/INDEX.fonts +.It Pa /usr/share/vt/fonts/INDEX.fonts database for fonts .It Pa /etc/rc.conf default font @@ -120,6 +122,8 @@ values .Xr dialog 1 , .Xr kbdcontrol 1 , .Xr vidcontrol 1 , +.Xr syscons 4 , +.Xr vt 4 , .Xr kbdmap 5 , .Xr rc.conf 5 .Sh HISTORY From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 11:04:51 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id B26F62D0; Tue, 26 Aug 2014 11:04:51 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9E0AF38E7; Tue, 26 Aug 2014 11:04:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7QB4pFq021495; Tue, 26 Aug 2014 11:04:51 GMT (envelope-from pluknet@FreeBSD.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7QB4pGa021494; Tue, 26 Aug 2014 11:04:51 GMT (envelope-from pluknet@FreeBSD.org) Message-Id: <201408261104.s7QB4pGa021494@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pluknet set sender to pluknet@FreeBSD.org using -f From: Sergey Kandaurov Date: Tue, 26 Aug 2014 11:04:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270659 - head/usr.bin/lock X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 11:04:51 -0000 Author: pluknet Date: Tue Aug 26 11:04:51 2014 New Revision: 270659 URL: http://svnweb.freebsd.org/changeset/base/270659 Log: Missed comma. Modified: head/usr.bin/lock/lock.1 Modified: head/usr.bin/lock/lock.1 ============================================================================== --- head/usr.bin/lock/lock.1 Tue Aug 26 10:56:51 2014 (r270658) +++ head/usr.bin/lock/lock.1 Tue Aug 26 11:04:51 2014 (r270659) @@ -75,7 +75,7 @@ virtual terminal. .El .Sh SEE ALSO .Xr vidcontrol 1 , -.Xr syscons 4 +.Xr syscons 4 , .Xr vt 4 .Sh HISTORY The From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 11:13:08 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 7C241BB3; Tue, 26 Aug 2014 11:13:08 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 67FEB39DB; Tue, 26 Aug 2014 11:13:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7QBD8gK026830; Tue, 26 Aug 2014 11:13:08 GMT (envelope-from se@FreeBSD.org) Received: (from se@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7QBD8sx026829; Tue, 26 Aug 2014 11:13:08 GMT (envelope-from se@FreeBSD.org) Message-Id: <201408261113.s7QBD8sx026829@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: se set sender to se@FreeBSD.org using -f From: Stefan Esser Date: Tue, 26 Aug 2014 11:13:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270660 - head/share/man/man4 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 11:13:08 -0000 Author: se Date: Tue Aug 26 11:13:07 2014 New Revision: 270660 URL: http://svnweb.freebsd.org/changeset/base/270660 Log: Back-out the references to vt(4) from this man-page. It appears that the splash support in vt is implemented within the vt driver and does not depend on splash(4). Submitted by: marius@alchemy.franken.de Modified: head/share/man/man4/splash.4 Modified: head/share/man/man4/splash.4 ============================================================================== --- head/share/man/man4/splash.4 Tue Aug 26 11:04:51 2014 (r270659) +++ head/share/man/man4/splash.4 Tue Aug 26 11:13:07 2014 (r270660) @@ -245,7 +245,6 @@ bitmap_name="/boot/splash.bin" .Xr vidcontrol 1 , .Xr syscons 4 , .Xr vga 4 , -.Xr vt 4 , .Xr loader.conf 5 , .Xr rc.conf 5 , .Xr kldload 8 , @@ -286,8 +285,6 @@ code. .Sh CAVEATS Both the splash screen and the screen saver work with .Xr syscons 4 - or -.Xr vt 4 only. .Sh BUGS If you load a screen saver while another screen saver has already From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 11:13:47 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id B1A85CF5; Tue, 26 Aug 2014 11:13:47 +0000 (UTC) Received: from mailout01.t-online.de (mailout01.t-online.de [194.25.134.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mailout00.t-online.de", Issuer "TeleSec ServerPass DE-1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6B3C539E3; Tue, 26 Aug 2014 11:13:47 +0000 (UTC) Received: from fwd08.aul.t-online.de (fwd08.aul.t-online.de [172.20.26.151]) by mailout01.t-online.de (Postfix) with SMTP id 86E1057F852; Tue, 26 Aug 2014 13:08:36 +0200 (CEST) Received: from [192.168.119.33] (E2tRqGZfohdQUX8McGRTGxA-wEIGduaPuiJlpT1NcYE9y6IVsX3p4gp9H53KFuug8Y@[84.154.101.219]) by fwd08.t-online.de with (TLSv1.2:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1XMEc2-1HNMIK0; Tue, 26 Aug 2014 13:08:30 +0200 Message-ID: <53FC6AAC.3010201@freebsd.org> Date: Tue, 26 Aug 2014 13:08:28 +0200 From: Stefan Esser User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.0 MIME-Version: 1.0 To: Marius Strobl Subject: Re: svn commit: r270647 - in head: etc/defaults share/man/man4 share/man/man5 share/man/man7 share/man/man8 References: <201408260813.s7Q8DUhM043859@svn.freebsd.org> <20140826085313.GC722@alchemy.franken.de> In-Reply-To: <20140826085313.GC722@alchemy.franken.de> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-ID: E2tRqGZfohdQUX8McGRTGxA-wEIGduaPuiJlpT1NcYE9y6IVsX3p4gp9H53KFuug8Y X-TOI-MSGID: 07d9446c-1d4f-4931-8711-86f1dcb9325b Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 11:13:47 -0000 Am 26.08.2014 um 10:53 schrieb Marius Strobl: > On Tue, Aug 26, 2014 at 08:13:30AM +0000, Stefan Esser wrote: >> Author: se >> Date: Tue Aug 26 08:13:30 2014 >> New Revision: 270647 >> URL: http://svnweb.freebsd.org/changeset/base/270647 >> >> Log: >> Add references to vt(4) and the configuration files in /usr7share/vt where >> appropriate (i.e. where syscons was already mentioned and vt supports the >> feature). Comments in defaults/rc.conf are updated to match the contents >> of the modified man-page rc.conf(5). >> >> Reviewed by: pluknet, emaste >> MFC after: 3 days >> > > <...> > >> Modified: head/share/man/man4/splash.4 >> ============================================================================== >> --- head/share/man/man4/splash.4 Tue Aug 26 06:31:52 2014 (r270646) >> +++ head/share/man/man4/splash.4 Tue Aug 26 08:13:30 2014 (r270647) >> @@ -245,6 +245,7 @@ bitmap_name="/boot/splash.bin" >> .Xr vidcontrol 1 , >> .Xr syscons 4 , >> .Xr vga 4 , >> +.Xr vt 4 , >> .Xr loader.conf 5 , >> .Xr rc.conf 5 , >> .Xr kldload 8 , >> @@ -285,6 +286,8 @@ code. >> .Sh CAVEATS >> Both the splash screen and the screen saver work with >> .Xr syscons 4 >> + or >> +.Xr vt 4 >> only. >> .Sh BUGS >> If you load a screen saver while another screen saver has already >> > > That information is incorrect; vt(4) has only very limited splash > screen support and doesn't interface with splash(4) for that. Screen > saver support even is entirely nonexistent with vt(4) to date. Hi Marius, thank you for pointing that out. I had added vt(4) behind comment markers in that file, since I did not know whether splash(4) was used with vt or not. From the feedback that I received, I assumed that it should work (and I seemed to remember that there was some kind of splash support in vt), but apparently in error. I'll back-out the change from splash.4 then ... Best regards, STefan From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 12:35:06 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 72074ED9; Tue, 26 Aug 2014 12:35:06 +0000 (UTC) Received: from mail-la0-x234.google.com (mail-la0-x234.google.com [IPv6:2a00:1450:4010:c03::234]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6B412315F; Tue, 26 Aug 2014 12:35:05 +0000 (UTC) Received: by mail-la0-f52.google.com with SMTP id b17so15003308lan.11 for ; Tue, 26 Aug 2014 05:35:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=PFTkWUdteumclE0Tz0L8bMDWkSk1Ix/s4BtsUEb7/oY=; b=XYslDfnLPcgQtuP/0yqMH55GLn8Z6EW2cLZm74lBRB/Z7NG4TH1IJyd5ObYsX1c0Yz eOl+kF8pUp/gzKDbMGYxLVM0EwaHK0C2oXgaHnvvFL0fkSpM/e0G9D90xcog70uP5aSU MjHp+mTW6e5UqMuVB50fXLiSCuz9FR8IDse3C9/He2kxdosijSX7jGxh/2y1Es37LM16 Oz7YvFsSawRe/La3IZfAOu9P8k48OterCdqXXg6ySralkaD6hHiWlQOy7cOrzrNptO6i CsH1AMhM49hw8zKPFeANZiqBOoRFwD5RXB2lKsALNlhW7+ryDHv4HgH3+aihZjw/mDEF bO+w== MIME-Version: 1.0 X-Received: by 10.112.149.36 with SMTP id tx4mr13769262lbb.79.1409056503253; Tue, 26 Aug 2014 05:35:03 -0700 (PDT) Sender: edschouten@gmail.com Received: by 10.152.225.168 with HTTP; Tue, 26 Aug 2014 05:35:03 -0700 (PDT) In-Reply-To: <201408201632.s7KGW2vF093636@svn.freebsd.org> References: <201408201632.s7KGW2vF093636@svn.freebsd.org> Date: Tue, 26 Aug 2014 14:35:03 +0200 X-Google-Sender-Auth: uK61c2TXV_AzcopN2-SDKNbG0cY Message-ID: Subject: Re: svn commit: r270227 - head/sys/sys From: Ed Schouten To: Davide Italiano Content-Type: text/plain; charset=UTF-8 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 12:35:06 -0000 Hey! On 20 August 2014 18:32, Davide Italiano wrote: > - _bt->frac = _ts->tv_nsec * (uint64_t)18446744073LL; > + _bt->frac = _ts->tv_nsec * (uint64_t)18446744073; You could also consider using UINT64_C(18446744073); that's the C standard way of creating an integer constant having a certain type. -- Ed Schouten From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 13:11:39 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 19BAA948; Tue, 26 Aug 2014 13:11:39 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DFAA2353E; Tue, 26 Aug 2014 13:11:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7QDBcPo082958; Tue, 26 Aug 2014 13:11:38 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7QDBcxE082957; Tue, 26 Aug 2014 13:11:38 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201408261311.s7QDBcxE082957@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Tue, 26 Aug 2014 13:11:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270661 - head/contrib/libarchive/tar X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 13:11:39 -0000 Author: ae Date: Tue Aug 26 13:11:38 2014 New Revision: 270661 URL: http://svnweb.freebsd.org/changeset/base/270661 Log: Remove leading '/' from hardlink name when removing them from the regular file name. This fixes the problem, when bsdtar can not create hardlinks to extracted files. Silence from: kientzle@ MFC after: 1 week Sponsored by: Yandex LLC Modified: head/contrib/libarchive/tar/util.c Modified: head/contrib/libarchive/tar/util.c ============================================================================== --- head/contrib/libarchive/tar/util.c Tue Aug 26 11:13:07 2014 (r270660) +++ head/contrib/libarchive/tar/util.c Tue Aug 26 13:11:38 2014 (r270661) @@ -372,6 +372,21 @@ strip_components(const char *p, int elem } } +static const char* +strip_leading_slashes(const char *p) +{ + + /* Remove leading "/../", "//", etc. */ + while (p[0] == '/' || p[0] == '\\') { + if (p[1] == '.' && p[2] == '.' && ( + p[3] == '/' || p[3] == '\\')) { + p += 3; /* Remove "/..", leave "/" for next pass. */ + } else + p += 1; /* Remove "/". */ + } + return (p); +} + /* * Handle --strip-components and any future path-rewriting options. * Returns non-zero if the pathname should not be extracted. @@ -474,16 +489,7 @@ edit_pathname(struct bsdtar *bsdtar, str p += 2; slashonly = 0; } - /* Remove leading "/../", "//", etc. */ - while (p[0] == '/' || p[0] == '\\') { - if (p[1] == '.' && p[2] == '.' && - (p[3] == '/' || p[3] == '\\')) { - p += 3; /* Remove "/..", leave "/" - * for next pass. */ - slashonly = 0; - } else - p += 1; /* Remove "/". */ - } + p = strip_leading_slashes(p); } while (rp != p); if (p != name && !bsdtar->warned_lead_slash) { @@ -504,6 +510,19 @@ edit_pathname(struct bsdtar *bsdtar, str name = "."; else name = p; + + p = archive_entry_hardlink(entry); + if (p != NULL) { + rp = strip_leading_slashes(p); + if (rp == '\0') + return (1); + if (rp != p) { + char *linkname = strdup(rp); + + archive_entry_copy_hardlink(entry, linkname); + free(linkname); + } + } } else { /* Strip redundant leading '/' characters. */ while (name[0] == '/' && name[1] == '/') From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 13:44:56 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id B55F22A9; Tue, 26 Aug 2014 13:44:56 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A06E23837; Tue, 26 Aug 2014 13:44:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7QDiuet097208; Tue, 26 Aug 2014 13:44:56 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7QDiuia097207; Tue, 26 Aug 2014 13:44:56 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408261344.s7QDiuia097207@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 26 Aug 2014 13:44:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270662 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 13:44:56 -0000 Author: gjb Date: Tue Aug 26 13:44:56 2014 New Revision: 270662 URL: http://svnweb.freebsd.org/changeset/base/270662 Log: Fix an oddly-worded sentence. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Aug 26 13:11:38 2014 (r270661) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Aug 26 13:44:56 2014 (r270662) @@ -1048,7 +1048,8 @@ been updated to version 1.7. The lukemftpd - has been removed from the &os; base system. + FTP server has been removed from the + &os; base system. From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 13:49:49 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id CB3865C8; Tue, 26 Aug 2014 13:49:49 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A275338B4; Tue, 26 Aug 2014 13:49:49 +0000 (UTC) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id C7DCBB95E; Tue, 26 Aug 2014 09:49:47 -0400 (EDT) From: John Baldwin To: Mateusz Guzik Subject: Re: svn commit: r270648 - in head/sys: kern sys Date: Tue, 26 Aug 2014 09:45:38 -0400 User-Agent: KMail/1.13.5 (FreeBSD/8.4-CBSD-20140415; KDE/4.5.5; amd64; ; ) References: <201408260817.s7Q8HMMT044455@svn.freebsd.org> In-Reply-To: <201408260817.s7Q8HMMT044455@svn.freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201408260945.39017.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Tue, 26 Aug 2014 09:49:47 -0400 (EDT) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 13:49:49 -0000 On Tuesday, August 26, 2014 4:17:22 am Mateusz Guzik wrote: > Author: mjg > Date: Tue Aug 26 08:17:22 2014 > New Revision: 270648 > URL: http://svnweb.freebsd.org/changeset/base/270648 > > Log: > Fix up races with f_seqcount handling. > > It was possible that the kernel would overwrite user-supplied hint. > > Abuse vnode lock for this purpose. > > In collaboration with: kib > MFC after: 1 week Do we care about this being correct enough to penalize reads by single- threading them? This is just an optimization, if you lose the race it doesn't actually break anything. -- John Baldwin From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 13:53:01 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id E1DE89F8; Tue, 26 Aug 2014 13:53:01 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CB07A398D; Tue, 26 Aug 2014 13:53:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7QDr1oW001713; Tue, 26 Aug 2014 13:53:01 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7QDr12a001712; Tue, 26 Aug 2014 13:53:01 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408261353.s7QDr12a001712@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 26 Aug 2014 13:53:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270663 - stable/10/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 13:53:02 -0000 Author: gjb Date: Tue Aug 26 13:53:01 2014 New Revision: 270663 URL: http://svnweb.freebsd.org/changeset/base/270663 Log: Add a non-breaking space in the mount_nfs(8) example. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Aug 26 13:44:56 2014 (r270662) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Aug 26 13:53:01 2014 (r270663) @@ -956,7 +956,7 @@ a key=value pair argument to the -o flag. For example, to specify NFS version 4, the syntax to use is - -o vers=4. + -o vers=4. Support for the account facility has been added to &man.pam.3; library. From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 13:55:29 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 071DDB81; Tue, 26 Aug 2014 13:55:29 +0000 (UTC) Received: from mail-we0-x234.google.com (mail-we0-x234.google.com [IPv6:2a00:1450:400c:c03::234]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 02C8839B9; Tue, 26 Aug 2014 13:55:27 +0000 (UTC) Received: by mail-we0-f180.google.com with SMTP id w61so14704368wes.25 for ; Tue, 26 Aug 2014 06:55:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=rcyKkkHKRFKy7o081gftNB6MS36+fW3ymsmoIJ9wfc0=; b=xCj1nOoFmWrW0VrQcbnoFEzPIK+d8TPVawK73K1M5ZaopAjxVHvIpQW5kOt/iWI3iw bpBo95ZKYzoUS+3OrqJff134tnvoO9WDErv8l9O+m5fWB0ympMnWkCqBRH4gd5TCdivs 3HkogZAw7u+6VjLyPbl1/rjzPTBm4LYwnXts0ya2s03VB01CjVHNwoTCGw82806yESKT GHoI0jpZm7yH0FamdNEZUXLqx2G6Ou2fwh4wxytvKKlOeyWPySqTpXpx0NwLtmhpUpBy HIKNopN+m/3p3sWCMrXa2WoeJYj3c3BwQvU+IE5NAlgP9Oeys8NDHdWUrFjR8kYXT8Ke s/Cw== X-Received: by 10.194.119.41 with SMTP id kr9mr2525670wjb.114.1409061326098; Tue, 26 Aug 2014 06:55:26 -0700 (PDT) Received: from dft-labs.eu (n1x0n-1-pt.tunnel.tserv5.lon1.ipv6.he.net. [2001:470:1f08:1f7::2]) by mx.google.com with ESMTPSA id lz1sm2642544wic.24.2014.08.26.06.55.24 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 26 Aug 2014 06:55:25 -0700 (PDT) Date: Tue, 26 Aug 2014 15:55:22 +0200 From: Mateusz Guzik To: John Baldwin Subject: Re: svn commit: r270648 - in head/sys: kern sys Message-ID: <20140826135522.GA10544@dft-labs.eu> References: <201408260817.s7Q8HMMT044455@svn.freebsd.org> <201408260945.39017.jhb@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <201408260945.39017.jhb@freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Mateusz Guzik X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 13:55:29 -0000 On Tue, Aug 26, 2014 at 09:45:38AM -0400, John Baldwin wrote: > On Tuesday, August 26, 2014 4:17:22 am Mateusz Guzik wrote: > > Author: mjg > > Date: Tue Aug 26 08:17:22 2014 > > New Revision: 270648 > > URL: http://svnweb.freebsd.org/changeset/base/270648 > > > > Log: > > Fix up races with f_seqcount handling. > > > > It was possible that the kernel would overwrite user-supplied hint. > > > > Abuse vnode lock for this purpose. > > > > In collaboration with: kib > > MFC after: 1 week > > Do we care about this being correct enough to penalize reads by single- > threading them? This is just an optimization, if you lose the race it doesn't > actually break anything. > We don't singlethread reads, vnode is locked exactly as it was previously. What changes is that a rarely used (as compared to reads) function playing with f_seqcount now takes exclusive lock. If anything, this is an optimization since it removes an unnecessary load_acq. -- Mateusz Guzik From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 13:58:49 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 78A4AD3C; Tue, 26 Aug 2014 13:58:49 +0000 (UTC) Received: from mail108.syd.optusnet.com.au (mail108.syd.optusnet.com.au [211.29.132.59]) by mx1.freebsd.org (Postfix) with ESMTP id 3A3D03A02; Tue, 26 Aug 2014 13:58:48 +0000 (UTC) Received: from c122-106-147-133.carlnfd1.nsw.optusnet.com.au (c122-106-147-133.carlnfd1.nsw.optusnet.com.au [122.106.147.133]) by mail108.syd.optusnet.com.au (Postfix) with ESMTPS id 53A041A3FC6; Tue, 26 Aug 2014 23:58:41 +1000 (EST) Date: Tue, 26 Aug 2014 23:58:40 +1000 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Ed Schouten Subject: Re: svn commit: r270227 - head/sys/sys In-Reply-To: Message-ID: <20140826233018.H32188@besplex.bde.org> References: <201408201632.s7KGW2vF093636@svn.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.1 cv=BdjhjNd2 c=1 sm=1 tr=0 a=7NqvjVvQucbO2RlWB8PEog==:117 a=PO7r1zJSAAAA:8 a=RrlIlrznAvoA:10 a=Bs0Nco5NFfgA:10 a=kj9zAlcOel0A:10 a=JzwRw_2MAAAA:8 a=6I5d2MoRAAAA:8 a=iBY4ed8fU91s6cjptCEA:9 a=CjuIK1q_8ugA:10 a=SV7veod9ZcQA:10 Cc: Davide Italiano , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 13:58:49 -0000 On Tue, 26 Aug 2014, Ed Schouten wrote: > On 20 August 2014 18:32, Davide Italiano wrote: >> - _bt->frac = _ts->tv_nsec * (uint64_t)18446744073LL; >> + _bt->frac = _ts->tv_nsec * (uint64_t)18446744073; > > You could also consider using UINT64_C(18446744073); that's the C > standard way of creating an integer constant having a certain type. That would be a further obfuscation. The *INTC() macros expand to integer constant expressions of the specified type suitable for use in #if preprocessing directives. (It is otherwise difficult to detemine the correct suffix, to add to the constant to give it the specified type). There are no preprocessing directives here, so a simple cast works. The cast could also be applied to the other operand but it is easier to read when applied to the constant. UINT64_C() might work around the compiler bug of warning for constants larger than ULONG_MAX, depending on its implementation. I think it always does. On 64-bit arches, the above constant is not larger than ULONG_MAX so there is no problem, and on 32-bit arches the implementation can't be much different from appending 'ULL'. The expression could also be written without a cast and without using UINT64_C(), by using a 'ULL' suffix instead of 'LL'. That would still use the long long abomination, and be different obfuscation -- the type of the constant doesn't really matter, but we need to promote to the type of 'frac', that is, uint64_t. 'ULL' works because long longs are at least 64 bits (and I think unsigned long longs are also 2's complemention, so their type is larger than uint64_t. Bruce From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 14:41:24 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 3C037A43; Tue, 26 Aug 2014 14:41:24 +0000 (UTC) Received: from mail-oa0-x235.google.com (mail-oa0-x235.google.com [IPv6:2607:f8b0:4003:c02::235]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DE9B13F40; Tue, 26 Aug 2014 14:41:23 +0000 (UTC) Received: by mail-oa0-f53.google.com with SMTP id j17so11979187oag.40 for ; Tue, 26 Aug 2014 07:41:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=OO/9O9c5ALwPvGCtajtihiu6CknoGzle3WcLD+iNQ9Y=; b=bRimdE0oFNGGefzv75v3p3Y3cDLrNot+h+NrsQ6pkkXchqCUAIK1xt7Q1CWNUWGPSU LqdtNxOTT7sAjGodMfTPTmDjzI6W0+nA/la2PmnbrQuIDr161pjBNQyBtSb9nG/2VWcn HFci/aIFvAXSJVDSkD5IMYbaXmbW+RdN6Xgij4eSkI3PphUYaLWgV9QqhalmYMrcVzHY FvZANVwhshfdyvZGfKjTqJHN5Y0c3uoTFrKgol1sQLV1M2yuXSV7CvoGZyWwnEmqZmKf J/t2A1tek3GTa3t9fqGVk7SboPq+DTBHwjCFS4GocFJU7suaWq3DYFBfwrQQH5XVaGx/ +OfA== MIME-Version: 1.0 X-Received: by 10.182.241.200 with SMTP id wk8mr28009491obc.27.1409064083171; Tue, 26 Aug 2014 07:41:23 -0700 (PDT) Received: by 10.182.98.111 with HTTP; Tue, 26 Aug 2014 07:41:23 -0700 (PDT) In-Reply-To: <20140826233018.H32188@besplex.bde.org> References: <201408201632.s7KGW2vF093636@svn.freebsd.org> <20140826233018.H32188@besplex.bde.org> Date: Tue, 26 Aug 2014 10:41:23 -0400 Message-ID: Subject: Re: svn commit: r270227 - head/sys/sys From: Benjamin Kaduk To: Bruce Evans Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.18-1 Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 14:41:24 -0000 On Tue, Aug 26, 2014 at 9:58 AM, Bruce Evans wrote: > > That would be a further obfuscation. The *INTC() macros expand to > integer constant expressions of the specified type suitable for use > in #if preprocessing directives. (It is otherwise difficult to > detemine the correct suffix, to add to the constant to give it the > specified type). There are no preprocessing directives here, so a > simple cast works. The cast could also be applied to the other > operand but it is easier to read when applied to the constant. > I thought that in C99, all integers in preprocessor evaluation were treated as if they were [u]intmax_t (6.10.1.4 in the n1256.pdf I have here). I was only just skimming that part yesterday for unrelated reasons, though, so maybe I'm missing the bigger picture. > The expression could also be written without a cast and without using > UINT64_C(), by using a 'ULL' suffix instead of 'LL'. That would still > use the long long abomination, and be different obfuscation -- the > type of the constant doesn't really matter, but we need to promote > to the type of 'frac', that is, uint64_t. 'ULL' works because long > longs are at least 64 bits (and I think unsigned long longs are also > 2's complemention, so their type is larger than uint64_t. Two's complement semantics are guaranteed for the fixed width types such as int64_t, but I'm not sure how that comes into play for unsigned types? -Ben From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 14:44:09 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 7CE46CF9; Tue, 26 Aug 2014 14:44:09 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 679413F6F; Tue, 26 Aug 2014 14:44:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7QEi9PB027752; Tue, 26 Aug 2014 14:44:09 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7QEi8hV027747; Tue, 26 Aug 2014 14:44:08 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201408261444.s7QEi8hV027747@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Tue, 26 Aug 2014 14:44:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270664 - in head/sys: dev/streams kern sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 14:44:09 -0000 Author: glebius Date: Tue Aug 26 14:44:08 2014 New Revision: 270664 URL: http://svnweb.freebsd.org/changeset/base/270664 Log: - Remove socket file operations declaration from sys/file.h. - Make them static in sys_socket.c. - Provide generic invfo_truncate() instead of soo_truncate(). Sponsored by: Netflix Sponsored by: Nginx, Inc. Modified: head/sys/dev/streams/streams.c head/sys/kern/kern_descrip.c head/sys/kern/sys_socket.c head/sys/kern/uipc_socket.c head/sys/sys/file.h Modified: head/sys/dev/streams/streams.c ============================================================================== --- head/sys/dev/streams/streams.c Tue Aug 26 13:53:01 2014 (r270663) +++ head/sys/dev/streams/streams.c Tue Aug 26 14:44:08 2014 (r270664) @@ -87,20 +87,8 @@ enum { static struct cdev *dt_ptm, *dt_arp, *dt_icmp, *dt_ip, *dt_tcp, *dt_udp, *dt_rawip, *dt_unix_dgram, *dt_unix_stream, *dt_unix_ord_stream; -static struct fileops svr4_netops = { - .fo_read = soo_read, - .fo_write = soo_write, - .fo_truncate = soo_truncate, - .fo_ioctl = soo_ioctl, - .fo_poll = soo_poll, - .fo_kqfilter = soo_kqfilter, - .fo_stat = soo_stat, - .fo_close = svr4_soo_close, - .fo_chmod = invfo_chmod, - .fo_chown = invfo_chown, - .fo_sendfile = invfo_sendfile, -}; - +static struct fileops svr4_netops; + static struct cdevsw streams_cdevsw = { .d_version = D_VERSION, .d_open = streamsopen, @@ -147,6 +135,11 @@ streams_modevent(module_t mod, int type, printf("WARNING: device config for STREAMS failed\n"); printf("Suggest unloading streams KLD\n"); } + + /* Inherit generic socket file operations, except close(2). */ + bcopy(&socketops, &svr4_netops, sizeof(struct fileops)); + svr4_netops.fo_close = svr4_soo_close; + return 0; case MOD_UNLOAD: /* XXX should check to see if it's busy first */ @@ -345,11 +338,15 @@ svr4_stream_get(fp) static int svr4_soo_close(struct file *fp, struct thread *td) { - struct socket *so = fp->f_data; + struct socket *so = fp->f_data; /* CHECKUNIT_DIAG(ENXIO);*/ svr4_delete_socket(td->td_proc, fp); free(so->so_emuldata, M_TEMP); - return soo_close(fp, td); + + fp->f_ops = &badfileops; + fp->f_data = NULL; + + return soclose(so); } Modified: head/sys/kern/kern_descrip.c ============================================================================== --- head/sys/kern/kern_descrip.c Tue Aug 26 13:53:01 2014 (r270663) +++ head/sys/kern/kern_descrip.c Tue Aug 26 14:44:08 2014 (r270664) @@ -3944,6 +3944,14 @@ struct fileops badfileops = { }; int +invfo_truncate(struct file *fp, off_t length, struct ucred *active_cred, + struct thread *td) +{ + + return (EINVAL); +} + +int invfo_chmod(struct file *fp, mode_t mode, struct ucred *active_cred, struct thread *td) { Modified: head/sys/kern/sys_socket.c ============================================================================== --- head/sys/kern/sys_socket.c Tue Aug 26 13:53:01 2014 (r270663) +++ head/sys/kern/sys_socket.c Tue Aug 26 14:44:08 2014 (r270664) @@ -56,10 +56,18 @@ __FBSDID("$FreeBSD$"); #include +static fo_rdwr_t soo_read; +static fo_rdwr_t soo_write; +static fo_ioctl_t soo_ioctl; +static fo_poll_t soo_poll; +extern fo_kqfilter_t soo_kqfilter; +static fo_stat_t soo_stat; +static fo_close_t soo_close; + struct fileops socketops = { .fo_read = soo_read, .fo_write = soo_write, - .fo_truncate = soo_truncate, + .fo_truncate = invfo_truncate, .fo_ioctl = soo_ioctl, .fo_poll = soo_poll, .fo_kqfilter = soo_kqfilter, @@ -71,8 +79,7 @@ struct fileops socketops = { .fo_flags = DFLAG_PASSABLE }; -/* ARGSUSED */ -int +static int soo_read(struct file *fp, struct uio *uio, struct ucred *active_cred, int flags, struct thread *td) { @@ -88,8 +95,7 @@ soo_read(struct file *fp, struct uio *ui return (error); } -/* ARGSUSED */ -int +static int soo_write(struct file *fp, struct uio *uio, struct ucred *active_cred, int flags, struct thread *td) { @@ -110,15 +116,7 @@ soo_write(struct file *fp, struct uio *u return (error); } -int -soo_truncate(struct file *fp, off_t length, struct ucred *active_cred, - struct thread *td) -{ - - return (EINVAL); -} - -int +static int soo_ioctl(struct file *fp, u_long cmd, void *data, struct ucred *active_cred, struct thread *td) { @@ -226,7 +224,7 @@ soo_ioctl(struct file *fp, u_long cmd, v return (error); } -int +static int soo_poll(struct file *fp, int events, struct ucred *active_cred, struct thread *td) { @@ -241,7 +239,7 @@ soo_poll(struct file *fp, int events, st return (sopoll(so, events, fp->f_cred, td)); } -int +static int soo_stat(struct file *fp, struct stat *ub, struct ucred *active_cred, struct thread *td) { @@ -281,8 +279,7 @@ soo_stat(struct file *fp, struct stat *u * file reference but the actual socket will not go away until the socket's * ref count hits 0. */ -/* ARGSUSED */ -int +static int soo_close(struct file *fp, struct thread *td) { int error = 0; Modified: head/sys/kern/uipc_socket.c ============================================================================== --- head/sys/kern/uipc_socket.c Tue Aug 26 13:53:01 2014 (r270663) +++ head/sys/kern/uipc_socket.c Tue Aug 26 14:44:08 2014 (r270664) @@ -160,6 +160,7 @@ static void filt_sowdetach(struct knote static int filt_sowrite(struct knote *kn, long hint); static int filt_solisten(struct knote *kn, long hint); static int inline hhook_run_socket(struct socket *so, void *hctx, int32_t h_id); +fo_kqfilter_t soo_kqfilter; static struct filterops solisten_filtops = { .f_isfd = 1, Modified: head/sys/sys/file.h ============================================================================== --- head/sys/sys/file.h Tue Aug 26 13:53:01 2014 (r270663) +++ head/sys/sys/file.h Tue Aug 26 14:44:08 2014 (r270664) @@ -231,23 +231,10 @@ int fget_write(struct thread *td, int fd struct file **fpp); int _fdrop(struct file *fp, struct thread *td); -/* - * The socket operations are used a couple of places. - * XXX: This is wrong, they should go through the operations vector for - * XXX: sockets instead of going directly for the individual functions. /phk - */ -fo_rdwr_t soo_read; -fo_rdwr_t soo_write; -fo_truncate_t soo_truncate; -fo_ioctl_t soo_ioctl; -fo_poll_t soo_poll; -fo_kqfilter_t soo_kqfilter; -fo_stat_t soo_stat; -fo_close_t soo_close; - fo_chmod_t invfo_chmod; fo_chown_t invfo_chown; fo_sendfile_t invfo_sendfile; +fo_truncate_t invfo_truncate; fo_sendfile_t vn_sendfile; fo_seek_t vn_seek; From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 15:31:57 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 3ABDDAF2; Tue, 26 Aug 2014 15:31:57 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0B23E3454; Tue, 26 Aug 2014 15:31:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7QFVuYj050579; Tue, 26 Aug 2014 15:31:56 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7QFVusu050576; Tue, 26 Aug 2014 15:31:56 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408261531.s7QFVusu050576@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 26 Aug 2014 15:31:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270665 - in stable/10: gnu/usr.bin/groff/tmac lib/clang sys/conf X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 15:31:57 -0000 Author: gjb Date: Tue Aug 26 15:31:56 2014 New Revision: 270665 URL: http://svnweb.freebsd.org/changeset/base/270665 Log: - Update stable/10 to 10.1-PRERELEASE now that the code slush is in effect. (Forgotten on the 22nd.) - Set the 10.1 as the .Fx mdoc(7) default. - Update the TARGET_TRIPLE and BUILD_TRIPLE for clang(1) to reflect 10.1. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/10/gnu/usr.bin/groff/tmac/mdoc.local stable/10/lib/clang/clang.build.mk stable/10/sys/conf/newvers.sh Modified: stable/10/gnu/usr.bin/groff/tmac/mdoc.local ============================================================================== --- stable/10/gnu/usr.bin/groff/tmac/mdoc.local Tue Aug 26 14:44:08 2014 (r270664) +++ stable/10/gnu/usr.bin/groff/tmac/mdoc.local Tue Aug 26 15:31:56 2014 (r270665) @@ -50,7 +50,7 @@ .ds doc-str-Lb-libstdthreads C11 Threads Library (libstdthreads, \-lstdthreads) . .\" Default .Os value -.ds doc-default-operating-system FreeBSD\~10.0 +.ds doc-default-operating-system FreeBSD\~10.1 . .\" FreeBSD releases not found in doc-common .ds doc-operating-system-FreeBSD-7.4 7.4 Modified: stable/10/lib/clang/clang.build.mk ============================================================================== --- stable/10/lib/clang/clang.build.mk Tue Aug 26 14:44:08 2014 (r270664) +++ stable/10/lib/clang/clang.build.mk Tue Aug 26 15:31:56 2014 (r270665) @@ -27,8 +27,8 @@ TARGET_ABI= gnueabi TARGET_ABI= unknown .endif -TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.0 -BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/}-unknown-freebsd10.0 +TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.1 +BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/}-unknown-freebsd10.1 CFLAGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=\"${TARGET_TRIPLE}\" \ -DLLVM_HOST_TRIPLE=\"${BUILD_TRIPLE}\" \ -DDEFAULT_SYSROOT=\"${TOOLS_PREFIX}\" Modified: stable/10/sys/conf/newvers.sh ============================================================================== --- stable/10/sys/conf/newvers.sh Tue Aug 26 14:44:08 2014 (r270664) +++ stable/10/sys/conf/newvers.sh Tue Aug 26 15:31:56 2014 (r270665) @@ -31,8 +31,8 @@ # $FreeBSD$ TYPE="FreeBSD" -REVISION="10.0" -BRANCH="STABLE" +REVISION="10.1" +BRANCH="PRERELEASE" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 16:40:21 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 479C7918; Tue, 26 Aug 2014 16:40:21 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 199D93A55; Tue, 26 Aug 2014 16:40:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7QGeK53080563; Tue, 26 Aug 2014 16:40:20 GMT (envelope-from alc@FreeBSD.org) Received: (from alc@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7QGeKkw080562; Tue, 26 Aug 2014 16:40:20 GMT (envelope-from alc@FreeBSD.org) Message-Id: <201408261640.s7QGeKkw080562@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: alc set sender to alc@FreeBSD.org using -f From: Alan Cox Date: Tue, 26 Aug 2014 16:40:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270666 - head/sys/vm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 16:40:21 -0000 Author: alc Date: Tue Aug 26 16:40:20 2014 New Revision: 270666 URL: http://svnweb.freebsd.org/changeset/base/270666 Log: Back in the days when the kernel was single threaded, testing "vm_paging_target() > 0" was a reasonable way of determining if the inactive queue scan met its target. However, now that other threads can be allocating pages while the inactive queue scan is running, it's an unreliable method. The effect of it being unreliable is that we can start swapping out processes when we didn't intend to. This issue has existed since the kernel was multithreaded, but the changes to the inactive queue target in 10.0-RELEASE have made its effects visible. This change introduces a more direct method for determining if the inactive queue scan met its target that is not affected by the actions of other threads. Reported by: Steve Polyack Tested by: pho, Steve Polyack (an earlier version) MFC after: 1 week Sponsored by: EMC / Isilon Storage Division Modified: head/sys/vm/vm_pageout.c Modified: head/sys/vm/vm_pageout.c ============================================================================== --- head/sys/vm/vm_pageout.c Tue Aug 26 15:31:56 2014 (r270665) +++ head/sys/vm/vm_pageout.c Tue Aug 26 16:40:20 2014 (r270666) @@ -1299,6 +1299,23 @@ relock_queues: } vm_pagequeue_unlock(pq); +#if !defined(NO_SWAPPING) + /* + * Wakeup the swapout daemon if we didn't cache or free the targeted + * number of pages. + */ + if (vm_swap_enabled && page_shortage > 0) + vm_req_vmdaemon(VM_SWAP_NORMAL); +#endif + + /* + * Wakeup the sync daemon if we skipped a vnode in a writeable object + * and we didn't cache or free enough pages. + */ + if (vnodes_skipped > 0 && page_shortage > vm_cnt.v_free_target - + vm_cnt.v_free_min) + (void)speedup_syncer(); + /* * Compute the number of pages we want to try to move from the * active queue to the inactive queue. @@ -1408,20 +1425,6 @@ relock_queues: } } #endif - - /* - * If we didn't get enough free pages, and we have skipped a vnode - * in a writeable object, wakeup the sync daemon. And kick swapout - * if we did not get enough free pages. - */ - if (vm_paging_target() > 0) { - if (vnodes_skipped && vm_page_count_min()) - (void) speedup_syncer(); -#if !defined(NO_SWAPPING) - if (vm_swap_enabled && vm_page_count_target()) - vm_req_vmdaemon(VM_SWAP_NORMAL); -#endif - } /* * If we are critically low on one of RAM or swap and low on From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 17:48:06 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 21DC08EC; Tue, 26 Aug 2014 17:48:06 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0CD673323; Tue, 26 Aug 2014 17:48:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7QHm5Q5017180; Tue, 26 Aug 2014 17:48:05 GMT (envelope-from dumbbell@FreeBSD.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7QHm5is017179; Tue, 26 Aug 2014 17:48:05 GMT (envelope-from dumbbell@FreeBSD.org) Message-Id: <201408261748.s7QHm5is017179@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dumbbell set sender to dumbbell@FreeBSD.org using -f From: Jean-Sebastien Pedron Date: Tue, 26 Aug 2014 17:48:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270667 - head/sys/dev/vt X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 17:48:06 -0000 Author: dumbbell Date: Tue Aug 26 17:48:05 2014 New Revision: 270667 URL: http://svnweb.freebsd.org/changeset/base/270667 Log: vt(4): When creating a window buffer, fill it entirely ... not just the visible part. This fixes a bug where, when switching from eg. vt_vga to vt_fb (ie. the resolution goes up), the originally hidden, uninitialized area of the buffer is displayed on the screen. This leads to a missing text cursor when it's over an unitialized area. This was also visible when selecting text: the uninitialized area was not highlighted. Internally, this area was zeroed: characters were all 0x00000000, meaning the foreground and background color was black. Now, everything is filled with a space with a gray foreground color, like the visible area. While here, remove the check for the mute flag and always use TERMINAL_NORM_ATTR as the character attribute (ie. gray foreground, black background). MFC after: 1 week Modified: head/sys/dev/vt/vt_buf.c Modified: head/sys/dev/vt/vt_buf.c ============================================================================== --- head/sys/dev/vt/vt_buf.c Tue Aug 26 16:40:20 2014 (r270666) +++ head/sys/dev/vt/vt_buf.c Tue Aug 26 17:48:05 2014 (r270667) @@ -410,9 +410,9 @@ vtbuf_init_early(struct vt_buf *vb) vtbuf_init_rows(vb); rect.tr_begin.tp_row = rect.tr_begin.tp_col = 0; - rect.tr_end = vb->vb_scr_size; - vtbuf_fill(vb, &rect, VTBUF_SPACE_CHAR((boothowto & RB_MUTE) == 0 ? - TERMINAL_KERN_ATTR : TERMINAL_NORM_ATTR)); + rect.tr_end.tp_col = vb->vb_scr_size.tp_col; + rect.tr_end.tp_row = vb->vb_history_size; + vtbuf_fill(vb, &rect, VTBUF_SPACE_CHAR(TERMINAL_NORM_ATTR)); vtbuf_make_undirty(vb); if ((vb->vb_flags & VBF_MTX_INIT) == 0) { mtx_init(&vb->vb_lock, "vtbuf", NULL, MTX_SPIN); From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 18:13:49 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 14761EF; Tue, 26 Aug 2014 18:13:49 +0000 (UTC) Received: from mail110.syd.optusnet.com.au (mail110.syd.optusnet.com.au [211.29.132.97]) by mx1.freebsd.org (Postfix) with ESMTP id B6D7D3608; Tue, 26 Aug 2014 18:13:48 +0000 (UTC) Received: from c122-106-147-133.carlnfd1.nsw.optusnet.com.au (c122-106-147-133.carlnfd1.nsw.optusnet.com.au [122.106.147.133]) by mail110.syd.optusnet.com.au (Postfix) with ESMTPS id 4AE507839FF; Wed, 27 Aug 2014 03:43:19 +1000 (EST) Date: Wed, 27 Aug 2014 03:43:18 +1000 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Benjamin Kaduk Subject: Re: svn commit: r270227 - head/sys/sys In-Reply-To: Message-ID: <20140827015544.C40875@besplex.bde.org> References: <201408201632.s7KGW2vF093636@svn.freebsd.org> <20140826233018.H32188@besplex.bde.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.1 cv=AOuw8Gd4 c=1 sm=1 tr=0 a=7NqvjVvQucbO2RlWB8PEog==:117 a=PO7r1zJSAAAA:8 a=RrlIlrznAvoA:10 a=Bs0Nco5NFfgA:10 a=kj9zAlcOel0A:10 a=JzwRw_2MAAAA:8 a=TF_a1ho2fTJttlButMQA:9 a=CjuIK1q_8ugA:10 Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" , Bruce Evans X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 18:13:49 -0000 On Tue, 26 Aug 2014, Benjamin Kaduk wrote: > On Tue, Aug 26, 2014 at 9:58 AM, Bruce Evans wrote: > >> >> That would be a further obfuscation. The *INTC() macros expand to >> integer constant expressions of the specified type suitable for use >> in #if preprocessing directives. (It is otherwise difficult to >> detemine the correct suffix, to add to the constant to give it the >> specified type). There are no preprocessing directives here, so a >> simple cast works. The cast could also be applied to the other >> operand but it is easier to read when applied to the constant. > > I thought that in C99, all integers in preprocessor evaluation were treated > as if > they were [u]intmax_t (6.10.1.4 in the n1256.pdf I have here). I was only > just > skimming that part yesterday for unrelated reasons, though, so maybe I'm > missing the bigger picture. Yes, that makes it unclear what typed constants in cpp expressions are useful for. C has always been careful to make limits like UINT_MAX have the correct type, but that seems to be worse than useless in cpp expressions. (Oops. I was thinking that UCHAR_MAX had type u_char, but the correctness actually goes the other way -- it is required to have type the promotion of u_char (signed int except on exotic machines). UINT_MAX has type unsigned int. So -UINT_MAX > 0 in normal expressions. But in cpp expressions, UINT_MAX promotes to intmax_t before it is negated (since C's broken "value-preserving" promotion rules apply). So -UINT_MAX < 0 in cpp expressions. There seem to be some compiler bugs in this. In cpp expressions, testing on clang on amd64 gives -UINT_MAX < 0 and -0xFFFFFFFF < 0, but -0xFFFFFFFFU > 0. The first 2 results are the same since UINT_MAX is just 0xFFFFFFFF. ( intentionally avoids using suffixes on constants if possible since it didn't use them old versions, I don't like them, and I would have tried to undo any changes that added them. Some buggy versions used them to break thinks like USHRT_MAX -- 0xFFFFU has the wrong type.) But 0xFFFFFFFF and 0xFFFFFFFFU have the same type if u_int == uint32_t, since the type of an unsuffixed hex constant is the type of lowest rank that can represent it. gcc-3.3 on i386 under an old version of FreeBSD gives the same results, except UINT_MAX is defined with a U suffix so the the result for it agrees with the wrong result for 0xFFFFFFFF. Perhaps this is specified somewhere, but it is bizarre for 0xFFFFFFFFU to promote not bug for bug compatibly with the "value-preserving" rules, while the same type and value spelled as 0xFFFFFFFF does promote bug for bug compatibly. TenDRA (4.2) is normally more of a C compiler than gcc or clang, and it gives very interesting errors for all 3 cpp expressions: [ISO C90 6.8.1]: Can't have target dependent '#if' at outer level. The expression is target-dependent since the type of 0xFFFFFFFF depends on the size of int. Even the result of -1U > 0 is apparently target- dependent in C90. I think it is still target-dependent. On exotic targets, uintmax_t == u_int, so there is no promotion and -1U > 0, but on normal targets 1U promotes to a (intmax_t)1 and negating that makes it negative. I didn't know about this stupid rule 6.8.1. It mainly prevents you writing target-dependent cpp expressions to determine the target. It seems to be a bug in TenDRA. 6.8.1 only says that it is implementation-defined whether the result is the same as a non-cpp expression, and gives an example of a more usefule expression involving character constants being quite likely to give a different rewsult. Sigh. My compiler and TurboC handled cpp expressions better in 1988. cpp was part of the compiler, so casts, sizeof() and floating point worked in it, and the result of constant expressions didn't depend on whether they were evaluated in cpp. Running my compiler now gives -0xFFFFFFFF > 0 for all spellings of 0xFFFFFFFF, since the compiler is pre-C90 and never implemented "value-preserving" promotion. It also never supported 64-bit integers, so promotion doesn't apply in this example, but it applies to -0xFFFF in 16-bit mode similarly. >> The expression could also be written without a cast and without using >> UINT64_C(), by using a 'ULL' suffix instead of 'LL'. That would still >> use the long long abomination, and be different obfuscation -- the >> type of the constant doesn't really matter, but we need to promote >> to the type of 'frac', that is, uint64_t. 'ULL' works because long >> longs are at least 64 bits (and I think unsigned long longs are also >> 2's complemention, so their type is larger than uint64_t. > > Two's complement semantics are guaranteed for the fixed width types > such as int64_t, but I'm not sure how that comes into play for unsigned > types? Unsigned types have 2's complement arithmetic, but might not have purely 2's complement representations (except for unsigned char). They can have padding bits, Perhaps with trap representations. I think that is the only complication allowed in in C99 and later. In C90, I think the representation could be anything, but C90 only allows 3 types of representations for integer types, and it allows inspecting representations by copying to arrays of unsigned char and looking at the bits. Both long long and unsigned long long are 64 bits, but 64 bits is not quite enough to guarantee representing int64_t since int64_t has a 2's complement while long long might be 1's complement -- then it can't represent INTMAX_MIN. This problem doesn't affect the unsigned case. Bruce From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 18:54:11 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 3CD8F347; Tue, 26 Aug 2014 18:54:11 +0000 (UTC) Received: from zxy.spb.ru (zxy.spb.ru [195.70.199.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E639B3A67; Tue, 26 Aug 2014 18:54:10 +0000 (UTC) Received: from slw by zxy.spb.ru with local (Exim 4.82 (FreeBSD)) (envelope-from ) id 1XMLsd-000GOP-KK; Tue, 26 Aug 2014 22:54:07 +0400 Date: Tue, 26 Aug 2014 22:54:07 +0400 From: Slawa Olhovchenkov To: Adrian Chadd Subject: Re: svn commit: r265792 - head/sys/kern Message-ID: <20140826185407.GE2075@zxy.spb.ru> References: <201405100053.s4A0rbF9080571@svn.freebsd.org> <20140511083114.GA53503@zxy.spb.ru> <20140520154113.GA23318@zxy.spb.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: slw@zxy.spb.ru X-SA-Exim-Scanned: No (on zxy.spb.ru); SAEximRunCond expanded to false Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 18:54:11 -0000 On Tue, May 20, 2014 at 09:04:25AM -0700, Adrian Chadd wrote: > On 20 May 2014 08:41, Slawa Olhovchenkov wrote: > > >> (But if you try it on 10.0 and it changes things, by all means let me know.) > > > > I am try on 10.0, but not sure about significant improvement (may be > > 10%). > > > > For current CPU (E5-2650 v2 @ 2.60GHz) hwpmc don't working (1. after > > collect some data `pmcstat -R sample.out -G out.txt` don't decode any; > > 2. kldunload hwpmc do kernel crash) and I can't collect detailed > > profile information. > > Yup. I'm starting to get really ticked off at how pmc logging on > multi-core devices just "stops" after a while. I'll talk with other > pmc people and see if we can figure out what the heck is going on. :( Now I can test you work on CPU w/ working pmc. Current traffic 16.8 Gbit/s. CPU: Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz (2000.04-MHz K8-class CPU) last pid: 22677; load averages: 9.12, 9.07, 8.90 up 0+04:06:06 22:52:57 47 processes: 3 running, 44 sleeping CPU 0: 11.8% user, 0.0% nice, 43.1% system, 1.6% interrupt, 43.5% idle CPU 1: 11.4% user, 0.0% nice, 51.8% system, 0.0% interrupt, 36.9% idle CPU 2: 10.6% user, 0.0% nice, 46.3% system, 0.8% interrupt, 42.4% idle CPU 3: 11.8% user, 0.0% nice, 45.1% system, 0.4% interrupt, 42.7% idle CPU 4: 13.7% user, 0.0% nice, 43.1% system, 0.0% interrupt, 43.1% idle CPU 5: 14.5% user, 0.0% nice, 45.9% system, 0.4% interrupt, 39.2% idle CPU 6: 0.0% user, 0.0% nice, 5.5% system, 68.6% interrupt, 25.9% idle CPU 7: 0.0% user, 0.0% nice, 4.3% system, 70.2% interrupt, 25.5% idle CPU 8: 0.0% user, 0.0% nice, 2.7% system, 69.4% interrupt, 27.8% idle CPU 9: 0.0% user, 0.0% nice, 4.7% system, 67.1% interrupt, 28.2% idle CPU 10: 0.0% user, 0.0% nice, 3.1% system, 76.9% interrupt, 20.0% idle CPU 11: 0.0% user, 0.0% nice, 5.1% system, 58.8% interrupt, 36.1% idle Mem: 322M Active, 15G Inact, 96G Wired, 956K Cache, 13G Free ARC: 90G Total, 84G MFU, 5690M MRU, 45M Anon, 394M Header, 98M Other Swap: @ CPU_CLK_UNHALTED_CORE [241440 samples] 10.59% [25561] _mtx_lock_spin_cookie @ /boot/kernel/kernel 94.25% [24092] pmclog_reserve @ /boot/kernel/hwpmc.ko 100.0% [24092] pmclog_process_callchain 100.0% [24092] pmc_process_samples 100.0% [24092] pmc_hook_handler 100.0% [24092] hardclock_cnt @ /boot/kernel/kernel 100.0% [24092] handleevents 99.62% [24001] timercb 100.0% [24001] lapic_handle_timer 00.38% [91] cpu_activeclock 100.0% [91] cpu_idle 100.0% [91] sched_idletd 100.0% [91] fork_exit 03.04% [777] callout_lock 91.63% [712] callout_reset_sbt_on 98.60% [702] tcp_timer_activate 94.87% [666] tcp_do_segment 100.0% [666] tcp_input 100.0% [666] ip_input 100.0% [666] netisr_dispatch_src 100.0% [666] ether_demux 100.0% [666] ether_nh_input 100.0% [666] netisr_dispatch_src 98.05% [653] ixgbe_rxeof @ /boot/kernel/if_ixgbe.ko 87.44% [571] ixgbe_msix_que 100.0% [571] intr_event_execute_handlers @ /boot/kernel/kernel 100.0% [571] ithread_loop 100.0% [571] fork_exit 12.56% [82] ixgbe_handle_que @ /boot/kernel/if_ixgbe.ko 100.0% [82] taskqueue_run_locked @ /boot/kernel/kernel 100.0% [82] taskqueue_thread_loop 100.0% [82] fork_exit 01.95% [13] tcp_lro_flush 92.31% [12] ixgbe_rxeof @ /boot/kernel/if_ixgbe.ko 100.0% [12] ixgbe_msix_que 100.0% [12] intr_event_execute_handlers @ /boot/kernel/kernel 100.0% [12] ithread_loop 07.69% [1] tcp_lro_rx 100.0% [1] ixgbe_rxeof @ /boot/kernel/if_ixgbe.ko 100.0% [1] ixgbe_msix_que 100.0% [1] intr_event_execute_handlers @ /boot/kernel/kernel 05.13% [36] tcp_output 100.0% [36] tcp_do_segment 100.0% [36] tcp_input 100.0% [36] ip_input 100.0% [36] netisr_dispatch_src 100.0% [36] ether_demux 100.0% [36] ether_nh_input 100.0% [36] netisr_dispatch_src 100.0% [36] ixgbe_rxeof @ /boot/kernel/if_ixgbe.ko 91.67% [33] ixgbe_msix_que 100.0% [33] intr_event_execute_handlers @ /boot/kernel/kernel 100.0% [33] ithread_loop 08.33% [3] ixgbe_handle_que @ /boot/kernel/if_ixgbe.ko 100.0% [3] taskqueue_run_locked @ /boot/kernel/kernel 100.0% [3] taskqueue_thread_loop From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 19:28:59 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 07225B2F; Tue, 26 Aug 2014 19:28:59 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CF2DA3F55; Tue, 26 Aug 2014 19:28:58 +0000 (UTC) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id AC50EB9A3; Tue, 26 Aug 2014 15:28:57 -0400 (EDT) From: John Baldwin To: "John-Mark Gurney" Subject: Re: svn commit: r270444 - in head/sys: kern sys Date: Tue, 26 Aug 2014 15:09:26 -0400 User-Agent: KMail/1.13.5 (FreeBSD/8.4-CBSD-20140415; KDE/4.5.5; amd64; ; ) References: <201408240904.s7O949sI083660@svn.freebsd.org> <1815651.yxLDiBYvJT@ralph.baldwin.cx> <20140825223034.GE71691@funkthat.com> In-Reply-To: <20140825223034.GE71691@funkthat.com> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201408261509.26815.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Tue, 26 Aug 2014 15:28:57 -0400 (EDT) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, Mateusz Guzik , src-committers@freebsd.org, Mateusz Guzik X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 19:28:59 -0000 On Monday, August 25, 2014 6:30:34 pm John-Mark Gurney wrote: > John Baldwin wrote this message on Mon, Aug 25, 2014 at 13:35 -0400: > > On Monday, August 25, 2014 07:02:41 PM Mateusz Guzik wrote: > > > On Mon, Aug 25, 2014 at 10:23:19AM -0400, John Baldwin wrote: > > > > On Sunday, August 24, 2014 09:04:09 AM Mateusz Guzik wrote: > > > > > Author: mjg > > > > > Date: Sun Aug 24 09:04:09 2014 > > > > > New Revision: 270444 > > > > > URL: http://svnweb.freebsd.org/changeset/base/270444 > > > > > > > > > > Log: > > > > > Fix getppid for traced processes. > > > > > > > > > > Traced processes always have the tracer set as the parent. > > > > > Utilize proc_realparent to obtain the right process when needed. > > > > > > > > Are you sure this won't break things? I know of several applications that > > > > expect a debugger to be the parent when attached and change behavior as a > > > > result (e.g. inserting a breakpoint on an assertion failure rather than > > > > generating a core). > > > > > > Well, this is what linux and solaris do. > > > > Interesting. > > > > > I don't feel strongly about this change. If you really want I'm happy to > > > revert. > > > > In general I'd like to someday have the debugger-debuggee relationship not > > override parent-child and this is a step in that direction. However, this > > will break existing applications, so this needs to be clearly documented in > > the release notes. In addition, we should probably advertise how a process > > can correctly determine if it is being run under a debugger (right now you can > > do 'getppid()' and use strcmp or strstr on the p_comm of that pid so you can > > do different things for "gdb" vs "gcore", etc. so just checking P_TRACED from > > kinfo_proc wouldn't be equivalent in functionality) > > But what about when you attach gdb to a running process... That > doesn't magicly make the now debugged process a child of gdb does it? % cat hello.c #include int main() { printf("hello world\n"); (void)getchar(); return (0); } % cc -g hello.c -o hello % ./hello hello world load: 9.81 cmd: hello 42599 [ttyin] 1.67r 0.00u 0.00s 0% 1056k < different window > % ps -O ppid -p `pgrep hello` PID PPID TT STAT TIME COMMAND 42599 5340 16 I+ 0:00.00 ./hello % gdb hello `pgrep hello` GNU gdb 6.1.1 [FreeBSD] ... (gdb) Suspended % ps -O ppid -p `pgrep hello` PID PPID TT STAT TIME COMMAND 42599 45079 16 TX+ 0:00.00 ./hello -- John Baldwin From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 19:29:01 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 570FEC08; Tue, 26 Aug 2014 19:29:01 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2CB3F3F57; Tue, 26 Aug 2014 19:29:01 +0000 (UTC) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 13C32B9BA; Tue, 26 Aug 2014 15:29:00 -0400 (EDT) From: John Baldwin To: Mateusz Guzik Subject: Re: svn commit: r270648 - in head/sys: kern sys Date: Tue, 26 Aug 2014 15:12:18 -0400 User-Agent: KMail/1.13.5 (FreeBSD/8.4-CBSD-20140415; KDE/4.5.5; amd64; ; ) References: <201408260817.s7Q8HMMT044455@svn.freebsd.org> <201408260945.39017.jhb@freebsd.org> <20140826135522.GA10544@dft-labs.eu> In-Reply-To: <20140826135522.GA10544@dft-labs.eu> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201408261512.18569.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Tue, 26 Aug 2014 15:29:00 -0400 (EDT) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Mateusz Guzik X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 19:29:01 -0000 On Tuesday, August 26, 2014 9:55:22 am Mateusz Guzik wrote: > On Tue, Aug 26, 2014 at 09:45:38AM -0400, John Baldwin wrote: > > On Tuesday, August 26, 2014 4:17:22 am Mateusz Guzik wrote: > > > Author: mjg > > > Date: Tue Aug 26 08:17:22 2014 > > > New Revision: 270648 > > > URL: http://svnweb.freebsd.org/changeset/base/270648 > > > > > > Log: > > > Fix up races with f_seqcount handling. > > > > > > It was possible that the kernel would overwrite user-supplied hint. > > > > > > Abuse vnode lock for this purpose. > > > > > > In collaboration with: kib > > > MFC after: 1 week > > > > Do we care about this being correct enough to penalize reads by single- > > threading them? This is just an optimization, if you lose the race it doesn't > > actually break anything. > > > > We don't singlethread reads, vnode is locked exactly as it was > previously. > > What changes is that a rarely used (as compared to reads) function > playing with f_seqcount now takes exclusive lock. > > If anything, this is an optimization since it removes an unnecessary > load_acq. Ah, I misread the diff and had thought the fcntl() changes were in the read() path instead. -- John Baldwin From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 19:29:00 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 222CCB31; Tue, 26 Aug 2014 19:29:00 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EBF973F56; Tue, 26 Aug 2014 19:28:59 +0000 (UTC) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id D6105B9B2; Tue, 26 Aug 2014 15:28:58 -0400 (EDT) From: John Baldwin To: Mateusz Guzik Subject: Re: svn commit: r270444 - in head/sys: kern sys Date: Tue, 26 Aug 2014 15:10:12 -0400 User-Agent: KMail/1.13.5 (FreeBSD/8.4-CBSD-20140415; KDE/4.5.5; amd64; ; ) References: <201408240904.s7O949sI083660@svn.freebsd.org> <1815651.yxLDiBYvJT@ralph.baldwin.cx> <20140826012816.GC23088@dft-labs.eu> In-Reply-To: <20140826012816.GC23088@dft-labs.eu> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201408261510.13162.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Tue, 26 Aug 2014 15:28:58 -0400 (EDT) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Mateusz Guzik X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 19:29:00 -0000 On Monday, August 25, 2014 9:28:16 pm Mateusz Guzik wrote: > On Mon, Aug 25, 2014 at 01:35:58PM -0400, John Baldwin wrote: > > On Monday, August 25, 2014 07:02:41 PM Mateusz Guzik wrote: > > > On Mon, Aug 25, 2014 at 10:23:19AM -0400, John Baldwin wrote: > > > > On Sunday, August 24, 2014 09:04:09 AM Mateusz Guzik wrote: > > > > > Author: mjg > > > > > Date: Sun Aug 24 09:04:09 2014 > > > > > New Revision: 270444 > > > > > URL: http://svnweb.freebsd.org/changeset/base/270444 > > > > > > > > > > Log: > > > > > Fix getppid for traced processes. > > > > > > > > > > Traced processes always have the tracer set as the parent. > > > > > Utilize proc_realparent to obtain the right process when needed. > > > > > > > > Are you sure this won't break things? I know of several applications that > > > > expect a debugger to be the parent when attached and change behavior as a > > > > result (e.g. inserting a breakpoint on an assertion failure rather than > > > > generating a core). > > > > > > Well, this is what linux and solaris do. > > > > Interesting. > > > > > I don't feel strongly about this change. If you really want I'm happy to > > > revert. > > > > In general I'd like to someday have the debugger-debuggee relationship not > > override parent-child and this is a step in that direction. However, this > > will break existing applications, so this needs to be clearly documented in > > the release notes. In addition, we should probably advertise how a process > > can correctly determine if it is being run under a debugger (right now you can > > do 'getppid()' and use strcmp or strstr on the p_comm of that pid so you can > > do different things for "gdb" vs "gcore", etc. so just checking P_TRACED from > > kinfo_proc wouldn't be equivalent in functionality) > > > > Is any of programs you mentioned opensource or at least publicly > available? The only ones I can currently think of are not publicly available. > In linux they provide TracerPid in /proc//status. > > We could add a specific sysctl or extend kinfo with the same data. A tracer pid would be sufficient. -- John Baldwin From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 19:32:18 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 2D151114; Tue, 26 Aug 2014 19:32:18 +0000 (UTC) Received: from h2.funkthat.com (gate2.funkthat.com [208.87.223.18]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "funkthat.com", Issuer "funkthat.com" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 0A03A3004; Tue, 26 Aug 2014 19:32:17 +0000 (UTC) Received: from h2.funkthat.com (localhost [127.0.0.1]) by h2.funkthat.com (8.14.3/8.14.3) with ESMTP id s7QJWAV9026027 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 26 Aug 2014 12:32:11 -0700 (PDT) (envelope-from jmg@h2.funkthat.com) Received: (from jmg@localhost) by h2.funkthat.com (8.14.3/8.14.3/Submit) id s7QJWAaH026026; Tue, 26 Aug 2014 12:32:10 -0700 (PDT) (envelope-from jmg) Date: Tue, 26 Aug 2014 12:32:10 -0700 From: John-Mark Gurney To: John Baldwin Subject: Re: svn commit: r270444 - in head/sys: kern sys Message-ID: <20140826193210.GL71691@funkthat.com> References: <201408240904.s7O949sI083660@svn.freebsd.org> <1815651.yxLDiBYvJT@ralph.baldwin.cx> <20140825223034.GE71691@funkthat.com> <201408261509.26815.jhb@freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201408261509.26815.jhb@freebsd.org> User-Agent: Mutt/1.4.2.3i X-Operating-System: FreeBSD 7.2-RELEASE i386 X-PGP-Fingerprint: 54BA 873B 6515 3F10 9E88 9322 9CB1 8F74 6D3F A396 X-Files: The truth is out there X-URL: http://resnet.uoregon.edu/~gurney_j/ X-Resume: http://resnet.uoregon.edu/~gurney_j/resume.html X-TipJar: bitcoin:13Qmb6AeTgQecazTWph4XasEsP7nGRbAPE X-to-the-FBI-CIA-and-NSA: HI! HOW YA DOIN? can i haz chizburger? X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.2 (h2.funkthat.com [127.0.0.1]); Tue, 26 Aug 2014 12:32:11 -0700 (PDT) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, Mateusz Guzik , src-committers@freebsd.org, Mateusz Guzik X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 19:32:18 -0000 John Baldwin wrote this message on Tue, Aug 26, 2014 at 15:09 -0400: > On Monday, August 25, 2014 6:30:34 pm John-Mark Gurney wrote: > > John Baldwin wrote this message on Mon, Aug 25, 2014 at 13:35 -0400: > > > On Monday, August 25, 2014 07:02:41 PM Mateusz Guzik wrote: > > > > On Mon, Aug 25, 2014 at 10:23:19AM -0400, John Baldwin wrote: > > > > > On Sunday, August 24, 2014 09:04:09 AM Mateusz Guzik wrote: > > > > > > Author: mjg > > > > > > Date: Sun Aug 24 09:04:09 2014 > > > > > > New Revision: 270444 > > > > > > URL: http://svnweb.freebsd.org/changeset/base/270444 > > > > > > > > > > > > Log: > > > > > > Fix getppid for traced processes. > > > > > > > > > > > > Traced processes always have the tracer set as the parent. > > > > > > Utilize proc_realparent to obtain the right process when needed. > > > > > > > > > > Are you sure this won't break things? I know of several applications that > > > > > expect a debugger to be the parent when attached and change behavior as a > > > > > result (e.g. inserting a breakpoint on an assertion failure rather than > > > > > generating a core). > > > > > > > > Well, this is what linux and solaris do. > > > > > > Interesting. > > > > > > > I don't feel strongly about this change. If you really want I'm happy to > > > > revert. > > > > > > In general I'd like to someday have the debugger-debuggee relationship not > > > override parent-child and this is a step in that direction. However, this > > > will break existing applications, so this needs to be clearly documented in > > > the release notes. In addition, we should probably advertise how a process > > > can correctly determine if it is being run under a debugger (right now you can > > > do 'getppid()' and use strcmp or strstr on the p_comm of that pid so you can > > > do different things for "gdb" vs "gcore", etc. so just checking P_TRACED from > > > kinfo_proc wouldn't be equivalent in functionality) > > > > But what about when you attach gdb to a running process... That > > doesn't magicly make the now debugged process a child of gdb does it? > > % cat hello.c > #include > > int > main() > { > printf("hello world\n"); > (void)getchar(); > return (0); > } > % cc -g hello.c -o hello > % ./hello > hello world > load: 9.81 cmd: hello 42599 [ttyin] 1.67r 0.00u 0.00s 0% 1056k > > < different window > > > % ps -O ppid -p `pgrep hello` > PID PPID TT STAT TIME COMMAND > 42599 5340 16 I+ 0:00.00 ./hello > % gdb hello `pgrep hello` > GNU gdb 6.1.1 [FreeBSD] > ... > (gdb) > Suspended > % ps -O ppid -p `pgrep hello` > PID PPID TT STAT TIME COMMAND > 42599 45079 16 TX+ 0:00.00 ./hello Wow, learn something new every day... But doesn't that break apps that use getppid to signal their parent that forked them? -- John-Mark Gurney Voice: +1 415 225 5579 "All that I will do, has been done, All that I have, has not." From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 19:35:28 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id DD1E6821; Tue, 26 Aug 2014 19:35:27 +0000 (UTC) Received: from mail-lb0-x22b.google.com (mail-lb0-x22b.google.com [IPv6:2a00:1450:4010:c04::22b]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D107B3069; Tue, 26 Aug 2014 19:35:26 +0000 (UTC) Received: by mail-lb0-f171.google.com with SMTP id w7so1964489lbi.30 for ; Tue, 26 Aug 2014 12:35:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=LnhjAqFfQPOsnOzXwcpvz1K2MExgN07zKRhS7m1ATrQ=; b=eQ0rAFIdS3xna/ynMMOxZWfXT4GUD2V8XDhTyH1M9w5uBFfQp2aqPP73D+z2fcfWLh 3MqH5wGM0e1yZALuE/p16c+qpYGLjMi8e8jKdNFZe9m6tlCRB9DUKMw0HPmdiRzj70Mv ZdFJgmvRL/wfE1HAc0CzdEurr6JNH8hFq3vQ2qnE8h0p0oB4geQBi7o78It1xMnX9oHp vJx29dr7ZgkRnwGKiM7bQAKpv//8TNDhyTNF+iX6vJOnF/DQsJvmGZhtTnQoj6d8xVNd 07biiaK5lf1g9vF3PKiAQddRiVYo9GjZbpsSP40fxnGAoUUM8GAubzhxuHOZNFNQZtRV YePw== X-Received: by 10.152.9.170 with SMTP id a10mr16214730lab.79.1409081724775; Tue, 26 Aug 2014 12:35:24 -0700 (PDT) Received: from mavbook.mavhome.dp.ua ([134.249.139.101]) by mx.google.com with ESMTPSA id lf2sm2641423lac.27.2014.08.26.12.35.23 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 26 Aug 2014 12:35:24 -0700 (PDT) Sender: Alexander Motin Message-ID: <53FCE179.9030804@FreeBSD.org> Date: Tue, 26 Aug 2014 22:35:21 +0300 From: Alexander Motin User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 MIME-Version: 1.0 To: Slawa Olhovchenkov , Adrian Chadd Subject: Re: svn commit: r265792 - head/sys/kern References: <201405100053.s4A0rbF9080571@svn.freebsd.org> <20140511083114.GA53503@zxy.spb.ru> <20140520154113.GA23318@zxy.spb.ru> <20140826185407.GE2075@zxy.spb.ru> In-Reply-To: <20140826185407.GE2075@zxy.spb.ru> X-Enigmail-Version: 1.6 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 19:35:28 -0000 On 26.08.2014 21:54, Slawa Olhovchenkov wrote: > On Tue, May 20, 2014 at 09:04:25AM -0700, Adrian Chadd wrote: > >> On 20 May 2014 08:41, Slawa Olhovchenkov wrote: >> >>>> (But if you try it on 10.0 and it changes things, by all means let me know.) >>> >>> I am try on 10.0, but not sure about significant improvement (may be >>> 10%). >>> >>> For current CPU (E5-2650 v2 @ 2.60GHz) hwpmc don't working (1. after >>> collect some data `pmcstat -R sample.out -G out.txt` don't decode any; >>> 2. kldunload hwpmc do kernel crash) and I can't collect detailed >>> profile information. >> >> Yup. I'm starting to get really ticked off at how pmc logging on >> multi-core devices just "stops" after a while. I'll talk with other >> pmc people and see if we can figure out what the heck is going on. :( > > Now I can test you work on CPU w/ working pmc. > @ CPU_CLK_UNHALTED_CORE [241440 samples] > > 10.59% [25561] _mtx_lock_spin_cookie @ /boot/kernel/kernel > 94.25% [24092] pmclog_reserve @ /boot/kernel/hwpmc.ko > 100.0% [24092] pmclog_process_callchain > 100.0% [24092] pmc_process_samples > 100.0% [24092] pmc_hook_handler > 100.0% [24092] hardclock_cnt @ /boot/kernel/kernel Slava, on large SMP systems you should specify some much bigger division rate (like `-n 100000000`) when doing PMC sampling. Otherwise you are mostly measuring PMC's internal lock congestion. -- Alexander Motin From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 19:36:35 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 741CDA3A; Tue, 26 Aug 2014 19:36:35 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5F94B30A5; Tue, 26 Aug 2014 19:36:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7QJaZ1g070622; Tue, 26 Aug 2014 19:36:35 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7QJaZeW070621; Tue, 26 Aug 2014 19:36:35 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408261936.s7QJaZeW070621@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 26 Aug 2014 19:36:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270668 - head/gnu/usr.bin/grep X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 19:36:35 -0000 Author: gjb Date: Tue Aug 26 19:36:34 2014 New Revision: 270668 URL: http://svnweb.freebsd.org/changeset/base/270668 Log: Add gnugrep.1 to CLEANFILES. MFC after: 3 days Sponsored by: The FreeBSD Foundation Modified: head/gnu/usr.bin/grep/Makefile Modified: head/gnu/usr.bin/grep/Makefile ============================================================================== --- head/gnu/usr.bin/grep/Makefile Tue Aug 26 17:48:05 2014 (r270667) +++ head/gnu/usr.bin/grep/Makefile Tue Aug 26 19:36:34 2014 (r270668) @@ -12,6 +12,7 @@ PROG= gnugrep SRCS= closeout.c dfa.c error.c exclude.c grep.c grepmat.c hard-locale.c \ isdir.c kwset.c obstack.c quotearg.c savedir.c search.c xmalloc.c \ xstrtoumax.c +CLEANFILES+= gnugrep.1 CFLAGS+=-I${.CURDIR} -I${DESTDIR}/usr/include/gnu -DHAVE_CONFIG_H From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 19:36:47 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id D3485B75; Tue, 26 Aug 2014 19:36:47 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BFC0B30AA; Tue, 26 Aug 2014 19:36:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7QJaldI070693; Tue, 26 Aug 2014 19:36:47 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7QJalGC070692; Tue, 26 Aug 2014 19:36:47 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408261936.s7QJalGC070692@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 26 Aug 2014 19:36:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270669 - head/usr.bin/host X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 19:36:47 -0000 Author: gjb Date: Tue Aug 26 19:36:47 2014 New Revision: 270669 URL: http://svnweb.freebsd.org/changeset/base/270669 Log: Add host.1 to CLEANFILES. MFC after: 3 days X-MFC-To: stable/10 only Sponsored by: The FreeBSD Foundation Modified: head/usr.bin/host/Makefile Modified: head/usr.bin/host/Makefile ============================================================================== --- head/usr.bin/host/Makefile Tue Aug 26 19:36:34 2014 (r270668) +++ head/usr.bin/host/Makefile Tue Aug 26 19:36:47 2014 (r270669) @@ -8,6 +8,7 @@ LDNSHOSTDIR= ${.CURDIR}/../../contrib/ld PROG= host SRCS= ldns-host.c MAN= host.1 +CLEANFILES+= host.1 host.1: ldns-host.1 sed -e 's/ldns-//gI' <${.ALLSRC} >${.TARGET} || \ From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 19:43:27 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id E06EBAF; Tue, 26 Aug 2014 19:43:26 +0000 (UTC) Received: from zxy.spb.ru (zxy.spb.ru [195.70.199.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 938CE3258; Tue, 26 Aug 2014 19:43:26 +0000 (UTC) Received: from slw by zxy.spb.ru with local (Exim 4.82 (FreeBSD)) (envelope-from ) id 1XMMeK-000CQO-KM; Tue, 26 Aug 2014 23:43:24 +0400 Date: Tue, 26 Aug 2014 23:43:24 +0400 From: Slawa Olhovchenkov To: Alexander Motin Subject: Re: svn commit: r265792 - head/sys/kern Message-ID: <20140826194324.GF2075@zxy.spb.ru> References: <201405100053.s4A0rbF9080571@svn.freebsd.org> <20140511083114.GA53503@zxy.spb.ru> <20140520154113.GA23318@zxy.spb.ru> <20140826185407.GE2075@zxy.spb.ru> <53FCE179.9030804@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <53FCE179.9030804@FreeBSD.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: slw@zxy.spb.ru X-SA-Exim-Scanned: No (on zxy.spb.ru); SAEximRunCond expanded to false Cc: "svn-src-head@freebsd.org" , Adrian Chadd , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 19:43:27 -0000 On Tue, Aug 26, 2014 at 10:35:21PM +0300, Alexander Motin wrote: > On 26.08.2014 21:54, Slawa Olhovchenkov wrote: > > On Tue, May 20, 2014 at 09:04:25AM -0700, Adrian Chadd wrote: > > > >> On 20 May 2014 08:41, Slawa Olhovchenkov wrote: > >> > >>>> (But if you try it on 10.0 and it changes things, by all means let me know.) > >>> > >>> I am try on 10.0, but not sure about significant improvement (may be > >>> 10%). > >>> > >>> For current CPU (E5-2650 v2 @ 2.60GHz) hwpmc don't working (1. after > >>> collect some data `pmcstat -R sample.out -G out.txt` don't decode any; > >>> 2. kldunload hwpmc do kernel crash) and I can't collect detailed > >>> profile information. > >> > >> Yup. I'm starting to get really ticked off at how pmc logging on > >> multi-core devices just "stops" after a while. I'll talk with other > >> pmc people and see if we can figure out what the heck is going on. :( > > > > Now I can test you work on CPU w/ working pmc. > > @ CPU_CLK_UNHALTED_CORE [241440 samples] > > > > 10.59% [25561] _mtx_lock_spin_cookie @ /boot/kernel/kernel > > 94.25% [24092] pmclog_reserve @ /boot/kernel/hwpmc.ko > > 100.0% [24092] pmclog_process_callchain > > 100.0% [24092] pmc_process_samples > > 100.0% [24092] pmc_hook_handler > > 100.0% [24092] hardclock_cnt @ /boot/kernel/kernel > > Slava, on large SMP systems you should specify some much bigger division > rate (like `-n 100000000`) when doing PMC sampling. Otherwise you are > mostly measuring PMC's internal lock congestion. OK, now traffic less (15.8 Gbit) Any other recomendations? last pid: 27787; load averages: 8.99, 8.53, 8.43 up 0+04:54:59 23:41:50 47 processes: 6 running, 41 sleeping CPU 0: 17.3% user, 0.0% nice, 36.9% system, 0.8% interrupt, 45.1% idle CPU 1: 12.9% user, 0.0% nice, 37.3% system, 0.4% interrupt, 49.4% idle CPU 2: 11.8% user, 0.0% nice, 40.4% system, 0.0% interrupt, 47.8% idle CPU 3: 11.4% user, 0.0% nice, 40.8% system, 0.4% interrupt, 47.5% idle CPU 4: 17.3% user, 0.0% nice, 41.2% system, 0.0% interrupt, 41.6% idle CPU 5: 14.9% user, 0.0% nice, 40.4% system, 0.4% interrupt, 44.3% idle CPU 6: 0.4% user, 0.0% nice, 5.5% system, 71.0% interrupt, 23.1% idle CPU 7: 0.4% user, 0.0% nice, 3.5% system, 63.9% interrupt, 32.2% idle CPU 8: 0.0% user, 0.0% nice, 3.5% system, 65.5% interrupt, 31.0% idle CPU 9: 0.4% user, 0.0% nice, 3.9% system, 70.2% interrupt, 25.5% idle CPU 10: 0.0% user, 0.0% nice, 3.9% system, 59.2% interrupt, 36.9% idle CPU 11: 0.4% user, 0.0% nice, 4.3% system, 69.8% interrupt, 25.5% idle Mem: 319M Active, 15G Inact, 96G Wired, 13G Free ARC: 90G Total, 85G MFU, 5233M MRU, 95M Anon, 396M Header, 101M Other Swap: @ CPU_CLK_UNHALTED_CORE [79302 samples] 09.97% [7908] _mtx_lock_spin_cookie @ /boot/kernel/kernel 95.73% [7570] pmclog_reserve @ /boot/kernel/hwpmc.ko 100.0% [7570] pmclog_process_callchain 100.0% [7570] pmc_process_samples 100.0% [7570] pmc_hook_handler 100.0% [7570] hardclock_cnt @ /boot/kernel/kernel 100.0% [7570] handleevents 97.54% [7384] timercb 100.0% [7384] lapic_handle_timer 02.46% [186] cpu_activeclock 100.0% [186] cpu_idle 100.0% [186] sched_idletd 100.0% [186] fork_exit 02.66% [210] callout_lock 94.76% [199] callout_reset_sbt_on 99.50% [198] tcp_timer_activate 94.95% [188] tcp_do_segment 100.0% [188] tcp_input 100.0% [188] ip_input 100.0% [188] netisr_dispatch_src 100.0% [188] ether_demux 100.0% [188] ether_nh_input 100.0% [188] netisr_dispatch_src 84.04% [158] ixgbe_rxeof @ /boot/kernel/if_ixgbe.ko 100.0% [158] ixgbe_msix_que 100.0% [158] intr_event_execute_handlers @ /boot/kernel/kernel 100.0% [158] ithread_loop 100.0% [158] fork_exit 15.96% [30] tcp_lro_flush 96.67% [29] ixgbe_rxeof @ /boot/kernel/if_ixgbe.ko 100.0% [29] ixgbe_msix_que 100.0% [29] intr_event_execute_handlers @ /boot/kernel/kernel 100.0% [29] ithread_loop 03.33% [1] tcp_lro_rx 100.0% [1] ixgbe_rxeof @ /boot/kernel/if_ixgbe.ko 100.0% [1] ixgbe_msix_que 100.0% [1] intr_event_execute_handlers @ /boot/kernel/kernel 05.05% [10] tcp_output 100.0% [10] tcp_do_segment 100.0% [10] tcp_input 100.0% [10] ip_input 100.0% [10] netisr_dispatch_src 100.0% [10] ether_demux 100.0% [10] ether_nh_input 100.0% [10] netisr_dispatch_src 100.0% [10] ixgbe_rxeof @ /boot/kernel/if_ixgbe.ko 100.0% [10] ixgbe_msix_que 100.0% [10] intr_event_execute_handlers @ /boot/kernel/kernel 100.0% [10] ithread_loop From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 19:58:49 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id A1D7594; Tue, 26 Aug 2014 19:58:49 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 72BE935CE; Tue, 26 Aug 2014 19:58:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7QJwnNC081169; Tue, 26 Aug 2014 19:58:49 GMT (envelope-from wblock@FreeBSD.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7QJwn3E081168; Tue, 26 Aug 2014 19:58:49 GMT (envelope-from wblock@FreeBSD.org) Message-Id: <201408261958.s7QJwn3E081168@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: wblock set sender to wblock@FreeBSD.org using -f From: Warren Block Date: Tue, 26 Aug 2014 19:58:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270670 - stable/10/sys/sys X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 19:58:49 -0000 Author: wblock (doc committer) Date: Tue Aug 26 19:58:48 2014 New Revision: 270670 URL: http://svnweb.freebsd.org/changeset/base/270670 Log: MFC r269743: Update the comments in exec.h with help from jilles. Modified: stable/10/sys/sys/exec.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/sys/exec.h ============================================================================== --- stable/10/sys/sys/exec.h Tue Aug 26 19:36:47 2014 (r270669) +++ stable/10/sys/sys/exec.h Tue Aug 26 19:58:48 2014 (r270670) @@ -39,12 +39,17 @@ #define _SYS_EXEC_H_ /* - * The following structure is found at the top of the user stack of each - * user process. The ps program uses it to locate argv and environment - * strings. Programs that wish ps to display other information may modify - * it; normally ps_argvstr points to the argv vector, and ps_nargvstr - * is the same as the program's argc. The fields ps_envstr and ps_nenvstr - * are the equivalent for the environment. + * Before ps_args existed, the following structure, found at the top of + * the user stack of each user process, was used by ps(1) to locate + * environment and argv strings. Normally ps_argvstr points to the + * argv vector, and ps_nargvstr is the same as the program's argc. The + * fields ps_envstr and ps_nenvstr are the equivalent for the environment. + * + * Programs should now use setproctitle(3) to change ps output. + * setproctitle() always informs the kernel with sysctl and sets the + * pointers in ps_strings. The kern.proc.args sysctl first tries p_args. + * If p_args is NULL, it then falls back to reading ps_strings and following + * the pointers. */ struct ps_strings { char **ps_argvstr; /* first of 0 or more argument strings */ @@ -55,6 +60,7 @@ struct ps_strings { /* * Address of ps_strings structure (in user space). + * Prefer the kern.ps_strings or kern.proc.ps_strings sysctls to this constant. */ #define PS_STRINGS (USRSTACK - sizeof(struct ps_strings)) #define SPARE_USRSPACE 4096 From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 20:01:18 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id B9210271; Tue, 26 Aug 2014 20:01:18 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 89F9A36AE; Tue, 26 Aug 2014 20:01:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7QK1IIJ082775; Tue, 26 Aug 2014 20:01:18 GMT (envelope-from wblock@FreeBSD.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7QK1Iog082773; Tue, 26 Aug 2014 20:01:18 GMT (envelope-from wblock@FreeBSD.org) Message-Id: <201408262001.s7QK1Iog082773@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: wblock set sender to wblock@FreeBSD.org using -f From: Warren Block Date: Tue, 26 Aug 2014 20:01:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r270671 - stable/9/sys/sys X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 20:01:18 -0000 Author: wblock (doc committer) Date: Tue Aug 26 20:01:18 2014 New Revision: 270671 URL: http://svnweb.freebsd.org/changeset/base/270671 Log: MFC r269743: Update the comments in exec.h with help from jilles. Modified: stable/9/sys/sys/exec.h Directory Properties: stable/9/sys/ (props changed) stable/9/sys/sys/ (props changed) Modified: stable/9/sys/sys/exec.h ============================================================================== --- stable/9/sys/sys/exec.h Tue Aug 26 19:58:48 2014 (r270670) +++ stable/9/sys/sys/exec.h Tue Aug 26 20:01:18 2014 (r270671) @@ -39,12 +39,17 @@ #define _SYS_EXEC_H_ /* - * The following structure is found at the top of the user stack of each - * user process. The ps program uses it to locate argv and environment - * strings. Programs that wish ps to display other information may modify - * it; normally ps_argvstr points to the argv vector, and ps_nargvstr - * is the same as the program's argc. The fields ps_envstr and ps_nenvstr - * are the equivalent for the environment. + * Before ps_args existed, the following structure, found at the top of + * the user stack of each user process, was used by ps(1) to locate + * environment and argv strings. Normally ps_argvstr points to the + * argv vector, and ps_nargvstr is the same as the program's argc. The + * fields ps_envstr and ps_nenvstr are the equivalent for the environment. + * + * Programs should now use setproctitle(3) to change ps output. + * setproctitle() always informs the kernel with sysctl and sets the + * pointers in ps_strings. The kern.proc.args sysctl first tries p_args. + * If p_args is NULL, it then falls back to reading ps_strings and following + * the pointers. */ struct ps_strings { char **ps_argvstr; /* first of 0 or more argument strings */ @@ -55,6 +60,7 @@ struct ps_strings { /* * Address of ps_strings structure (in user space). + * Prefer the kern.ps_strings or kern.proc.ps_strings sysctls to this constant. */ #define PS_STRINGS (USRSTACK - sizeof(struct ps_strings)) #define SPARE_USRSPACE 4096 From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 20:40:12 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id BEC1E857; Tue, 26 Aug 2014 20:40:12 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AAB013AC4; Tue, 26 Aug 2014 20:40:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7QKeCn2000646; Tue, 26 Aug 2014 20:40:12 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7QKeCx6000645; Tue, 26 Aug 2014 20:40:12 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408262040.s7QKeCx6000645@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 26 Aug 2014 20:40:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270672 - head/usr.bin/svn/svn X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 20:40:12 -0000 Author: gjb Date: Tue Aug 26 20:40:12 2014 New Revision: 270672 URL: http://svnweb.freebsd.org/changeset/base/270672 Log: Add svnlite.1 to CLEANFILES. MFC after: 3 days X-MFC-To: stable/10 only Sponsored by: The FreeBSD Foundation Modified: head/usr.bin/svn/svn/Makefile Modified: head/usr.bin/svn/svn/Makefile ============================================================================== --- head/usr.bin/svn/svn/Makefile Tue Aug 26 20:01:18 2014 (r270671) +++ head/usr.bin/svn/svn/Makefile Tue Aug 26 20:40:12 2014 (r270672) @@ -51,6 +51,7 @@ DPADD= ${LIBSVN_CLIENT} ${LIBSVN_WC} ${L ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \ ${LIBCRYPTO} ${LIBSSL} ${LIBPTHREAD} +CLEANFILES+= svnlite.1 .if(defined(ORGANIZATION) && !empty(ORGANIZATION)) DPSRCS+= freebsd-organization.h CLEANFILES+= freebsd-organization.h From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 21:15:35 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 1DAFA9CB; Tue, 26 Aug 2014 21:15:35 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 097E03ED8; Tue, 26 Aug 2014 21:15:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7QLFYBD020448; Tue, 26 Aug 2014 21:15:34 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7QLFYSR020447; Tue, 26 Aug 2014 21:15:34 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <201408262115.s7QLFYSR020447@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Tue, 26 Aug 2014 21:15:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270673 - head/sys/netinet X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 21:15:35 -0000 Author: tuexen Date: Tue Aug 26 21:15:34 2014 New Revision: 270673 URL: http://svnweb.freebsd.org/changeset/base/270673 Log: Announce SCTP support in the kern.features sysctl variables. MFC after: 3 days Modified: head/sys/netinet/sctp_sysctl.c Modified: head/sys/netinet/sctp_sysctl.c ============================================================================== --- head/sys/netinet/sctp_sysctl.c Tue Aug 26 20:40:12 2014 (r270672) +++ head/sys/netinet/sctp_sysctl.c Tue Aug 26 21:15:34 2014 (r270673) @@ -41,6 +41,9 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include + +FEATURE(sctp, "Stream Control Transmission Protocol"); /* * sysctl tunable variables From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 21:21:57 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 9B80BC24; Tue, 26 Aug 2014 21:21:57 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 875453F9F; Tue, 26 Aug 2014 21:21:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7QLLvVV024077; Tue, 26 Aug 2014 21:21:57 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7QLLvqs024076; Tue, 26 Aug 2014 21:21:57 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201408262121.s7QLLvqs024076@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Tue, 26 Aug 2014 21:21:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270674 - head/usr.bin/ktrace X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 21:21:57 -0000 Author: jhb Date: Tue Aug 26 21:21:57 2014 New Revision: 270674 URL: http://svnweb.freebsd.org/changeset/base/270674 Log: Clarify that the -c argument clears the list of tracepoints specified by -t (it does not clear all tracepoints). Submitted by: jmg, Eric van Gyzen MFC after: 1 week Modified: head/usr.bin/ktrace/ktrace.1 Modified: head/usr.bin/ktrace/ktrace.1 ============================================================================== --- head/usr.bin/ktrace/ktrace.1 Tue Aug 26 21:15:34 2014 (r270673) +++ head/usr.bin/ktrace/ktrace.1 Tue Aug 26 21:21:57 2014 (r270674) @@ -28,7 +28,7 @@ .\" @(#)ktrace.1 8.1 (Berkeley) 6/6/93 .\" $FreeBSD$ .\" -.Dd May 31, 2012 +.Dd August 26, 2014 .Dt KTRACE 1 .Os .Sh NAME @@ -81,7 +81,7 @@ Append to the trace file instead of recr Disable tracing on all user-owned processes, and, if executed by root, all processes in the system. .It Fl c -Clear the trace points associated with the specified file or processes. +Clear the specified trace points associated with the given file or processes. .It Fl d Descendants; perform the operation for all current children of the designated processes. @@ -102,8 +102,10 @@ Enable (disable) tracing on the indicate .Fl p flag is permitted). .It Fl t Ar trstr -The string argument represents the kernel trace points, one per letter. -The following table equates the letters with the tracepoints: +Specify the list of trace points to enable or disable, one per letter. +If an explicit list is not specified, the default set of trace points is used. +.Pp +The following trace points are supported: .Pp .Bl -tag -width flag -compact .It Cm c From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 21:24:01 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 6742AF4D; Tue, 26 Aug 2014 21:24:01 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 396AA3FD9; Tue, 26 Aug 2014 21:24:01 +0000 (UTC) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id A3F60B94A; Tue, 26 Aug 2014 17:23:59 -0400 (EDT) From: John Baldwin To: "John-Mark Gurney" Subject: Re: svn commit: r270444 - in head/sys: kern sys Date: Tue, 26 Aug 2014 17:23:10 -0400 User-Agent: KMail/1.13.5 (FreeBSD/8.4-CBSD-20140415; KDE/4.5.5; amd64; ; ) References: <201408240904.s7O949sI083660@svn.freebsd.org> <201408261509.26815.jhb@freebsd.org> <20140826193210.GL71691@funkthat.com> In-Reply-To: <20140826193210.GL71691@funkthat.com> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201408261723.10854.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Tue, 26 Aug 2014 17:23:59 -0400 (EDT) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, Mateusz Guzik , src-committers@freebsd.org, Mateusz Guzik X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 21:24:01 -0000 On Tuesday, August 26, 2014 3:32:10 pm John-Mark Gurney wrote: > John Baldwin wrote this message on Tue, Aug 26, 2014 at 15:09 -0400: > > On Monday, August 25, 2014 6:30:34 pm John-Mark Gurney wrote: > > > John Baldwin wrote this message on Mon, Aug 25, 2014 at 13:35 -0400: > > > > On Monday, August 25, 2014 07:02:41 PM Mateusz Guzik wrote: > > > > > On Mon, Aug 25, 2014 at 10:23:19AM -0400, John Baldwin wrote: > > > > > > On Sunday, August 24, 2014 09:04:09 AM Mateusz Guzik wrote: > > > > > > > Author: mjg > > > > > > > Date: Sun Aug 24 09:04:09 2014 > > > > > > > New Revision: 270444 > > > > > > > URL: http://svnweb.freebsd.org/changeset/base/270444 > > > > > > > > > > > > > > Log: > > > > > > > Fix getppid for traced processes. > > > > > > > > > > > > > > Traced processes always have the tracer set as the parent. > > > > > > > Utilize proc_realparent to obtain the right process when needed. > > > > > > > > > > > > Are you sure this won't break things? I know of several applications that > > > > > > expect a debugger to be the parent when attached and change behavior as a > > > > > > result (e.g. inserting a breakpoint on an assertion failure rather than > > > > > > generating a core). > > > > > > > > > > Well, this is what linux and solaris do. > > > > > > > > Interesting. > > > > > > > > > I don't feel strongly about this change. If you really want I'm happy to > > > > > revert. > > > > > > > > In general I'd like to someday have the debugger-debuggee relationship not > > > > override parent-child and this is a step in that direction. However, this > > > > will break existing applications, so this needs to be clearly documented in > > > > the release notes. In addition, we should probably advertise how a process > > > > can correctly determine if it is being run under a debugger (right now you can > > > > do 'getppid()' and use strcmp or strstr on the p_comm of that pid so you can > > > > do different things for "gdb" vs "gcore", etc. so just checking P_TRACED from > > > > kinfo_proc wouldn't be equivalent in functionality) > > > > > > But what about when you attach gdb to a running process... That > > > doesn't magicly make the now debugged process a child of gdb does it? > > > > % cat hello.c > > #include > > > > int > > main() > > { > > printf("hello world\n"); > > (void)getchar(); > > return (0); > > } > > % cc -g hello.c -o hello > > % ./hello > > hello world > > load: 9.81 cmd: hello 42599 [ttyin] 1.67r 0.00u 0.00s 0% 1056k > > > > < different window > > > > > % ps -O ppid -p `pgrep hello` > > PID PPID TT STAT TIME COMMAND > > 42599 5340 16 I+ 0:00.00 ./hello > > % gdb hello `pgrep hello` > > GNU gdb 6.1.1 [FreeBSD] > > ... > > (gdb) > > Suspended > > % ps -O ppid -p `pgrep hello` > > PID PPID TT STAT TIME COMMAND > > 42599 45079 16 TX+ 0:00.00 ./hello > > Wow, learn something new every day... > > But doesn't that break apps that use getppid to signal their parent > that forked them? Until mjg@'s commit, yes. It's been that way in FreeBSD at least for as long as I can remember. Certainly back to 4.x. -- John Baldwin From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 21:39:43 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id A1B5BA68 for ; Tue, 26 Aug 2014 21:39:43 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7E06F315B for ; Tue, 26 Aug 2014 21:39:43 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.9/8.14.9) with ESMTP id s7QLdhma014233 for ; Tue, 26 Aug 2014 21:39:43 GMT (envelope-from bdrewery@freefall.freebsd.org) Received: (from bdrewery@localhost) by freefall.freebsd.org (8.14.9/8.14.9/Submit) id s7QLdhVC014229 for svn-src-all@freebsd.org; Tue, 26 Aug 2014 21:39:43 GMT (envelope-from bdrewery) Received: (qmail 40304 invoked from network); 26 Aug 2014 16:39:41 -0500 Received: from unknown (HELO ?10.10.0.24?) (freebsd@shatow.net@10.10.0.24) by sweb.xzibition.com with ESMTPA; 26 Aug 2014 16:39:41 -0500 Message-ID: <53FCFE98.9010800@FreeBSD.org> Date: Tue, 26 Aug 2014 16:39:36 -0500 From: Bryan Drewery Organization: FreeBSD User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.0 MIME-Version: 1.0 To: John-Mark Gurney Subject: Re: svn commit: r270444 - in head/sys: kern sys References: <201408240904.s7O949sI083660@svn.freebsd.org> <201408261509.26815.jhb@freebsd.org> <20140826193210.GL71691@funkthat.com> <201408261723.10854.jhb@freebsd.org> In-Reply-To: <201408261723.10854.jhb@freebsd.org> OpenPGP: id=6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="LRugLOi8w5XMmr5B43HhmWM0fomc9h9aB" Cc: Mateusz Guzik , John Baldwin , Mateusz Guzik , svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-head@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 21:39:43 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --LRugLOi8w5XMmr5B43HhmWM0fomc9h9aB Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 8/26/2014 4:23 PM, John Baldwin wrote: > On Tuesday, August 26, 2014 3:32:10 pm John-Mark Gurney wrote: >> John Baldwin wrote this message on Tue, Aug 26, 2014 at 15:09 -0400: >>> On Monday, August 25, 2014 6:30:34 pm John-Mark Gurney wrote: >>>> John Baldwin wrote this message on Mon, Aug 25, 2014 at 13:35 -0400:= >>>>> On Monday, August 25, 2014 07:02:41 PM Mateusz Guzik wrote: >>>>>> On Mon, Aug 25, 2014 at 10:23:19AM -0400, John Baldwin wrote: >>>>>>> On Sunday, August 24, 2014 09:04:09 AM Mateusz Guzik wrote: >>>>>>>> Author: mjg >>>>>>>> Date: Sun Aug 24 09:04:09 2014 >>>>>>>> New Revision: 270444 >>>>>>>> URL: http://svnweb.freebsd.org/changeset/base/270444 >>>>>>>> >>>>>>>> Log: >>>>>>>> Fix getppid for traced processes. >>>>>>>> =20 >>>>>>>> Traced processes always have the tracer set as the parent. >>>>>>>> Utilize proc_realparent to obtain the right process when neede= d. >>>>>>> >>>>>>> Are you sure this won't break things? I know of several applicat= ions that >>>>>>> expect a debugger to be the parent when attached and change behav= ior as a >>>>>>> result (e.g. inserting a breakpoint on an assertion failure rathe= r than >>>>>>> generating a core). >>>>>> >>>>>> Well, this is what linux and solaris do. >>>>> >>>>> Interesting. >>>>> >>>>>> I don't feel strongly about this change. If you really want I'm ha= ppy to >>>>>> revert. >>>>> >>>>> In general I'd like to someday have the debugger-debuggee relations= hip not=20 >>>>> override parent-child and this is a step in that direction. Howeve= r, this=20 >>>>> will break existing applications, so this needs to be clearly docum= ented in=20 >>>>> the release notes. In addition, we should probably advertise how a= process=20 >>>>> can correctly determine if it is being run under a debugger (right = now you can=20 >>>>> do 'getppid()' and use strcmp or strstr on the p_comm of that pid s= o you can=20 >>>>> do different things for "gdb" vs "gcore", etc. so just checking P_T= RACED from=20 >>>>> kinfo_proc wouldn't be equivalent in functionality) >>>> >>>> But what about when you attach gdb to a running process... That >>>> doesn't magicly make the now debugged process a child of gdb does it= ? >>> >>> % cat hello.c >>> #include >>> >>> int >>> main() >>> { >>> printf("hello world\n"); >>> (void)getchar(); >>> return (0); >>> } >>> % cc -g hello.c -o hello >>> % ./hello=20 >>> hello world >>> load: 9.81 cmd: hello 42599 [ttyin] 1.67r 0.00u 0.00s 0% 1056k >>> >>> < different window > >>> >>> % ps -O ppid -p `pgrep hello` >>> PID PPID TT STAT TIME COMMAND >>> 42599 5340 16 I+ 0:00.00 ./hello >>> % gdb hello `pgrep hello` >>> GNU gdb 6.1.1 [FreeBSD] >>> ... >>> (gdb) >>> Suspended >>> % ps -O ppid -p `pgrep hello` >>> PID PPID TT STAT TIME COMMAND >>> 42599 45079 16 TX+ 0:00.00 ./hello >> >> Wow, learn something new every day... >> >> But doesn't that break apps that use getppid to signal their parent >> that forked them? >=20 > Until mjg@'s commit, yes. It's been that way in FreeBSD at least for > as long as I can remember. Certainly back to 4.x. >=20 Fun things can happen (local DoS) when you trace your own parent too. Recently fixed by other commits. Easily thwarted by security.bsd.unprivileged_proc_debug=3D0. --=20 Regards, Bryan Drewery --LRugLOi8w5XMmr5B43HhmWM0fomc9h9aB Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (MingW32) iQEcBAEBAgAGBQJT/P6YAAoJEDXXcbtuRpfPI60H/0Wo09VS/ar8zLbm0B8r8gSm uV4/vMKbtkXtKy7yoXVrEKrznZL6hrJLL8q9e9XF6njuSvGtgu9WS5s1pU8oD4OY cQfi7YsUt3+ESLFbSYNKoCIqaNKa/8uv3DcIc7YR2maDXCShbvc2KnShw5SFpVOd ObvppKxNnTGrfwjJW1Ha59gIad222oFmqQtA/4DUUF4PIk0AGNdHfcAivYbtcJnn HDUmfYo25x35kcTfzMaI5srgAwTVlMwBFdKpDZm7Kkc8O+uUSwdm9BioWeLkg9Nk 53s8E8SS+lGisVIzp3qlrFxtYDhrv40CtSEDXBtdL4gqwo0e42O/y79/3tUBvJM= =8fyp -----END PGP SIGNATURE----- --LRugLOi8w5XMmr5B43HhmWM0fomc9h9aB-- From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 21:55:29 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 5328021F; Tue, 26 Aug 2014 21:55:29 +0000 (UTC) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E60AB339C; Tue, 26 Aug 2014 21:55:28 +0000 (UTC) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.14.9/8.14.9) with ESMTP id s7QLtMix005151 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 27 Aug 2014 00:55:22 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.9.2 kib.kiev.ua s7QLtMix005151 Received: (from kostik@localhost) by tom.home (8.14.9/8.14.9/Submit) id s7QLtMPI005149; Wed, 27 Aug 2014 00:55:22 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Wed, 27 Aug 2014 00:55:22 +0300 From: Konstantin Belousov To: John Baldwin Subject: Re: svn commit: r270444 - in head/sys: kern sys Message-ID: <20140826215522.GG2737@kib.kiev.ua> References: <201408240904.s7O949sI083660@svn.freebsd.org> <201408261509.26815.jhb@freebsd.org> <20140826193210.GL71691@funkthat.com> <201408261723.10854.jhb@freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="zb2WCku5UPqpvxO1" Content-Disposition: inline In-Reply-To: <201408261723.10854.jhb@freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on tom.home Cc: Mateusz Guzik , Mateusz Guzik , John-Mark Gurney , src-committers@freebsd.org, svn-src-head@freebsd.org, svn-src-all@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 21:55:29 -0000 --zb2WCku5UPqpvxO1 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Aug 26, 2014 at 05:23:10PM -0400, John Baldwin wrote: > On Tuesday, August 26, 2014 3:32:10 pm John-Mark Gurney wrote: > > John Baldwin wrote this message on Tue, Aug 26, 2014 at 15:09 -0400: > > > On Monday, August 25, 2014 6:30:34 pm John-Mark Gurney wrote: > > > > John Baldwin wrote this message on Mon, Aug 25, 2014 at 13:35 -0400: > > > > > On Monday, August 25, 2014 07:02:41 PM Mateusz Guzik wrote: > > > > > > On Mon, Aug 25, 2014 at 10:23:19AM -0400, John Baldwin wrote: > > > > > > > On Sunday, August 24, 2014 09:04:09 AM Mateusz Guzik wrote: > > > > > > > > Author: mjg > > > > > > > > Date: Sun Aug 24 09:04:09 2014 > > > > > > > > New Revision: 270444 > > > > > > > > URL: http://svnweb.freebsd.org/changeset/base/270444 > > > > > > > >=20 > > > > > > > > Log: > > > > > > > > Fix getppid for traced processes. > > > > > > > > =20 > > > > > > > > Traced processes always have the tracer set as the parent. > > > > > > > > Utilize proc_realparent to obtain the right process when = needed. > > > > > > >=20 > > > > > > > Are you sure this won't break things? I know of several appl= ications that > > > > > > > expect a debugger to be the parent when attached and change b= ehavior as a > > > > > > > result (e.g. inserting a breakpoint on an assertion failure r= ather than > > > > > > > generating a core). Shouldn't such applications use a breakpoint instruction like INT3 unconditionally then ? Detection of the attached debugger is inherently racy, the debugger might have detached after the test. This, and the fact that default action for the SIGTRAP is coredumping. > > > > > >=20 > > > > > > Well, this is what linux and solaris do. > > > > >=20 > > > > > Interesting. > > > > >=20 > > > > > > I don't feel strongly about this change. If you really want I'm= happy to > > > > > > revert. > > > > >=20 > > > > > In general I'd like to someday have the debugger-debuggee relatio= nship not=20 > > > > > override parent-child and this is a step in that direction. Howe= ver, this=20 > > > > > will break existing applications, so this needs to be clearly doc= umented in=20 > > > > > the release notes. In addition, we should probably advertise how= a process=20 > > > > > can correctly determine if it is being run under a debugger (righ= t now you can=20 > > > > > do 'getppid()' and use strcmp or strstr on the p_comm of that pid= so you can=20 > > > > > do different things for "gdb" vs "gcore", etc. so just checking P= _TRACED from=20 > > > > > kinfo_proc wouldn't be equivalent in functionality) > > > >=20 > > > > But what about when you attach gdb to a running process... That > > > > doesn't magicly make the now debugged process a child of gdb does i= t? > > >=20 > > > % cat hello.c > > > #include > > >=20 > > > int > > > main() > > > { > > > printf("hello world\n"); > > > (void)getchar(); > > > return (0); > > > } > > > % cc -g hello.c -o hello > > > % ./hello=20 > > > hello world > > > load: 9.81 cmd: hello 42599 [ttyin] 1.67r 0.00u 0.00s 0% 1056k > > >=20 > > > < different window > > > >=20 > > > % ps -O ppid -p `pgrep hello` > > > PID PPID TT STAT TIME COMMAND > > > 42599 5340 16 I+ 0:00.00 ./hello > > > % gdb hello `pgrep hello` > > > GNU gdb 6.1.1 [FreeBSD] > > > ... > > > (gdb) > > > Suspended > > > % ps -O ppid -p `pgrep hello` > > > PID PPID TT STAT TIME COMMAND > > > 42599 45079 16 TX+ 0:00.00 ./hello > >=20 > > Wow, learn something new every day... > >=20 > > But doesn't that break apps that use getppid to signal their parent > > that forked them? >=20 > Until mjg@'s commit, yes. It's been that way in FreeBSD at least for > as long as I can remember. Certainly back to 4.x. The ps(1) trick continues to work after the commit, since kern_proc sysctl directly accesses p_pptr to fill ki_ppid. I simply forgot about it during the review. Anyway, checking the parent pid is definitely not the right way to see if the process is under ptrace debugging. What if the parent is the debugger ? The p_flag AKA ki_flag P_TRACED bit seems to be the correct indicator. --zb2WCku5UPqpvxO1 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJT/QJJAAoJEJDCuSvBvK1BEfkP/jjIzJjcDvk+DitCmqKWoe7i rp//4QfHcy6dFhrfvE/6hY50RC9OkDYPW1dN+8BMuiFv776ZvNpSRPS20d8tHF2Y dJlo+ljE+2YzS3u279fP7b0g1CtbR6gJSaxLrrnQmsAZ/xkGGZuKXT2mlzy7389g cy3Kyx8UhwgSiDujcIpFygB7OK2zmvioygt2eZY52n7p9IIUJ/PI8KBmm870Q+9g tJw3ziuP6YYd7k37zpkhYBVKdmzR+H7TKjLKjIr5+xbKE4BJEyhBcWSWFuoI8RjI MEdsZ0N4CbOHnVgEnCD4JJ7GTHWQi3Ug02yKKmeZd4u8eiUtIeeAftOhMI3HjFGp 316Q/M/qbzJo/NsaRx+CRKOKEXzxXEGsI28hCcPfBYcfj+jrrQ3DVlCkL2PJ6p6D yCG8KfeitmnR1bkz+34py//Ah2llENkPiGpItl9GeM/22KYc/kJXeHDJ0emTh+M+ MVZyyhjsDKsSrv9M9wgMZhvARyYg/o3htU+zv7iFbR/iFRwnnvoAb2Nq5RCctsBv Cr261JZjH29QbjvGT/jxoeuks3vgEpx0j6IuACPE5Gqdl7W3UiXiMSpTubMHDznG iH0B3B8yjX56W6uOuwfDRcjHnd9U+F2LW0gVIdOT+yKZwrXZZZ+soXF6UaEL1NuU kxNqjeIfMAWddg3ML7yY =0bVf -----END PGP SIGNATURE----- --zb2WCku5UPqpvxO1-- From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 22:05:42 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id D1FE066F; Tue, 26 Aug 2014 22:05:42 +0000 (UTC) Received: from mail-qa0-x232.google.com (mail-qa0-x232.google.com [IPv6:2607:f8b0:400d:c00::232]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6D93234A9; Tue, 26 Aug 2014 22:05:42 +0000 (UTC) Received: by mail-qa0-f50.google.com with SMTP id s7so14649320qap.9 for ; Tue, 26 Aug 2014 15:05:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=PE+bHw0BptnETiUHFEJtSjX3B8y1f0M9AbA3WCIeyk4=; b=auqL357Axl8MZo2PmsJptxHFnWLshvtdwiuxA4YqO2KWnUBX00L7w9xuEqqo5bLPYK dbNWZwJPQEj8APZisUaVpdcrfUloB4UH87zFdRXi5kjYCN9PoaRm9VoakGA0iXYWrtUB miPtePnoKpQqqzVUIUO1Qq76ADhmXmMNNEHcXJcm25SWCGftkES7ORoxwLVnyus/acRO 7fNqhYQ4qFozfmaQIBkK0EdG48fzsTc/HasqKasfkHKUkdVQo6/LzElj901Z65aT2YjI CZ/LxCZSDbNxZyv+MoiBJHavl8UxlMIEd7qZ7OlYaYCuZlqYH9wzjgE0RXxq2pzQJWUa 2TAQ== MIME-Version: 1.0 X-Received: by 10.140.104.69 with SMTP id z63mr47388929qge.81.1409090741352; Tue, 26 Aug 2014 15:05:41 -0700 (PDT) Sender: adrian.chadd@gmail.com Received: by 10.224.39.139 with HTTP; Tue, 26 Aug 2014 15:05:41 -0700 (PDT) In-Reply-To: <20140826185407.GE2075@zxy.spb.ru> References: <201405100053.s4A0rbF9080571@svn.freebsd.org> <20140511083114.GA53503@zxy.spb.ru> <20140520154113.GA23318@zxy.spb.ru> <20140826185407.GE2075@zxy.spb.ru> Date: Tue, 26 Aug 2014 15:05:41 -0700 X-Google-Sender-Auth: _9Z8W2RUPmBKvtLvaFA3bOFHdhU Message-ID: Subject: Re: svn commit: r265792 - head/sys/kern From: Adrian Chadd To: Slawa Olhovchenkov Content-Type: text/plain; charset=UTF-8 Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 22:05:42 -0000 This to me reads like "we need to fix pmc's locking so it's not so terrible on multi-multi-core-machines." :) -a On 26 August 2014 11:54, Slawa Olhovchenkov wrote: > On Tue, May 20, 2014 at 09:04:25AM -0700, Adrian Chadd wrote: > >> On 20 May 2014 08:41, Slawa Olhovchenkov wrote: >> >> >> (But if you try it on 10.0 and it changes things, by all means let me know.) >> > >> > I am try on 10.0, but not sure about significant improvement (may be >> > 10%). >> > >> > For current CPU (E5-2650 v2 @ 2.60GHz) hwpmc don't working (1. after >> > collect some data `pmcstat -R sample.out -G out.txt` don't decode any; >> > 2. kldunload hwpmc do kernel crash) and I can't collect detailed >> > profile information. >> >> Yup. I'm starting to get really ticked off at how pmc logging on >> multi-core devices just "stops" after a while. I'll talk with other >> pmc people and see if we can figure out what the heck is going on. :( > > Now I can test you work on CPU w/ working pmc. > Current traffic 16.8 Gbit/s. > CPU: Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz (2000.04-MHz K8-class CPU) > > last pid: 22677; load averages: 9.12, 9.07, 8.90 up 0+04:06:06 22:52:57 > 47 processes: 3 running, 44 sleeping > CPU 0: 11.8% user, 0.0% nice, 43.1% system, 1.6% interrupt, 43.5% idle > CPU 1: 11.4% user, 0.0% nice, 51.8% system, 0.0% interrupt, 36.9% idle > CPU 2: 10.6% user, 0.0% nice, 46.3% system, 0.8% interrupt, 42.4% idle > CPU 3: 11.8% user, 0.0% nice, 45.1% system, 0.4% interrupt, 42.7% idle > CPU 4: 13.7% user, 0.0% nice, 43.1% system, 0.0% interrupt, 43.1% idle > CPU 5: 14.5% user, 0.0% nice, 45.9% system, 0.4% interrupt, 39.2% idle > CPU 6: 0.0% user, 0.0% nice, 5.5% system, 68.6% interrupt, 25.9% idle > CPU 7: 0.0% user, 0.0% nice, 4.3% system, 70.2% interrupt, 25.5% idle > CPU 8: 0.0% user, 0.0% nice, 2.7% system, 69.4% interrupt, 27.8% idle > CPU 9: 0.0% user, 0.0% nice, 4.7% system, 67.1% interrupt, 28.2% idle > CPU 10: 0.0% user, 0.0% nice, 3.1% system, 76.9% interrupt, 20.0% idle > CPU 11: 0.0% user, 0.0% nice, 5.1% system, 58.8% interrupt, 36.1% idle > Mem: 322M Active, 15G Inact, 96G Wired, 956K Cache, 13G Free > ARC: 90G Total, 84G MFU, 5690M MRU, 45M Anon, 394M Header, 98M Other > Swap: > > > > @ CPU_CLK_UNHALTED_CORE [241440 samples] > > 10.59% [25561] _mtx_lock_spin_cookie @ /boot/kernel/kernel > 94.25% [24092] pmclog_reserve @ /boot/kernel/hwpmc.ko > 100.0% [24092] pmclog_process_callchain > 100.0% [24092] pmc_process_samples > 100.0% [24092] pmc_hook_handler > 100.0% [24092] hardclock_cnt @ /boot/kernel/kernel > 100.0% [24092] handleevents > 99.62% [24001] timercb > 100.0% [24001] lapic_handle_timer > 00.38% [91] cpu_activeclock > 100.0% [91] cpu_idle > 100.0% [91] sched_idletd > 100.0% [91] fork_exit > 03.04% [777] callout_lock > 91.63% [712] callout_reset_sbt_on > 98.60% [702] tcp_timer_activate > 94.87% [666] tcp_do_segment > 100.0% [666] tcp_input > 100.0% [666] ip_input > 100.0% [666] netisr_dispatch_src > 100.0% [666] ether_demux > 100.0% [666] ether_nh_input > 100.0% [666] netisr_dispatch_src > 98.05% [653] ixgbe_rxeof @ /boot/kernel/if_ixgbe.ko > 87.44% [571] ixgbe_msix_que > 100.0% [571] intr_event_execute_handlers @ /boot/kernel/kernel > 100.0% [571] ithread_loop > 100.0% [571] fork_exit > 12.56% [82] ixgbe_handle_que @ /boot/kernel/if_ixgbe.ko > 100.0% [82] taskqueue_run_locked @ /boot/kernel/kernel > 100.0% [82] taskqueue_thread_loop > 100.0% [82] fork_exit > 01.95% [13] tcp_lro_flush > 92.31% [12] ixgbe_rxeof @ /boot/kernel/if_ixgbe.ko > 100.0% [12] ixgbe_msix_que > 100.0% [12] intr_event_execute_handlers @ /boot/kernel/kernel > 100.0% [12] ithread_loop > 07.69% [1] tcp_lro_rx > 100.0% [1] ixgbe_rxeof @ /boot/kernel/if_ixgbe.ko > 100.0% [1] ixgbe_msix_que > 100.0% [1] intr_event_execute_handlers @ /boot/kernel/kernel > 05.13% [36] tcp_output > 100.0% [36] tcp_do_segment > 100.0% [36] tcp_input > 100.0% [36] ip_input > 100.0% [36] netisr_dispatch_src > 100.0% [36] ether_demux > 100.0% [36] ether_nh_input > 100.0% [36] netisr_dispatch_src > 100.0% [36] ixgbe_rxeof @ /boot/kernel/if_ixgbe.ko > 91.67% [33] ixgbe_msix_que > 100.0% [33] intr_event_execute_handlers @ /boot/kernel/kernel > 100.0% [33] ithread_loop > 08.33% [3] ixgbe_handle_que @ /boot/kernel/if_ixgbe.ko > 100.0% [3] taskqueue_run_locked @ /boot/kernel/kernel > 100.0% [3] taskqueue_thread_loop From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 22:20:03 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 6E33EB5B; Tue, 26 Aug 2014 22:20:03 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 593C535FE; Tue, 26 Aug 2014 22:20:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7QMK3hn048662; Tue, 26 Aug 2014 22:20:03 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7QMK2Lr048657; Tue, 26 Aug 2014 22:20:02 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201408262220.s7QMK2Lr048657@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Tue, 26 Aug 2014 22:20:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270675 - head/usr.sbin/mailwrapper X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 22:20:03 -0000 Author: bapt Date: Tue Aug 26 22:20:02 2014 New Revision: 270675 URL: http://svnweb.freebsd.org/changeset/base/270675 Log: Allow mailwrapper to use mailer.conf from localbase (respecting LOCALBASE env var if set) Phabric: https://reviews.freebsd.org/D412 Reviewed by: bdrewery MFC after: 2 weeks Relnotes: yes Modified: head/usr.sbin/mailwrapper/mailwrapper.8 head/usr.sbin/mailwrapper/mailwrapper.c Modified: head/usr.sbin/mailwrapper/mailwrapper.8 ============================================================================== --- head/usr.sbin/mailwrapper/mailwrapper.8 Tue Aug 26 21:21:57 2014 (r270674) +++ head/usr.sbin/mailwrapper/mailwrapper.8 Tue Aug 26 22:20:02 2014 (r270675) @@ -31,7 +31,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd August 7, 2006 +.Dd August 27, 2014 .Dt MAILWRAPPER 8 .Os .Sh NAME @@ -109,6 +109,8 @@ utility is designed to replace and to invoke an appropriate MTA instead of .Xr sendmail 8 based on configuration information placed in +.Pa ${LOCALBASE}/etc/mail/mailer.conf +falling back on .Pa /etc/mail/mailer.conf . This permits the administrator to configure which MTA is to be invoked on the system at run time. @@ -126,6 +128,8 @@ should be turned off in Configuration for .Nm is kept in +.Pa ${LOCALBASE}/etc/mail/mailer.conf +or .Pa /etc/mail/mailer.conf . .Pa /usr/sbin/sendmail is typically set up as a symbolic link to Modified: head/usr.sbin/mailwrapper/mailwrapper.c ============================================================================== --- head/usr.sbin/mailwrapper/mailwrapper.c Tue Aug 26 21:21:57 2014 (r270674) +++ head/usr.sbin/mailwrapper/mailwrapper.c Tue Aug 26 22:20:02 2014 (r270675) @@ -35,6 +35,8 @@ #include __FBSDID("$FreeBSD$"); +#include + #include #include #include @@ -87,6 +89,8 @@ main(int argc, char *argv[], char *envp[ FILE *config; char *line, *cp, *from, *to, *ap; const char *progname; + char localmailerconf[MAXPATHLEN]; + const char *mailerconf; size_t len, lineno = 0; int i; struct arglist al; @@ -98,11 +102,18 @@ main(int argc, char *argv[], char *envp[ initarg(&al); addarg(&al, argv[0]); - if ((config = fopen(_PATH_MAILERCONF, "r")) == NULL) { + snprintf(localmailerconf, MAXPATHLEN, "%s/etc/mail/mailer.conf", + getenv("LOCALBASE") ? getenv("LOCALBASE") : "/usr/local"); + + mailerconf = localmailerconf; + if ((config = fopen(localmailerconf, "r")) == NULL) + mailerconf = _PATH_MAILERCONF; + + if (config == NULL && ((config = fopen(mailerconf, "r")) == NULL)) { addarg(&al, NULL); openlog(getprogname(), LOG_PID, LOG_MAIL); syslog(LOG_INFO, "cannot open %s, using %s as default MTA", - _PATH_MAILERCONF, _PATH_DEFAULTMTA); + mailerconf, _PATH_DEFAULTMTA); closelog(); execve(_PATH_DEFAULTMTA, al.argv, envp); err(EX_OSERR, "cannot exec %s", _PATH_DEFAULTMTA); @@ -112,7 +123,7 @@ main(int argc, char *argv[], char *envp[ for (;;) { if ((line = fparseln(config, &len, &lineno, NULL, 0)) == NULL) { if (feof(config)) - errx(EX_CONFIG, "no mapping in %s", _PATH_MAILERCONF); + errx(EX_CONFIG, "no mapping in %s", mailerconf); err(EX_CONFIG, "cannot parse line %lu", (u_long)lineno); } @@ -157,6 +168,6 @@ main(int argc, char *argv[], char *envp[ /*NOTREACHED*/ parse_error: errx(EX_CONFIG, "parse error in %s at line %lu", - _PATH_MAILERCONF, (u_long)lineno); + mailerconf, (u_long)lineno); /*NOTREACHED*/ } From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 22:21:35 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 44BA6CD9; Tue, 26 Aug 2014 22:21:35 +0000 (UTC) Received: from zxy.spb.ru (zxy.spb.ru [195.70.199.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ED183368C; Tue, 26 Aug 2014 22:21:34 +0000 (UTC) Received: from slw by zxy.spb.ru with local (Exim 4.82 (FreeBSD)) (envelope-from ) id 1XMP7M-0004c1-0j; Wed, 27 Aug 2014 02:21:32 +0400 Date: Wed, 27 Aug 2014 02:21:32 +0400 From: Slawa Olhovchenkov To: Adrian Chadd Subject: Re: svn commit: r265792 - head/sys/kern Message-ID: <20140826222131.GG2075@zxy.spb.ru> References: <201405100053.s4A0rbF9080571@svn.freebsd.org> <20140511083114.GA53503@zxy.spb.ru> <20140520154113.GA23318@zxy.spb.ru> <20140826185407.GE2075@zxy.spb.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: slw@zxy.spb.ru X-SA-Exim-Scanned: No (on zxy.spb.ru); SAEximRunCond expanded to false Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 22:21:35 -0000 On Tue, Aug 26, 2014 at 03:05:41PM -0700, Adrian Chadd wrote: > This to me reads like "we need to fix pmc's locking so it's not so > terrible on multi-multi-core-machines." :) I am may be wrong, but I don't see in pmc interrupt path. May be this is need fix too? > On 26 August 2014 11:54, Slawa Olhovchenkov wrote: > > On Tue, May 20, 2014 at 09:04:25AM -0700, Adrian Chadd wrote: > > > >> On 20 May 2014 08:41, Slawa Olhovchenkov wrote: > >> > >> >> (But if you try it on 10.0 and it changes things, by all means let me know.) > >> > > >> > I am try on 10.0, but not sure about significant improvement (may be > >> > 10%). > >> > > >> > For current CPU (E5-2650 v2 @ 2.60GHz) hwpmc don't working (1. after > >> > collect some data `pmcstat -R sample.out -G out.txt` don't decode any; > >> > 2. kldunload hwpmc do kernel crash) and I can't collect detailed > >> > profile information. > >> > >> Yup. I'm starting to get really ticked off at how pmc logging on > >> multi-core devices just "stops" after a while. I'll talk with other > >> pmc people and see if we can figure out what the heck is going on. :( > > > > Now I can test you work on CPU w/ working pmc. > > Current traffic 16.8 Gbit/s. > > CPU: Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz (2000.04-MHz K8-class CPU) > > > > last pid: 22677; load averages: 9.12, 9.07, 8.90 up 0+04:06:06 22:52:57 > > 47 processes: 3 running, 44 sleeping > > CPU 0: 11.8% user, 0.0% nice, 43.1% system, 1.6% interrupt, 43.5% idle > > CPU 1: 11.4% user, 0.0% nice, 51.8% system, 0.0% interrupt, 36.9% idle > > CPU 2: 10.6% user, 0.0% nice, 46.3% system, 0.8% interrupt, 42.4% idle > > CPU 3: 11.8% user, 0.0% nice, 45.1% system, 0.4% interrupt, 42.7% idle > > CPU 4: 13.7% user, 0.0% nice, 43.1% system, 0.0% interrupt, 43.1% idle > > CPU 5: 14.5% user, 0.0% nice, 45.9% system, 0.4% interrupt, 39.2% idle > > CPU 6: 0.0% user, 0.0% nice, 5.5% system, 68.6% interrupt, 25.9% idle > > CPU 7: 0.0% user, 0.0% nice, 4.3% system, 70.2% interrupt, 25.5% idle > > CPU 8: 0.0% user, 0.0% nice, 2.7% system, 69.4% interrupt, 27.8% idle > > CPU 9: 0.0% user, 0.0% nice, 4.7% system, 67.1% interrupt, 28.2% idle > > CPU 10: 0.0% user, 0.0% nice, 3.1% system, 76.9% interrupt, 20.0% idle > > CPU 11: 0.0% user, 0.0% nice, 5.1% system, 58.8% interrupt, 36.1% idle > > Mem: 322M Active, 15G Inact, 96G Wired, 956K Cache, 13G Free > > ARC: 90G Total, 84G MFU, 5690M MRU, 45M Anon, 394M Header, 98M Other > > Swap: > > > > > > > > @ CPU_CLK_UNHALTED_CORE [241440 samples] > > > > 10.59% [25561] _mtx_lock_spin_cookie @ /boot/kernel/kernel > > 94.25% [24092] pmclog_reserve @ /boot/kernel/hwpmc.ko > > 100.0% [24092] pmclog_process_callchain > > 100.0% [24092] pmc_process_samples > > 100.0% [24092] pmc_hook_handler > > 100.0% [24092] hardclock_cnt @ /boot/kernel/kernel > > 100.0% [24092] handleevents > > 99.62% [24001] timercb > > 100.0% [24001] lapic_handle_timer > > 00.38% [91] cpu_activeclock > > 100.0% [91] cpu_idle > > 100.0% [91] sched_idletd > > 100.0% [91] fork_exit > > 03.04% [777] callout_lock > > 91.63% [712] callout_reset_sbt_on > > 98.60% [702] tcp_timer_activate > > 94.87% [666] tcp_do_segment > > 100.0% [666] tcp_input > > 100.0% [666] ip_input > > 100.0% [666] netisr_dispatch_src > > 100.0% [666] ether_demux > > 100.0% [666] ether_nh_input > > 100.0% [666] netisr_dispatch_src > > 98.05% [653] ixgbe_rxeof @ /boot/kernel/if_ixgbe.ko > > 87.44% [571] ixgbe_msix_que > > 100.0% [571] intr_event_execute_handlers @ /boot/kernel/kernel > > 100.0% [571] ithread_loop > > 100.0% [571] fork_exit > > 12.56% [82] ixgbe_handle_que @ /boot/kernel/if_ixgbe.ko > > 100.0% [82] taskqueue_run_locked @ /boot/kernel/kernel > > 100.0% [82] taskqueue_thread_loop > > 100.0% [82] fork_exit > > 01.95% [13] tcp_lro_flush > > 92.31% [12] ixgbe_rxeof @ /boot/kernel/if_ixgbe.ko > > 100.0% [12] ixgbe_msix_que > > 100.0% [12] intr_event_execute_handlers @ /boot/kernel/kernel > > 100.0% [12] ithread_loop > > 07.69% [1] tcp_lro_rx > > 100.0% [1] ixgbe_rxeof @ /boot/kernel/if_ixgbe.ko > > 100.0% [1] ixgbe_msix_que > > 100.0% [1] intr_event_execute_handlers @ /boot/kernel/kernel > > 05.13% [36] tcp_output > > 100.0% [36] tcp_do_segment > > 100.0% [36] tcp_input > > 100.0% [36] ip_input > > 100.0% [36] netisr_dispatch_src > > 100.0% [36] ether_demux > > 100.0% [36] ether_nh_input > > 100.0% [36] netisr_dispatch_src > > 100.0% [36] ixgbe_rxeof @ /boot/kernel/if_ixgbe.ko > > 91.67% [33] ixgbe_msix_que > > 100.0% [33] intr_event_execute_handlers @ /boot/kernel/kernel > > 100.0% [33] ithread_loop > > 08.33% [3] ixgbe_handle_que @ /boot/kernel/if_ixgbe.ko > > 100.0% [3] taskqueue_run_locked @ /boot/kernel/kernel > > 100.0% [3] taskqueue_thread_loop From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 22:33:34 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id D1B2D2AE; Tue, 26 Aug 2014 22:33:34 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BE076390A; Tue, 26 Aug 2014 22:33:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7QMXYoG056792; Tue, 26 Aug 2014 22:33:34 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7QMXYfd056791; Tue, 26 Aug 2014 22:33:34 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201408262233.s7QMXYfd056791@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Tue, 26 Aug 2014 22:33:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270676 - head/etc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 22:33:34 -0000 Author: bapt Date: Tue Aug 26 22:33:34 2014 New Revision: 270676 URL: http://svnweb.freebsd.org/changeset/base/270676 Log: Allow to configure services from ${LOCALBASE}/etc/rc.conf.d Reviewed by: bdrewery MFC after: 1 week Relnotes: yes Modified: head/etc/rc.subr Modified: head/etc/rc.subr ============================================================================== --- head/etc/rc.subr Tue Aug 26 22:20:02 2014 (r270675) +++ head/etc/rc.subr Tue Aug 26 22:33:34 2014 (r270676) @@ -1301,6 +1301,10 @@ load_rc_config() fi done fi + if [ -f ${LOCALBASE:-/usr/local}/etc/rc.conf.d/"$_name" ]; then + debug "Sourcing ${LOCALBASE:-/usr/local}/etc/rc.conf.d/${_name}" + . ${LOCALBASE:-/usr/local}/etc/rc.conf.d/"$_name" + fi # Set defaults if defined. for _var in $rcvar; do From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 22:39:25 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id F392F883; Tue, 26 Aug 2014 22:39:24 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E02C43AA8; Tue, 26 Aug 2014 22:39:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7QMdOpY057669; Tue, 26 Aug 2014 22:39:24 GMT (envelope-from gavin@FreeBSD.org) Received: (from gavin@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7QMdOUp057668; Tue, 26 Aug 2014 22:39:24 GMT (envelope-from gavin@FreeBSD.org) Message-Id: <201408262239.s7QMdOUp057668@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gavin set sender to gavin@FreeBSD.org using -f From: Gavin Atkinson Date: Tue, 26 Aug 2014 22:39:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270677 - head/etc/pam.d X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 22:39:25 -0000 Author: gavin Date: Tue Aug 26 22:39:24 2014 New Revision: 270677 URL: http://svnweb.freebsd.org/changeset/base/270677 Log: Fix xref, pam(8) -> pam(3) PR: 193045 Submitted by: rsimmons0 gmail com MFC after: 3 days Modified: head/etc/pam.d/README Modified: head/etc/pam.d/README ============================================================================== --- head/etc/pam.d/README Tue Aug 26 22:33:34 2014 (r270676) +++ head/etc/pam.d/README Tue Aug 26 22:39:24 2014 (r270677) @@ -8,7 +8,7 @@ particular service, the /etc/pam.d/other file does not exist, /etc/pam.conf is searched for entries matching the specified service or, failing that, the "other" service. -See the pam(8) manual page for an explanation of the workings of the +See the pam(3) manual page for an explanation of the workings of the PAM library and descriptions of the various files and modules. Below is a summary of the format for the pam.conf and /etc/pam.d/* files. From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 22:47:41 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 1CF78D8B; Tue, 26 Aug 2014 22:47:41 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 07ED63B9C; Tue, 26 Aug 2014 22:47:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7QMleYi062224; Tue, 26 Aug 2014 22:47:40 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7QMleYl062223; Tue, 26 Aug 2014 22:47:40 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408262247.s7QMleYl062223@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 26 Aug 2014 22:47:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270678 - stable/10/release/doc/en_US.ISO8859-1/hardware X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 22:47:41 -0000 Author: gjb Date: Tue Aug 26 22:47:40 2014 New Revision: 270678 URL: http://svnweb.freebsd.org/changeset/base/270678 Log: Add the following to the hardware notes: - aacraid(4) - alc(4) - ath_hal(4) - atp(4) - cxgbe(4) - hptnr(4) Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/hardware/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/hardware/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/hardware/article.xml Tue Aug 26 22:39:24 2014 (r270677) +++ stable/10/release/doc/en_US.ISO8859-1/hardware/article.xml Tue Aug 26 22:47:40 2014 (r270678) @@ -665,6 +665,8 @@ &hwlist.aac; + &hwlist.aacraid; + &hwlist.adv; &hwlist.adw; @@ -709,6 +711,8 @@ &hwlist.hptmv; + &hwlist.hptnr; + &hwlist.hptrr; &hwlist.ida; @@ -819,6 +823,8 @@ &hwlist.ale; + &hwlist.alc; + &hwlist.aue; &hwlist.axe; @@ -846,6 +852,8 @@ &hwlist.cxgb; + &hwlist.cxgbe; + &hwlist.dc; &hwlist.de; @@ -998,6 +1006,8 @@ &hwlist.ath; + &hwlist.ath.hal; + &hwlist.bwi; &hwlist.bwn; @@ -1581,6 +1591,10 @@ + &hwlist.atp; + + + [&arch.amd64;, &arch.i386;] PS/2 keyboards (&man.atkbd.4; driver) From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 22:54:55 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 50C15448; Tue, 26 Aug 2014 22:54:55 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3C7AB3C92; Tue, 26 Aug 2014 22:54:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7QMst4q066886; Tue, 26 Aug 2014 22:54:55 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7QMstrv066884; Tue, 26 Aug 2014 22:54:55 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201408262254.s7QMstrv066884@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Tue, 26 Aug 2014 22:54:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270679 - head/share/man/man5 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 22:54:55 -0000 Author: bapt Date: Tue Aug 26 22:54:54 2014 New Revision: 270679 URL: http://svnweb.freebsd.org/changeset/base/270679 Log: Document the new ${LOCALBASE}/etc/rc.conf.d in rc.conf(5) MFC after: 1 week Modified: head/share/man/man5/rc.conf.5 Modified: head/share/man/man5/rc.conf.5 ============================================================================== --- head/share/man/man5/rc.conf.5 Tue Aug 26 22:47:40 2014 (r270678) +++ head/share/man/man5/rc.conf.5 Tue Aug 26 22:54:54 2014 (r270679) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 15, 2014 +.Dd August 27, 2014 .Dt RC.CONF 5 .Os .Sh NAME @@ -69,6 +69,8 @@ you can also place smaller configuration .Xr rc 8 script in the .Pa /etc/rc.conf.d +directory or in the +.Pa ${LOCALBASE}/etc/rc.conf.d directory, which will be included by the .Va load_rc_config function. From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 23:19:10 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 5DB0BDD9; Tue, 26 Aug 2014 23:19:10 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 48AC53F1E; Tue, 26 Aug 2014 23:19:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7QNJAqh077333; Tue, 26 Aug 2014 23:19:10 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7QNJAhp077332; Tue, 26 Aug 2014 23:19:10 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408262319.s7QNJAhp077332@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 26 Aug 2014 23:19:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270680 - stable/10/release/doc/en_US.ISO8859-1/hardware X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 23:19:10 -0000 Author: gjb Date: Tue Aug 26 23:19:09 2014 New Revision: 270680 URL: http://svnweb.freebsd.org/changeset/base/270680 Log: Fix alphabetical sorting with alc(4) addition. Move atp(4) driver under 'Pointing Devices', added to 'Keyboards' by mistake. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/hardware/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/hardware/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/hardware/article.xml Tue Aug 26 22:54:54 2014 (r270679) +++ stable/10/release/doc/en_US.ISO8859-1/hardware/article.xml Tue Aug 26 23:19:09 2014 (r270680) @@ -821,10 +821,10 @@ &hwlist.age; - &hwlist.ale; - &hwlist.alc; + &hwlist.ale; + &hwlist.aue; &hwlist.axe; @@ -1591,10 +1591,6 @@ - &hwlist.atp; - - - [&arch.amd64;, &arch.i386;] PS/2 keyboards (&man.atkbd.4; driver) @@ -1614,6 +1610,10 @@ + &hwlist.atp; + + + [&arch.amd64;, &arch.i386;, &arch.pc98;] Bus mice and compatible devices (&man.mse.4; driver) From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 23:31:24 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 2FBF929A; Tue, 26 Aug 2014 23:31:24 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1B5E03099; Tue, 26 Aug 2014 23:31:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7QNVMwH082899; Tue, 26 Aug 2014 23:31:22 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7QNVMOb082898; Tue, 26 Aug 2014 23:31:22 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408262331.s7QNVMOb082898@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 26 Aug 2014 23:31:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270681 - stable/10/release/doc/en_US.ISO8859-1/errata X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 23:31:24 -0000 Author: gjb Date: Tue Aug 26 23:31:22 2014 New Revision: 270681 URL: http://svnweb.freebsd.org/changeset/base/270681 Log: Fix a typo: s/sytem/system/ Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/errata/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/errata/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/errata/article.xml Tue Aug 26 23:19:09 2014 (r270680) +++ stable/10/release/doc/en_US.ISO8859-1/errata/article.xml Tue Aug 26 23:31:22 2014 (r270681) @@ -333,7 +333,7 @@ boot Updating LSI firmware on &man.mps.4; controllers with the sas2flash utility may cause - the system to hang, or may cause the sytem to panic. This + the system to hang, or may cause the system to panic. This is fixed in the stable/10 branch with revisions r262553 and r262575, and will be included in From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 23:45:27 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 2A4E4919; Tue, 26 Aug 2014 23:45:27 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 139BD321A; Tue, 26 Aug 2014 23:45:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7QNjRxh090789; Tue, 26 Aug 2014 23:45:27 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7QNjRlr090788; Tue, 26 Aug 2014 23:45:27 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408262345.s7QNjRlr090788@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 26 Aug 2014 23:45:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270682 - stable/10/release/doc/en_US.ISO8859-1/hardware X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 23:45:27 -0000 Author: gjb Date: Tue Aug 26 23:45:26 2014 New Revision: 270682 URL: http://svnweb.freebsd.org/changeset/base/270682 Log: Fix the stable/10 hardware/article.xml to conform to FDP style conventions. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/hardware/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/hardware/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/hardware/article.xml Tue Aug 26 23:31:22 2014 (r270681) +++ stable/10/release/doc/en_US.ISO8859-1/hardware/article.xml Tue Aug 26 23:45:26 2014 (r270682) @@ -1,14 +1,15 @@ %release; %devauto; ]> -
- &os; &release.current; Hardware Notes - +
+ + &os; &release.current; Hardware Notes The &os; Documentation Project @@ -30,7 +31,8 @@ 2012 2013 2014 - The &os; Documentation Project + The &os; Documentation + Project @@ -43,7 +45,6 @@ &tm-attrib.sun; &tm-attrib.general; - @@ -97,8 +98,8 @@ - The single-core &intel; &xeon; - processors Nocona, Irwindale, + The single-core &intel; &xeon; processors + Nocona, Irwindale, Potomac, and Cranford have EM64T support. @@ -121,9 +122,10 @@ Some &intel; &pentium; 4s and Celeron Ds using the Prescott core have EM64T support. See - the Intel - Processor Spec Finder for the definitive answer about - EM64T support in Intel processors. + the Intel + Processor Spec Finder for the definitive answer + about EM64T support in Intel processors. @@ -148,14 +150,14 @@ i386 &os;/&arch.i386; runs on a wide variety of IBM PC - compatible machines. Due to the wide range of + compatible machines. Due to the wide range of hardware available for this architecture, it is impossible to exhaustively list all combinations of equipment supported by &os;. Nevertheless, some general guidelines are presented here. Almost all &i386;-compatible processors with a floating - point unit are supported. All &intel; processors beginning + point unit are supported. All &intel; processors beginning with the 80486 are supported, including the 80486, &pentium;, &pentium; Pro, &pentium; II, &pentium; III, &pentium; 4, and variants thereof, such as the &xeon; and &celeron; processors. @@ -225,19 +227,22 @@ (DSDT) provided by each machine's BIOS. Some machines have bad or incomplete DSDTs, which prevents ACPI from functioning correctly. Replacement DSDTs for some machines can be found - at the DSDT - section of the ACPI4Linux project - Web site. &os; can use these DSDTs to override the DSDT - provided by the BIOS; see the &man.acpi.4; manual page for - more information. + at the DSDT + section of the ACPI4Linux + project Web site. &os; can use these DSDTs to override the + DSDT provided by the BIOS; see the &man.acpi.4; manual page + for more information. ia64 - Currently supported processors are the &itanium; - and the &itanium; - 2. + Currently supported processors are the &itanium; + and the &itanium; 2. Supported chipsets include: @@ -260,10 +265,10 @@ Most devices that can be found in or are compatible with &arch.ia64; machines are fully supported. The notable - exception is the VGA console. The &os; support for VGA + exception is the VGA console. The &os; support for VGA consoles is at this time too much based on PC hardware and not all &arch.ia64; machines have chipsets that provide sufficient - PC legacy support. As such &man.syscons.4; can not be enabled + PC legacy support. As such &man.syscons.4; cannot be enabled and the use of a serial console is required. @@ -299,8 +304,8 @@ powerpc - All Apple PowerPC machines with built-in USB are supported, - as well a limited selection of non-Apple machines, + All Apple PowerPC machines with built-in USB are + supported, as well a limited selection of non-Apple machines, including KVM on POWER7 SMP is supported on all systems with more than @@ -311,8 +316,8 @@ sparc64 This section describes the systems currently known to be - supported by &os; on the Fujitsu &sparc64; and Sun &ultrasparc; - platforms. + supported by &os; on the Fujitsu &sparc64; and Sun + &ultrasparc; platforms. SMP is supported on all systems with more than 1 processor. @@ -322,8 +327,8 @@ supported by the &man.creator.4; (Sun Creator, Sun Creator3D and Sun Elite3D) or &man.machfb.4; (Sun PGX and Sun PGX64 as well as the ATI Mach64 chips found onboard in for example - &sun.blade; 100, &sun.blade; 150, &sun.ultra; 5 and &sun.ultra; 10) - driver must use the serial console. + &sun.blade; 100, &sun.blade; 150, &sun.ultra; 5 and + &sun.ultra; 10) driver must use the serial console. If you have a system that is not listed here, it may not have been tested with &os; &release.current;. We encourage @@ -468,10 +473,11 @@ The following systems are partially supported by &os;. In - particular the fiber channel controllers in SBus-based systems are not - supported. However, it is possible to use these with a SCSI controller - supported by the &man.esp.4; driver (Sun ESP SCSI, Sun FAS Fast-SCSI - and Sun FAS366 Fast-Wide SCSI controllers). + particular the fiber channel controllers in SBus-based systems + are not supported. However, it is possible to use these with + a SCSI controller supported by the &man.esp.4; driver (Sun ESP + SCSI, Sun FAS Fast-SCSI and Sun FAS366 Fast-Wide SCSI + controllers). @@ -483,9 +489,9 @@ - Starting with 7.2-RELEASE, &arch.sparc64; systems based on Sun - &ultrasparc; III and beyond are also supported by &os;, which includes - the following known working systems: + Starting with 7.2-RELEASE, &arch.sparc64; systems based on + Sun &ultrasparc; III and beyond are also supported by &os;, + which includes the following known working systems: @@ -513,7 +519,8 @@ - &sun.fire; V215 (support first appeared in 7.3-RELEASE and 8.1-RELEASE) + &sun.fire; V215 (support first appeared in 7.3-RELEASE + and 8.1-RELEASE) @@ -521,7 +528,8 @@ - &sun.fire; V245 (support first appeared in 7.3-RELEASE and 8.1-RELEASE) + &sun.fire; V245 (support first appeared in 7.3-RELEASE + and 8.1-RELEASE) @@ -534,9 +542,10 @@ - &sun.fire; V480 (501-6780 and 501-6790 centerplanes only, for - which support first appeared in 7.3-RELEASE and 8.1-RELEASE, - other centerplanes might work beginning with 8.3-RELEASE and 9.0-RELEASE) + &sun.fire; V480 (501-6780 and 501-6790 centerplanes + only, for which support first appeared in 7.3-RELEASE and + 8.1-RELEASE, other centerplanes might work beginning with + 8.3-RELEASE and 9.0-RELEASE) @@ -544,8 +553,9 @@ - &sun.fire; V890 (support first appeared in 7.4-RELEASE and 8.1-RELEASE, - non-mixed &ultrasparc; IV/IV+ CPU-configurations only) + &sun.fire; V890 (support first appeared in 7.4-RELEASE + and 8.1-RELEASE, non-mixed &ultrasparc; IV/IV+ + CPU-configurations only) @@ -554,7 +564,7 @@ The following Sun &ultrasparc; systems are not tested but - believed to be also supported by &os;: + also believed to be supported by &os;: @@ -562,14 +572,16 @@ - &sun.fire; V490 (support first appeared in 7.4-RELEASE and 8.1-RELEASE, - non-mixed &ultrasparc; IV/IV+ CPU-configurations only) + &sun.fire; V490 (support first appeared in 7.4-RELEASE + and 8.1-RELEASE, non-mixed &ultrasparc; IV/IV+ + CPU-configurations only) - Starting with 7.4-RELEASE and 8.1-RELEASE, &arch.sparc64; systems based on - Fujitsu &sparc64; V are also supported by &os;, which - includes the following known working systems: + Starting with 7.4-RELEASE and 8.1-RELEASE, &arch.sparc64; + systems based on Fujitsu &sparc64; V are also supported by + &os;, which includes the following known working + systems: @@ -577,8 +589,8 @@ - The following Fujitsu &primepower; systems are not tested but - believed to be also supported by &os;: + The following Fujitsu &primepower; systems are not tested + but also believed to be supported by &os;: @@ -699,7 +711,7 @@ [&arch.amd64;, &arch.i386;] Booting from these - controllers is supported. EISA adapters are not + controllers is supported. EISA adapters are not supported. @@ -731,7 +743,7 @@ [&arch.amd64;, &arch.i386;] Booting from these - controllers is supported. EISA adapters are not + controllers is supported. EISA adapters are not supported. @@ -782,8 +794,8 @@ support CD-ROM commands are supported for read-only access by the CD-ROM drivers (such as &man.cd.4;). WORM/CD-R/CD-RW writing support is provided by &man.cdrecord.1;, which is a - part of the sysutils/cdrtools port in the Ports - Collection. + part of the sysutils/cdrtools port in the + Ports Collection. The following CD-ROM type systems are supported at this time: @@ -1023,8 +1035,8 @@ 4965AGN IEEE 802.11n PCI network adapters (&man.iwn.4; driver) - [&arch.i386;, &arch.amd64;] Marvell Libertas IEEE 802.11b/g - PCI network adapters (&man.malo.4; driver) + [&arch.i386;, &arch.amd64;] Marvell Libertas IEEE + 802.11b/g PCI network adapters (&man.malo.4; driver) Marvell 88W8363 IEEE 802.11n wireless network adapters (&man.mwl.4; driver) @@ -1145,12 +1157,13 @@ - [&arch.amd64;, &arch.i386;] Avlab Technology, PCI IO 2S - and PCI IO 4S + [&arch.amd64;, &arch.i386;] Avlab Technology, PCI IO + 2S and PCI IO 4S - [&arch.amd64;, &arch.i386;] Comtrol RocketPort 550 + [&arch.amd64;, &arch.i386;] Comtrol RocketPort + 550 @@ -1224,7 +1237,7 @@ [&arch.amd64;, &arch.i386;] SIIG Cyber 4S PCI - 16C550/16C650/16C850 + 16C550/16C650/16C850 @@ -1307,7 +1320,7 @@ "flags 0x15000?01" is necessary in kernel - configuration. + configuration. [&arch.pc98;] Media Intelligent RSB-384 (&man.sio.4; @@ -1456,7 +1469,8 @@ [&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;] - USB Bluetooth adapters can be found in Bluetooth section. + USB Bluetooth adapters can be found in Bluetooth section. &hwlist.ohci; @@ -1578,7 +1592,8 @@ Information regarding specific video cards and compatibility with Xorg can be - found at http://www.x.org/. + found at http://www.x.org/. [&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;] @@ -1637,7 +1652,8 @@ &man.moused.8; has more information on using pointing devices with &os;. Information on using pointing devices - with Xorg can be found at http://www.x.org/. + with Xorg can be found at http://www.x.org/. [&arch.amd64;, &arch.i386;] PC standard @@ -1670,8 +1686,9 @@ [&arch.i386;] Xilinx XC6200-based reconfigurable hardware - cards compatible with the HOT1 from Virtual Computers (xrpu - driver). + cards compatible with the HOT1 from Virtual Computers + (xrpu driver). [&arch.pc98;] Power Management Controller of NEC PC-98 Note (pmc driver) From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 23:50:22 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 7C7CBD89; Tue, 26 Aug 2014 23:50:22 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DA0D327D; Tue, 26 Aug 2014 23:50:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7QNoM1U094304; Tue, 26 Aug 2014 23:50:22 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7QNoMMt094303; Tue, 26 Aug 2014 23:50:22 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408262350.s7QNoMMt094303@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 26 Aug 2014 23:50:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270683 - stable/10/release/doc/en_US.ISO8859-1/readme X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 23:50:22 -0000 Author: gjb Date: Tue Aug 26 23:50:21 2014 New Revision: 270683 URL: http://svnweb.freebsd.org/changeset/base/270683 Log: Update the readme/article.xml to reflect send-pr(1) is deprecated, and direct to Bugzilla. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/readme/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/readme/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/readme/article.xml Tue Aug 26 23:45:26 2014 (r270682) +++ stable/10/release/doc/en_US.ISO8859-1/readme/article.xml Tue Aug 26 23:50:21 2014 (r270683) @@ -249,21 +249,17 @@ course even more welcome. The preferred method to submit bug reports from a machine - with Internet mail connectivity is to use the &man.send-pr.1; - command. + with Internet connectivity is to use the Bugzilla + bug tracker. Problem Reports (PRs) submitted in this way will be filed and their progress tracked; the &os; developers will do their best to respond to all reported bugs as soon as - possible. A list + possible. A list of all active PRs is available on the &os; Web site; this list is useful to see what potential problems other users have encountered. - Note that &man.send-pr.1; itself is a shell script that - should be easy to move even onto a non-&os; system. Using - this interface is highly preferred. If, for some reason, you - are unable to use &man.send-pr.1; to submit a bug report, you - can try to send it to the &a.bugs;. + Note that &man.send-pr.1; is deprecated. For more information, Writing &os; Problem Reports, available on the &os; Web From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 23:51:02 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 1121DF0C; Tue, 26 Aug 2014 23:51:02 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F100B332A; Tue, 26 Aug 2014 23:51:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7QNp16W094445; Tue, 26 Aug 2014 23:51:01 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7QNp1BK094444; Tue, 26 Aug 2014 23:51:01 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408262351.s7QNp1BK094444@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 26 Aug 2014 23:51:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270684 - stable/10/release/doc/en_US.ISO8859-1/readme X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 23:51:02 -0000 Author: gjb Date: Tue Aug 26 23:51:01 2014 New Revision: 270684 URL: http://svnweb.freebsd.org/changeset/base/270684 Log: Bump copyright year. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/readme/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/readme/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/readme/article.xml Tue Aug 26 23:50:21 2014 (r270683) +++ stable/10/release/doc/en_US.ISO8859-1/readme/article.xml Tue Aug 26 23:51:01 2014 (r270684) @@ -35,6 +35,7 @@ 2011 2012 2013 + 2014 The &os; Documentation Project From owner-svn-src-all@FreeBSD.ORG Tue Aug 26 23:58:54 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id A520C54E; Tue, 26 Aug 2014 23:58:54 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8EA3F33C1; Tue, 26 Aug 2014 23:58:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7QNws6S096019; Tue, 26 Aug 2014 23:58:54 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7QNwswR096018; Tue, 26 Aug 2014 23:58:54 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408262358.s7QNwswR096018@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 26 Aug 2014 23:58:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270685 - stable/10/release/doc/en_US.ISO8859-1/readme X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 23:58:54 -0000 Author: gjb Date: Tue Aug 26 23:58:54 2014 New Revision: 270685 URL: http://svnweb.freebsd.org/changeset/base/270685 Log: Fix the stable/10 hardware/article.xml to conform to FDP style conventions. Fix a few rendering issues, while here. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/readme/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/readme/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/readme/article.xml Tue Aug 26 23:51:01 2014 (r270684) +++ stable/10/release/doc/en_US.ISO8859-1/readme/article.xml Tue Aug 26 23:58:54 2014 (r270685) @@ -1,10 +1,10 @@ %release; ]> - -
- &os; &release.current; README - +
+ + &os; &release.current; README The &os; Project @@ -36,7 +37,8 @@ 2012 2013 2014 - The &os; Documentation Project + The &os; Documentation + Project @@ -47,31 +49,32 @@ &tm-attrib.general; - - This document gives a brief introduction to &os; - &release.current;. It includes some information on how to - obtain &os;, a listing of various ways to contact the &os; - Project, and pointers to some other sources of - information. - + + This document gives a brief introduction to &os; + &release.current;. It includes some information on how to + obtain &os;, a listing of various ways to contact the &os; + Project, and pointers to some other sources of + information. + Introduction - This distribution is a &release.type; of &os; &release.current;, the - latest point along the &release.branch; branch. + This distribution is a &release.type; of &os; + &release.current;, the latest point along the &release.branch; + branch. About &os; &os; is an operating system based on 4.4 BSD Lite for - AMD64 and Intel EM64T based PC hardware (&arch.amd64;), - Intel, AMD, Cyrix or NexGen x86 based PC hardware (&arch.i386;), - Intel Itanium Processor based computers (&arch.ia64;), - NEC PC-9801/9821 series PCs and compatibles (&arch.pc98;), - and &ultrasparc; machines (&arch.sparc64;). Versions - for the &arm; (&arch.arm;), &mips; (&arch.mips;), and + AMD64 and Intel EM64T based PC hardware (&arch.amd64;), Intel, + AMD, Cyrix or NexGen x86 based PC hardware + (&arch.i386;), Intel Itanium Processor based computers + (&arch.ia64;), NEC PC-9801/9821 series PCs and compatibles + (&arch.pc98;), and &ultrasparc; machines (&arch.sparc64;). + Versions for the &arm; (&arch.arm;), &mips; (&arch.mips;), and &powerpc; (&arch.powerpc;) architectures are currently under development as well. &os; works with a wide variety of peripherals and configurations and can be used for everything @@ -88,61 +91,63 @@ A large collection of third-party ported software (the Ports Collection) is also provided to make it - easy to obtain and install all your favorite traditional &unix; - utilities for &os;. Each port consists of a - set of scripts to retrieve, configure, build, and install a - piece of software, with a single command. Over &os.numports; - ports, from editors to programming languages to graphical - applications, make &os; a powerful and comprehensive operating - environment that extends far beyond what's provided by many - commercial versions of &unix;. Most ports are also available as - pre-compiled packages, which can be quickly - installed from the installation program. + easy to obtain and install all your favorite traditional + &unix; utilities for &os;. Each port consists + of a set of scripts to retrieve, configure, build, and install + a piece of software, with a single command. Over + &os.numports; ports, from editors to programming languages to + graphical applications, make &os; a powerful and comprehensive + operating environment that extends far beyond what's provided + by many commercial versions of &unix;. Most ports are also + available as pre-compiled packages, which can + be quickly installed from the installation program. Target Audience - This &release.type; is aimed primarily at early adopters - and various other users who want to get involved with the - ongoing development of &os;. While the &os; development team - tries its best to ensure that each &release.type; works as - advertised, &release.branch; is very much a - work-in-progress. - - The basic requirements for using this &release.type; are - technical proficiency with &os; and an understanding of the - ongoing development process of &os; &release.branch; (as - discussed on the &a.stable;). - - For those more interested in doing business with &os; than - in experimenting with new &os; technology, formal releases - (such as &release.prev.stable;) are frequently more appropriate. - Releases undergo a period of testing and quality assurance - checking to ensure high reliability and dependability. - - This &release.type; is aimed primarily at early adopters - and various other users who want to get involved with the - ongoing development of &os;. While the &os; development team - tries its best to ensure that each &release.type; works as - advertised, &release.branch; is very much a - work-in-progress. - - The basic requirements for using this &release.type; are - technical proficiency with &os; and an understanding of the - ongoing development process of &os; &release.branch; (as - discussed on the &a.stable;). - - For those more interested in doing business with &os; than - in experimenting with new &os; technology, formal releases - (such as &release.prev.stable;) are frequently more appropriate. - Releases undergo a period of testing and quality assurance - checking to ensure high reliability and dependability. - - This &release.type; of &os; is suitable for all users. It - has undergone a period of testing and quality assurance - checking to ensure the highest reliability and - dependability. + This &release.type; is aimed + primarily at early adopters and various other users who want + to get involved with the ongoing development of &os;. While + the &os; development team tries its best to ensure that each + &release.type; works as advertised, &release.branch; is very + much a work-in-progress. + + The basic requirements for using + this &release.type; are technical proficiency with &os; and an + understanding of the ongoing development process of &os; + &release.branch; (as discussed on the &a.stable;). + + For those more interested in doing + business with &os; than in experimenting with new &os; + technology, formal releases (such as &release.prev.stable;) + are frequently more appropriate. Releases undergo a period of + testing and quality assurance checking to ensure high + reliability and dependability. + + This &release.type; is aimed + primarily at early adopters and various other users who want + to get involved with the ongoing development of &os;. While + the &os; development team tries its best to ensure that each + &release.type; works as advertised, &release.branch; is very + much a work-in-progress. + + The basic requirements for using + this &release.type; are technical proficiency with &os; and an + understanding of the ongoing development process of &os; + &release.branch; (as discussed on the &a.stable;). + + For those more interested in doing + business with &os; than in experimenting with new &os; + technology, formal releases (such as &release.prev.stable;) + are frequently more appropriate. Releases undergo a period of + testing and quality assurance checking to ensure high + reliability and dependability. + + This &release.type; of &os; is + suitable for all users. It has undergone a period of testing + and quality assurance checking to ensure the highest + reliability and dependability. @@ -166,16 +171,18 @@ Collection, or other extra material. A list of the CDROM and DVD publishers known to the - project are listed in the Obtaining - &os; appendix to the Handbook. + project are listed in the Obtaining + &os; appendix to the Handbook. FTP You can use FTP to retrieve &os; and any or all of its - optional packages from ftp://ftp.FreeBSD.org/, which is the official - &os; release site, or any of its + optional packages from ftp://ftp.FreeBSD.org/, + which is the official &os; release site, or any of its mirrors. Lists of locations that mirror &os; can be found in the @@ -187,8 +194,9 @@ Additional mirror sites are always welcome. Contact freebsd-admin@FreeBSD.org for more details on becoming an official mirror site. You can also find useful - information for mirror sites at the Mirroring - &os; article. + information for mirror sites at the Mirroring &os; + article. Mirrors generally contain the ISO images generally used to create a CDROM of a &os; release. They usually also contain @@ -208,16 +216,17 @@ For any questions or general technical support issues, please send mail to the &a.questions;. - If you're tracking the &release.branch; development efforts, you + If tracking the &release.branch; development efforts, you must join the &a.stable;, in order to keep abreast of recent developments and changes that may affect the way you use and maintain the system. - Being a largely-volunteer effort, the &os; - Project is always happy to have extra hands willing to help—there are already far more desired enhancements than - there is time to implement them. To contact the developers on - technical matters, or with offers of help, please send mail to - the &a.hackers;. + Being a largely-volunteer effort, the &os; Project is + always happy to have extra hands willing to help—there + are already far more desired enhancements than there is time + to implement them. To contact the developers on technical + matters, or with offers of help, please send mail to the + &a.hackers;. Please note that these mailing lists can experience significant amounts of traffic. If you @@ -226,13 +235,15 @@ preferable to subscribe instead to the &a.announce;. All of the mailing lists can be freely joined by anyone - wishing to do so. Visit the - &os; Mailman Info Page. This will give you more - information on joining the various lists, accessing archives, - etc. There are a number of mailing lists targeted at special - interest groups not mentioned here; more information can be - obtained either from the Mailman pages or the mailing - lists section of the &os; Web site. + wishing to do so. Visit the &os; Mailman Info + Page. This will give you more information on joining + the various lists, accessing archives, etc. There are + a number of mailing lists targeted at special interest groups + not mentioned here; more information can be obtained either + from the Mailman pages or the mailing + lists section of the &os; Web site. Do not send email to the lists @@ -250,22 +261,24 @@ course even more welcome. The preferred method to submit bug reports from a machine - with Internet connectivity is to use the Bugzilla - bug tracker. + with Internet connectivity is to use the + Bugzilla bug tracker. Problem Reports (PRs) submitted in this way will be filed and their progress tracked; the &os; developers will do their best to respond to all reported bugs as soon as - possible. A list - of all active PRs is available on the &os; Web site; - this list is useful to see what potential problems other users - have encountered. + possible. A list of all + active PRs is available on the &os; Web site; this + list is useful to see what potential problems other users have + encountered. Note that &man.send-pr.1; is deprecated. - For more information, Writing - &os; Problem Reports, available on the &os; Web - site, has a number of helpful hints on writing and submitting - effective problem reports. + For more information, Writing + &os; Problem Reports, available on the &os; + Web site, has a number of helpful hints on writing and + submitting effective problem reports. @@ -284,47 +297,47 @@ provided in various formats. Most distributions will include both ASCII text (.TXT) and HTML (.HTM) renditions. Some distributions - may also include other formats such as Portable Document Format - (.PDF). + may also include other formats such as Portable Document + Format (.PDF). - - - README.TXT: This file, which - gives some general information about &os; as well as - some cursory notes about obtaining a - distribution. - - - - RELNOTES.TXT: The release - notes, showing what's new and different in &os; - &release.current; compared to the previous release (&os; - &release.prev;). - - - - HARDWARE.TXT: The hardware - compatibility list, showing devices with which &os; has - been tested and is known to work. - - - - ERRATA.TXT: Release errata. - Late-breaking, post-release information can be found in - this file, which is principally applicable to releases - (as opposed to snapshots). It is important to consult - this file before installing a release of &os;, as it - contains the latest information on problems which have - been found and fixed since the release was - created. - - - + + + README.TXT: This file, which + gives some general information about &os; as well as + some cursory notes about obtaining a + distribution. + + + + RELNOTES.TXT: The release + notes, showing what's new and different in &os; + &release.current; compared to the previous release (&os; + &release.prev;). + + + + HARDWARE.TXT: The hardware + compatibility list, showing devices with which &os; has + been tested and is known to work. + + + + ERRATA.TXT: Release errata. + Late-breaking, post-release information can be found in + this file, which is principally applicable to releases + (as opposed to snapshots). It is important to consult + this file before installing a release of &os;, as it + contains the latest information on problems which have + been found and fixed since the release was + created. + + On platforms that support &man.bsdinstall.8; (currently - &arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;, and &arch.sparc64;), these documents are generally available via the - Documentation menu during installation. Once the system is - installed, you can revisit this menu by re-running the + &arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;, and + &arch.sparc64;), these documents are generally available via + the Documentation menu during installation. Once the system + is installed, you can revisit this menu by re-running the &man.bsdinstall.8; utility. @@ -336,8 +349,9 @@ other copies are kept updated on the Internet and should be consulted as the current errata for this release. These other copies of the errata are located at - &url.base;/releases/ (as - well as any sites which keep up-to-date mirrors of this + &url.base;/releases/ + (as well as any sites which keep up-to-date mirrors of this location). @@ -345,50 +359,54 @@ Manual Pages - As with almost all &unix; like operating systems, &os; comes - with a set of on-line manual pages, accessed through the - &man.man.1; command or through the hypertext manual - pages gateway on the &os; Web site. In general, the - manual pages provide information on the different commands and - APIs available to the &os; user. + As with almost all &unix; like operating systems, &os; + comes with a set of on-line manual pages, accessed through the + &man.man.1; command or through the hypertext + manual pages gateway on the &os; Web site. In + general, the manual pages provide information on the different + commands and APIs available to the &os; user. In some cases, manual pages are written to give information on particular topics. Notable examples of such - manual pages are &man.tuning.7; (a guide to performance tuning), - &man.security.7; (an introduction to &os; security), and - &man.style.9; (a style guide to kernel coding). + manual pages are &man.tuning.7; (a guide to performance + tuning), &man.security.7; (an introduction to &os; security), + and &man.style.9; (a style guide to kernel coding). Books and Articles Two highly-useful collections of &os;-related information, - maintained by the &os; Project, - are the &os; Handbook and &os; FAQ (Frequently Asked - Questions document). On-line versions of the Handbook - and FAQ - are always available from the &os; Documentation - page or its mirrors. If you install the + maintained by the &os; Project, are the &os; Handbook and &os; + FAQ (Frequently Asked Questions document). On-line versions + of the Handbook and FAQ are always + available from the &os; Documentation + page or its mirrors. If you install the doc distribution set, you can use a Web browser to read the Handbook and FAQ locally. In particular, note that the Handbook contains a step-by-step guide to installing &os;. A number of on-line books and articles, also maintained by - the &os; Project, cover more-specialized, &os;-related topics. - This material spans a wide range of topics, from effective use - of the mailing lists, to dual-booting &os; with other - operating systems, to guidelines for new committers. Like the - Handbook and FAQ, these documents are available from the &os; - Documentation Page or in the doc - distribution set. + the &os; Project, cover more-specialized, &os;-related topics. + This material spans a wide range of topics, from effective use + of the mailing lists, to dual-booting &os; with other + operating systems, to guidelines for new committers. Like the + Handbook and FAQ, these documents are available from the &os; + Documentation Page or in the doc + distribution set. A listing of other books and documents about &os; can be - found in the bibliography - of the &os; Handbook. Because of &os;'s strong &unix; heritage, - many other articles and books written for &unix; systems are - applicable as well, some of which are also listed in the - bibliography. + found in the bibliography + of the &os; Handbook. Because of &os;'s strong &unix; + heritage, many other articles and books written for &unix; + systems are applicable as well, some of which are also listed + in the bibliography. @@ -397,10 +415,11 @@ &os; represents the cumulative work of many hundreds, if not thousands, of individuals from around the world who have worked - countless hours to bring about this &release.type;. For a - complete list of &os; developers and contributors, please see - Contributors - to &os; on the &os; Web site or any of its + countless hours to bring about this &release.type;. For + a complete list of &os; developers and contributors, please see + Contributors + to &os; on the &os; Web site or any of its mirrors. Special thanks also go to the many thousands of &os; users From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 00:07:34 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 085EF9B8; Wed, 27 Aug 2014 00:07:34 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E6DF634AC; Wed, 27 Aug 2014 00:07:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7R07XVJ001714; Wed, 27 Aug 2014 00:07:33 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7R07XHJ001713; Wed, 27 Aug 2014 00:07:33 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408270007.s7R07XHJ001713@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 27 Aug 2014 00:07:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270686 - stable/10/release/doc/en_US.ISO8859-1/errata X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 00:07:34 -0000 Author: gjb Date: Wed Aug 27 00:07:33 2014 New Revision: 270686 URL: http://svnweb.freebsd.org/changeset/base/270686 Log: Fix the stable/10 errata/article.xml to conform to FDP style conventions (as best as possible). Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/errata/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/errata/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/errata/article.xml Tue Aug 26 23:58:54 2014 (r270685) +++ stable/10/release/doc/en_US.ISO8859-1/errata/article.xml Wed Aug 27 00:07:33 2014 (r270686) @@ -1,14 +1,14 @@ + "http://www.FreeBSD.org/release/XML/release.ent"> %release; ]>
+ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"> + &os; &release.prev; Errata @@ -19,7 +19,8 @@ 2014 - The &os; Documentation Project + The &os; Documentation + Project @@ -31,46 +32,45 @@ This document lists errata items for &os; &release.prev;, - containing significant information discovered after the release - or too late in the release cycle to be otherwise included in the - release documentation. - This information includes security advisories, as well as news - relating to the software or documentation that could affect its - operation or usability. An up-to-date version of this document - should always be consulted before installing this version of + containing significant information discovered after the + release or too late in the release cycle to be otherwise + included in the release documentation. This information + includes security advisories, as well as news relating to the + software or documentation that could affect its operation or + usability. An up-to-date version of this document should + always be consulted before installing this version of &os;. - This errata document for &os; &release.prev; - will be maintained until the release of &os; &release.next;. + This errata document for &os; &release.prev; will be + maintained until the release of &os; &release.next;. Introduction - This errata document contains late-breaking news - about &os; &release.prev; - Before installing this version, it is important to consult this - document to learn about any post-release discoveries or problems - that may already have been found and fixed. + This errata document contains late-breaking + news about &os; &release.prev; Before installing this + version, it is important to consult this document to learn about + any post-release discoveries or problems that may already have + been found and fixed. Any version of this errata document actually distributed with the release (for example, on a CDROM distribution) will be out of date by definition, but other copies are kept updated on the Internet and should be consulted as the current - errata for this release. These other copies of the - errata are located at - , - plus any sites - which keep up-to-date mirrors of this location. + errata for this release. These other copies of the + errata are located at , plus any + sites which keep up-to-date mirrors of this location. Source and binary snapshots of &os; &release.branch; also contain up-to-date copies of this document (as of the time of the snapshot). - For a list of all &os; CERT security advisories, see - - or . + For a list of all &os; CERT security advisories, see or . @@ -240,17 +240,17 @@ It causes various errors and makes &os; quite unstable. Although the cause is still unclear, disabling unmapped I/O - works as a workaround. To disable it, choose Escape to - loader prompt in the boot menu and enter the following - lines from &man.loader.8; prompt, after - an OK: + works as a workaround. To disable it, choose + Escape to loader prompt in the boot menu + and enter the following lines from &man.loader.8; prompt, + after an OK: set vfs.unmapped_buf_allowed=0 boot Note that the following line has to be added to - /boot/loader.conf after a boot. - It disables unmapped I/O at every boot: + /boot/loader.conf after a boot. It + disables unmapped I/O at every boot: vfs.unmapped_buf_allowed=0 @@ -295,7 +295,8 @@ boot ifconfig_bxe0="DHCP -tso" - This bug has been fixed on &os; &release.current;. + This bug has been fixed on &os; + &release.current;. @@ -327,7 +328,7 @@ boot The &man.mount.udf.8; utility has a bug which prevents it from mounting any UDF file system. This has been fixed - in &os;-CURRENT and &os; &release.current;. + in &os;-CURRENT and &os; &release.current;. From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 00:48:09 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id B41EE4B2; Wed, 27 Aug 2014 00:48:09 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A049637EF; Wed, 27 Aug 2014 00:48:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7R0m9mh020534; Wed, 27 Aug 2014 00:48:09 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7R0m9R5020533; Wed, 27 Aug 2014 00:48:09 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201408270048.s7R0m9R5020533@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 27 Aug 2014 00:48:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270687 - head/libexec/rtld-elf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 00:48:09 -0000 Author: kib Date: Wed Aug 27 00:48:09 2014 New Revision: 270687 URL: http://svnweb.freebsd.org/changeset/base/270687 Log: Remove stray newline. Modified: head/libexec/rtld-elf/rtld.c Modified: head/libexec/rtld-elf/rtld.c ============================================================================== --- head/libexec/rtld-elf/rtld.c Wed Aug 27 00:07:33 2014 (r270686) +++ head/libexec/rtld-elf/rtld.c Wed Aug 27 00:48:09 2014 (r270687) @@ -2784,7 +2784,7 @@ search_library_pathfds(const char *name, size_t len; int dirfd, fd; - dbg("%s('%s', '%s', fdp)\n", __func__, name, path); + dbg("%s('%s', '%s', fdp)", __func__, name, path); /* Don't load from user-specified libdirs into setuid binaries. */ if (!trust) From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 00:50:52 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 0731D620; Wed, 27 Aug 2014 00:50:52 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CD0463880; Wed, 27 Aug 2014 00:50:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7R0opBt023630; Wed, 27 Aug 2014 00:50:51 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7R0opZn023505; Wed, 27 Aug 2014 00:50:51 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408270050.s7R0opZn023505@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 27 Aug 2014 00:50:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270688 - in stable/10/release: . arm X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 00:50:52 -0000 Author: gjb Date: Wed Aug 27 00:50:51 2014 New Revision: 270688 URL: http://svnweb.freebsd.org/changeset/base/270688 Log: MFC r270417, r270418, r270455, r270457: r270417: Fix arm build breakage when building stable/10 on head/. r270418: Also export UNAME_r to fix arm builds. r270455: Set OSREL and UNAME_r in release/release.sh when building ports to prevent ports build failures from killing the release build. r270457: Wrap a long line. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/arm/release.sh stable/10/release/release.sh Directory Properties: stable/10/ (props changed) Modified: stable/10/release/arm/release.sh ============================================================================== --- stable/10/release/arm/release.sh Wed Aug 27 00:48:09 2014 (r270687) +++ stable/10/release/arm/release.sh Wed Aug 27 00:50:51 2014 (r270688) @@ -92,6 +92,14 @@ install_uboot() { } main() { + # Fix broken ports that use kern.osreldate. + OSVERSION=$(chroot ${CHROOTDIR} /usr/bin/uname -U) + export OSVERSION + REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release -V REVISION) + BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH) + UNAME_r=${REVISION}-${BRANCH} + export UNAME_r + # Build the 'xdev' target for crochet. eval chroot ${CHROOTDIR} make -C /usr/src \ ${XDEV_FLAGS} XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} \ Modified: stable/10/release/release.sh ============================================================================== --- stable/10/release/release.sh Wed Aug 27 00:48:09 2014 (r270687) +++ stable/10/release/release.sh Wed Aug 27 00:50:51 2014 (r270688) @@ -253,11 +253,16 @@ if [ -d ${CHROOTDIR}/usr/ports ]; then ## Trick the ports 'run-autotools-fixup' target to do the right thing. _OSVERSION=$(sysctl -n kern.osreldate) + REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release -V REVISION) + BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH) + UNAME_r=${REVISION}-${BRANCH} if [ -d ${CHROOTDIR}/usr/doc ] && [ -z "${NODOC}" ]; then PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes" - PBUILD_FLAGS="${PBUILD_FLAGS}" + PBUILD_FLAGS="${PBUILD_FLAGS} UNAME_r=${UNAME_r}" + PBUILD_FLAGS="${PBUILD_FLAGS} OSREL=${REVISION}" chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \ - ${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" install clean distclean + ${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" \ + install clean distclean fi fi From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 00:53:57 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 3EA93764; Wed, 27 Aug 2014 00:53:57 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2A60F3897; Wed, 27 Aug 2014 00:53:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7R0rvlJ024670; Wed, 27 Aug 2014 00:53:57 GMT (envelope-from grehan@FreeBSD.org) Received: (from grehan@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7R0rvPI024669; Wed, 27 Aug 2014 00:53:57 GMT (envelope-from grehan@FreeBSD.org) Message-Id: <201408270053.s7R0rvPI024669@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: grehan set sender to grehan@FreeBSD.org using -f From: Peter Grehan Date: Wed, 27 Aug 2014 00:53:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270689 - head/sys/amd64/vmm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 00:53:57 -0000 Author: grehan Date: Wed Aug 27 00:53:56 2014 New Revision: 270689 URL: http://svnweb.freebsd.org/changeset/base/270689 Log: Implement the 0x2B SUB instruction, and the OR variant of 0x81. Found with local APIC accesses from bitrig/amd64 bsd.rd, 07/15-snap. Reviewed by: neel MFC after: 3 days Modified: head/sys/amd64/vmm/vmm_instruction_emul.c Modified: head/sys/amd64/vmm/vmm_instruction_emul.c ============================================================================== --- head/sys/amd64/vmm/vmm_instruction_emul.c Wed Aug 27 00:50:51 2014 (r270688) +++ head/sys/amd64/vmm/vmm_instruction_emul.c Wed Aug 27 00:53:56 2014 (r270689) @@ -65,6 +65,7 @@ enum { VIE_OP_TYPE_MOVZX, VIE_OP_TYPE_AND, VIE_OP_TYPE_OR, + VIE_OP_TYPE_SUB, VIE_OP_TYPE_TWO_BYTE, VIE_OP_TYPE_PUSH, VIE_OP_TYPE_CMP, @@ -97,6 +98,10 @@ static const struct vie_op one_byte_opco .op_byte = 0x0F, .op_type = VIE_OP_TYPE_TWO_BYTE }, + [0x2B] = { + .op_byte = 0x2B, + .op_type = VIE_OP_TYPE_SUB, + }, [0x3B] = { .op_byte = 0x3B, .op_type = VIE_OP_TYPE_CMP, @@ -597,18 +602,16 @@ emulate_and(void *vm, int vcpuid, uint64 break; case 0x81: /* - * AND mem (ModRM:r/m) with immediate and store the + * AND/OR mem (ModRM:r/m) with immediate and store the * result in mem. * - * 81 /4 and r/m16, imm16 - * 81 /4 and r/m32, imm32 - * REX.W + 81 /4 and r/m64, imm32 sign-extended to 64 + * AND: i = 4 + * OR: i = 1 + * 81 /i op r/m16, imm16 + * 81 /i op r/m32, imm32 + * REX.W + 81 /i op r/m64, imm32 sign-extended to 64 * - * Currently, only the AND operation of the 0x81 opcode - * is implemented (ModRM:reg = b100). */ - if ((vie->reg & 7) != 4) - break; /* get the first operand */ error = memread(vm, vcpuid, gpa, &val1, size, arg); @@ -616,11 +619,26 @@ emulate_and(void *vm, int vcpuid, uint64 break; /* - * perform the operation with the pre-fetched immediate - * operand and write the result - */ - val1 &= vie->immediate; - error = memwrite(vm, vcpuid, gpa, val1, size, arg); + * perform the operation with the pre-fetched immediate + * operand and write the result + */ + switch (vie->reg & 7) { + case 0x4: + /* modrm:reg == b100, AND */ + val1 &= vie->immediate; + break; + case 0x1: + /* modrm:reg == b001, OR */ + val1 |= vie->immediate; + break; + default: + error = EINVAL; + break; + } + if (error) + break; + + error = memwrite(vm, vcpuid, gpa, val1, size, arg); break; default: break; @@ -723,6 +741,62 @@ emulate_cmp(void *vm, int vcpuid, uint64 } static int +emulate_sub(void *vm, int vcpuid, uint64_t gpa, struct vie *vie, + mem_region_read_t memread, mem_region_write_t memwrite, void *arg) +{ + int error, size; + uint64_t nval, rflags, rflags2, val1, val2; + enum vm_reg_name reg; + + size = vie->opsize; + error = EINVAL; + + switch (vie->op.op_byte) { + case 0x2B: + /* + * SUB r/m from r and store the result in r + * + * 2B/r SUB r16, r/m16 + * 2B/r SUB r32, r/m32 + * REX.W + 2B/r SUB r64, r/m64 + */ + + /* get the first operand */ + reg = gpr_map[vie->reg]; + error = vie_read_register(vm, vcpuid, reg, &val1); + if (error) + break; + + /* get the second operand */ + error = memread(vm, vcpuid, gpa, &val2, size, arg); + if (error) + break; + + /* perform the operation and write the result */ + nval = val1 - val2; + error = vie_update_register(vm, vcpuid, reg, nval, size); + break; + default: + break; + } + + if (!error) { + rflags2 = getcc(size, val1, val2); + error = vie_read_register(vm, vcpuid, VM_REG_GUEST_RFLAGS, + &rflags); + if (error) + return (error); + + rflags &= ~RFLAGS_STATUS_BITS; + rflags |= rflags2 & RFLAGS_STATUS_BITS; + error = vie_update_register(vm, vcpuid, VM_REG_GUEST_RFLAGS, + rflags, 8); + } + + return (error); +} + +static int emulate_push(void *vm, int vcpuid, uint64_t mmio_gpa, struct vie *vie, struct vm_guest_paging *paging, mem_region_read_t memread, mem_region_write_t memwrite, void *arg) @@ -865,6 +939,10 @@ vmm_emulate_instruction(void *vm, int vc error = emulate_or(vm, vcpuid, gpa, vie, memread, memwrite, memarg); break; + case VIE_OP_TYPE_SUB: + error = emulate_sub(vm, vcpuid, gpa, vie, + memread, memwrite, memarg); + break; default: error = EINVAL; break; From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 00:57:46 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 851728D4; Wed, 27 Aug 2014 00:57:46 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 70F0038B1; Wed, 27 Aug 2014 00:57:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7R0vkhr025294; Wed, 27 Aug 2014 00:57:46 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7R0vkk9025293; Wed, 27 Aug 2014 00:57:46 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408270057.s7R0vkk9025293@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 27 Aug 2014 00:57:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r270690 - stable/9/release X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 00:57:46 -0000 Author: gjb Date: Wed Aug 27 00:57:45 2014 New Revision: 270690 URL: http://svnweb.freebsd.org/changeset/base/270690 Log: MFC r270455, r270457: r270455: Set OSREL and UNAME_r in release/release.sh when building ports to prevent ports build failures from killing the release build. r270457: Wrap a long line. Sponsored by: The FreeBSD Foundation Modified: stable/9/release/release.sh Directory Properties: stable/9/release/ (props changed) Modified: stable/9/release/release.sh ============================================================================== --- stable/9/release/release.sh Wed Aug 27 00:53:56 2014 (r270689) +++ stable/9/release/release.sh Wed Aug 27 00:57:45 2014 (r270690) @@ -253,11 +253,16 @@ if [ -d ${CHROOTDIR}/usr/ports ]; then ## Trick the ports 'run-autotools-fixup' target to do the right thing. _OSVERSION=$(sysctl -n kern.osreldate) + REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release -V REVISION) + BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH) + UNAME_r=${REVISION}-${BRANCH} if [ -d ${CHROOTDIR}/usr/doc ] && [ -z "${NODOC}" ]; then PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes" - PBUILD_FLAGS="${PBUILD_FLAGS}" + PBUILD_FLAGS="${PBUILD_FLAGS} UNAME_r=${UNAME_r}" + PBUILD_FLAGS="${PBUILD_FLAGS} OSREL=${REVISION}" chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \ - ${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" install clean distclean + ${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" \ + install clean distclean fi fi From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 01:02:03 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 7B1EEA67; Wed, 27 Aug 2014 01:02:03 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4CF103940; Wed, 27 Aug 2014 01:02:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7R123fa029339; Wed, 27 Aug 2014 01:02:03 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7R122Bc029334; Wed, 27 Aug 2014 01:02:02 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201408270102.s7R122Bc029334@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 27 Aug 2014 01:02:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270691 - head/sys/compat/freebsd32 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 01:02:03 -0000 Author: kib Date: Wed Aug 27 01:02:02 2014 New Revision: 270691 URL: http://svnweb.freebsd.org/changeset/base/270691 Log: Fix handling of the third argument for fcntl(2). The native syscall uses long for arg, which needs translation. Discussed with and tested by: mjg Sponsored by: The FreeBSD Foundation MFC after: 1 week Modified: head/sys/compat/freebsd32/freebsd32_misc.c head/sys/compat/freebsd32/syscalls.master Modified: head/sys/compat/freebsd32/freebsd32_misc.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_misc.c Wed Aug 27 00:57:45 2014 (r270690) +++ head/sys/compat/freebsd32/freebsd32_misc.c Wed Aug 27 01:02:02 2014 (r270691) @@ -2980,3 +2980,28 @@ freebsd32_procctl(struct thread *td, str return (kern_procctl(td, uap->idtype, PAIR32TO64(id_t, uap->id), uap->com, data)); } + +int +freebsd32_fcntl(struct thread *td, struct freebsd32_fcntl_args *uap) +{ + intptr_t tmp; + + switch (uap->cmd) { + /* + * Do unsigned conversion for arg when operation + * interprets it as flags or pointer. + */ + case F_SETLK_REMOTE: + case F_SETLKW: + case F_SETLK: + case F_GETLK: + case F_SETFD: + case F_SETFL: + tmp = (unsigned int)(uap->arg); + break; + default: + tmp = uap->arg; + break; + } + return (kern_fcntl(td, uap->fd, uap->cmd, tmp)); +} Modified: head/sys/compat/freebsd32/syscalls.master ============================================================================== --- head/sys/compat/freebsd32/syscalls.master Wed Aug 27 00:57:45 2014 (r270690) +++ head/sys/compat/freebsd32/syscalls.master Wed Aug 27 01:02:02 2014 (r270691) @@ -200,7 +200,8 @@ 89 AUE_GETDTABLESIZE NOPROTO { int getdtablesize(void); } 90 AUE_DUP2 NOPROTO { int dup2(u_int from, u_int to); } 91 AUE_NULL UNIMPL getdopt -92 AUE_FCNTL NOPROTO { int fcntl(int fd, int cmd, long arg); } +92 AUE_FCNTL STD { int freebsd32_fcntl(int fd, int cmd, \ + int arg); } 93 AUE_SELECT STD { int freebsd32_select(int nd, fd_set *in, \ fd_set *ou, fd_set *ex, \ struct timeval32 *tv); } From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 01:02:20 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id DE5CFBA0; Wed, 27 Aug 2014 01:02:20 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C9FE63944; Wed, 27 Aug 2014 01:02:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7R12KbZ029423; Wed, 27 Aug 2014 01:02:20 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7R12Jtq029418; Wed, 27 Aug 2014 01:02:19 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201408270102.s7R12Jtq029418@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 27 Aug 2014 01:02:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270692 - head/sys/compat/freebsd32 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 01:02:21 -0000 Author: kib Date: Wed Aug 27 01:02:19 2014 New Revision: 270692 URL: http://svnweb.freebsd.org/changeset/base/270692 Log: Regen. Modified: head/sys/compat/freebsd32/freebsd32_proto.h head/sys/compat/freebsd32/freebsd32_syscall.h head/sys/compat/freebsd32/freebsd32_syscalls.c head/sys/compat/freebsd32/freebsd32_sysent.c head/sys/compat/freebsd32/freebsd32_systrace_args.c Modified: head/sys/compat/freebsd32/freebsd32_proto.h ============================================================================== --- head/sys/compat/freebsd32/freebsd32_proto.h Wed Aug 27 01:02:02 2014 (r270691) +++ head/sys/compat/freebsd32/freebsd32_proto.h Wed Aug 27 01:02:19 2014 (r270692) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 263318 2014-03-18 21:32:03Z attilio + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 270691 2014-08-27 01:02:02Z kib */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -92,6 +92,11 @@ struct freebsd32_getitimer_args { char which_l_[PADL_(u_int)]; u_int which; char which_r_[PADR_(u_int)]; char itv_l_[PADL_(struct itimerval32 *)]; struct itimerval32 * itv; char itv_r_[PADR_(struct itimerval32 *)]; }; +struct freebsd32_fcntl_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)]; + char arg_l_[PADL_(int)]; int arg; char arg_r_[PADR_(int)]; +}; struct freebsd32_select_args { char nd_l_[PADL_(int)]; int nd; char nd_r_[PADR_(int)]; char in_l_[PADL_(fd_set *)]; fd_set * in; char in_r_[PADR_(fd_set *)]; @@ -695,6 +700,7 @@ int freebsd32_execve(struct thread *, st int freebsd32_mprotect(struct thread *, struct freebsd32_mprotect_args *); int freebsd32_setitimer(struct thread *, struct freebsd32_setitimer_args *); int freebsd32_getitimer(struct thread *, struct freebsd32_getitimer_args *); +int freebsd32_fcntl(struct thread *, struct freebsd32_fcntl_args *); int freebsd32_select(struct thread *, struct freebsd32_select_args *); int freebsd32_gettimeofday(struct thread *, struct freebsd32_gettimeofday_args *); int freebsd32_getrusage(struct thread *, struct freebsd32_getrusage_args *); @@ -1098,6 +1104,7 @@ int freebsd7_freebsd32_shmctl(struct thr #define FREEBSD32_SYS_AUE_freebsd32_mprotect AUE_MPROTECT #define FREEBSD32_SYS_AUE_freebsd32_setitimer AUE_SETITIMER #define FREEBSD32_SYS_AUE_freebsd32_getitimer AUE_GETITIMER +#define FREEBSD32_SYS_AUE_freebsd32_fcntl AUE_FCNTL #define FREEBSD32_SYS_AUE_freebsd32_select AUE_SELECT #define FREEBSD32_SYS_AUE_ofreebsd32_sigreturn AUE_NULL #define FREEBSD32_SYS_AUE_ofreebsd32_sigvec AUE_O_SIGVEC Modified: head/sys/compat/freebsd32/freebsd32_syscall.h ============================================================================== --- head/sys/compat/freebsd32/freebsd32_syscall.h Wed Aug 27 01:02:02 2014 (r270691) +++ head/sys/compat/freebsd32/freebsd32_syscall.h Wed Aug 27 01:02:19 2014 (r270692) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 263318 2014-03-18 21:32:03Z attilio + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 270691 2014-08-27 01:02:02Z kib */ #define FREEBSD32_SYS_syscall 0 @@ -97,7 +97,7 @@ /* 88 is obsolete osethostname */ #define FREEBSD32_SYS_getdtablesize 89 #define FREEBSD32_SYS_dup2 90 -#define FREEBSD32_SYS_fcntl 92 +#define FREEBSD32_SYS_freebsd32_fcntl 92 #define FREEBSD32_SYS_freebsd32_select 93 #define FREEBSD32_SYS_fsync 95 #define FREEBSD32_SYS_setpriority 96 Modified: head/sys/compat/freebsd32/freebsd32_syscalls.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_syscalls.c Wed Aug 27 01:02:02 2014 (r270691) +++ head/sys/compat/freebsd32/freebsd32_syscalls.c Wed Aug 27 01:02:19 2014 (r270692) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 263318 2014-03-18 21:32:03Z attilio + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 270691 2014-08-27 01:02:02Z kib */ const char *freebsd32_syscallnames[] = { @@ -102,7 +102,7 @@ const char *freebsd32_syscallnames[] = { "getdtablesize", /* 89 = getdtablesize */ "dup2", /* 90 = dup2 */ "#91", /* 91 = getdopt */ - "fcntl", /* 92 = fcntl */ + "freebsd32_fcntl", /* 92 = freebsd32_fcntl */ "freebsd32_select", /* 93 = freebsd32_select */ "#94", /* 94 = setdopt */ "fsync", /* 95 = fsync */ Modified: head/sys/compat/freebsd32/freebsd32_sysent.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_sysent.c Wed Aug 27 01:02:02 2014 (r270691) +++ head/sys/compat/freebsd32/freebsd32_sysent.c Wed Aug 27 01:02:19 2014 (r270692) @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 263318 2014-03-18 21:32:03Z attilio + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 270691 2014-08-27 01:02:02Z kib */ #include "opt_compat.h" @@ -139,7 +139,7 @@ struct sysent freebsd32_sysent[] = { { 0, (sy_call_t *)sys_getdtablesize, AUE_GETDTABLESIZE, NULL, 0, 0, 0, SY_THR_STATIC }, /* 89 = getdtablesize */ { AS(dup2_args), (sy_call_t *)sys_dup2, AUE_DUP2, NULL, 0, 0, 0, SY_THR_STATIC }, /* 90 = dup2 */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 91 = getdopt */ - { AS(fcntl_args), (sy_call_t *)sys_fcntl, AUE_FCNTL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 92 = fcntl */ + { AS(freebsd32_fcntl_args), (sy_call_t *)freebsd32_fcntl, AUE_FCNTL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 92 = freebsd32_fcntl */ { AS(freebsd32_select_args), (sy_call_t *)freebsd32_select, AUE_SELECT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 93 = freebsd32_select */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 94 = setdopt */ { AS(fsync_args), (sy_call_t *)sys_fsync, AUE_FSYNC, NULL, 0, 0, 0, SY_THR_STATIC }, /* 95 = fsync */ Modified: head/sys/compat/freebsd32/freebsd32_systrace_args.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_systrace_args.c Wed Aug 27 01:02:02 2014 (r270691) +++ head/sys/compat/freebsd32/freebsd32_systrace_args.c Wed Aug 27 01:02:19 2014 (r270692) @@ -557,12 +557,12 @@ systrace_args(int sysnum, void *params, *n_args = 2; break; } - /* fcntl */ + /* freebsd32_fcntl */ case 92: { - struct fcntl_args *p = params; + struct freebsd32_fcntl_args *p = params; iarg[0] = p->fd; /* int */ iarg[1] = p->cmd; /* int */ - iarg[2] = p->arg; /* long */ + iarg[2] = p->arg; /* int */ *n_args = 3; break; } @@ -4147,7 +4147,7 @@ systrace_entry_setargdesc(int sysnum, in break; }; break; - /* fcntl */ + /* freebsd32_fcntl */ case 92: switch(ndx) { case 0: @@ -4157,7 +4157,7 @@ systrace_entry_setargdesc(int sysnum, in p = "int"; break; case 2: - p = "long"; + p = "int"; break; default: break; @@ -9174,7 +9174,7 @@ systrace_return_setargdesc(int sysnum, i if (ndx == 0 || ndx == 1) p = "int"; break; - /* fcntl */ + /* freebsd32_fcntl */ case 92: if (ndx == 0 || ndx == 1) p = "int"; From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 01:34:34 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 8DF42158; Wed, 27 Aug 2014 01:34:34 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 79A993BA1; Wed, 27 Aug 2014 01:34:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7R1YYA1043619; Wed, 27 Aug 2014 01:34:34 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7R1YYav043618; Wed, 27 Aug 2014 01:34:34 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201408270134.s7R1YYav043618@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 27 Aug 2014 01:34:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270693 - stable/10/sys/amd64/include X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 01:34:34 -0000 Author: kib Date: Wed Aug 27 01:34:33 2014 New Revision: 270693 URL: http://svnweb.freebsd.org/changeset/base/270693 Log: MFC r270202: Increase max number of physical segments on amd64 to 63. Modified: stable/10/sys/amd64/include/vmparam.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/amd64/include/vmparam.h ============================================================================== --- stable/10/sys/amd64/include/vmparam.h Wed Aug 27 01:02:19 2014 (r270692) +++ stable/10/sys/amd64/include/vmparam.h Wed Aug 27 01:34:33 2014 (r270693) @@ -87,7 +87,7 @@ * largest physical address that is accessible by ISA DMA is split * into two PHYSSEG entries. */ -#define VM_PHYSSEG_MAX 31 +#define VM_PHYSSEG_MAX 63 /* * Create three free page pools: VM_FREEPOOL_DEFAULT is the default pool From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 01:37:23 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 6A5102D7; Wed, 27 Aug 2014 01:37:23 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5644D3BC0; Wed, 27 Aug 2014 01:37:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7R1bNXB044091; Wed, 27 Aug 2014 01:37:23 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7R1bNgF044090; Wed, 27 Aug 2014 01:37:23 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201408270137.s7R1bNgF044090@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 27 Aug 2014 01:37:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270694 - stable/10/sys/ufs/ffs X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 01:37:23 -0000 Author: kib Date: Wed Aug 27 01:37:22 2014 New Revision: 270694 URL: http://svnweb.freebsd.org/changeset/base/270694 Log: MFC r270203: Correct the test for condition to suspend UFS filesystem during unmount. Modified: stable/10/sys/ufs/ffs/ffs_vfsops.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/ufs/ffs/ffs_vfsops.c ============================================================================== --- stable/10/sys/ufs/ffs/ffs_vfsops.c Wed Aug 27 01:34:33 2014 (r270693) +++ stable/10/sys/ufs/ffs/ffs_vfsops.c Wed Aug 27 01:37:22 2014 (r270694) @@ -1213,7 +1213,7 @@ ffs_unmount(mp, mntflags) susp = 0; if (mntflags & MNT_FORCE) { flags |= FORCECLOSE; - susp = fs->fs_ronly != 0; + susp = fs->fs_ronly == 0; } #ifdef UFS_EXTATTR if ((error = ufs_extattr_stop(mp, td))) { From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 01:38:27 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 2984D41F; Wed, 27 Aug 2014 01:38:27 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 151F33BC9; Wed, 27 Aug 2014 01:38:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7R1cQp4044299; Wed, 27 Aug 2014 01:38:26 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7R1cQqf044298; Wed, 27 Aug 2014 01:38:26 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201408270138.s7R1cQqf044298@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 27 Aug 2014 01:38:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270695 - stable/10/sys/ufs/ufs X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 01:38:27 -0000 Author: kib Date: Wed Aug 27 01:38:26 2014 New Revision: 270695 URL: http://svnweb.freebsd.org/changeset/base/270695 Log: MFC r270204: Do not busy the UFS mount point inside VOP_RENAME(). Modified: stable/10/sys/ufs/ufs/ufs_vnops.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/ufs/ufs/ufs_vnops.c ============================================================================== --- stable/10/sys/ufs/ufs/ufs_vnops.c Wed Aug 27 01:37:22 2014 (r270694) +++ stable/10/sys/ufs/ufs/ufs_vnops.c Wed Aug 27 01:38:26 2014 (r270695) @@ -1142,11 +1142,6 @@ ufs_rename(ap) mp = NULL; goto releout; } - error = vfs_busy(mp, 0); - if (error) { - mp = NULL; - goto releout; - } relock: /* * We need to acquire 2 to 4 locks depending on whether tvp is NULL @@ -1546,8 +1541,6 @@ unlockout: if (error == 0 && tdp->i_flag & IN_NEEDSYNC) error = VOP_FSYNC(tdvp, MNT_WAIT, td); vput(tdvp); - if (mp) - vfs_unbusy(mp); return (error); bad: @@ -1565,8 +1558,6 @@ releout: vrele(tdvp); if (tvp) vrele(tvp); - if (mp) - vfs_unbusy(mp); return (error); } From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 04:52:03 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 08B3EBF9; Wed, 27 Aug 2014 04:52:03 +0000 (UTC) Received: from mail.allbsd.org (gatekeeper.allbsd.org [IPv6:2001:2f0:104:e001::32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.allbsd.org", Issuer "RapidSSL CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C33473056; Wed, 27 Aug 2014 04:52:01 +0000 (UTC) Received: from alph.d.allbsd.org ([IPv6:2001:2f0:104:e010:862b:2bff:febc:8956]) (authenticated bits=56) by mail.allbsd.org (8.14.9/8.14.8) with ESMTP id s7R4pZql097426 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 27 Aug 2014 13:51:47 +0900 (JST) (envelope-from hrs@FreeBSD.org) Received: from localhost (localhost [IPv6:::1]) (authenticated bits=0) by alph.d.allbsd.org (8.14.8/8.14.8) with ESMTP id s7R4pX4u004853; Wed, 27 Aug 2014 13:51:35 +0900 (JST) (envelope-from hrs@FreeBSD.org) Date: Wed, 27 Aug 2014 13:48:00 +0900 (JST) Message-Id: <20140827.134800.2047075166971853210.hrs@allbsd.org> To: bapt@FreeBSD.org Subject: Re: svn commit: r270676 - head/etc From: Hiroki Sato In-Reply-To: <201408262233.s7QMXYfd056791@svn.freebsd.org> References: <201408262233.s7QMXYfd056791@svn.freebsd.org> X-PGPkey-fingerprint: BDB3 443F A5DD B3D0 A530 FFD7 4F2C D3D8 2793 CF2D X-Mailer: Mew version 6.6 on Emacs 24.3 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Multipart/Signed; protocol="application/pgp-signature"; micalg=pgp-sha1; boundary="--Security_Multipart0(Wed_Aug_27_13_48_00_2014_152)--" Content-Transfer-Encoding: 7bit X-Virus-Scanned: clamav-milter 0.97.4 at gatekeeper.allbsd.org X-Virus-Status: Clean X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (mail.allbsd.org [IPv6:2001:2f0:104:e001::32]); Wed, 27 Aug 2014 13:51:55 +0900 (JST) X-Spam-Status: No, score=-97.9 required=13.0 tests=CONTENT_TYPE_PRESENT, RDNS_NONE,SPF_SOFTFAIL,USER_IN_WHITELIST autolearn=no version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on gatekeeper.allbsd.org Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 04:52:03 -0000 ----Security_Multipart0(Wed_Aug_27_13_48_00_2014_152)-- Content-Type: Multipart/Mixed; boundary="--Next_Part(Wed_Aug_27_13_48_00_2014_381)--" Content-Transfer-Encoding: 7bit ----Next_Part(Wed_Aug_27_13_48_00_2014_381)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Baptiste Daroussin wrote in <201408262233.s7QMXYfd056791@svn.freebsd.org>: ba> Author: bapt ba> Date: Tue Aug 26 22:33:34 2014 ba> New Revision: 270676 ba> URL: http://svnweb.freebsd.org/changeset/base/270676 ba> ba> Log: ba> Allow to configure services from ${LOCALBASE}/etc/rc.conf.d ba> ba> Reviewed by: bdrewery ba> MFC after: 1 week ba> Relnotes: yes ba> ba> Modified: ba> head/etc/rc.subr ba> ba> Modified: head/etc/rc.subr ba> ============================================================================== ba> --- head/etc/rc.subr Tue Aug 26 22:20:02 2014 (r270675) ba> +++ head/etc/rc.subr Tue Aug 26 22:33:34 2014 (r270676) ba> @@ -1301,6 +1301,10 @@ load_rc_config() ba> fi ba> done ba> fi ba> + if [ -f ${LOCALBASE:-/usr/local}/etc/rc.conf.d/"$_name" ]; then ba> + debug "Sourcing ${LOCALBASE:-/usr/local}/etc/rc.conf.d/${_name}" ba> + . ${LOCALBASE:-/usr/local}/etc/rc.conf.d/"$_name" ba> + fi This should hornor ${local_startup} instead of ${LOCALBASE} since it is not used in rc(8), and should be compatible with DES's commit in r270392. How about the attached patch? -- Hiroki ----Next_Part(Wed_Aug_27_13_48_00_2014_381)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="rc.subr.20140827-1.diff" Index: etc/rc.subr =================================================================== --- etc/rc.subr (revision 270695) +++ etc/rc.subr (working copy) @@ -1270,7 +1270,7 @@ # load_rc_config() { - local _name _rcvar_val _var _defval _v _msg _new + local _name _rcvar_val _var _defval _v _msg _new _d _name=$1 if [ -z "$_name" ]; then err 3 'USAGE: load_rc_config name' @@ -1289,23 +1289,22 @@ fi _rc_conf_loaded=true fi - if [ -f /etc/rc.conf.d/"$_name" ]; then - debug "Sourcing /etc/rc.conf.d/$_name" - . /etc/rc.conf.d/"$_name" - elif [ -d /etc/rc.conf.d/"$_name" ] ; then - local _rc - for _rc in /etc/rc.conf.d/"$_name"/* ; do - if [ -f "$_rc" ] ; then - debug "Sourcing $_rc" - . "$_rc" - fi - done - fi - if [ -f ${LOCALBASE:-/usr/local}/etc/rc.conf.d/"$_name" ]; then - debug "Sourcing ${LOCALBASE:-/usr/local}/etc/rc.conf.d/${_name}" - . ${LOCALBASE:-/usr/local}/etc/rc.conf.d/"$_name" - fi + for _d in /etc ${local_startup%*/rc.d}; do + if [ -f ${_d}/rc.conf.d/"$_name" ]; then + debug "Sourcing ${_d}/rc.conf.d/$_name" + . ${_d}/rc.conf.d/"$_name" + elif [ -d ${_d}/rc.conf.d/"$_name" ] ; then + local _rc + for _rc in ${_d}/rc.conf.d/"$_name"/* ; do + if [ -f "$_rc" ] ; then + debug "Sourcing $_rc" + . "$_rc" + fi + done + fi + done + # Set defaults if defined. for _var in $rcvar; do eval _defval=\$${_var}_defval ----Next_Part(Wed_Aug_27_13_48_00_2014_381)---- ----Security_Multipart0(Wed_Aug_27_13_48_00_2014_152)-- Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEABECAAYFAlP9YwAACgkQTyzT2CeTzy0XwgCfawZi0t4DJ4ic1516gTQFwBh1 iAIAn19TvhrHvwmtVuB7/+1YA7lOzsrc =9Mtv -----END PGP SIGNATURE----- ----Security_Multipart0(Wed_Aug_27_13_48_00_2014_152)---- From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 05:41:42 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 7CE9C8FA; Wed, 27 Aug 2014 05:41:42 +0000 (UTC) Received: from mail-wg0-x22b.google.com (mail-wg0-x22b.google.com [IPv6:2a00:1450:400c:c00::22b]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A0DE2354C; Wed, 27 Aug 2014 05:41:41 +0000 (UTC) Received: by mail-wg0-f43.google.com with SMTP id l18so15453099wgh.14 for ; Tue, 26 Aug 2014 22:41:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=y0tZaMGmmoqkRVT4yDFlOACrFEEiJuEiV4rsw2kB7NI=; b=YVDwHG8Tw8g7O6D3rX7wjM3RP6IYyg3exGQodCQYQ9qHjyicKV0lR58E6D6xYUqaT/ g/iupOefgfZ9kj+azgEKyCNy9LCCPJIflua+zx1l+vnwKIfHy9tCpu83xnVWcb7LmfDB hoVxlzuV6KJD1ZDKeUL2/2awTD5ScucsDuIrvUzjGhf37rnUulEE/cw0em2cSMBUW0Xq w6HpD30dU2sBy+TNcTfwabcdpR6eMgaKBATBr53OYN+iM6sIca+Be0fo3xP59dj0WXSM 9ccQVzgtGRzoxt5KN6O2S5w0dvr54PtBTllP4DkwrWnrCs8HzZnFDawq2OguZS87d3n5 hvfg== X-Received: by 10.180.188.141 with SMTP id ga13mr25371739wic.18.1409118099887; Tue, 26 Aug 2014 22:41:39 -0700 (PDT) Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1]) by mx.google.com with ESMTPSA id xn15sm19858782wib.13.2014.08.26.22.41.36 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Aug 2014 22:41:36 -0700 (PDT) Sender: Baptiste Daroussin Date: Wed, 27 Aug 2014 07:41:34 +0200 From: Baptiste Daroussin To: Hiroki Sato Subject: Re: svn commit: r270676 - head/etc Message-ID: <20140827054134.GF65120@ivaldir.etoilebsd.net> References: <201408262233.s7QMXYfd056791@svn.freebsd.org> <20140827.134800.2047075166971853210.hrs@allbsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="f61P+fpdnY2FZS1u" Content-Disposition: inline In-Reply-To: <20140827.134800.2047075166971853210.hrs@allbsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 05:41:42 -0000 --f61P+fpdnY2FZS1u Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Aug 27, 2014 at 01:48:00PM +0900, Hiroki Sato wrote: > Baptiste Daroussin wrote > in <201408262233.s7QMXYfd056791@svn.freebsd.org>: >=20 > ba> Author: bapt > ba> Date: Tue Aug 26 22:33:34 2014 > ba> New Revision: 270676 > ba> URL: http://svnweb.freebsd.org/changeset/base/270676 > ba> > ba> Log: > ba> Allow to configure services from ${LOCALBASE}/etc/rc.conf.d > ba> > ba> Reviewed by: bdrewery > ba> MFC after: 1 week > ba> Relnotes: yes > ba> > ba> Modified: > ba> head/etc/rc.subr > ba> > ba> Modified: head/etc/rc.subr > ba> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > ba> --- head/etc/rc.subr Tue Aug 26 22:20:02 2014 (r270675) > ba> +++ head/etc/rc.subr Tue Aug 26 22:33:34 2014 (r270676) > ba> @@ -1301,6 +1301,10 @@ load_rc_config() > ba> fi > ba> done > ba> fi > ba> + if [ -f ${LOCALBASE:-/usr/local}/etc/rc.conf.d/"$_name" ]; then > ba> + debug "Sourcing ${LOCALBASE:-/usr/local}/etc/rc.conf.d/${_name}" > ba> + . ${LOCALBASE:-/usr/local}/etc/rc.conf.d/"$_name" > ba> + fi >=20 > This should hornor ${local_startup} instead of ${LOCALBASE} since it > is not used in rc(8), and should be compatible with DES's commit in > r270392. >=20 > How about the attached patch? >=20 I do like it better than mine thank you regards, Bapt --f61P+fpdnY2FZS1u Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEARECAAYFAlP9b44ACgkQ8kTtMUmk6Ex0vACggYK9GJ+FbhPzkB3xT5wE+WCz hJYAnj+B0BkmSvt+jWSQABEHzyOsI0EM =mASg -----END PGP SIGNATURE----- --f61P+fpdnY2FZS1u-- From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 06:13:44 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id B4667BE; Wed, 27 Aug 2014 06:13:44 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A096137BE; Wed, 27 Aug 2014 06:13:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7R6DiGG071772; Wed, 27 Aug 2014 06:13:44 GMT (envelope-from grehan@FreeBSD.org) Received: (from grehan@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7R6DiDS071771; Wed, 27 Aug 2014 06:13:44 GMT (envelope-from grehan@FreeBSD.org) Message-Id: <201408270613.s7R6DiDS071771@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: grehan set sender to grehan@FreeBSD.org using -f From: Peter Grehan Date: Wed, 27 Aug 2014 06:13:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270696 - stable/10/sys/amd64/include X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 06:13:44 -0000 Author: grehan Date: Wed Aug 27 06:13:44 2014 New Revision: 270696 URL: http://svnweb.freebsd.org/changeset/base/270696 Log: MFC 270438 Change __inline style to be consistent with FreeBSD usage, and also fix gcc build. PR: 192880 Modified: stable/10/sys/amd64/include/vmm.h Modified: stable/10/sys/amd64/include/vmm.h ============================================================================== --- stable/10/sys/amd64/include/vmm.h Wed Aug 27 01:38:26 2014 (r270695) +++ stable/10/sys/amd64/include/vmm.h Wed Aug 27 06:13:44 2014 (r270696) @@ -587,25 +587,25 @@ struct vm_exit { void vm_inject_fault(void *vm, int vcpuid, int vector, int errcode_valid, int errcode); -static void __inline +static __inline void vm_inject_ud(void *vm, int vcpuid) { vm_inject_fault(vm, vcpuid, IDT_UD, 0, 0); } -static void __inline +static __inline void vm_inject_gp(void *vm, int vcpuid) { vm_inject_fault(vm, vcpuid, IDT_GP, 1, 0); } -static void __inline +static __inline void vm_inject_ac(void *vm, int vcpuid, int errcode) { vm_inject_fault(vm, vcpuid, IDT_AC, 1, errcode); } -static void __inline +static __inline void vm_inject_ss(void *vm, int vcpuid, int errcode) { vm_inject_fault(vm, vcpuid, IDT_SS, 1, errcode); From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 09:19:23 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 937696A6; Wed, 27 Aug 2014 09:19:23 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7307F382B; Wed, 27 Aug 2014 09:19:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7R9JNTV054140; Wed, 27 Aug 2014 09:19:23 GMT (envelope-from hrs@FreeBSD.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7R9JNeF054138; Wed, 27 Aug 2014 09:19:23 GMT (envelope-from hrs@FreeBSD.org) Message-Id: <201408270919.s7R9JNeF054138@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hrs set sender to hrs@FreeBSD.org using -f From: Hiroki Sato Date: Wed, 27 Aug 2014 09:19:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270698 - in head: etc share/man/man5 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 09:19:23 -0000 Author: hrs Date: Wed Aug 27 09:19:22 2014 New Revision: 270698 URL: http://svnweb.freebsd.org/changeset/base/270698 Log: - Use $local_startup to load rc.conf.d/* scripts. - Document support of rc.conf.d//* introduced in r270392. Discussed with: bapt Modified: head/etc/rc.subr head/share/man/man5/rc.conf.5 Modified: head/etc/rc.subr ============================================================================== --- head/etc/rc.subr Wed Aug 27 08:05:57 2014 (r270697) +++ head/etc/rc.subr Wed Aug 27 09:19:22 2014 (r270698) @@ -1270,7 +1270,7 @@ run_rc_script() # load_rc_config() { - local _name _rcvar_val _var _defval _v _msg _new + local _name _rcvar_val _var _defval _v _msg _new _d _name=$1 if [ -z "$_name" ]; then err 3 'USAGE: load_rc_config name' @@ -1289,22 +1289,21 @@ load_rc_config() fi _rc_conf_loaded=true fi - if [ -f /etc/rc.conf.d/"$_name" ]; then - debug "Sourcing /etc/rc.conf.d/$_name" - . /etc/rc.conf.d/"$_name" - elif [ -d /etc/rc.conf.d/"$_name" ] ; then - local _rc - for _rc in /etc/rc.conf.d/"$_name"/* ; do - if [ -f "$_rc" ] ; then - debug "Sourcing $_rc" - . "$_rc" - fi - done - fi - if [ -f ${LOCALBASE:-/usr/local}/etc/rc.conf.d/"$_name" ]; then - debug "Sourcing ${LOCALBASE:-/usr/local}/etc/rc.conf.d/${_name}" - . ${LOCALBASE:-/usr/local}/etc/rc.conf.d/"$_name" - fi + + for _d in /etc ${local_startup%*/rc.d}; do + if [ -f ${_d}/rc.conf.d/"$_name" ]; then + debug "Sourcing ${_d}/rc.conf.d/$_name" + . ${_d}/rc.conf.d/"$_name" + elif [ -d ${_d}/rc.conf.d/"$_name" ] ; then + local _rc + for _rc in ${_d}/rc.conf.d/"$_name"/* ; do + if [ -f "$_rc" ] ; then + debug "Sourcing $_rc" + . "$_rc" + fi + done + fi + done # Set defaults if defined. for _var in $rcvar; do Modified: head/share/man/man5/rc.conf.5 ============================================================================== --- head/share/man/man5/rc.conf.5 Wed Aug 27 08:05:57 2014 (r270697) +++ head/share/man/man5/rc.conf.5 Wed Aug 27 09:19:22 2014 (r270698) @@ -63,20 +63,37 @@ The file is used to override settings in .Pa /etc/rc.conf for historical reasons. +.Pp In addition to .Pa /etc/rc.conf.local you can also place smaller configuration files for each .Xr rc 8 script in the .Pa /etc/rc.conf.d -directory or in the -.Pa ${LOCALBASE}/etc/rc.conf.d -directory, which will be included by the +directory or +.Ao Ar dir Ac Ns Pa /rc.conf.d +directories specified in +.Va local_startup , +which will be included by the .Va load_rc_config function. For jail configurations you could use the file .Pa /etc/rc.conf.d/jail to store jail specific configuration options. +If +.Va local_startup +contains +.Pa /usr/local/etc/rc.d +and +.Pa /opt/conf , +.Pa /usr/local/rc.conf.d/jail +and +.Pa /opt/conf/rc.conf.d/jail +will be loaded. +If +.Ao Ar dir Ac Ns Pa /rc.conf.d/ Ns Ao Ar name Ac +is a directory, +all of files in the directory will be loaded. Also see the .Va rc_conf_files variable below. From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 09:34:42 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 84CD6DF5; Wed, 27 Aug 2014 09:34:42 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5627E39D8; Wed, 27 Aug 2014 09:34:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7R9YglJ062585; Wed, 27 Aug 2014 09:34:42 GMT (envelope-from dumbbell@FreeBSD.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7R9Yf1O062583; Wed, 27 Aug 2014 09:34:41 GMT (envelope-from dumbbell@FreeBSD.org) Message-Id: <201408270934.s7R9Yf1O062583@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dumbbell set sender to dumbbell@FreeBSD.org using -f From: Jean-Sebastien Pedron Date: Wed, 27 Aug 2014 09:34:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270702 - head/sys/dev/vt X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 09:34:42 -0000 Author: dumbbell Date: Wed Aug 27 09:34:41 2014 New Revision: 270702 URL: http://svnweb.freebsd.org/changeset/base/270702 Log: vt(4): Implement basic support for KDSETMODE ioctl With the current implementation, this allows an X11 server to tell the console it switches a particular window in "graphics mode". This information is used by the mouse handling code to ignore sysmouse events in the window taken by the X server: only him should receive those events. Reported by: flo@, glebius@, kan@ Tested by: flo@ Reviewed by: kan@ MFC after: 1 week Modified: head/sys/dev/vt/vt.h head/sys/dev/vt/vt_core.c Modified: head/sys/dev/vt/vt.h ============================================================================== --- head/sys/dev/vt/vt.h Wed Aug 27 09:26:33 2014 (r270701) +++ head/sys/dev/vt/vt.h Wed Aug 27 09:34:41 2014 (r270702) @@ -271,6 +271,7 @@ struct vt_window { #define VWF_VTYLOCK 0x10 /* Prevent window switch. */ #define VWF_MOUSE_HIDE 0x20 /* Disable mouse events processing. */ #define VWF_READY 0x40 /* Window fully initialized. */ +#define VWF_GRAPHICS 0x80 /* Window in graphics mode (KDSETMODE). */ #define VWF_SWWAIT_REL 0x10000 /* Program wait for VT acquire is done. */ #define VWF_SWWAIT_ACQ 0x20000 /* Program wait for VT release is done. */ pid_t vw_pid; /* Terminal holding process */ Modified: head/sys/dev/vt/vt_core.c ============================================================================== --- head/sys/dev/vt/vt_core.c Wed Aug 27 09:26:33 2014 (r270701) +++ head/sys/dev/vt/vt_core.c Wed Aug 27 09:34:41 2014 (r270702) @@ -1476,8 +1476,13 @@ vt_mouse_event(int type, int x, int y, i vf = vw->vw_font; mark = 0; - if (vw->vw_flags & VWF_MOUSE_HIDE) - return; /* Mouse disabled. */ + if (vw->vw_flags & (VWF_MOUSE_HIDE | VWF_GRAPHICS)) + /* + * Either the mouse is disabled, or the window is in + * "graphics mode". The graphics mode is usually set by + * an X server, using the KDSETMODE ioctl. + */ + return; if (vf == NULL) /* Text mode. */ return; @@ -1509,7 +1514,7 @@ vt_mouse_event(int type, int x, int y, i vd->vd_my = y; if ((vd->vd_mstate & MOUSE_BUTTON1DOWN) && (vtbuf_set_mark(&vw->vw_buf, VTB_MARK_MOVE, - vd->vd_mx / vf->vf_width, + vd->vd_mx / vf->vf_width, vd->vd_my / vf->vf_height) == 1)) { /* @@ -1854,7 +1859,20 @@ skip_thunk: return (0); } case KDSETMODE: - /* XXX */ + /* + * FIXME: This implementation is incomplete compared to + * syscons. + */ + switch (*(int *)data) { + case KD_TEXT: + case KD_TEXT1: + case KD_PIXEL: + vw->vw_flags &= ~VWF_GRAPHICS; + break; + case KD_GRAPHICS: + vw->vw_flags |= VWF_GRAPHICS; + break; + } return (0); case KDENABIO: /* allow io operations */ error = priv_check(td, PRIV_IO); From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 10:04:12 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 36D8D421; Wed, 27 Aug 2014 10:04:12 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 16DE33C5D; Wed, 27 Aug 2014 10:04:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7RA4BYd075882; Wed, 27 Aug 2014 10:04:11 GMT (envelope-from dumbbell@FreeBSD.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7RA4B5D075878; Wed, 27 Aug 2014 10:04:11 GMT (envelope-from dumbbell@FreeBSD.org) Message-Id: <201408271004.s7RA4B5D075878@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dumbbell set sender to dumbbell@FreeBSD.org using -f From: Jean-Sebastien Pedron Date: Wed, 27 Aug 2014 10:04:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270705 - in head/sys: dev/vt kern sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 10:04:12 -0000 Author: dumbbell Date: Wed Aug 27 10:04:10 2014 New Revision: 270705 URL: http://svnweb.freebsd.org/changeset/base/270705 Log: vt(4): Add cngrab() and cnungrab() callbacks They are used when a panic occurs or when entering a DDB session for instance. cngrab() forces a vt-switch to the console window, no matter if the original window is another terminal or an X session. However, cnungrab() doesn't vt-switch back to the original window currently. MFC after: 1 week Modified: head/sys/dev/vt/vt.h head/sys/dev/vt/vt_core.c head/sys/kern/subr_terminal.c head/sys/sys/terminal.h Modified: head/sys/dev/vt/vt.h ============================================================================== --- head/sys/dev/vt/vt.h Wed Aug 27 09:57:27 2014 (r270704) +++ head/sys/dev/vt/vt.h Wed Aug 27 10:04:10 2014 (r270705) @@ -261,6 +261,8 @@ struct vt_window { term_rect_t vw_draw_area; /* (?) Drawable area. */ unsigned int vw_number; /* (c) Window number. */ int vw_kbdmode; /* (?) Keyboard mode. */ + int vw_prev_kbdmode;/* (?) Previous mode. */ + int vw_grabbed; /* (?) Grab count. */ char *vw_kbdsq; /* Escape sequence queue*/ unsigned int vw_flags; /* (d) Per-window flags. */ int vw_mouse_level;/* Mouse op mode. */ Modified: head/sys/dev/vt/vt_core.c ============================================================================== --- head/sys/dev/vt/vt_core.c Wed Aug 27 09:57:27 2014 (r270704) +++ head/sys/dev/vt/vt_core.c Wed Aug 27 10:04:10 2014 (r270705) @@ -70,6 +70,9 @@ static tc_done_t vtterm_done; static tc_cnprobe_t vtterm_cnprobe; static tc_cngetc_t vtterm_cngetc; +static tc_cngrab_t vtterm_cngrab; +static tc_cnungrab_t vtterm_cnungrab; + static tc_opened_t vtterm_opened; static tc_ioctl_t vtterm_ioctl; static tc_mmap_t vtterm_mmap; @@ -86,6 +89,9 @@ const struct terminal_class vt_termclass .tc_cnprobe = vtterm_cnprobe, .tc_cngetc = vtterm_cngetc, + .tc_cngrab = vtterm_cngrab, + .tc_cnungrab = vtterm_cnungrab, + .tc_opened = vtterm_opened, .tc_ioctl = vtterm_ioctl, .tc_mmap = vtterm_mmap, @@ -191,6 +197,7 @@ static struct vt_window vt_conswindow = .vw_device = &vt_consdev, .vw_terminal = &vt_consterm, .vw_kbdmode = K_XLATE, + .vw_grabbed = 0, }; static struct terminal vt_consterm = { .tm_class = &vt_termclass, @@ -1202,6 +1209,64 @@ vtterm_cngetc(struct terminal *tm) } static void +vtterm_cngrab(struct terminal *tm) +{ + struct vt_device *vd; + struct vt_window *vw; + keyboard_t *kbd; + + vw = tm->tm_softc; + vd = vw->vw_device; + + if (!cold) + vt_window_switch(vw); + + kbd = kbd_get_keyboard(vd->vd_keyboard); + if (kbd == NULL) + return; + + if (vw->vw_grabbed++ > 0) + return; + + /* + * Make sure the keyboard is accessible even when the kbd device + * driver is disabled. + */ + kbdd_enable(kbd); + + /* We shall always use the keyboard in the XLATE mode here. */ + vw->vw_prev_kbdmode = vw->vw_kbdmode; + vw->vw_kbdmode = K_XLATE; + (void)kbdd_ioctl(kbd, KDSKBMODE, (caddr_t)&vw->vw_kbdmode); + + kbdd_poll(kbd, TRUE); +} + +static void +vtterm_cnungrab(struct terminal *tm) +{ + struct vt_device *vd; + struct vt_window *vw; + keyboard_t *kbd; + + vw = tm->tm_softc; + vd = vw->vw_device; + + kbd = kbd_get_keyboard(vd->vd_keyboard); + if (kbd == NULL) + return; + + if (--vw->vw_grabbed > 0) + return; + + kbdd_poll(kbd, FALSE); + + vw->vw_kbdmode = vw->vw_prev_kbdmode; + (void)kbdd_ioctl(kbd, KDSKBMODE, (caddr_t)&vw->vw_kbdmode); + kbdd_disable(kbd); +} + +static void vtterm_opened(struct terminal *tm, int opened) { struct vt_window *vw = tm->tm_softc; Modified: head/sys/kern/subr_terminal.c ============================================================================== --- head/sys/kern/subr_terminal.c Wed Aug 27 09:57:27 2014 (r270704) +++ head/sys/kern/subr_terminal.c Wed Aug 27 10:04:10 2014 (r270705) @@ -476,13 +476,17 @@ termcn_cnregister(struct terminal *tm) static void termcn_cngrab(struct consdev *cp) { + struct terminal *tm = cp->cn_arg; + tm->tm_class->tc_cngrab(tm); } static void termcn_cnungrab(struct consdev *cp) { + struct terminal *tm = cp->cn_arg; + tm->tm_class->tc_cnungrab(tm); } static void Modified: head/sys/sys/terminal.h ============================================================================== --- head/sys/sys/terminal.h Wed Aug 27 09:57:27 2014 (r270704) +++ head/sys/sys/terminal.h Wed Aug 27 10:04:10 2014 (r270705) @@ -155,6 +155,9 @@ typedef void tc_done_t(struct terminal * typedef void tc_cnprobe_t(struct terminal *tm, struct consdev *cd); typedef int tc_cngetc_t(struct terminal *tm); +typedef void tc_cngrab_t(struct terminal *tm); +typedef void tc_cnungrab_t(struct terminal *tm); + typedef void tc_opened_t(struct terminal *tm, int opened); typedef int tc_ioctl_t(struct terminal *tm, u_long cmd, caddr_t data, struct thread *td); @@ -175,6 +178,10 @@ struct terminal_class { tc_cnprobe_t *tc_cnprobe; tc_cngetc_t *tc_cngetc; + /* DDB & panic handling. */ + tc_cngrab_t *tc_cngrab; + tc_cnungrab_t *tc_cnungrab; + /* Misc. */ tc_opened_t *tc_opened; tc_ioctl_t *tc_ioctl; From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 10:07:08 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id CAAF3685; Wed, 27 Aug 2014 10:07:08 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B665B3C8B; Wed, 27 Aug 2014 10:07:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7RA78CE076421; Wed, 27 Aug 2014 10:07:08 GMT (envelope-from dumbbell@FreeBSD.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7RA786w076420; Wed, 27 Aug 2014 10:07:08 GMT (envelope-from dumbbell@FreeBSD.org) Message-Id: <201408271007.s7RA786w076420@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dumbbell set sender to dumbbell@FreeBSD.org using -f From: Jean-Sebastien Pedron Date: Wed, 27 Aug 2014 10:07:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270706 - head/sys/dev/drm2 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 10:07:08 -0000 Author: dumbbell Date: Wed Aug 27 10:07:08 2014 New Revision: 270706 URL: http://svnweb.freebsd.org/changeset/base/270706 Log: drm: Don't "taskqueue" vt-switch if under DDB/panic situation If DDB is active, we can't use a taskqueue thread to switch away from the X window, because this thread can't run. Reviewed by: ray@ Approved by: ray@ MFC after: 1 week Modified: head/sys/dev/drm2/drm_fb_helper.c Modified: head/sys/dev/drm2/drm_fb_helper.c ============================================================================== --- head/sys/dev/drm2/drm_fb_helper.c Wed Aug 27 10:04:10 2014 (r270705) +++ head/sys/dev/drm2/drm_fb_helper.c Wed Aug 27 10:07:08 2014 (r270706) @@ -36,6 +36,8 @@ __FBSDID("$FreeBSD$"); #include #include +#include + struct vt_kms_softc { struct drm_fb_helper *fb_helper; struct task fb_mode_task; @@ -64,7 +66,11 @@ vt_kms_postswitch(void *arg) struct vt_kms_softc *sc; sc = (struct vt_kms_softc *)arg; - taskqueue_enqueue_fast(taskqueue_thread, &sc->fb_mode_task); + + if (!kdb_active && panicstr == NULL) + taskqueue_enqueue_fast(taskqueue_thread, &sc->fb_mode_task); + else + drm_fb_helper_restore_fbdev_mode(sc->fb_helper); return (0); } From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 10:13:05 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id E61F783C; Wed, 27 Aug 2014 10:13:05 +0000 (UTC) Received: from mail.made4.biz (mail.made4.biz [IPv6:2001:41d0:2:c018::1:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AD2013D3D; Wed, 27 Aug 2014 10:13:05 +0000 (UTC) Received: from 141.7.19.93.rev.sfr.net ([93.19.7.141] helo=i915.dumbbell.fr) by mail.made4.biz with esmtpsa (TLSv1.2:DHE-RSA-AES128-SHA:128) (Exim 4.83 (FreeBSD)) (envelope-from ) id 1XMaDv-000GEq-Ns; Wed, 27 Aug 2014 12:13:03 +0200 Message-ID: <53FDAF2F.5010808@FreeBSD.org> Date: Wed, 27 Aug 2014 12:13:03 +0200 From: =?UTF-8?B?SmVhbi1Tw6liYXN0aWVuIFDDqWRyb24=?= User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.0 MIME-Version: 1.0 To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r270705 - in head/sys: dev/vt kern sys References: <201408271004.s7RA4B5D075878@svn.freebsd.org> In-Reply-To: <201408271004.s7RA4B5D075878@svn.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 10:13:06 -0000 On 27.08.2014 12:04, Jean-Sebastien Pedron wrote: > Author: dumbbell > Date: Wed Aug 27 10:04:10 2014 > New Revision: 270705 > URL: http://svnweb.freebsd.org/changeset/base/270705 > > Log: > vt(4): Add cngrab() and cnungrab() callbacks Review: https://reviews.freebsd.org/D682 Reviewed by: ray@ Approved by: ray@ -- Jean-Sébastien Pédron From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 10:21:50 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 7B313B24; Wed, 27 Aug 2014 10:21:50 +0000 (UTC) Received: from cell.glebius.int.ru (glebius.int.ru [81.19.69.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "cell.glebius.int.ru", Issuer "cell.glebius.int.ru" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id F28043E60; Wed, 27 Aug 2014 10:21:48 +0000 (UTC) Received: from cell.glebius.int.ru (localhost [127.0.0.1]) by cell.glebius.int.ru (8.14.9/8.14.9) with ESMTP id s7RALdSo065017 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 27 Aug 2014 14:21:39 +0400 (MSK) (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by cell.glebius.int.ru (8.14.9/8.14.9/Submit) id s7RALdHA065016; Wed, 27 Aug 2014 14:21:39 +0400 (MSK) (envelope-from glebius@FreeBSD.org) X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to glebius@FreeBSD.org using -f Date: Wed, 27 Aug 2014 14:21:39 +0400 From: Gleb Smirnoff To: Jean-Sebastien Pedron Subject: Re: svn commit: r270702 - head/sys/dev/vt Message-ID: <20140827102139.GN7693@FreeBSD.org> References: <201408270934.s7R9Yf1O062583@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201408270934.s7R9Yf1O062583@svn.freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 10:21:50 -0000 On Wed, Aug 27, 2014 at 09:34:41AM +0000, Jean-Sebastien Pedron wrote: J> Author: dumbbell J> Date: Wed Aug 27 09:34:41 2014 J> New Revision: 270702 J> URL: http://svnweb.freebsd.org/changeset/base/270702 J> J> Log: J> vt(4): Implement basic support for KDSETMODE ioctl J> J> With the current implementation, this allows an X11 server to tell J> the console it switches a particular window in "graphics mode". This J> information is used by the mouse handling code to ignore sysmouse events J> in the window taken by the X server: only him should receive those J> events. J> J> Reported by: flo@, glebius@, kan@ J> Tested by: flo@ J> Reviewed by: kan@ J> MFC after: 1 week Thanks a lot! Works okay. -- Totus tuus, Glebius. From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 11:08:10 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 761F49E9; Wed, 27 Aug 2014 11:08:10 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 56DD43278; Wed, 27 Aug 2014 11:08:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7RB8AiN004301; Wed, 27 Aug 2014 11:08:10 GMT (envelope-from dumbbell@FreeBSD.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7RB8AC7004300; Wed, 27 Aug 2014 11:08:10 GMT (envelope-from dumbbell@FreeBSD.org) Message-Id: <201408271108.s7RB8AC7004300@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dumbbell set sender to dumbbell@FreeBSD.org using -f From: Jean-Sebastien Pedron Date: Wed, 27 Aug 2014 11:08:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270707 - head/sys/dev/vt X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 11:08:10 -0000 Author: dumbbell Date: Wed Aug 27 11:08:09 2014 New Revision: 270707 URL: http://svnweb.freebsd.org/changeset/base/270707 Log: vt(4): Pause the vt_flush() timer when the screen is up-to-date The timer is restarted whenever a window buffer is marked as dirty or the mouse cursor moves. There's still room for improvement. For instance, we should not mark a window buffer as dirty when this window isn't displayed. Review: https://reviews.freebsd.org/D683 Reviewed by: ray@ Approved by: ray@ MFC after: 1 week Modified: head/sys/dev/vt/vt_core.c Modified: head/sys/dev/vt/vt_core.c ============================================================================== --- head/sys/dev/vt/vt_core.c Wed Aug 27 10:07:08 2014 (r270706) +++ head/sys/dev/vt/vt_core.c Wed Aug 27 11:08:09 2014 (r270707) @@ -255,7 +255,8 @@ static void vt_resume_flush_timer(struct vt_device *vd, int ms) { - if (!atomic_cmpset_int(&vd->vd_timer_armed, 0, 1)) + if (!(vd->vd_flags & VDF_ASYNC) || + !atomic_cmpset_int(&vd->vd_timer_armed, 0, 1)) return; vt_schedule_flush(vd, ms); @@ -265,7 +266,8 @@ static void vt_suspend_flush_timer(struct vt_device *vd) { - if (!atomic_cmpset_int(&vd->vd_timer_armed, 1, 0)) + if (!(vd->vd_flags & VDF_ASYNC) || + !atomic_cmpset_int(&vd->vd_timer_armed, 1, 0)) return; callout_drain(&vd->vd_timer); @@ -467,9 +469,11 @@ vt_scroll(struct vt_window *vw, int offs if (diff < -size.tp_row || diff > size.tp_row) { vw->vw_device->vd_flags |= VDF_INVALID; + vt_resume_flush_timer(vw->vw_device, 0); return; } vw->vw_device->vd_flags |= VDF_INVALID; /*XXX*/ + vt_resume_flush_timer(vw->vw_device, 0); } static int @@ -782,6 +786,7 @@ vtterm_cursor(struct terminal *tm, const struct vt_window *vw = tm->tm_softc; vtbuf_cursor_position(&vw->vw_buf, p); + vt_resume_flush_timer(vw->vw_device, 0); } static void @@ -790,6 +795,7 @@ vtterm_putchar(struct terminal *tm, cons struct vt_window *vw = tm->tm_softc; vtbuf_putchar(&vw->vw_buf, p, c); + vt_resume_flush_timer(vw->vw_device, 0); } static void @@ -798,6 +804,7 @@ vtterm_fill(struct terminal *tm, const t struct vt_window *vw = tm->tm_softc; vtbuf_fill_locked(&vw->vw_buf, r, c); + vt_resume_flush_timer(vw->vw_device, 0); } static void @@ -807,6 +814,7 @@ vtterm_copy(struct terminal *tm, const t struct vt_window *vw = tm->tm_softc; vtbuf_copy(&vw->vw_buf, r, p); + vt_resume_flush_timer(vw->vw_device, 0); } static void @@ -817,6 +825,7 @@ vtterm_param(struct terminal *tm, int cm switch (cmd) { case TP_SHOWCURSOR: vtbuf_cursor_visibility(&vw->vw_buf, arg); + vt_resume_flush_timer(vw->vw_device, 0); break; case TP_MOUSE: vw->vw_mouse_level = arg; @@ -915,7 +924,7 @@ vt_mark_mouse_position_as_dirty(struct v } #endif -static void +static int vt_flush(struct vt_device *vd) { struct vt_window *vw; @@ -929,14 +938,14 @@ vt_flush(struct vt_device *vd) vw = vd->vd_curwindow; if (vw == NULL) - return; + return (0); if (vd->vd_flags & VDF_SPLASH || vw->vw_flags & VWF_BUSY) - return; + return (0); vf = vw->vw_font; if (((vd->vd_flags & VDF_TEXTMODE) == 0) && (vf == NULL)) - return; + return (0); #ifndef SC_NO_CUTPASTE cursor_was_shown = vd->vd_mshown; @@ -990,20 +999,27 @@ vt_flush(struct vt_device *vd) if (tarea.tr_begin.tp_col < tarea.tr_end.tp_col) { vd->vd_driver->vd_bitblt_text(vd, vw, &tarea); + return (1); } + + return (0); } static void vt_timer(void *arg) { struct vt_device *vd; + int changed; vd = arg; /* Update screen if required. */ - vt_flush(vd); + changed = vt_flush(vd); /* Schedule for next update. */ - vt_schedule_flush(vd, 0); + if (changed) + vt_schedule_flush(vd, 0); + else + vd->vd_timer_armed = 0; } static void @@ -1372,6 +1388,7 @@ vt_change_font(struct vt_window *vw, str if (vd->vd_curwindow == vw) { vt_set_border(vw, vf, TC_BLACK); vd->vd_flags |= VDF_INVALID; + vt_resume_flush_timer(vw->vw_device, 0); } vw->vw_flags &= ~VWF_BUSY; VT_UNLOCK(vd); @@ -1588,6 +1605,8 @@ vt_mouse_event(int type, int x, int y, i */ vd->vd_markedwin = vw; } + + vt_resume_flush_timer(vw->vw_device, 0); return; /* Done */ case MOUSE_BUTTON_EVENT: /* Buttons */ @@ -1672,6 +1691,7 @@ vt_mouse_event(int type, int x, int y, i * window with selection. */ vd->vd_markedwin = vw; + vt_resume_flush_timer(vw->vw_device, 0); } } @@ -1695,6 +1715,7 @@ vt_mouse_state(int show) /* Mark mouse position as dirty. */ vt_mark_mouse_position_as_dirty(vd); + vt_resume_flush_timer(vw->vw_device, 0); } #endif From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 11:27:49 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 0A5C8127; Wed, 27 Aug 2014 11:27:49 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EA299348D; Wed, 27 Aug 2014 11:27:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7RBRmbR013598; Wed, 27 Aug 2014 11:27:48 GMT (envelope-from dumbbell@FreeBSD.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7RBRmVs013597; Wed, 27 Aug 2014 11:27:48 GMT (envelope-from dumbbell@FreeBSD.org) Message-Id: <201408271127.s7RBRmVs013597@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dumbbell set sender to dumbbell@FreeBSD.org using -f From: Jean-Sebastien Pedron Date: Wed, 27 Aug 2014 11:27:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270708 - head/sys/dev/vt X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 11:27:49 -0000 Author: dumbbell Date: Wed Aug 27 11:27:48 2014 New Revision: 270708 URL: http://svnweb.freebsd.org/changeset/base/270708 Log: vt(4): Recompute the drawable area when the resolution changes This was only done when the font changed. MFC after: 1 week Modified: head/sys/dev/vt/vt_core.c Modified: head/sys/dev/vt/vt_core.c ============================================================================== --- head/sys/dev/vt/vt_core.c Wed Aug 27 11:08:09 2014 (r270707) +++ head/sys/dev/vt/vt_core.c Wed Aug 27 11:27:48 2014 (r270708) @@ -2269,12 +2269,11 @@ vt_resize(struct vt_device *vd) vw = vd->vd_windows[i]; VT_LOCK(vd); /* Assign default font to window, if not textmode. */ - if (!(vd->vd_flags & VDF_TEXTMODE) && vw->vw_font == NULL) { + if (!(vd->vd_flags & VDF_TEXTMODE) && vw->vw_font == NULL) vw->vw_font = vtfont_ref(&vt_font_default); - vt_compute_drawable_area(vw); - } VT_UNLOCK(vd); /* Resize terminal windows */ + vt_compute_drawable_area(vw); while (vt_change_font(vw, vw->vw_font) == EBUSY) { DPRINTF(100, "%s: vt_change_font() is busy, " "window %d\n", __func__, i); From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 13:22:06 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 3DF46BCF; Wed, 27 Aug 2014 13:22:06 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 251F1307D; Wed, 27 Aug 2014 13:22:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7RDM6eA069957; Wed, 27 Aug 2014 13:22:06 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7RDLr3d069813; Wed, 27 Aug 2014 13:21:53 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201408271321.s7RDLr3d069813@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 27 Aug 2014 13:21:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270710 - in head/sys: contrib/rdma/krping dev/cxgb dev/cxgbe/iw_cxgbe modules/mlx4 modules/mlx4ib modules/mlxen ofed/drivers/infiniband/core ofed/drivers/infiniband/hw/mlx4 ofed/driver... X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 13:22:06 -0000 Author: hselasky Date: Wed Aug 27 13:21:53 2014 New Revision: 270710 URL: http://svnweb.freebsd.org/changeset/base/270710 Log: - Update the OFED Linux Emulation layer as a preparation for a hardware driver update from Mellanox Technologies. - Remove empty files from the OFED Linux Emulation layer. - Fix compile warnings related to printf() and the "%lld" and "%llx" format specifiers. - Add some missing 2-clause BSD copyrights. - Add "Mellanox Technologies, Ltd." to list of copyright holders. - Add some new compatibility files. - Fix order of uninit in the mlx4ib module to avoid crash at unload using the new module_exit_order() function. MFC after: 1 week Sponsored by: Mellanox Technologies Added: head/sys/ofed/include/linux/cache.h (contents, props changed) head/sys/ofed/include/linux/etherdevice.h (contents, props changed) head/sys/ofed/include/linux/kmod.h (contents, props changed) head/sys/ofed/include/linux/ktime.h (contents, props changed) head/sys/ofed/include/linux/math64.h (contents, props changed) head/sys/ofed/include/net/if_inet6.h (contents, props changed) Deleted: head/sys/ofed/include/asm/current.h head/sys/ofed/include/asm/semaphore.h head/sys/ofed/include/asm/system.h head/sys/ofed/include/linux/atomic.h head/sys/ofed/include/linux/bitmap.h head/sys/ofed/include/linux/ctype.h head/sys/ofed/include/linux/init.h head/sys/ofed/include/linux/rtnetlink.h head/sys/ofed/include/linux/stddef.h head/sys/ofed/include/net/addrconf.h head/sys/ofed/include/net/arp.h head/sys/ofed/include/net/ip6_route.h head/sys/ofed/include/net/neighbour.h Modified: head/sys/contrib/rdma/krping/krping.c head/sys/dev/cxgb/cxgb_osdep.h head/sys/dev/cxgbe/iw_cxgbe/cm.c head/sys/dev/cxgbe/iw_cxgbe/qp.c head/sys/modules/mlx4/Makefile head/sys/modules/mlx4ib/Makefile head/sys/modules/mlxen/Makefile head/sys/ofed/drivers/infiniband/core/addr.c head/sys/ofed/drivers/infiniband/core/cm.c head/sys/ofed/drivers/infiniband/core/device.c head/sys/ofed/drivers/infiniband/core/iwcm.c head/sys/ofed/drivers/infiniband/core/sa_query.c head/sys/ofed/drivers/infiniband/core/sysfs.c head/sys/ofed/drivers/infiniband/core/ucm.c head/sys/ofed/drivers/infiniband/core/user_mad.c head/sys/ofed/drivers/infiniband/core/uverbs_cmd.c head/sys/ofed/drivers/infiniband/core/uverbs_main.c head/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c head/sys/ofed/drivers/infiniband/hw/mlx4/cm.c head/sys/ofed/drivers/infiniband/hw/mlx4/mad.c head/sys/ofed/drivers/infiniband/hw/mlx4/main.c head/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_ib.h head/sys/ofed/drivers/infiniband/hw/mlx4/mr.c head/sys/ofed/drivers/infiniband/hw/mlx4/qp.c head/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c head/sys/ofed/drivers/infiniband/hw/mthca/mthca_allocator.c head/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c head/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c head/sys/ofed/drivers/infiniband/hw/mthca/mthca_reset.c head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c head/sys/ofed/drivers/net/mlx4/alloc.c head/sys/ofed/drivers/net/mlx4/cmd.c head/sys/ofed/drivers/net/mlx4/cq.c head/sys/ofed/drivers/net/mlx4/en_netdev.c head/sys/ofed/drivers/net/mlx4/en_rx.c head/sys/ofed/drivers/net/mlx4/eq.c head/sys/ofed/drivers/net/mlx4/fw.c head/sys/ofed/drivers/net/mlx4/main.c head/sys/ofed/drivers/net/mlx4/mcg.c head/sys/ofed/drivers/net/mlx4/mr.c head/sys/ofed/drivers/net/mlx4/pd.c head/sys/ofed/drivers/net/mlx4/qp.c head/sys/ofed/drivers/net/mlx4/reset.c head/sys/ofed/drivers/net/mlx4/resource_tracker.c head/sys/ofed/drivers/net/mlx4/sense.c head/sys/ofed/drivers/net/mlx4/srq.c head/sys/ofed/drivers/net/mlx4/xrcd.c head/sys/ofed/include/asm/atomic-long.h head/sys/ofed/include/asm/atomic.h head/sys/ofed/include/asm/byteorder.h head/sys/ofed/include/asm/fcntl.h head/sys/ofed/include/asm/io.h head/sys/ofed/include/asm/page.h head/sys/ofed/include/asm/pgtable.h head/sys/ofed/include/asm/types.h head/sys/ofed/include/asm/uaccess.h head/sys/ofed/include/linux/bitops.h head/sys/ofed/include/linux/cdev.h head/sys/ofed/include/linux/clocksource.h head/sys/ofed/include/linux/compat.h head/sys/ofed/include/linux/compiler.h head/sys/ofed/include/linux/completion.h head/sys/ofed/include/linux/delay.h head/sys/ofed/include/linux/device.h head/sys/ofed/include/linux/dma-attrs.h head/sys/ofed/include/linux/dma-mapping.h head/sys/ofed/include/linux/dmapool.h head/sys/ofed/include/linux/err.h head/sys/ofed/include/linux/errno.h head/sys/ofed/include/linux/ethtool.h head/sys/ofed/include/linux/file.h head/sys/ofed/include/linux/fs.h head/sys/ofed/include/linux/gfp.h head/sys/ofed/include/linux/hardirq.h head/sys/ofed/include/linux/idr.h head/sys/ofed/include/linux/if_arp.h head/sys/ofed/include/linux/if_ether.h head/sys/ofed/include/linux/if_vlan.h head/sys/ofed/include/linux/in.h head/sys/ofed/include/linux/in6.h head/sys/ofed/include/linux/inet.h head/sys/ofed/include/linux/inetdevice.h head/sys/ofed/include/linux/interrupt.h head/sys/ofed/include/linux/io-mapping.h head/sys/ofed/include/linux/io.h head/sys/ofed/include/linux/ioctl.h head/sys/ofed/include/linux/jiffies.h head/sys/ofed/include/linux/kdev_t.h head/sys/ofed/include/linux/kernel.h head/sys/ofed/include/linux/kobject.h head/sys/ofed/include/linux/kref.h head/sys/ofed/include/linux/kthread.h head/sys/ofed/include/linux/linux_compat.c head/sys/ofed/include/linux/linux_idr.c head/sys/ofed/include/linux/linux_radix.c head/sys/ofed/include/linux/list.h head/sys/ofed/include/linux/lockdep.h head/sys/ofed/include/linux/log2.h head/sys/ofed/include/linux/miscdevice.h head/sys/ofed/include/linux/mm.h head/sys/ofed/include/linux/module.h head/sys/ofed/include/linux/moduleparam.h head/sys/ofed/include/linux/mount.h head/sys/ofed/include/linux/mutex.h head/sys/ofed/include/linux/net.h head/sys/ofed/include/linux/netdevice.h head/sys/ofed/include/linux/notifier.h head/sys/ofed/include/linux/page.h head/sys/ofed/include/linux/pci.h head/sys/ofed/include/linux/poll.h head/sys/ofed/include/linux/radix-tree.h head/sys/ofed/include/linux/random.h head/sys/ofed/include/linux/rbtree.h head/sys/ofed/include/linux/rwlock.h head/sys/ofed/include/linux/rwsem.h head/sys/ofed/include/linux/scatterlist.h head/sys/ofed/include/linux/sched.h head/sys/ofed/include/linux/semaphore.h head/sys/ofed/include/linux/slab.h head/sys/ofed/include/linux/socket.h head/sys/ofed/include/linux/spinlock.h head/sys/ofed/include/linux/string.h head/sys/ofed/include/linux/sysfs.h head/sys/ofed/include/linux/timer.h head/sys/ofed/include/linux/types.h head/sys/ofed/include/linux/uaccess.h head/sys/ofed/include/linux/vmalloc.h head/sys/ofed/include/linux/wait.h head/sys/ofed/include/linux/workqueue.h head/sys/ofed/include/net/ip.h head/sys/ofed/include/net/ipv6.h head/sys/ofed/include/net/netevent.h head/sys/ofed/include/net/tcp.h head/sys/ofed/include/rdma/ib_umem.h head/sys/ofed/include/rdma/ib_verbs.h Modified: head/sys/contrib/rdma/krping/krping.c ============================================================================== --- head/sys/contrib/rdma/krping/krping.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/contrib/rdma/krping/krping.c Wed Aug 27 13:21:53 2014 (r270710) @@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include @@ -46,7 +45,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include Modified: head/sys/dev/cxgb/cxgb_osdep.h ============================================================================== --- head/sys/dev/cxgb/cxgb_osdep.h Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/dev/cxgb/cxgb_osdep.h Wed Aug 27 13:21:53 2014 (r270710) @@ -91,8 +91,6 @@ struct t3_mbuf_hdr { #endif #endif -#define __read_mostly __attribute__((__section__(".data.read_mostly"))) - /* * Workaround for weird Chelsio issue */ Modified: head/sys/dev/cxgbe/iw_cxgbe/cm.c ============================================================================== --- head/sys/dev/cxgbe/iw_cxgbe/cm.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/dev/cxgbe/iw_cxgbe/cm.c Wed Aug 27 13:21:53 2014 (r270710) @@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: head/sys/dev/cxgbe/iw_cxgbe/qp.c ============================================================================== --- head/sys/dev/cxgbe/iw_cxgbe/qp.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/dev/cxgbe/iw_cxgbe/qp.c Wed Aug 27 13:21:53 2014 (r270710) @@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include Modified: head/sys/modules/mlx4/Makefile ============================================================================== --- head/sys/modules/mlx4/Makefile Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/modules/mlx4/Makefile Wed Aug 27 13:21:53 2014 (r270710) @@ -12,6 +12,7 @@ CFLAGS+= -I${.CURDIR}/../../ofed/include .include CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS} +CFLAGS+= -fms-extensions CWARNFLAGS.mcg.c= -Wno-unused CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}} Modified: head/sys/modules/mlx4ib/Makefile ============================================================================== --- head/sys/modules/mlx4ib/Makefile Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/modules/mlx4ib/Makefile Wed Aug 27 13:21:53 2014 (r270710) @@ -14,6 +14,7 @@ CFLAGS+= -I${.CURDIR}/../../ofed/drivers CFLAGS+= -I${.CURDIR}/../../ofed/include/ CFLAGS+= -DCONFIG_INFINIBAND_USER_MEM CFLAGS+= -DINET6 -DINET -DOFED +CFLAGS+= -fms-extensions .include Modified: head/sys/modules/mlxen/Makefile ============================================================================== --- head/sys/modules/mlxen/Makefile Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/modules/mlxen/Makefile Wed Aug 27 13:21:53 2014 (r270710) @@ -8,6 +8,7 @@ SRCS += en_rx.c en_tx.c SRCS += opt_inet.h opt_inet6.h CFLAGS+= -I${.CURDIR}/../../ofed/drivers/net/mlx4 CFLAGS+= -I${.CURDIR}/../../ofed/include/ +CFLAGS+= -fms-extensions .include Modified: head/sys/ofed/drivers/infiniband/core/addr.c ============================================================================== --- head/sys/ofed/drivers/infiniband/core/addr.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/infiniband/core/addr.c Wed Aug 27 13:21:53 2014 (r270710) @@ -36,12 +36,8 @@ #include #include #include -#include -#include #include #include -#include -#include #include MODULE_AUTHOR("Sean Hefty"); Modified: head/sys/ofed/drivers/infiniband/core/cm.c ============================================================================== --- head/sys/ofed/drivers/infiniband/core/cm.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/infiniband/core/cm.c Wed Aug 27 13:21:53 2014 (r270710) @@ -45,6 +45,9 @@ #include #include #include +#include + +#include #include #include @@ -3890,5 +3893,5 @@ static void __exit ib_cm_cleanup(void) } module_init_order(ib_cm_init, SI_ORDER_SECOND); -module_exit(ib_cm_cleanup); +module_exit_order(ib_cm_cleanup, SI_ORDER_FIRST); Modified: head/sys/ofed/drivers/infiniband/core/device.c ============================================================================== --- head/sys/ofed/drivers/infiniband/core/device.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/infiniband/core/device.c Wed Aug 27 13:21:53 2014 (r270710) @@ -36,7 +36,6 @@ #include #include #include -#include #include #include Modified: head/sys/ofed/drivers/infiniband/core/iwcm.c ============================================================================== --- head/sys/ofed/drivers/infiniband/core/iwcm.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/infiniband/core/iwcm.c Wed Aug 27 13:21:53 2014 (r270710) @@ -43,6 +43,7 @@ #include #include #include +#include #include #include Modified: head/sys/ofed/drivers/infiniband/core/sa_query.c ============================================================================== --- head/sys/ofed/drivers/infiniband/core/sa_query.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/infiniband/core/sa_query.c Wed Aug 27 13:21:53 2014 (r270710) @@ -33,7 +33,6 @@ */ #include -#include #include #include #include Modified: head/sys/ofed/drivers/infiniband/core/sysfs.c ============================================================================== --- head/sys/ofed/drivers/infiniband/core/sysfs.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/infiniband/core/sysfs.c Wed Aug 27 13:21:53 2014 (r270710) @@ -36,6 +36,7 @@ #include #include +#include #include #include Modified: head/sys/ofed/drivers/infiniband/core/ucm.c ============================================================================== --- head/sys/ofed/drivers/infiniband/core/ucm.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/infiniband/core/ucm.c Wed Aug 27 13:21:53 2014 (r270710) @@ -32,7 +32,6 @@ */ #include -#include #include #include #include @@ -43,6 +42,7 @@ #include #include #include +#include #include @@ -1295,7 +1295,7 @@ static void ib_ucm_remove_one(struct ib_ device_unregister(&ucm_dev->dev); } -static ssize_t show_abi_version(struct class *class, char *buf) +static ssize_t show_abi_version(struct class *class, struct class_attribute *attr, char *buf) { return sprintf(buf, "%d\n", IB_USER_CM_ABI_VERSION); } Modified: head/sys/ofed/drivers/infiniband/core/user_mad.c ============================================================================== --- head/sys/ofed/drivers/infiniband/core/user_mad.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/infiniband/core/user_mad.c Wed Aug 27 13:21:53 2014 (r270710) @@ -34,7 +34,6 @@ */ #include -#include #include #include #include @@ -986,7 +985,7 @@ static ssize_t show_port(struct device * } static DEVICE_ATTR(port, S_IRUGO, show_port, NULL); -static ssize_t show_abi_version(struct class *class, char *buf) +static ssize_t show_abi_version(struct class *class, struct class_attribute *attr, char *buf) { return sprintf(buf, "%d\n", IB_USER_MAD_ABI_VERSION); } Modified: head/sys/ofed/drivers/infiniband/core/uverbs_cmd.c ============================================================================== --- head/sys/ofed/drivers/infiniband/core/uverbs_cmd.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/infiniband/core/uverbs_cmd.c Wed Aug 27 13:21:53 2014 (r270710) @@ -35,6 +35,7 @@ #include #include +#include #include #include Modified: head/sys/ofed/drivers/infiniband/core/uverbs_main.c ============================================================================== --- head/sys/ofed/drivers/infiniband/core/uverbs_main.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/infiniband/core/uverbs_main.c Wed Aug 27 13:21:53 2014 (r270710) @@ -35,7 +35,6 @@ */ #include -#include #include #include #include @@ -565,8 +564,12 @@ struct file *ib_uverbs_alloc_event_file( * system call on a uverbs file, which will already have a * module reference. */ +#ifdef __linux__ filp = alloc_file(uverbs_event_mnt, dget(uverbs_event_mnt->mnt_root), FMODE_READ, fops_get(&uverbs_event_fops)); +#else + filp = alloc_file(FMODE_READ, fops_get(&uverbs_event_fops)); +#endif if (!filp) { ret = -ENFILE; goto err_fd; @@ -767,7 +770,7 @@ static ssize_t show_dev_abi_version(stru } static DEVICE_ATTR(abi_version, S_IRUGO, show_dev_abi_version, NULL); -static ssize_t show_abi_version(struct class *class, char *buf) +static ssize_t show_abi_version(struct class *class, struct class_attribute *attr, char *buf) { return sprintf(buf, "%d\n", IB_USER_VERBS_ABI_VERSION); } Modified: head/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c ============================================================================== --- head/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c Wed Aug 27 13:21:53 2014 (r270710) @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #include @@ -81,7 +80,7 @@ void mlx4_ib_update_cache_on_guid_change guid_indexes = be64_to_cpu((__force __be64) dev->sriov.alias_guid. ports_guid[port_num - 1]. all_rec_per_port[block_num].guid_indexes); - pr_debug("port: %d, guid_indexes: 0x%llx\n", port_num, guid_indexes); + pr_debug("port: %d, guid_indexes: 0x%llx\n", port_num, (long long)guid_indexes); for (i = 0; i < NUM_ALIAS_GUID_IN_REC; i++) { /* The location of the specific index starts from bit number 4 @@ -145,7 +144,7 @@ void mlx4_ib_notify_slaves_on_guid_chang guid_indexes = be64_to_cpu((__force __be64) dev->sriov.alias_guid. ports_guid[port_num - 1]. all_rec_per_port[block_num].guid_indexes); - pr_debug("port: %d, guid_indexes: 0x%llx\n", port_num, guid_indexes); + pr_debug("port: %d, guid_indexes: 0x%llx\n", port_num, (long long)guid_indexes); /*calculate the slaves and notify them*/ for (i = 0; i < NUM_ALIAS_GUID_IN_REC; i++) { Modified: head/sys/ofed/drivers/infiniband/hw/mlx4/cm.c ============================================================================== --- head/sys/ofed/drivers/infiniband/hw/mlx4/cm.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/infiniband/hw/mlx4/cm.c Wed Aug 27 13:21:53 2014 (r270710) @@ -333,7 +333,7 @@ int mlx4_ib_demux_cm_handler(struct ib_d *slave = mlx4_ib_find_real_gid(ibdev, port, gid.global.interface_id); if (*slave < 0) { mlx4_ib_warn(ibdev, "failed matching slave_id by gid (0x%llx)\n", - gid.global.interface_id); + (long long)gid.global.interface_id); return -ENOENT; } return 0; Modified: head/sys/ofed/drivers/infiniband/hw/mlx4/mad.c ============================================================================== --- head/sys/ofed/drivers/infiniband/hw/mlx4/mad.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/infiniband/hw/mlx4/mad.c Wed Aug 27 13:21:53 2014 (r270710) @@ -1664,12 +1664,12 @@ static void mlx4_ib_tunnel_comp_worker(s (MLX4_NUM_TUNNEL_BUFS - 1)); if (ret) pr_err("Failed reposting tunnel " - "buf:%lld\n", wc.wr_id); + "buf:%lld\n", (long long)wc.wr_id); break; case IB_WC_SEND: pr_debug("received tunnel send completion:" "wrid=0x%llx, status=0x%x\n", - wc.wr_id, wc.status); + (long long)wc.wr_id, wc.status); ib_destroy_ah(tun_qp->tx_ring[wc.wr_id & (MLX4_NUM_TUNNEL_BUFS - 1)].ah); tun_qp->tx_ring[wc.wr_id & (MLX4_NUM_TUNNEL_BUFS - 1)].ah @@ -1685,7 +1685,7 @@ static void mlx4_ib_tunnel_comp_worker(s } else { pr_debug("mlx4_ib: completion error in tunnel: %d." " status = %d, wrid = 0x%llx\n", - ctx->slave, wc.status, wc.wr_id); + ctx->slave, wc.status, (long long)wc.wr_id); if (!MLX4_TUN_IS_RECV(wc.wr_id)) { ib_destroy_ah(tun_qp->tx_ring[wc.wr_id & (MLX4_NUM_TUNNEL_BUFS - 1)].ah); @@ -1837,7 +1837,7 @@ static void mlx4_ib_sqp_comp_worker(stru if (mlx4_ib_post_pv_qp_buf(ctx, sqp, wc.wr_id & (MLX4_NUM_TUNNEL_BUFS - 1))) pr_err("Failed reposting SQP " - "buf:%lld\n", wc.wr_id); + "buf:%lld\n", (long long)wc.wr_id); break; default: BUG_ON(1); @@ -1846,7 +1846,7 @@ static void mlx4_ib_sqp_comp_worker(stru } else { pr_debug("mlx4_ib: completion error in tunnel: %d." " status = %d, wrid = 0x%llx\n", - ctx->slave, wc.status, wc.wr_id); + ctx->slave, wc.status, (long long)wc.wr_id); if (!MLX4_TUN_IS_RECV(wc.wr_id)) { ib_destroy_ah(sqp->tx_ring[wc.wr_id & (MLX4_NUM_TUNNEL_BUFS - 1)].ah); Modified: head/sys/ofed/drivers/infiniband/hw/mlx4/main.c ============================================================================== --- head/sys/ofed/drivers/infiniband/hw/mlx4/main.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/infiniband/hw/mlx4/main.c Wed Aug 27 13:21:53 2014 (r270710) @@ -37,15 +37,14 @@ #include #endif -#include #include #include #include #include -#include #include #include #include +#include #include #include Modified: head/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_ib.h ============================================================================== --- head/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_ib.h Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_ib.h Wed Aug 27 13:21:53 2014 (r270710) @@ -38,6 +38,7 @@ #include #include #include +#include #include #include Modified: head/sys/ofed/drivers/infiniband/hw/mlx4/mr.c ============================================================================== --- head/sys/ofed/drivers/infiniband/hw/mlx4/mr.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/infiniband/hw/mlx4/mr.c Wed Aug 27 13:21:53 2014 (r270710) @@ -159,7 +159,7 @@ static int mlx4_ib_umem_write_mtt_block( if (len & (mtt_size-1ULL)) { WARN(1 , "write_block: len %llx is not aligned to mtt_size %llx\n", - len, mtt_size); + (long long)len, (long long)mtt_size); return -EINVAL; } @@ -416,7 +416,7 @@ int mlx4_ib_umem_calc_optimal_mtt_size(s WARN((total_len & ((1ULL<> block_shift; end: @@ -426,7 +426,7 @@ end: */ WARN(1, "mlx4_ib_umem_calc_optimal_mtt_size - unexpected shift %lld\n", - block_shift); + (long long)block_shift); block_shift = min_shift; } Modified: head/sys/ofed/drivers/infiniband/hw/mlx4/qp.c ============================================================================== --- head/sys/ofed/drivers/infiniband/hw/mlx4/qp.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/infiniband/hw/mlx4/qp.c Wed Aug 27 13:21:53 2014 (r270710) @@ -34,7 +34,6 @@ #include #include #include -#include #include #include Modified: head/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c ============================================================================== --- head/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c Wed Aug 27 13:21:53 2014 (r270710) @@ -34,6 +34,7 @@ #include "mlx4_ib.h" #include #include +#include #include /*show_admin_alias_guid returns the administratively assigned value of that GUID. Modified: head/sys/ofed/drivers/infiniband/hw/mthca/mthca_allocator.c ============================================================================== --- head/sys/ofed/drivers/infiniband/hw/mthca/mthca_allocator.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/infiniband/hw/mthca/mthca_allocator.c Wed Aug 27 13:21:53 2014 (r270710) @@ -32,7 +32,6 @@ #include #include -#include #include "mthca_dev.h" Modified: head/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c ============================================================================== --- head/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c Wed Aug 27 13:21:53 2014 (r270710) @@ -33,7 +33,6 @@ */ #include -#include #include #include #include Modified: head/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c ============================================================================== --- head/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c Wed Aug 27 13:21:53 2014 (r270710) @@ -40,6 +40,7 @@ #include #include +#include #include "mthca_dev.h" #include "mthca_cmd.h" Modified: head/sys/ofed/drivers/infiniband/hw/mthca/mthca_reset.c ============================================================================== --- head/sys/ofed/drivers/infiniband/hw/mthca/mthca_reset.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/infiniband/hw/mthca/mthca_reset.c Wed Aug 27 13:21:53 2014 (r270710) @@ -30,7 +30,6 @@ * SOFTWARE. */ -#include #include #include #include Modified: head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c ============================================================================== --- head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c Wed Aug 27 13:21:53 2014 (r270710) @@ -40,7 +40,6 @@ static int ipoib_resolvemulti(struct ifn #include -#include #include #include #include Modified: head/sys/ofed/drivers/net/mlx4/alloc.c ============================================================================== --- head/sys/ofed/drivers/net/mlx4/alloc.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/net/mlx4/alloc.c Wed Aug 27 13:21:53 2014 (r270710) @@ -34,8 +34,7 @@ #include #include #include -//#include /* XXX SK probabaly not needed in freeBSD XXX */ -#include +#include #include #include Modified: head/sys/ofed/drivers/net/mlx4/cmd.c ============================================================================== --- head/sys/ofed/drivers/net/mlx4/cmd.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/net/mlx4/cmd.c Wed Aug 27 13:21:53 2014 (r270710) @@ -640,7 +640,7 @@ static int mlx4_ACCESS_MEM(struct mlx4_d (slave & ~0x7f) | (size & 0xff)) { mlx4_err(dev, "Bad access mem params - slave_addr:0x%llx " "master_addr:0x%llx slave_id:%d size:%d\n", - slave_addr, master_addr, slave, size); + (long long)slave_addr, (long long)master_addr, slave, size); return -EINVAL; } @@ -1553,7 +1553,7 @@ static int mlx4_master_activate_admin_st return err; } mlx4_dbg((&(priv->dev)), "alloc mac %llx idx %d slave %d port %d\n", - vp_oper->state.mac, vp_oper->mac_idx, slave, port); + (long long)vp_oper->state.mac, vp_oper->mac_idx, slave, port); } } return 0; @@ -2117,7 +2117,7 @@ int mlx4_set_vf_mac(struct mlx4_dev *dev s_info = &priv->mfunc.master.vf_admin[vf].vport[port]; s_info->mac = mlx4_mac_to_u64(mac); mlx4_info(dev, "default mac on vf %d port %d to %llX will take afect only after vf restart\n", - vf, port, s_info->mac); + vf, port, (long long)s_info->mac); return 0; } EXPORT_SYMBOL_GPL(mlx4_set_vf_mac); Modified: head/sys/ofed/drivers/net/mlx4/cq.c ============================================================================== --- head/sys/ofed/drivers/net/mlx4/cq.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/net/mlx4/cq.c Wed Aug 27 13:21:53 2014 (r270710) @@ -34,7 +34,6 @@ * SOFTWARE. */ -#include #include #include Modified: head/sys/ofed/drivers/net/mlx4/en_netdev.c ============================================================================== --- head/sys/ofed/drivers/net/mlx4/en_netdev.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/net/mlx4/en_netdev.c Wed Aug 27 13:21:53 2014 (r270710) @@ -1581,7 +1581,7 @@ int mlx4_en_init_netdev(struct mlx4_en_d if (ILLEGAL_MAC(priv->mac)) { en_err(priv, "Port: %d, invalid mac burned: 0x%llx, quiting\n", - priv->port, priv->mac); + priv->port, (long long)priv->mac); err = -EINVAL; goto out; } Modified: head/sys/ofed/drivers/net/mlx4/en_rx.c ============================================================================== --- head/sys/ofed/drivers/net/mlx4/en_rx.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/net/mlx4/en_rx.c Wed Aug 27 13:21:53 2014 (r270710) @@ -136,7 +136,7 @@ static void mlx4_en_free_rx_desc(struct frag_info = &priv->frag_info[nr]; dma = be64_to_cpu(rx_desc->data[nr].addr); - en_dbg(DRV, priv, "Unmaping buffer at dma:0x%llx\n", (u64) dma); + en_dbg(DRV, priv, "Unmaping buffer at dma:0x%llx\n", (long long) dma); pci_unmap_single(mdev->pdev, dma, frag_info->frag_size, PCI_DMA_FROMDEVICE); m_free(mb_list[nr]); Modified: head/sys/ofed/drivers/net/mlx4/eq.c ============================================================================== --- head/sys/ofed/drivers/net/mlx4/eq.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/net/mlx4/eq.c Wed Aug 27 13:21:53 2014 (r270710) @@ -31,7 +31,6 @@ * SOFTWARE. */ -#include #include #include #include Modified: head/sys/ofed/drivers/net/mlx4/fw.c ============================================================================== --- head/sys/ofed/drivers/net/mlx4/fw.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/net/mlx4/fw.c Wed Aug 27 13:21:53 2014 (r270710) @@ -1078,14 +1078,14 @@ int mlx4_QUERY_FW(struct mlx4_dev *dev) MLX4_GET(fw->comm_bar, outbox, QUERY_FW_COMM_BAR_OFFSET); fw->comm_bar = (fw->comm_bar >> 6) * 2; mlx4_dbg(dev, "Communication vector bar:%d offset:0x%llx\n", - fw->comm_bar, fw->comm_base); + fw->comm_bar, (long long)fw->comm_base); mlx4_dbg(dev, "FW size %d KB\n", fw->fw_pages >> 2); MLX4_GET(fw->clock_offset, outbox, QUERY_FW_CLOCK_OFFSET); MLX4_GET(fw->clock_bar, outbox, QUERY_FW_CLOCK_BAR); fw->clock_bar = (fw->clock_bar >> 6) * 2; mlx4_dbg(dev, "Internal clock bar:%d offset:0x%llx\n", - fw->comm_bar, fw->comm_base); + fw->comm_bar, (long long)fw->comm_base); /* * Round up number of system pages needed in case Modified: head/sys/ofed/drivers/net/mlx4/main.c ============================================================================== --- head/sys/ofed/drivers/net/mlx4/main.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/net/mlx4/main.c Wed Aug 27 13:21:53 2014 (r270710) @@ -34,7 +34,6 @@ */ #include -#include #include #include #include @@ -42,6 +41,7 @@ #include #include #include +#include #include #include Modified: head/sys/ofed/drivers/net/mlx4/mcg.c ============================================================================== --- head/sys/ofed/drivers/net/mlx4/mcg.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/net/mlx4/mcg.c Wed Aug 27 13:21:53 2014 (r270710) @@ -886,7 +886,7 @@ int mlx4_flow_detach(struct mlx4_dev *de err = mlx4_QP_FLOW_STEERING_DETACH(dev, reg_id); if (err) mlx4_err(dev, "Fail to detach network rule. registration id = 0x%llx\n", - reg_id); + (long long)reg_id); return err; } EXPORT_SYMBOL_GPL(mlx4_flow_detach); Modified: head/sys/ofed/drivers/net/mlx4/mr.c ============================================================================== --- head/sys/ofed/drivers/net/mlx4/mr.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/net/mlx4/mr.c Wed Aug 27 13:21:53 2014 (r270710) @@ -32,7 +32,6 @@ * SOFTWARE. */ -#include #include #include #include Modified: head/sys/ofed/drivers/net/mlx4/pd.c ============================================================================== --- head/sys/ofed/drivers/net/mlx4/pd.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/net/mlx4/pd.c Wed Aug 27 13:21:53 2014 (r270710) @@ -31,7 +31,6 @@ * SOFTWARE. */ -#include #include #include Modified: head/sys/ofed/drivers/net/mlx4/qp.c ============================================================================== --- head/sys/ofed/drivers/net/mlx4/qp.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/net/mlx4/qp.c Wed Aug 27 13:21:53 2014 (r270710) @@ -33,8 +33,6 @@ * SOFTWARE. */ -#include - #include #include Modified: head/sys/ofed/drivers/net/mlx4/reset.c ============================================================================== --- head/sys/ofed/drivers/net/mlx4/reset.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/net/mlx4/reset.c Wed Aug 27 13:21:53 2014 (r270710) @@ -31,7 +31,6 @@ * SOFTWARE. */ -#include #include #include #include Modified: head/sys/ofed/drivers/net/mlx4/resource_tracker.c ============================================================================== --- head/sys/ofed/drivers/net/mlx4/resource_tracker.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/net/mlx4/resource_tracker.c Wed Aug 27 13:21:53 2014 (r270710) @@ -1166,7 +1166,7 @@ static int qp_res_start_move_to(struct m switch (state) { case RES_QP_BUSY: mlx4_dbg(dev, "%s: failed RES_QP, 0x%llx\n", - __func__, r->com.res_id); + __func__, (long long)r->com.res_id); err = -EBUSY; break; @@ -1174,7 +1174,7 @@ static int qp_res_start_move_to(struct m if (r->com.state == RES_QP_MAPPED && !alloc) break; - mlx4_dbg(dev, "failed RES_QP, 0x%llx\n", r->com.res_id); + mlx4_dbg(dev, "failed RES_QP, 0x%llx\n", (long long)r->com.res_id); err = -EINVAL; break; @@ -1184,7 +1184,7 @@ static int qp_res_start_move_to(struct m break; else { mlx4_dbg(dev, "failed RES_QP, 0x%llx\n", - r->com.res_id); + (long long)r->com.res_id); err = -EINVAL; } @@ -3766,7 +3766,7 @@ static int _move_all_busy(struct mlx4_de mlx4_dbg(dev, "%s id 0x%llx is busy\n", ResourceType(type), - r->res_id); + (long long)r->res_id); ++busy; } else { r->from_state = r->state; Modified: head/sys/ofed/drivers/net/mlx4/sense.c ============================================================================== --- head/sys/ofed/drivers/net/mlx4/sense.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/net/mlx4/sense.c Wed Aug 27 13:21:53 2014 (r270710) @@ -53,7 +53,7 @@ int mlx4_SENSE_PORT(struct mlx4_dev *dev } if (out_param > 2) { - mlx4_err(dev, "Sense returned illegal value: 0x%llx\n", out_param); + mlx4_err(dev, "Sense returned illegal value: 0x%llx\n", (long long)out_param); return -EINVAL; } Modified: head/sys/ofed/drivers/net/mlx4/srq.c ============================================================================== --- head/sys/ofed/drivers/net/mlx4/srq.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/net/mlx4/srq.c Wed Aug 27 13:21:53 2014 (r270710) @@ -31,8 +31,6 @@ * SOFTWARE. */ -#include - #include #include Modified: head/sys/ofed/drivers/net/mlx4/xrcd.c ============================================================================== --- head/sys/ofed/drivers/net/mlx4/xrcd.c Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/drivers/net/mlx4/xrcd.c Wed Aug 27 13:21:53 2014 (r270710) @@ -31,7 +31,6 @@ * SOFTWARE. */ -#include #include #include "mlx4.h" Modified: head/sys/ofed/include/asm/atomic-long.h ============================================================================== --- head/sys/ofed/include/asm/atomic-long.h Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/include/asm/atomic-long.h Wed Aug 27 13:21:53 2014 (r270710) @@ -2,6 +2,7 @@ * Copyright (c) 2010 Isilon Systems, Inc. * Copyright (c) 2010 iX Systems, Inc. * Copyright (c) 2010 Panasas, Inc. + * Copyright (c) 2013, 2014 Mellanox Technologies, Ltd. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,6 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + #ifndef _ATOMIC_LONG_H_ #define _ATOMIC_LONG_H_ Modified: head/sys/ofed/include/asm/atomic.h ============================================================================== --- head/sys/ofed/include/asm/atomic.h Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/include/asm/atomic.h Wed Aug 27 13:21:53 2014 (r270710) @@ -2,6 +2,7 @@ * Copyright (c) 2010 Isilon Systems, Inc. * Copyright (c) 2010 iX Systems, Inc. * Copyright (c) 2010 Panasas, Inc. + * Copyright (c) 2013, 2014 Mellanox Technologies, Ltd. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -32,7 +33,6 @@ #include #include #include -#include typedef struct { volatile u_int counter; @@ -90,7 +90,6 @@ static inline int atomic_add_unless(atom for (;;) { if (unlikely(c == (u))) break; - // old = atomic_cmpxchg((v), c, c + (a)); /*Linux*/ old = atomic_cmpset_int(&v->counter, c, c + (a)); if (likely(old == c)) break; Modified: head/sys/ofed/include/asm/byteorder.h ============================================================================== --- head/sys/ofed/include/asm/byteorder.h Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/include/asm/byteorder.h Wed Aug 27 13:21:53 2014 (r270710) @@ -2,6 +2,7 @@ * Copyright (c) 2010 Isilon Systems, Inc. * Copyright (c) 2010 iX Systems, Inc. * Copyright (c) 2010 Panasas, Inc. + * Copyright (c) 2013, 2014 Mellanox Technologies, Ltd. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,6 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + #ifndef _ASM_BYTEORDER_H_ #define _ASM_BYTEORDER_H_ Modified: head/sys/ofed/include/asm/fcntl.h ============================================================================== --- head/sys/ofed/include/asm/fcntl.h Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/include/asm/fcntl.h Wed Aug 27 13:21:53 2014 (r270710) @@ -2,6 +2,7 @@ * Copyright (c) 2010 Isilon Systems, Inc. * Copyright (c) 2010 iX Systems, Inc. * Copyright (c) 2010 Panasas, Inc. + * Copyright (c) 2013, 2014 Mellanox Technologies, Ltd. * All rights reserved. * * Redistribution and use in source and binary forms, with or without Modified: head/sys/ofed/include/asm/io.h ============================================================================== --- head/sys/ofed/include/asm/io.h Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/include/asm/io.h Wed Aug 27 13:21:53 2014 (r270710) @@ -1,7 +1,8 @@ -/*- +/* * Copyright (c) 2010 Isilon Systems, Inc. * Copyright (c) 2010 iX Systems, Inc. * Copyright (c) 2010 Panasas, Inc. + * Copyright (c) 2013, 2014 Mellanox Technologies, Ltd. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,4 +27,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#ifndef _ASM_IO_H_ +#define _ASM_IO_H_ + #include + +#endif /* _ASM_IO_H_ */ Modified: head/sys/ofed/include/asm/page.h ============================================================================== --- head/sys/ofed/include/asm/page.h Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/include/asm/page.h Wed Aug 27 13:21:53 2014 (r270710) @@ -2,6 +2,7 @@ * Copyright (c) 2010 Isilon Systems, Inc. * Copyright (c) 2010 iX Systems, Inc. * Copyright (c) 2010 Panasas, Inc. + * Copyright (c) 2013, 2014 Mellanox Technologies, Ltd. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,4 +27,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#ifndef _ASM_PAGE_H_ +#define _ASM_PAGE_H_ + #include + +#endif /*_ASM_PAGE_H_*/ Modified: head/sys/ofed/include/asm/pgtable.h ============================================================================== --- head/sys/ofed/include/asm/pgtable.h Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/include/asm/pgtable.h Wed Aug 27 13:21:53 2014 (r270710) @@ -2,6 +2,7 @@ * Copyright (c) 2010 Isilon Systems, Inc. * Copyright (c) 2010 iX Systems, Inc. * Copyright (c) 2010 Panasas, Inc. + * Copyright (c) 2013, 2014 Mellanox Technologies, Ltd. * All rights reserved. * * Redistribution and use in source and binary forms, with or without Modified: head/sys/ofed/include/asm/types.h ============================================================================== --- head/sys/ofed/include/asm/types.h Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/include/asm/types.h Wed Aug 27 13:21:53 2014 (r270710) @@ -2,6 +2,7 @@ * Copyright (c) 2010 Isilon Systems, Inc. * Copyright (c) 2010 iX Systems, Inc. * Copyright (c) 2010 Panasas, Inc. + * Copyright (c) 2013, 2014 Mellanox Technologies, Ltd. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,43 +26,36 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + #ifndef _ASM_TYPES_H_ #define _ASM_TYPES_H_ -typedef unsigned short umode_t; - -typedef signed char __s8; -typedef unsigned char __u8; - -typedef signed short __s16; -typedef unsigned short __u16; - -typedef signed int __s32; -typedef unsigned int __u32; - -#if defined(__GNUC__) // && !defined(__STRICT_ANSI__) -typedef signed long long __s64; -typedef unsigned long long __u64; -#endif - #ifdef _KERNEL -typedef signed char s8; -typedef unsigned char u8; - -typedef signed short s16; -typedef unsigned short u16; - -typedef signed int s32; -typedef unsigned int u32; - -typedef signed long long s64; -typedef unsigned long long u64; +typedef uint8_t u8; +typedef uint8_t __u8; +typedef uint16_t u16; +typedef uint16_t __u16; +typedef uint32_t u32; +typedef uint32_t __u32; +typedef uint64_t u64; +typedef uint64_t __u64; + +typedef int8_t s8; +typedef int8_t __s8; +typedef int16_t s16; +typedef int16_t __s16; +typedef int32_t s32; +typedef int32_t __s32; +typedef int64_t s64; +typedef int64_t __s64; /* DMA addresses come in generic and 64-bit flavours. */ typedef vm_paddr_t dma_addr_t; typedef vm_paddr_t dma64_addr_t; +typedef unsigned short umode_t; + #endif /* _KERNEL */ #endif /* _ASM_TYPES_H_ */ Modified: head/sys/ofed/include/asm/uaccess.h ============================================================================== --- head/sys/ofed/include/asm/uaccess.h Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/include/asm/uaccess.h Wed Aug 27 13:21:53 2014 (r270710) @@ -2,6 +2,7 @@ * Copyright (c) 2010 Isilon Systems, Inc. * Copyright (c) 2010 iX Systems, Inc. * Copyright (c) 2010 Panasas, Inc. + * Copyright (c) 2013, 2014 Mellanox Technologies, Ltd. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,6 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + #ifndef _ASM_UACCESS_H_ #define _ASM_UACCESS_H_ Modified: head/sys/ofed/include/linux/bitops.h ============================================================================== --- head/sys/ofed/include/linux/bitops.h Wed Aug 27 12:25:46 2014 (r270709) +++ head/sys/ofed/include/linux/bitops.h Wed Aug 27 13:21:53 2014 (r270710) @@ -2,6 +2,7 @@ * Copyright (c) 2010 Isilon Systems, Inc. * Copyright (c) 2010 iX Systems, Inc. * Copyright (c) 2010 Panasas, Inc. + * Copyright (c) 2013, 2014 Mellanox Technologies, Ltd. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -37,6 +38,8 @@ #define BITS_TO_LONGS(n) howmany((n), BITS_PER_LONG) #define BIT_WORD(nr) ((nr) / BITS_PER_LONG) +#define BITS_PER_BYTE 8 + static inline int __ffs(int mask) { @@ -463,6 +466,27 @@ bitmap_find_free_region(unsigned long *b } /** + * bitmap_allocate_region - allocate bitmap region + * @bitmap: array of unsigned longs corresponding to the bitmap + * @pos: beginning of bit region to allocate + * @order: region size (log base 2 of number of bits) to allocate + * + * Allocate (set bits in) a specified region of a bitmap. + * + * Return 0 on success, or %-EBUSY if specified region wasn't + * free (not all bits were zero). + */ + +static inline int +bitmap_allocate_region(unsigned long *bitmap, int pos, int order) +{ + if (!__reg_op(bitmap, pos, order, REG_OP_ISFREE)) + return -EBUSY; + __reg_op(bitmap, pos, order, REG_OP_ALLOC); + return 0; +} + +/** * bitmap_release_region - release allocated bitmap region * @bitmap: array of unsigned longs corresponding to the bitmap * @pos: beginning of bit region to release @@ -480,4 +504,9 @@ bitmap_release_region(unsigned long *bit } +#define for_each_set_bit(bit, addr, size) \ + for ((bit) = find_first_bit((addr), (size)); \ + (bit) < (size); \ + (bit) = find_next_bit((addr), (size), (bit) + 1)) + #endif /* _LINUX_BITOPS_H_ */ Added: head/sys/ofed/include/linux/cache.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/ofed/include/linux/cache.h Wed Aug 27 13:21:53 2014 (r270710) @@ -0,0 +1,37 @@ +/*- + * Copyright (c) 2010 Isilon Systems, Inc. + * Copyright (c) 2010 iX Systems, Inc. + * Copyright (c) 2010 Panasas, Inc. + * Copyright (c) 2013, 2014 Mellanox Technologies, Ltd. + * 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 unmodified, 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 ``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. + */ + +#ifndef _LINUX_CACHE_H_ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 14:07:25 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 0D2DF454; Wed, 27 Aug 2014 14:07:25 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EC4C73685; Wed, 27 Aug 2014 14:07:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7RE7OL7089300; Wed, 27 Aug 2014 14:07:24 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7RE7O8V089299; Wed, 27 Aug 2014 14:07:24 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201408271407.s7RE7O8V089299@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 27 Aug 2014 14:07:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270711 - stable/10/sys/netinet/cc X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 14:07:25 -0000 Author: hselasky Date: Wed Aug 27 14:07:24 2014 New Revision: 270711 URL: http://svnweb.freebsd.org/changeset/base/270711 Log: MFC r269777: Fix string length argument passed to "sysctl_handle_string()" so that the complete string is returned by the function and not just only one byte. PR: 192544 Modified: stable/10/sys/netinet/cc/cc.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/netinet/cc/cc.c ============================================================================== --- stable/10/sys/netinet/cc/cc.c Wed Aug 27 13:21:53 2014 (r270710) +++ stable/10/sys/netinet/cc/cc.c Wed Aug 27 14:07:24 2014 (r270711) @@ -101,7 +101,7 @@ cc_default_algo(SYSCTL_HANDLER_ARGS) CC_LIST_RLOCK(); strlcpy(default_cc, CC_DEFAULT()->name, TCP_CA_NAME_MAX); CC_LIST_RUNLOCK(); - err = sysctl_handle_string(oidp, default_cc, 1, req); + err = sysctl_handle_string(oidp, default_cc, 0, req); } else { /* Find algo with specified name and set it to default. */ CC_LIST_RLOCK(); @@ -166,7 +166,7 @@ cc_list_available(SYSCTL_HANDLER_ARGS) if (!err) { sbuf_finish(s); - err = sysctl_handle_string(oidp, sbuf_data(s), 1, req); + err = sysctl_handle_string(oidp, sbuf_data(s), 0, req); } sbuf_delete(s); From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 14:09:06 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id EC5417B2; Wed, 27 Aug 2014 14:09:05 +0000 (UTC) Received: from zxy.spb.ru (zxy.spb.ru [195.70.199.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A479636BF; Wed, 27 Aug 2014 14:09:05 +0000 (UTC) Received: from slw by zxy.spb.ru with local (Exim 4.82 (FreeBSD)) (envelope-from ) id 1XMduI-000ETc-NF; Wed, 27 Aug 2014 18:09:02 +0400 Date: Wed, 27 Aug 2014 18:09:02 +0400 From: Slawa Olhovchenkov To: Andrew Thompson Subject: Re: svn commit: r270644 - stable/10/usr.sbin/bsdinstall/scripts Message-ID: <20140827140902.GA41194@zxy.spb.ru> References: <201408260231.s7Q2VbCW087619@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201408260231.s7Q2VbCW087619@svn.freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: slw@zxy.spb.ru X-SA-Exim-Scanned: No (on zxy.spb.ru); SAEximRunCond expanded to false Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-10@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 14:09:06 -0000 On Tue, Aug 26, 2014 at 02:31:37AM +0000, Andrew Thompson wrote: In zfs directory layout you missing some separate datesets: usr/home (or, may be, just /home) usr/obj usr/ports/packages usr/ports/distfiles Can you do it before 10.1? From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 14:11:26 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 3B919980; Wed, 27 Aug 2014 14:11:26 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 264DF3767; Wed, 27 Aug 2014 14:11:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7REBQwZ091509; Wed, 27 Aug 2014 14:11:26 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7REBQGP091508; Wed, 27 Aug 2014 14:11:26 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201408271411.s7REBQGP091508@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 27 Aug 2014 14:11:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r270712 - stable/9/sys/netinet/cc X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 14:11:26 -0000 Author: hselasky Date: Wed Aug 27 14:11:25 2014 New Revision: 270712 URL: http://svnweb.freebsd.org/changeset/base/270712 Log: MFC r269777: Fix string length argument passed to "sysctl_handle_string()" so that the complete string is returned by the function and not just only one byte. PR: 192544 Modified: stable/9/sys/netinet/cc/cc.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/netinet/cc/cc.c ============================================================================== --- stable/9/sys/netinet/cc/cc.c Wed Aug 27 14:07:24 2014 (r270711) +++ stable/9/sys/netinet/cc/cc.c Wed Aug 27 14:11:25 2014 (r270712) @@ -101,7 +101,7 @@ cc_default_algo(SYSCTL_HANDLER_ARGS) CC_LIST_RLOCK(); strlcpy(default_cc, CC_DEFAULT()->name, TCP_CA_NAME_MAX); CC_LIST_RUNLOCK(); - err = sysctl_handle_string(oidp, default_cc, 1, req); + err = sysctl_handle_string(oidp, default_cc, 0, req); } else { /* Find algo with specified name and set it to default. */ CC_LIST_RLOCK(); @@ -166,7 +166,7 @@ cc_list_available(SYSCTL_HANDLER_ARGS) if (!err) { sbuf_finish(s); - err = sysctl_handle_string(oidp, sbuf_data(s), 1, req); + err = sysctl_handle_string(oidp, sbuf_data(s), 0, req); } sbuf_delete(s); From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 14:13:48 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 72804B86; Wed, 27 Aug 2014 14:13:48 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5D20537A7; Wed, 27 Aug 2014 14:13:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7REDmi7093695; Wed, 27 Aug 2014 14:13:48 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7REDme3093694; Wed, 27 Aug 2014 14:13:48 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201408271413.s7REDme3093694@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 27 Aug 2014 14:13:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r270713 - stable/8/sys/netinet/cc X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 14:13:48 -0000 Author: hselasky Date: Wed Aug 27 14:13:47 2014 New Revision: 270713 URL: http://svnweb.freebsd.org/changeset/base/270713 Log: MFC r269777: Fix string length argument passed to "sysctl_handle_string()" so that the complete string is returned by the function and not just only one byte. PR: 192544 Modified: stable/8/sys/netinet/cc/cc.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/netinet/ (props changed) Modified: stable/8/sys/netinet/cc/cc.c ============================================================================== --- stable/8/sys/netinet/cc/cc.c Wed Aug 27 14:11:25 2014 (r270712) +++ stable/8/sys/netinet/cc/cc.c Wed Aug 27 14:13:47 2014 (r270713) @@ -101,7 +101,7 @@ cc_default_algo(SYSCTL_HANDLER_ARGS) CC_LIST_RLOCK(); strlcpy(default_cc, CC_DEFAULT()->name, TCP_CA_NAME_MAX); CC_LIST_RUNLOCK(); - err = sysctl_handle_string(oidp, default_cc, 1, req); + err = sysctl_handle_string(oidp, default_cc, 0, req); } else { /* Find algo with specified name and set it to default. */ CC_LIST_RLOCK(); @@ -166,7 +166,7 @@ cc_list_available(SYSCTL_HANDLER_ARGS) if (!err) { sbuf_finish(s); - err = sysctl_handle_string(oidp, sbuf_data(s), 1, req); + err = sysctl_handle_string(oidp, sbuf_data(s), 0, req); } sbuf_delete(s); From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 14:17:16 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 728ECDFB; Wed, 27 Aug 2014 14:17:16 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5D31B3803; Wed, 27 Aug 2014 14:17:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7REHG1h094247; Wed, 27 Aug 2014 14:17:16 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7REHGuX094246; Wed, 27 Aug 2014 14:17:16 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201408271417.s7REHGuX094246@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 27 Aug 2014 14:17:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270714 - stable/10/lib/libusb X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 14:17:16 -0000 Author: hselasky Date: Wed Aug 27 14:17:15 2014 New Revision: 270714 URL: http://svnweb.freebsd.org/changeset/base/270714 Log: MFC r270133: Add more USB class codes. Modified: stable/10/lib/libusb/libusb.h Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libusb/libusb.h ============================================================================== --- stable/10/lib/libusb/libusb.h Wed Aug 27 14:13:47 2014 (r270713) +++ stable/10/lib/libusb/libusb.h Wed Aug 27 14:17:15 2014 (r270714) @@ -51,10 +51,18 @@ enum libusb_class_code { LIBUSB_CLASS_COMM = 2, LIBUSB_CLASS_HID = 3, LIBUSB_CLASS_PTP = 6, + LIBUSB_CLASS_IMAGE = 6, LIBUSB_CLASS_PRINTER = 7, LIBUSB_CLASS_MASS_STORAGE = 8, LIBUSB_CLASS_HUB = 9, LIBUSB_CLASS_DATA = 10, + LIBUSB_CLASS_SMART_CARD = 11, + LIBUSB_CLASS_CONTENT_SECURITY = 13, + LIBUSB_CLASS_VIDEO = 14, + LIBUSB_CLASS_PERSONAL_HEALTHCARE = 15, + LIBUSB_CLASS_DIAGNOSTIC_DEVICE = 0xdc, + LIBUSB_CLASS_WIRELESS = 0xe0, + LIBUSB_CLASS_APPLICATION = 0xfe, LIBUSB_CLASS_VENDOR_SPEC = 0xff, }; From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 14:18:49 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 02C63F46; Wed, 27 Aug 2014 14:18:49 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E1C40381A; Wed, 27 Aug 2014 14:18:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7REImVN094494; Wed, 27 Aug 2014 14:18:48 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7REImCr094493; Wed, 27 Aug 2014 14:18:48 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201408271418.s7REImCr094493@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 27 Aug 2014 14:18:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r270715 - stable/9/lib/libusb X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 14:18:49 -0000 Author: hselasky Date: Wed Aug 27 14:18:48 2014 New Revision: 270715 URL: http://svnweb.freebsd.org/changeset/base/270715 Log: MFC r270133: Add more USB class codes. Modified: stable/9/lib/libusb/libusb.h Directory Properties: stable/9/lib/libusb/ (props changed) Modified: stable/9/lib/libusb/libusb.h ============================================================================== --- stable/9/lib/libusb/libusb.h Wed Aug 27 14:17:15 2014 (r270714) +++ stable/9/lib/libusb/libusb.h Wed Aug 27 14:18:48 2014 (r270715) @@ -48,10 +48,18 @@ enum libusb_class_code { LIBUSB_CLASS_COMM = 2, LIBUSB_CLASS_HID = 3, LIBUSB_CLASS_PTP = 6, + LIBUSB_CLASS_IMAGE = 6, LIBUSB_CLASS_PRINTER = 7, LIBUSB_CLASS_MASS_STORAGE = 8, LIBUSB_CLASS_HUB = 9, LIBUSB_CLASS_DATA = 10, + LIBUSB_CLASS_SMART_CARD = 11, + LIBUSB_CLASS_CONTENT_SECURITY = 13, + LIBUSB_CLASS_VIDEO = 14, + LIBUSB_CLASS_PERSONAL_HEALTHCARE = 15, + LIBUSB_CLASS_DIAGNOSTIC_DEVICE = 0xdc, + LIBUSB_CLASS_WIRELESS = 0xe0, + LIBUSB_CLASS_APPLICATION = 0xfe, LIBUSB_CLASS_VENDOR_SPEC = 0xff, }; From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 14:20:02 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 6744C139; Wed, 27 Aug 2014 14:20:02 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 51EC93838; Wed, 27 Aug 2014 14:20:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7REK2h8094784; Wed, 27 Aug 2014 14:20:02 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7REK24K094782; Wed, 27 Aug 2014 14:20:02 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201408271420.s7REK24K094782@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 27 Aug 2014 14:20:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r270716 - stable/8/lib/libusb X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 14:20:02 -0000 Author: hselasky Date: Wed Aug 27 14:20:01 2014 New Revision: 270716 URL: http://svnweb.freebsd.org/changeset/base/270716 Log: MFC r270133: Add more USB class codes. Modified: stable/8/lib/libusb/libusb.h Directory Properties: stable/8/lib/libusb/ (props changed) Modified: stable/8/lib/libusb/libusb.h ============================================================================== --- stable/8/lib/libusb/libusb.h Wed Aug 27 14:18:48 2014 (r270715) +++ stable/8/lib/libusb/libusb.h Wed Aug 27 14:20:01 2014 (r270716) @@ -48,10 +48,18 @@ enum libusb_class_code { LIBUSB_CLASS_COMM = 2, LIBUSB_CLASS_HID = 3, LIBUSB_CLASS_PTP = 6, + LIBUSB_CLASS_IMAGE = 6, LIBUSB_CLASS_PRINTER = 7, LIBUSB_CLASS_MASS_STORAGE = 8, LIBUSB_CLASS_HUB = 9, LIBUSB_CLASS_DATA = 10, + LIBUSB_CLASS_SMART_CARD = 11, + LIBUSB_CLASS_CONTENT_SECURITY = 13, + LIBUSB_CLASS_VIDEO = 14, + LIBUSB_CLASS_PERSONAL_HEALTHCARE = 15, + LIBUSB_CLASS_DIAGNOSTIC_DEVICE = 0xdc, + LIBUSB_CLASS_WIRELESS = 0xe0, + LIBUSB_CLASS_APPLICATION = 0xfe, LIBUSB_CLASS_VENDOR_SPEC = 0xff, }; From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 14:22:41 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 204C72BB; Wed, 27 Aug 2014 14:22:41 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E59B838DE; Wed, 27 Aug 2014 14:22:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7REMe04098425; Wed, 27 Aug 2014 14:22:40 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7REMeED098424; Wed, 27 Aug 2014 14:22:40 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201408271422.s7REMeED098424@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 27 Aug 2014 14:22:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270717 - stable/10/sys/dev/sound/usb X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 14:22:41 -0000 Author: hselasky Date: Wed Aug 27 14:22:40 2014 New Revision: 270717 URL: http://svnweb.freebsd.org/changeset/base/270717 Log: MFC r270134: Use the "bSubslotSize" and "bSubFrameSize" fields to obtain the actual sample size. According to the USB audio frame format specification from USB.org, the value in the "bBitResolution" field can be less than the actual sample size, depending on the actual hardware, and should not be used for this computation. PR: 192755 Modified: stable/10/sys/dev/sound/usb/uaudio.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/sound/usb/uaudio.c ============================================================================== --- stable/10/sys/dev/sound/usb/uaudio.c Wed Aug 27 14:20:01 2014 (r270716) +++ stable/10/sys/dev/sound/usb/uaudio.c Wed Aug 27 14:22:40 2014 (r270717) @@ -1665,21 +1665,10 @@ uaudio_chan_fill_info_sub(struct uaudio_ } else if (audio_rev >= UAUDIO_VERSION_20) { uint32_t dwFormat; - uint8_t bSubslotSize; dwFormat = UGETDW(asid.v2->bmFormats); bChannels = asid.v2->bNrChannels; - bBitResolution = asf1d.v2->bBitResolution; - bSubslotSize = asf1d.v2->bSubslotSize; - - /* Map 4-byte aligned 24-bit samples into 32-bit */ - if (bBitResolution == 24 && bSubslotSize == 4) - bBitResolution = 32; - - if (bBitResolution != (bSubslotSize * 8)) { - DPRINTF("Invalid bSubslotSize\n"); - goto next_ep; - } + bBitResolution = asf1d.v2->bSubslotSize * 8; if ((bChannels != channels) || (bBitResolution != bit_resolution)) { @@ -1726,7 +1715,7 @@ uaudio_chan_fill_info_sub(struct uaudio_ wFormat = UGETW(asid.v1->wFormatTag); bChannels = UAUDIO_MAX_CHAN(asf1d.v1->bNrChannels); - bBitResolution = asf1d.v1->bBitResolution; + bBitResolution = asf1d.v1->bSubFrameSize * 8; if (asf1d.v1->bSamFreqType == 0) { DPRINTFN(16, "Sample rate: %d-%dHz\n", From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 14:24:01 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 6504C500; Wed, 27 Aug 2014 14:24:01 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3797538FE; Wed, 27 Aug 2014 14:24:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7REO1M6098816; Wed, 27 Aug 2014 14:24:01 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7REO1Ut098814; Wed, 27 Aug 2014 14:24:01 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201408271424.s7REO1Ut098814@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 27 Aug 2014 14:24:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r270718 - stable/9/sys/dev/sound/usb X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 14:24:01 -0000 Author: hselasky Date: Wed Aug 27 14:24:00 2014 New Revision: 270718 URL: http://svnweb.freebsd.org/changeset/base/270718 Log: MFC r270134: Use the "bSubslotSize" and "bSubFrameSize" fields to obtain the actual sample size. According to the USB audio frame format specification from USB.org, the value in the "bBitResolution" field can be less than the actual sample size, depending on the actual hardware, and should not be used for this computation. PR: 192755 Modified: stable/9/sys/dev/sound/usb/uaudio.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/sound/usb/uaudio.c ============================================================================== --- stable/9/sys/dev/sound/usb/uaudio.c Wed Aug 27 14:22:40 2014 (r270717) +++ stable/9/sys/dev/sound/usb/uaudio.c Wed Aug 27 14:24:00 2014 (r270718) @@ -1665,21 +1665,10 @@ uaudio_chan_fill_info_sub(struct uaudio_ } else if (audio_rev >= UAUDIO_VERSION_20) { uint32_t dwFormat; - uint8_t bSubslotSize; dwFormat = UGETDW(asid.v2->bmFormats); bChannels = asid.v2->bNrChannels; - bBitResolution = asf1d.v2->bBitResolution; - bSubslotSize = asf1d.v2->bSubslotSize; - - /* Map 4-byte aligned 24-bit samples into 32-bit */ - if (bBitResolution == 24 && bSubslotSize == 4) - bBitResolution = 32; - - if (bBitResolution != (bSubslotSize * 8)) { - DPRINTF("Invalid bSubslotSize\n"); - goto next_ep; - } + bBitResolution = asf1d.v2->bSubslotSize * 8; if ((bChannels != channels) || (bBitResolution != bit_resolution)) { @@ -1726,7 +1715,7 @@ uaudio_chan_fill_info_sub(struct uaudio_ wFormat = UGETW(asid.v1->wFormatTag); bChannels = UAUDIO_MAX_CHAN(asf1d.v1->bNrChannels); - bBitResolution = asf1d.v1->bBitResolution; + bBitResolution = asf1d.v1->bSubFrameSize * 8; if (asf1d.v1->bSamFreqType == 0) { DPRINTFN(16, "Sample rate: %d-%dHz\n", From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 14:25:18 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id E0CC16B2; Wed, 27 Aug 2014 14:25:18 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B1CE13923; Wed, 27 Aug 2014 14:25:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7REPIbl099097; Wed, 27 Aug 2014 14:25:18 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7REPIfT099095; Wed, 27 Aug 2014 14:25:18 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201408271425.s7REPIfT099095@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 27 Aug 2014 14:25:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r270719 - stable/8/sys/dev/sound/usb X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 14:25:19 -0000 Author: hselasky Date: Wed Aug 27 14:25:18 2014 New Revision: 270719 URL: http://svnweb.freebsd.org/changeset/base/270719 Log: MFC r270134: Use the "bSubslotSize" and "bSubFrameSize" fields to obtain the actual sample size. According to the USB audio frame format specification from USB.org, the value in the "bBitResolution" field can be less than the actual sample size, depending on the actual hardware, and should not be used for this computation. PR: 192755 Modified: stable/8/sys/dev/sound/usb/uaudio.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/dev/ (props changed) stable/8/sys/dev/sound/ (props changed) stable/8/sys/dev/sound/usb/ (props changed) Modified: stable/8/sys/dev/sound/usb/uaudio.c ============================================================================== --- stable/8/sys/dev/sound/usb/uaudio.c Wed Aug 27 14:24:00 2014 (r270718) +++ stable/8/sys/dev/sound/usb/uaudio.c Wed Aug 27 14:25:18 2014 (r270719) @@ -1665,21 +1665,10 @@ uaudio_chan_fill_info_sub(struct uaudio_ } else if (audio_rev >= UAUDIO_VERSION_20) { uint32_t dwFormat; - uint8_t bSubslotSize; dwFormat = UGETDW(asid.v2->bmFormats); bChannels = asid.v2->bNrChannels; - bBitResolution = asf1d.v2->bBitResolution; - bSubslotSize = asf1d.v2->bSubslotSize; - - /* Map 4-byte aligned 24-bit samples into 32-bit */ - if (bBitResolution == 24 && bSubslotSize == 4) - bBitResolution = 32; - - if (bBitResolution != (bSubslotSize * 8)) { - DPRINTF("Invalid bSubslotSize\n"); - goto next_ep; - } + bBitResolution = asf1d.v2->bSubslotSize * 8; if ((bChannels != channels) || (bBitResolution != bit_resolution)) { @@ -1726,7 +1715,7 @@ uaudio_chan_fill_info_sub(struct uaudio_ wFormat = UGETW(asid.v1->wFormatTag); bChannels = UAUDIO_MAX_CHAN(asf1d.v1->bNrChannels); - bBitResolution = asf1d.v1->bBitResolution; + bBitResolution = asf1d.v1->bSubFrameSize * 8; if (asf1d.v1->bSamFreqType == 0) { DPRINTFN(16, "Sample rate: %d-%dHz\n", From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 15:10:29 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id CF767573; Wed, 27 Aug 2014 15:10:29 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B0ABA3EA3; Wed, 27 Aug 2014 15:10:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7RFATrv018620; Wed, 27 Aug 2014 15:10:29 GMT (envelope-from dumbbell@FreeBSD.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7RFATwQ018617; Wed, 27 Aug 2014 15:10:29 GMT (envelope-from dumbbell@FreeBSD.org) Message-Id: <201408271510.s7RFATwQ018617@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dumbbell set sender to dumbbell@FreeBSD.org using -f From: Jean-Sebastien Pedron Date: Wed, 27 Aug 2014 15:10:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270720 - in head/sys/dev: fb vt/hw/fb vt/hw/ofwfb X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 15:10:29 -0000 Author: dumbbell Date: Wed Aug 27 15:10:28 2014 New Revision: 270720 URL: http://svnweb.freebsd.org/changeset/base/270720 Log: vt(4): Fix mouse cursor handling in vt_fb/creator_vt/ofwfb There were two issues: 1. The area given to vt_is_cursor_in_area() was adding the drawable area offset, something already handled by this function. 2. The cursor was shifted on the screen by the offset of this area and thus was misplaced or not erased. Furthermore, when reaching the bottom or right borders, the cursor was either totally removed or not erased correctly. MFC after: 1 week Modified: head/sys/dev/fb/creator_vt.c head/sys/dev/vt/hw/fb/vt_fb.c head/sys/dev/vt/hw/ofwfb/ofwfb.c Modified: head/sys/dev/fb/creator_vt.c ============================================================================== --- head/sys/dev/fb/creator_vt.c Wed Aug 27 14:25:18 2014 (r270719) +++ head/sys/dev/fb/creator_vt.c Wed Aug 27 15:10:28 2014 (r270720) @@ -186,21 +186,20 @@ creatorfb_bitblt_bitmap(struct vt_device struct creatorfb_softc *sc = vd->vd_softc; u_long line; uint32_t fgc, bgc; - int c; + int c, l; uint8_t b, m; fgc = sc->fb.fb_cmap[fg]; bgc = sc->fb.fb_cmap[bg]; b = m = 0; - /* Don't try to put off screen pixels */ - if (((x + width) > vd->vd_width) || ((y + height) > - vd->vd_height)) - return; - line = (sc->fb.fb_stride * y) + 4*x; - for (; height > 0; height--) { - for (c = 0; c < width; c++) { + for (l = 0; + l < height && y + l < vw->vw_draw_area.tr_end.tp_row; + l++) { + for (c = 0; + c < width && x + c < vw->vw_draw_area.tr_end.tp_col; + c++) { if (c % 8 == 0) b = *pattern++; else @@ -258,20 +257,17 @@ creatorfb_bitblt_text(struct vt_device * term_rect_t drawn_area; - drawn_area.tr_begin.tp_col = area->tr_begin.tp_col * vf->vf_width + - vw->vw_draw_area.tr_begin.tp_col; - drawn_area.tr_begin.tp_row = area->tr_begin.tp_row * vf->vf_height + - vw->vw_draw_area.tr_begin.tp_row; - drawn_area.tr_end.tp_col = area->tr_end.tp_col * vf->vf_width + - vw->vw_draw_area.tr_begin.tp_col; - drawn_area.tr_end.tp_row = area->tr_end.tp_row * vf->vf_height + - vw->vw_draw_area.tr_begin.tp_row; + drawn_area.tr_begin.tp_col = area->tr_begin.tp_col * vf->vf_width; + drawn_area.tr_begin.tp_row = area->tr_begin.tp_row * vf->vf_height; + drawn_area.tr_end.tp_col = area->tr_end.tp_col * vf->vf_width; + drawn_area.tr_end.tp_row = area->tr_end.tp_row * vf->vf_height; if (vt_is_cursor_in_area(vd, &drawn_area)) { creatorfb_bitblt_bitmap(vd, vw, vd->vd_mcursor->map, vd->vd_mcursor->mask, vd->vd_mcursor->width, vd->vd_mcursor->height, - vd->vd_mx_drawn, vd->vd_my_drawn, + vd->vd_mx_drawn + vw->vw_draw_area.tr_begin.tp_col, + vd->vd_my_drawn + vw->vw_draw_area.tr_begin.tp_row, vd->vd_mcursor_fg, vd->vd_mcursor_bg); } #endif Modified: head/sys/dev/vt/hw/fb/vt_fb.c ============================================================================== --- head/sys/dev/vt/hw/fb/vt_fb.c Wed Aug 27 14:25:18 2014 (r270719) +++ head/sys/dev/vt/hw/fb/vt_fb.c Wed Aug 27 15:10:28 2014 (r270720) @@ -263,17 +263,16 @@ vt_fb_bitblt_bitmap(struct vt_device *vd b = m = 0; bpl = (width + 7) >> 3; /* Bytes per source line. */ - /* Don't try to put off screen pixels */ - if (((x + width) > info->fb_width) || ((y + height) > - info->fb_height)) - return; - KASSERT((info->fb_vbase != 0), ("Unmapped framebuffer")); line = (info->fb_stride * y) + (x * bpp); - for (l = 0; l < height; l++) { + for (l = 0; + l < height && y + l < vw->vw_draw_area.tr_end.tp_row; + l++) { ch = pattern; - for (c = 0; c < width; c++) { + for (c = 0; + c < width && x + c < vw->vw_draw_area.tr_end.tp_col; + c++) { if (c % 8 == 0) b = *ch++; else @@ -353,20 +352,17 @@ vt_fb_bitblt_text(struct vt_device *vd, term_rect_t drawn_area; - drawn_area.tr_begin.tp_col = area->tr_begin.tp_col * vf->vf_width + - vw->vw_draw_area.tr_begin.tp_col; - drawn_area.tr_begin.tp_row = area->tr_begin.tp_row * vf->vf_height + - vw->vw_draw_area.tr_begin.tp_row; - drawn_area.tr_end.tp_col = area->tr_end.tp_col * vf->vf_width + - vw->vw_draw_area.tr_begin.tp_col; - drawn_area.tr_end.tp_row = area->tr_end.tp_row * vf->vf_height + - vw->vw_draw_area.tr_begin.tp_row; + drawn_area.tr_begin.tp_col = area->tr_begin.tp_col * vf->vf_width; + drawn_area.tr_begin.tp_row = area->tr_begin.tp_row * vf->vf_height; + drawn_area.tr_end.tp_col = area->tr_end.tp_col * vf->vf_width; + drawn_area.tr_end.tp_row = area->tr_end.tp_row * vf->vf_height; if (vt_is_cursor_in_area(vd, &drawn_area)) { vt_fb_bitblt_bitmap(vd, vw, vd->vd_mcursor->map, vd->vd_mcursor->mask, vd->vd_mcursor->width, vd->vd_mcursor->height, - vd->vd_mx_drawn, vd->vd_my_drawn, + vd->vd_mx_drawn + vw->vw_draw_area.tr_begin.tp_col, + vd->vd_my_drawn + vw->vw_draw_area.tr_begin.tp_row, vd->vd_mcursor_fg, vd->vd_mcursor_bg); } #endif Modified: head/sys/dev/vt/hw/ofwfb/ofwfb.c ============================================================================== --- head/sys/dev/vt/hw/ofwfb/ofwfb.c Wed Aug 27 14:25:18 2014 (r270719) +++ head/sys/dev/vt/hw/ofwfb/ofwfb.c Wed Aug 27 15:10:28 2014 (r270720) @@ -110,7 +110,7 @@ ofwfb_bitblt_bitmap(struct vt_device *vd struct fb_info *sc = vd->vd_softc; u_long line; uint32_t fgc, bgc; - int c; + int c, l; uint8_t b, m; union { uint32_t l; @@ -121,13 +121,13 @@ ofwfb_bitblt_bitmap(struct vt_device *vd bgc = sc->fb_cmap[bg]; b = m = 0; - /* Don't try to put off screen pixels */ - if (((x + width) > vd->vd_width) || ((y + height) > - vd->vd_height)) - return; - line = (sc->fb_stride * y) + x * sc->fb_bpp/8; if (mask == NULL && sc->fb_bpp == 8 && (width % 8 == 0)) { + /* Don't try to put off screen pixels */ + if (((x + width) > vd->vd_width) || ((y + height) > + vd->vd_height)) + return; + for (; height > 0; height--) { for (c = 0; c < width; c += 8) { b = *pattern++; @@ -160,8 +160,12 @@ ofwfb_bitblt_bitmap(struct vt_device *vd line += sc->fb_stride; } } else { - for (; height > 0; height--) { - for (c = 0; c < width; c++) { + for (l = 0; + l < height && y + l < vw->vw_draw_area.tr_end.tp_row; + l++) { + for (c = 0; + c < width && x + c < vw->vw_draw_area.tr_end.tp_col; + c++) { if (c % 8 == 0) b = *pattern++; else @@ -231,20 +235,17 @@ ofwfb_bitblt_text(struct vt_device *vd, term_rect_t drawn_area; - drawn_area.tr_begin.tp_col = area->tr_begin.tp_col * vf->vf_width + - vw->vw_draw_area.tr_begin.tp_col; - drawn_area.tr_begin.tp_row = area->tr_begin.tp_row * vf->vf_height + - vw->vw_draw_area.tr_begin.tp_row; - drawn_area.tr_end.tp_col = area->tr_end.tp_col * vf->vf_width + - vw->vw_draw_area.tr_begin.tp_col; - drawn_area.tr_end.tp_row = area->tr_end.tp_row * vf->vf_height + - vw->vw_draw_area.tr_begin.tp_row; + drawn_area.tr_begin.tp_col = area->tr_begin.tp_col * vf->vf_width; + drawn_area.tr_begin.tp_row = area->tr_begin.tp_row * vf->vf_height; + drawn_area.tr_end.tp_col = area->tr_end.tp_col * vf->vf_width; + drawn_area.tr_end.tp_row = area->tr_end.tp_row * vf->vf_height; if (vt_is_cursor_in_area(vd, &drawn_area)) { ofwfb_bitblt_bitmap(vd, vw, vd->vd_mcursor->map, vd->vd_mcursor->mask, vd->vd_mcursor->width, vd->vd_mcursor->height, - vd->vd_mx_drawn, vd->vd_my_drawn, + vd->vd_mx_drawn + vw->vw_draw_area.tr_begin.tp_col, + vd->vd_my_drawn + vw->vw_draw_area.tr_begin.tp_row, vd->vd_mcursor_fg, vd->vd_mcursor_bg); } #endif From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 15:33:09 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 3C87FE11; Wed, 27 Aug 2014 15:33:09 +0000 (UTC) Received: from mail-pd0-x22c.google.com (mail-pd0-x22c.google.com [IPv6:2607:f8b0:400e:c02::22c]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F2B99321F; Wed, 27 Aug 2014 15:33:08 +0000 (UTC) Received: by mail-pd0-f172.google.com with SMTP id y13so458412pdi.17 for ; Wed, 27 Aug 2014 08:33:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-type:content-disposition:in-reply-to :user-agent; bh=roniw7XOOYVPwgoGBxbwBKJaPeiw3gqtXDqLBpaji6g=; b=g1rqnH4q83e3T/QrhI19kjvLu4rMIx3W6qeg2gKDxzPHTwK5oDP1ZzyWMzPU+cYntz HQwNAHQ33RMHEVZZ1X4gZF1fWDV07ikrynDF5ZynJaWnx4BhW5R8Tk459IQSBZkArzkX TVk8E+ACDs6a6t1MUeUc/ZwA5j2hqyAGKa5K4I7owfWTWpkKzg9rOLyi4aJhpYHwWPNi wdh0KiKEfweMDE6khbtSuQ9leRa1wk4ZSPLMEksc5JUzryMYITP1sxfN8n3BX7VOSgTj UTfvFLuiCM2Bseil5b/XZIobquoX+nAJL3JQX72ZuIyZiUViiVKHCM67cVjF26rsJkpL Wcow== X-Received: by 10.66.152.171 with SMTP id uz11mr46001264pab.96.1409153584972; Wed, 27 Aug 2014 08:33:04 -0700 (PDT) Received: from ox ([24.6.44.228]) by mx.google.com with ESMTPSA id ah2sm2520711pad.10.2014.08.27.08.33.02 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 27 Aug 2014 08:33:03 -0700 (PDT) Date: Wed, 27 Aug 2014 08:32:57 -0700 From: Navdeep Parhar To: Hans Petter Selasky Subject: Re: svn commit: r270710 - in head/sys: contrib/rdma/krping dev/cxgb dev/cxgbe/iw_cxgbe modules/mlx4 modules/mlx4ib modules/mlxen ofed/drivers/infiniband/core ofed/drivers/infiniband/hw/mlx4 ofed/driver... Message-ID: <20140827153257.GA22432@ox> Mail-Followup-To: Hans Petter Selasky , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201408271321.s7RDLr3d069813@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201408271321.s7RDLr3d069813@svn.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 15:33:09 -0000 On Wed, Aug 27, 2014 at 01:21:53PM +0000, Hans Petter Selasky wrote: > Author: hselasky > Date: Wed Aug 27 13:21:53 2014 > New Revision: 270710 > URL: http://svnweb.freebsd.org/changeset/base/270710 > > Log: > - Update the OFED Linux Emulation layer as a preparation for a > hardware driver update from Mellanox Technologies. What upstream OFED version does this update correspond to? It's always useful to know what version our implementation is at when looking at external RDMA code. Regards, Navdeep From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 16:05:18 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id BB90E9F6; Wed, 27 Aug 2014 16:05:18 +0000 (UTC) Received: from mail.turbocat.net (mail.turbocat.net [IPv6:2a01:4f8:d16:4514::2]) (using TLSv1.1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7C135374F; Wed, 27 Aug 2014 16:05:18 +0000 (UTC) Received: from laptop015.home.selasky.org (cm-176.74.213.204.customer.telag.net [176.74.213.204]) (using TLSv1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mail.turbocat.net (Postfix) with ESMTPSA id 5B95B1FE027; Wed, 27 Aug 2014 18:05:16 +0200 (CEST) Message-ID: <53FE01C5.2010405@selasky.org> Date: Wed, 27 Aug 2014 18:05:25 +0200 From: Hans Petter Selasky User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.1.0 MIME-Version: 1.0 To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r270710 - in head/sys: contrib/rdma/krping dev/cxgb dev/cxgbe/iw_cxgbe modules/mlx4 modules/mlx4ib modules/mlxen ofed/drivers/infiniband/core ofed/drivers/infiniband/hw/mlx4 ofed/driver... References: <201408271321.s7RDLr3d069813@svn.freebsd.org> <20140827153257.GA22432@ox> In-Reply-To: <20140827153257.GA22432@ox> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 16:05:18 -0000 On 08/27/14 17:32, Navdeep Parhar wrote: > On Wed, Aug 27, 2014 at 01:21:53PM +0000, Hans Petter Selasky wrote: >> Author: hselasky >> Date: Wed Aug 27 13:21:53 2014 >> New Revision: 270710 >> URL: http://svnweb.freebsd.org/changeset/base/270710 >> >> Log: >> - Update the OFED Linux Emulation layer as a preparation for a >> hardware driver update from Mellanox Technologies. > > What upstream OFED version does this update correspond to? It's always > useful to know what version our implementation is at when looking at > external RDMA code. > > Regards, > Navdeep > > Hi, Forwarded from Mellanox: The MLNX OFED version the driver is taken from is 2.1. --HPS From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 16:54:42 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id F3117253; Wed, 27 Aug 2014 16:54:41 +0000 (UTC) Received: from mail-wi0-x22a.google.com (mail-wi0-x22a.google.com [IPv6:2a00:1450:400c:c05::22a]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DAB8A3DA3; Wed, 27 Aug 2014 16:54:40 +0000 (UTC) Received: by mail-wi0-f170.google.com with SMTP id f8so6932970wiw.5 for ; Wed, 27 Aug 2014 09:54:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=PiyJm4kBkNobVVL2+jRCuw9HryNBRBKOpsz67L6Amtc=; b=eBCCBcDbd1Los+kFh2Aqg/RXIllysP6WAByo9PLndMiU1rE85garP6Xt6xUlngtyA2 FIweBzcqVMV0E7oIOve30Q4HRyubemjznG9jEpgP2Yq2UcUiHUT6Y+u0IThb15TFwTWM VUfrqSPtvAVBDXaIi+lo/Jd/0G9HcVERGG5F+8TkD6xIB5UjQOTlgRyVhp0l9/4RU8zh HIzurQ2k6hivgC0qLt5aVM5uJJZRroG23Iu5vtxsSvq344DFskmPlmxEzqrttal+tCFH 6az/l9uZXWq84eno29c0/dv6xW+asNm4FU5shXTzx42fbZtwB0h8ZkjFS/ESY+/nxGVb 2l7A== X-Received: by 10.194.78.4 with SMTP id x4mr38827041wjw.44.1409158476993; Wed, 27 Aug 2014 09:54:36 -0700 (PDT) Received: from dft-labs.eu (n1x0n-1-pt.tunnel.tserv5.lon1.ipv6.he.net. [2001:470:1f08:1f7::2]) by mx.google.com with ESMTPSA id ju1sm2536545wjc.1.2014.08.27.09.54.35 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 27 Aug 2014 09:54:35 -0700 (PDT) Date: Wed, 27 Aug 2014 18:54:32 +0200 From: Mateusz Guzik To: Konstantin Belousov Subject: Re: svn commit: r270444 - in head/sys: kern sys Message-ID: <20140827165432.GA28581@dft-labs.eu> References: <201408240904.s7O949sI083660@svn.freebsd.org> <201408261509.26815.jhb@freebsd.org> <20140826193210.GL71691@funkthat.com> <201408261723.10854.jhb@freebsd.org> <20140826215522.GG2737@kib.kiev.ua> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20140826215522.GG2737@kib.kiev.ua> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: src-committers@freebsd.org, John Baldwin , Mateusz Guzik , svn-src-all@freebsd.org, svn-src-head@freebsd.org, John-Mark Gurney X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 16:54:42 -0000 On Wed, Aug 27, 2014 at 12:55:22AM +0300, Konstantin Belousov wrote: > On Tue, Aug 26, 2014 at 05:23:10PM -0400, John Baldwin wrote: > > On Tuesday, August 26, 2014 3:32:10 pm John-Mark Gurney wrote: > > > John Baldwin wrote this message on Tue, Aug 26, 2014 at 15:09 -0400: > > > > On Monday, August 25, 2014 6:30:34 pm John-Mark Gurney wrote: > > > > > John Baldwin wrote this message on Mon, Aug 25, 2014 at 13:35 -0400: > > > > > > On Monday, August 25, 2014 07:02:41 PM Mateusz Guzik wrote: > > > > > > > On Mon, Aug 25, 2014 at 10:23:19AM -0400, John Baldwin wrote: > > > > > > > > On Sunday, August 24, 2014 09:04:09 AM Mateusz Guzik wrote: > > > > > > > > > Author: mjg > > > > > > > > > Date: Sun Aug 24 09:04:09 2014 > > > > > > > > > New Revision: 270444 > > > > > > > > > URL: http://svnweb.freebsd.org/changeset/base/270444 > > > > > > > > > > > > > > > > > > Log: > > > > > > > > > Fix getppid for traced processes. > > > > > > > > > > > > > > > > > > Traced processes always have the tracer set as the parent. > > > > > > > > > Utilize proc_realparent to obtain the right process when needed. > > > > > > > > > > > > > > > > Are you sure this won't break things? I know of several applications that > > > > > > > > expect a debugger to be the parent when attached and change behavior as a > > > > > > > > result (e.g. inserting a breakpoint on an assertion failure rather than > > > > > > > > generating a core). > Shouldn't such applications use a breakpoint instruction like INT3 > unconditionally then ? Detection of the attached debugger is inherently > racy, the debugger might have detached after the test. This, and the > fact that default action for the SIGTRAP is coredumping. > > > > > > > > > > > > > > > Well, this is what linux and solaris do. > > > > > > > > > > > > Interesting. > > > > > > > > > > > > > I don't feel strongly about this change. If you really want I'm happy to > > > > > > > revert. > > > > > > > > > > > > In general I'd like to someday have the debugger-debuggee relationship not > > > > > > override parent-child and this is a step in that direction. However, this > > > > > > will break existing applications, so this needs to be clearly documented in > > > > > > the release notes. In addition, we should probably advertise how a process > > > > > > can correctly determine if it is being run under a debugger (right now you can > > > > > > do 'getppid()' and use strcmp or strstr on the p_comm of that pid so you can > > > > > > do different things for "gdb" vs "gcore", etc. so just checking P_TRACED from > > > > > > kinfo_proc wouldn't be equivalent in functionality) > > > > > > > > > > But what about when you attach gdb to a running process... That > > > > > doesn't magicly make the now debugged process a child of gdb does it? > > > > > > > > % cat hello.c > > > > #include > > > > > > > > int > > > > main() > > > > { > > > > printf("hello world\n"); > > > > (void)getchar(); > > > > return (0); > > > > } > > > > % cc -g hello.c -o hello > > > > % ./hello > > > > hello world > > > > load: 9.81 cmd: hello 42599 [ttyin] 1.67r 0.00u 0.00s 0% 1056k > > > > > > > > < different window > > > > > > > > > % ps -O ppid -p `pgrep hello` > > > > PID PPID TT STAT TIME COMMAND > > > > 42599 5340 16 I+ 0:00.00 ./hello > > > > % gdb hello `pgrep hello` > > > > GNU gdb 6.1.1 [FreeBSD] > > > > ... > > > > (gdb) > > > > Suspended > > > > % ps -O ppid -p `pgrep hello` > > > > PID PPID TT STAT TIME COMMAND > > > > 42599 45079 16 TX+ 0:00.00 ./hello > > > > > > Wow, learn something new every day... > > > > > > But doesn't that break apps that use getppid to signal their parent > > > that forked them? > > > > Until mjg@'s commit, yes. It's been that way in FreeBSD at least for > > as long as I can remember. Certainly back to 4.x. > > The ps(1) trick continues to work after the commit, since kern_proc > sysctl directly accesses p_pptr to fill ki_ppid. I simply forgot about > it during the review. > Fixing it requires taking proctree_lock when it is otherwise not needed, which is somewhat unfortunate. > Anyway, checking the parent pid is definitely not the right way to > see if the process is under ptrace debugging. What if the parent > is the debugger ? The p_flag AKA ki_flag P_TRACED bit seems to be > the correct indicator. It was stated they want to do something based on the name of the tracer. Whether that makes sense or not is unclear for me. Either way, having a way of checking who traces is a nice thing to retain. So how about the following: diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c index 3a0c323..38a9934 100644 --- a/bin/ps/keyword.c +++ b/bin/ps/keyword.c @@ -157,6 +157,7 @@ static VAR var[] = { {"tdnam", "TDNAM", NULL, LJUST, tdnam, 0, CHAR, NULL, 0}, {"time", "TIME", NULL, USER, cputime, 0, CHAR, NULL, 0}, {"tpgid", "TPGID", NULL, 0, kvar, KOFF(ki_tpgid), UINT, PIDFMT, 0}, + {"tracer", "TRACER", NULL, 0, kvar, KOFF(ki_tracer), UINT, PIDFMT, 0}, {"tsid", "TSID", NULL, 0, kvar, KOFF(ki_tsid), UINT, PIDFMT, 0}, {"tsiz", "TSIZ", NULL, 0, kvar, KOFF(ki_tsize), PGTOK, "ld", 0}, {"tt", "TT ", NULL, 0, tname, 0, CHAR, NULL, 0}, diff --git a/bin/ps/ps.1 b/bin/ps/ps.1 index d8e56fb..294ecf9 100644 --- a/bin/ps/ps.1 +++ b/bin/ps/ps.1 @@ -29,7 +29,7 @@ .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd August 7, 2014 +.Dd August 27, 2014 .Dt PS 1 .Os .Sh NAME @@ -665,6 +665,8 @@ accumulated CPU time, user + system (alias .Cm cputime ) .It Cm tpgid control terminal process group ID +.It Cm tracer +tracer process ID .\".It Cm trss .\"text resident set size (in Kbytes) .It Cm tsid diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 6689186..530969a 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -791,6 +791,8 @@ fill_kinfo_proc_only(struct proc *p, struct kinfo_proc *kp) struct ucred *cred; struct sigacts *ps; + /* For proc_realparent. */ + sx_assert(&proctree_lock, SX_LOCKED); PROC_LOCK_ASSERT(p, MA_OWNED); bzero(kp, sizeof(*kp)); @@ -920,7 +922,9 @@ fill_kinfo_proc_only(struct proc *p, struct kinfo_proc *kp) kp->ki_acflag = p->p_acflag; kp->ki_lock = p->p_lock; if (p->p_pptr) - kp->ki_ppid = p->p_pptr->p_pid; + kp->ki_ppid = proc_realparent(p)->p_pid; + if (p->p_flag & P_TRACED) + kp->ki_tracer = p->p_pptr->p_pid; } /* @@ -1287,10 +1291,11 @@ sysctl_kern_proc(SYSCTL_HANDLER_ARGS) error = sysctl_wire_old_buffer(req, 0); if (error) return (error); + sx_slock(&proctree_lock); error = pget((pid_t)name[0], PGET_CANSEE, &p); - if (error != 0) - return (error); - error = sysctl_out_proc(p, req, flags, 0); + if (error == 0) + error = sysctl_out_proc(p, req, flags, 0); + sx_sunlock(&proctree_lock); return (error); } @@ -1318,6 +1323,7 @@ sysctl_kern_proc(SYSCTL_HANDLER_ARGS) error = sysctl_wire_old_buffer(req, 0); if (error != 0) return (error); + sx_slock(&proctree_lock); sx_slock(&allproc_lock); for (doingzomb=0 ; doingzomb < 2 ; doingzomb++) { if (!doingzomb) @@ -1422,11 +1428,13 @@ sysctl_kern_proc(SYSCTL_HANDLER_ARGS) error = sysctl_out_proc(p, req, flags, doingzomb); if (error) { sx_sunlock(&allproc_lock); + sx_sunlock(&proctree_lock); return (error); } } } sx_sunlock(&allproc_lock); + sx_sunlock(&proctree_lock); return (0); } diff --git a/sys/sys/user.h b/sys/sys/user.h index f7b18df..6775ff7 100644 --- a/sys/sys/user.h +++ b/sys/sys/user.h @@ -84,7 +84,7 @@ * it in two places: function fill_kinfo_proc in sys/kern/kern_proc.c and * function kvm_proclist in lib/libkvm/kvm_proc.c . */ -#define KI_NSPARE_INT 7 +#define KI_NSPARE_INT 6 #define KI_NSPARE_LONG 12 #define KI_NSPARE_PTR 6 @@ -187,6 +187,7 @@ struct kinfo_proc { */ char ki_sparestrings[50]; /* spare string space */ int ki_spareints[KI_NSPARE_INT]; /* spare room for growth */ + int ki_tracer; /* Pid of tracing process */ int ki_flag2; /* P2_* flags */ int ki_fibnum; /* Default FIB number */ u_int ki_cr_flags; /* Credential flags */ -- Mateusz Guzik From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 17:16:53 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 2AF0CBB3; Wed, 27 Aug 2014 17:16:53 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 15D763024; Wed, 27 Aug 2014 17:16:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7RHGqgk077538; Wed, 27 Aug 2014 17:16:52 GMT (envelope-from dumbbell@FreeBSD.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7RHGq4r077537; Wed, 27 Aug 2014 17:16:52 GMT (envelope-from dumbbell@FreeBSD.org) Message-Id: <201408271716.s7RHGq4r077537@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dumbbell set sender to dumbbell@FreeBSD.org using -f From: Jean-Sebastien Pedron Date: Wed, 27 Aug 2014 17:16:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270721 - head/sys/dev/vt X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 17:16:53 -0000 Author: dumbbell Date: Wed Aug 27 17:16:52 2014 New Revision: 270721 URL: http://svnweb.freebsd.org/changeset/base/270721 Log: vt(4): If the terminal shrinks, make sure the mouse is inside the new area MFC after: 1 week Modified: head/sys/dev/vt/vt_core.c Modified: head/sys/dev/vt/vt_core.c ============================================================================== --- head/sys/dev/vt/vt_core.c Wed Aug 27 15:10:28 2014 (r270720) +++ head/sys/dev/vt/vt_core.c Wed Aug 27 17:16:52 2014 (r270721) @@ -1381,9 +1381,20 @@ vt_change_font(struct vt_window *vw, str */ vtfont_unref(vw->vw_font); vw->vw_font = vtfont_ref(vf); - vt_compute_drawable_area(vw); } + /* + * Compute the drawable area and move the mouse cursor inside + * it, in case the new area is smaller than the previous one. + */ + vt_compute_drawable_area(vw); + vd->vd_mx = min(vd->vd_mx, + vw->vw_draw_area.tr_end.tp_col - + vw->vw_draw_area.tr_begin.tp_col - 1); + vd->vd_my = min(vd->vd_my, + vw->vw_draw_area.tr_end.tp_row - + vw->vw_draw_area.tr_begin.tp_row - 1); + /* Force a full redraw the next timer tick. */ if (vd->vd_curwindow == vw) { vt_set_border(vw, vf, TC_BLACK); @@ -2272,8 +2283,8 @@ vt_resize(struct vt_device *vd) if (!(vd->vd_flags & VDF_TEXTMODE) && vw->vw_font == NULL) vw->vw_font = vtfont_ref(&vt_font_default); VT_UNLOCK(vd); + /* Resize terminal windows */ - vt_compute_drawable_area(vw); while (vt_change_font(vw, vw->vw_font) == EBUSY) { DPRINTF(100, "%s: vt_change_font() is busy, " "window %d\n", __func__, i); From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 17:45:00 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 48BC233A; Wed, 27 Aug 2014 17:45:00 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 342CE3356; Wed, 27 Aug 2014 17:45:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7RHixnr090586; Wed, 27 Aug 2014 17:45:00 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7RHixfg090585; Wed, 27 Aug 2014 17:44:59 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201408271744.s7RHixfg090585@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 27 Aug 2014 17:44:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270722 - head/sbin/gbde X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 17:45:00 -0000 Author: jhb Date: Wed Aug 27 17:44:59 2014 New Revision: 270722 URL: http://svnweb.freebsd.org/changeset/base/270722 Log: Correct the destroy example. The -n argument is not needed (and is not valid). Reported by: mwlucas Reviewed by: phk MFC after: 1 week Modified: head/sbin/gbde/gbde.8 Modified: head/sbin/gbde/gbde.8 ============================================================================== --- head/sbin/gbde/gbde.8 Wed Aug 27 17:16:52 2014 (r270721) +++ head/sbin/gbde/gbde.8 Wed Aug 27 17:44:59 2014 (r270722) @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 1, 2013 +.Dd August 27, 2014 .Dt GBDE 8 .Os .Sh NAME @@ -235,7 +235,7 @@ pass-phrase: .Pp To destroy all copies of the masterkey: .Pp -.Dl "gbde destroy ada0s1f -n -1" +.Dl "gbde destroy ada0s1f" .Sh SEE ALSO .Xr gbde 4 , .Xr geom 4 From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 17:47:16 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 34CDE4CC; Wed, 27 Aug 2014 17:47:16 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 08F33337C; Wed, 27 Aug 2014 17:47:16 +0000 (UTC) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 820A6B960; Wed, 27 Aug 2014 13:47:14 -0400 (EDT) From: John Baldwin To: Konstantin Belousov Subject: Re: svn commit: r270444 - in head/sys: kern sys Date: Wed, 27 Aug 2014 12:29:19 -0400 User-Agent: KMail/1.13.5 (FreeBSD/8.4-CBSD-20140415; KDE/4.5.5; amd64; ; ) References: <201408240904.s7O949sI083660@svn.freebsd.org> <201408261723.10854.jhb@freebsd.org> <20140826215522.GG2737@kib.kiev.ua> In-Reply-To: <20140826215522.GG2737@kib.kiev.ua> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Message-Id: <201408271229.19301.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Wed, 27 Aug 2014 13:47:14 -0400 (EDT) Cc: Mateusz Guzik , Mateusz Guzik , John-Mark Gurney , src-committers@freebsd.org, svn-src-head@freebsd.org, svn-src-all@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 17:47:16 -0000 On Tuesday, August 26, 2014 5:55:22 pm Konstantin Belousov wrote: > On Tue, Aug 26, 2014 at 05:23:10PM -0400, John Baldwin wrote: > > On Tuesday, August 26, 2014 3:32:10 pm John-Mark Gurney wrote: > > > John Baldwin wrote this message on Tue, Aug 26, 2014 at 15:09 -0400: > > > > On Monday, August 25, 2014 6:30:34 pm John-Mark Gurney wrote: > > > > > John Baldwin wrote this message on Mon, Aug 25, 2014 at 13:35 -0400: > > > > > > On Monday, August 25, 2014 07:02:41 PM Mateusz Guzik wrote: > > > > > > > On Mon, Aug 25, 2014 at 10:23:19AM -0400, John Baldwin wrote: > > > > > > > > On Sunday, August 24, 2014 09:04:09 AM Mateusz Guzik wrote: > > > > > > > > > Author: mjg > > > > > > > > > Date: Sun Aug 24 09:04:09 2014 > > > > > > > > > New Revision: 270444 > > > > > > > > > URL: http://svnweb.freebsd.org/changeset/base/270444 > > > > > > > > > > > > > > > > > > Log: > > > > > > > > > Fix getppid for traced processes. > > > > > > > > > > > > > > > > > > Traced processes always have the tracer set as the parent. > > > > > > > > > Utilize proc_realparent to obtain the right process when needed. > > > > > > > > > > > > > > > > Are you sure this won't break things? I know of several applications that > > > > > > > > expect a debugger to be the parent when attached and change behavior as a > > > > > > > > result (e.g. inserting a breakpoint on an assertion failure rather than > > > > > > > > generating a core). > Shouldn't such applications use a breakpoint instruction like INT3 > unconditionally then ? Detection of the attached debugger is inherently > racy, the debugger might have detached after the test. This, and the > fact that default action for the SIGTRAP is coredumping. For whatever reason, the developer may want to not core dump but just log (maybe thrown an exception) normally, but if gdb is attached, it wants to always trigger a breakpoint first (the one I can currently think of is in some uber-fancy assertion handling class). > > Until mjg@'s commit, yes. It's been that way in FreeBSD at least for > > as long as I can remember. Certainly back to 4.x. > > The ps(1) trick continues to work after the commit, since kern_proc > sysctl directly accesses p_pptr to fill ki_ppid. I simply forgot about > it during the review. Ah, well. > Anyway, checking the parent pid is definitely not the right way to > see if the process is under ptrace debugging. What if the parent > is the debugger ? The p_flag AKA ki_flag P_TRACED bit seems to be > the correct indicator. As noted before, that just tells you that something is tracing you, but it might be strace or truss. The evil code above actually looks at p_comm name of the pid and does strstr() "gdb" or the like. -- John Baldwin From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 18:00:58 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id AA0B7B0E; Wed, 27 Aug 2014 18:00:58 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9271C3546; Wed, 27 Aug 2014 18:00:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7RI0wO6096946; Wed, 27 Aug 2014 18:00:58 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7RI0wsb096945; Wed, 27 Aug 2014 18:00:58 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <201408271800.s7RI0wsb096945@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Wed, 27 Aug 2014 18:00:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270723 - stable/10 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 18:00:58 -0000 Author: truckman Date: Wed Aug 27 18:00:58 2014 New Revision: 270723 URL: http://svnweb.freebsd.org/changeset/base/270723 Log: MFC r270510 Catch up to gcc 3.3 -> 3.4 upgrade. Modified: stable/10/ObsoleteFiles.inc Directory Properties: stable/10/ (props changed) Modified: stable/10/ObsoleteFiles.inc ============================================================================== --- stable/10/ObsoleteFiles.inc Wed Aug 27 17:44:59 2014 (r270722) +++ stable/10/ObsoleteFiles.inc Wed Aug 27 18:00:58 2014 (r270723) @@ -3063,6 +3063,202 @@ OLD_FILES+=lib/geom/geom_concat.so.1 OLD_FILES+=lib/geom/geom_label.so.1 OLD_FILES+=lib/geom/geom_nop.so.1 OLD_FILES+=lib/geom/geom_stripe.so.1 +# 20040728: GCC 3.4.2 +OLD_DIRS+=usr/include/c++/3.3 +OLD_FILES+=usr/include/c++/3.3/FlexLexer.h +OLD_FILES+=usr/include/c++/3.3/algorithm +OLD_FILES+=usr/include/c++/3.3/backward/algo.h +OLD_FILES+=usr/include/c++/3.3/backward/algobase.h +OLD_FILES+=usr/include/c++/3.3/backward/alloc.h +OLD_FILES+=usr/include/c++/3.3/backward/backward_warning.h +OLD_FILES+=usr/include/c++/3.3/backward/bvector.h +OLD_FILES+=usr/include/c++/3.3/backward/complex.h +OLD_FILES+=usr/include/c++/3.3/backward/defalloc.h +OLD_FILES+=usr/include/c++/3.3/backward/deque.h +OLD_FILES+=usr/include/c++/3.3/backward/fstream.h +OLD_FILES+=usr/include/c++/3.3/backward/function.h +OLD_FILES+=usr/include/c++/3.3/backward/hash_map.h +OLD_FILES+=usr/include/c++/3.3/backward/hash_set.h +OLD_FILES+=usr/include/c++/3.3/backward/hashtable.h +OLD_FILES+=usr/include/c++/3.3/backward/heap.h +OLD_FILES+=usr/include/c++/3.3/backward/iomanip.h +OLD_FILES+=usr/include/c++/3.3/backward/iostream.h +OLD_FILES+=usr/include/c++/3.3/backward/istream.h +OLD_FILES+=usr/include/c++/3.3/backward/iterator.h +OLD_FILES+=usr/include/c++/3.3/backward/list.h +OLD_FILES+=usr/include/c++/3.3/backward/map.h +OLD_FILES+=usr/include/c++/3.3/backward/multimap.h +OLD_FILES+=usr/include/c++/3.3/backward/multiset.h +OLD_FILES+=usr/include/c++/3.3/backward/new.h +OLD_FILES+=usr/include/c++/3.3/backward/ostream.h +OLD_FILES+=usr/include/c++/3.3/backward/pair.h +OLD_FILES+=usr/include/c++/3.3/backward/queue.h +OLD_FILES+=usr/include/c++/3.3/backward/rope.h +OLD_FILES+=usr/include/c++/3.3/backward/set.h +OLD_FILES+=usr/include/c++/3.3/backward/slist.h +OLD_FILES+=usr/include/c++/3.3/backward/stack.h +OLD_FILES+=usr/include/c++/3.3/backward/stream.h +OLD_FILES+=usr/include/c++/3.3/backward/streambuf.h +OLD_FILES+=usr/include/c++/3.3/backward/strstream +OLD_FILES+=usr/include/c++/3.3/backward/strstream.h +OLD_FILES+=usr/include/c++/3.3/backward/tempbuf.h +OLD_FILES+=usr/include/c++/3.3/backward/tree.h +OLD_FILES+=usr/include/c++/3.3/backward/vector.h +OLD_DIRS+=usr/include/c++/3.3/backward +OLD_FILES+=usr/include/c++/3.3/bits/atomicity.h +OLD_FILES+=usr/include/c++/3.3/bits/basic_file.h +OLD_FILES+=usr/include/c++/3.3/bits/basic_ios.h +OLD_FILES+=usr/include/c++/3.3/bits/basic_ios.tcc +OLD_FILES+=usr/include/c++/3.3/bits/basic_string.h +OLD_FILES+=usr/include/c++/3.3/bits/basic_string.tcc +OLD_FILES+=usr/include/c++/3.3/bits/boost_concept_check.h +OLD_FILES+=usr/include/c++/3.3/bits/c++config.h +OLD_FILES+=usr/include/c++/3.3/bits/c++io.h +OLD_FILES+=usr/include/c++/3.3/bits/c++locale.h +OLD_FILES+=usr/include/c++/3.3/bits/c++locale_internal.h +OLD_FILES+=usr/include/c++/3.3/bits/char_traits.h +OLD_FILES+=usr/include/c++/3.3/bits/cmath.tcc +OLD_FILES+=usr/include/c++/3.3/bits/codecvt.h +OLD_FILES+=usr/include/c++/3.3/bits/codecvt_specializations.h +OLD_FILES+=usr/include/c++/3.3/bits/concept_check.h +OLD_FILES+=usr/include/c++/3.3/bits/cpp_type_traits.h +OLD_FILES+=usr/include/c++/3.3/bits/ctype_base.h +OLD_FILES+=usr/include/c++/3.3/bits/ctype_inline.h +OLD_FILES+=usr/include/c++/3.3/bits/ctype_noninline.h +OLD_FILES+=usr/include/c++/3.3/bits/deque.tcc +OLD_FILES+=usr/include/c++/3.3/bits/fpos.h +OLD_FILES+=usr/include/c++/3.3/bits/fstream.tcc +OLD_FILES+=usr/include/c++/3.3/bits/functexcept.h +OLD_FILES+=usr/include/c++/3.3/bits/generic_shadow.h +OLD_FILES+=usr/include/c++/3.3/bits/gslice.h +OLD_FILES+=usr/include/c++/3.3/bits/gslice_array.h +OLD_FILES+=usr/include/c++/3.3/bits/gthr-default.h +OLD_FILES+=usr/include/c++/3.3/bits/gthr-posix.h +OLD_FILES+=usr/include/c++/3.3/bits/gthr-single.h +OLD_FILES+=usr/include/c++/3.3/bits/gthr.h +OLD_FILES+=usr/include/c++/3.3/bits/indirect_array.h +OLD_FILES+=usr/include/c++/3.3/bits/ios_base.h +OLD_FILES+=usr/include/c++/3.3/bits/istream.tcc +OLD_FILES+=usr/include/c++/3.3/bits/list.tcc +OLD_FILES+=usr/include/c++/3.3/bits/locale_classes.h +OLD_FILES+=usr/include/c++/3.3/bits/locale_facets.h +OLD_FILES+=usr/include/c++/3.3/bits/locale_facets.tcc +OLD_FILES+=usr/include/c++/3.3/bits/localefwd.h +OLD_FILES+=usr/include/c++/3.3/bits/mask_array.h +OLD_FILES+=usr/include/c++/3.3/bits/messages_members.h +OLD_FILES+=usr/include/c++/3.3/bits/os_defines.h +OLD_FILES+=usr/include/c++/3.3/bits/ostream.tcc +OLD_FILES+=usr/include/c++/3.3/bits/pthread_allocimpl.h +OLD_FILES+=usr/include/c++/3.3/bits/slice.h +OLD_FILES+=usr/include/c++/3.3/bits/slice_array.h +OLD_FILES+=usr/include/c++/3.3/bits/sstream.tcc +OLD_FILES+=usr/include/c++/3.3/bits/stl_algo.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_algobase.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_alloc.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_bvector.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_construct.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_deque.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_function.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_heap.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_iterator.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_iterator_base_funcs.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_iterator_base_types.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_list.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_map.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_multimap.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_multiset.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_numeric.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_pair.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_pthread_alloc.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_queue.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_raw_storage_iter.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_relops.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_set.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_stack.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_tempbuf.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_threads.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_tree.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_uninitialized.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_vector.h +OLD_FILES+=usr/include/c++/3.3/bits/stream_iterator.h +OLD_FILES+=usr/include/c++/3.3/bits/streambuf.tcc +OLD_FILES+=usr/include/c++/3.3/bits/streambuf_iterator.h +OLD_FILES+=usr/include/c++/3.3/bits/stringfwd.h +OLD_FILES+=usr/include/c++/3.3/bits/time_members.h +OLD_FILES+=usr/include/c++/3.3/bits/type_traits.h +OLD_FILES+=usr/include/c++/3.3/bits/valarray_array.h +OLD_FILES+=usr/include/c++/3.3/bits/valarray_array.tcc +OLD_FILES+=usr/include/c++/3.3/bits/valarray_meta.h +OLD_FILES+=usr/include/c++/3.3/bits/vector.tcc +OLD_DIRS+=usr/include/c++/3.3/bits +OLD_FILES+=usr/include/c++/3.3/bitset +OLD_FILES+=usr/include/c++/3.3/cassert +OLD_FILES+=usr/include/c++/3.3/cctype +OLD_FILES+=usr/include/c++/3.3/cerrno +OLD_FILES+=usr/include/c++/3.3/cfloat +OLD_FILES+=usr/include/c++/3.3/ciso646 +OLD_FILES+=usr/include/c++/3.3/climits +OLD_FILES+=usr/include/c++/3.3/clocale +OLD_FILES+=usr/include/c++/3.3/cmath +OLD_FILES+=usr/include/c++/3.3/complex +OLD_FILES+=usr/include/c++/3.3/csetjmp +OLD_FILES+=usr/include/c++/3.3/csignal +OLD_FILES+=usr/include/c++/3.3/cstdarg +OLD_FILES+=usr/include/c++/3.3/cstddef +OLD_FILES+=usr/include/c++/3.3/cstdio +OLD_FILES+=usr/include/c++/3.3/cstdlib +OLD_FILES+=usr/include/c++/3.3/cstring +OLD_FILES+=usr/include/c++/3.3/ctime +OLD_FILES+=usr/include/c++/3.3/cwchar +OLD_FILES+=usr/include/c++/3.3/cwctype +OLD_FILES+=usr/include/c++/3.3/cxxabi.h +OLD_FILES+=usr/include/c++/3.3/deque +OLD_FILES+=usr/include/c++/3.3/exception +OLD_FILES+=usr/include/c++/3.3/exception_defines.h +OLD_FILES+=usr/include/c++/3.3/ext/algorithm +OLD_FILES+=usr/include/c++/3.3/ext/enc_filebuf.h +OLD_FILES+=usr/include/c++/3.3/ext/functional +OLD_FILES+=usr/include/c++/3.3/ext/hash_map +OLD_FILES+=usr/include/c++/3.3/ext/hash_set +OLD_FILES+=usr/include/c++/3.3/ext/iterator +OLD_FILES+=usr/include/c++/3.3/ext/memory +OLD_FILES+=usr/include/c++/3.3/ext/numeric +OLD_FILES+=usr/include/c++/3.3/ext/rb_tree +OLD_FILES+=usr/include/c++/3.3/ext/rope +OLD_FILES+=usr/include/c++/3.3/ext/ropeimpl.h +OLD_FILES+=usr/include/c++/3.3/ext/slist +OLD_FILES+=usr/include/c++/3.3/ext/stdio_filebuf.h +OLD_FILES+=usr/include/c++/3.3/ext/stl_hash_fun.h +OLD_FILES+=usr/include/c++/3.3/ext/stl_hashtable.h +OLD_FILES+=usr/include/c++/3.3/ext/stl_rope.h +OLD_DIRS+=usr/include/c++/3.3/ext +OLD_FILES+=usr/include/c++/3.3/fstream +OLD_FILES+=usr/include/c++/3.3/functional +OLD_FILES+=usr/include/c++/3.3/iomanip +OLD_FILES+=usr/include/c++/3.3/ios +OLD_FILES+=usr/include/c++/3.3/iosfwd +OLD_FILES+=usr/include/c++/3.3/iostream +OLD_FILES+=usr/include/c++/3.3/istream +OLD_FILES+=usr/include/c++/3.3/iterator +OLD_FILES+=usr/include/c++/3.3/limits +OLD_FILES+=usr/include/c++/3.3/list +OLD_FILES+=usr/include/c++/3.3/locale +OLD_FILES+=usr/include/c++/3.3/map +OLD_FILES+=usr/include/c++/3.3/memory +OLD_FILES+=usr/include/c++/3.3/new +OLD_FILES+=usr/include/c++/3.3/numeric +OLD_FILES+=usr/include/c++/3.3/ostream +OLD_FILES+=usr/include/c++/3.3/queue +OLD_FILES+=usr/include/c++/3.3/set +OLD_FILES+=usr/include/c++/3.3/sstream +OLD_FILES+=usr/include/c++/3.3/stack +OLD_FILES+=usr/include/c++/3.3/stdexcept +OLD_FILES+=usr/include/c++/3.3/streambuf +OLD_FILES+=usr/include/c++/3.3/string +OLD_FILES+=usr/include/c++/3.3/typeinfo +OLD_FILES+=usr/include/c++/3.3/utility +OLD_FILES+=usr/include/c++/3.3/valarray +OLD_FILES+=usr/include/c++/3.3/vector # 20040713: fla(4) removed. OLD_FILES+=usr/share/man/man4/fla.4.gz # 200407XX From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 18:03:07 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id C8488E56; Wed, 27 Aug 2014 18:03:07 +0000 (UTC) Received: from shxd.cx (unknown [64.201.244.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AFC68357A; Wed, 27 Aug 2014 18:03:07 +0000 (UTC) Received: from 50-196-156-133-static.hfc.comcastbusiness.net ([50.196.156.133]:60540 helo=THEMADHATTER) by shxd.cx with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.77 (FreeBSD)) (envelope-from ) id 1XMNeZ-000DLW-AD; Tue, 26 Aug 2014 13:47:43 -0700 From: To: "'Slawa Olhovchenkov'" , "'Andrew Thompson'" References: <201408260231.s7Q2VbCW087619@svn.freebsd.org> <20140827140902.GA41194@zxy.spb.ru> In-Reply-To: <20140827140902.GA41194@zxy.spb.ru> Subject: RE: svn commit: r270644 - stable/10/usr.sbin/bsdinstall/scripts Date: Wed, 27 Aug 2014 11:02:28 -0700 Message-ID: <1d0501cfc221$1114f850$333ee8f0$@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Mailer: Microsoft Outlook 15.0 Thread-Index: AQEo8EZCNfdT+2JOA5CJW31HcDTrpwF783yrnSaA7nA= Content-Language: en-us Sender: devin@shxd.cx Cc: dteske@FreeBSD.org, svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-10@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 18:03:07 -0000 > -----Original Message----- > From: owner-src-committers@freebsd.org [mailto:owner-src- > committers@freebsd.org] On Behalf Of Slawa Olhovchenkov > Sent: Wednesday, August 27, 2014 7:09 AM > To: Andrew Thompson > Cc: src-committers@freebsd.org; svn-src-all@freebsd.org; svn-src- > stable@freebsd.org; svn-src-stable-10@freebsd.org > Subject: Re: svn commit: r270644 - stable/10/usr.sbin/bsdinstall/scripts > > On Tue, Aug 26, 2014 at 02:31:37AM +0000, Andrew Thompson wrote: > > In zfs directory layout you missing some separate datesets: > > usr/home (or, may be, just /home) > usr/obj > usr/ports/packages > usr/ports/distfiles > > Can you do it before 10.1? You must have missed the following in the evolution of that script: http://svnweb.freebsd.org/base?view=revision&revision=257842 [snip] + Remove some unnecessary default ZFS datasets from the automatic "zfsboot" script. Such as: /usr/ports/distfiles /usr/ports/packages /usr/obj /var/db /var/empty /var/mail and /var/run (these can all be created as-needed once the system is installed). [/snip] The idea is that all of those directories you mentioned are empty by default on a freshly installed system. Compare that to directories which are not empty -- if the user wants the data in a separate dataset, they have salvage existing data in the process. -- Devin From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 18:25:15 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id D95B44E6; Wed, 27 Aug 2014 18:25:15 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A8F063787; Wed, 27 Aug 2014 18:25:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7RIPFV5009163; Wed, 27 Aug 2014 18:25:15 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7RIPFb7009161; Wed, 27 Aug 2014 18:25:15 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201408271825.s7RIPFb7009161@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 27 Aug 2014 18:25:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270724 - in stable/10: etc/mtree lib/libutil lib/libutil/tests tools/regression/lib/libutil X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 18:25:16 -0000 Author: ngie Date: Wed Aug 27 18:25:14 2014 New Revision: 270724 URL: http://svnweb.freebsd.org/changeset/base/270724 Log: MFC r270180: r269906: Add missing BSD.tests.dist entry for lib/libutil to unbreak installworld with MK_TESTS == no Phabric: D555 Approved by: jmmv (mentor, implicit) Pointyhat to: ngie r269904: Integrate lib/libutil into the build/kyua Remove the .t wrappers Rename all of the TAP test applications from test- to _test to match the convention described in the TestSuite wiki page humanize_number_test.c: - Fix -Wformat warnings with counter variables - Fix minor style(9) issues: -- Header sorting -- Variable declaration alignment/sorting in main(..) -- Fit the lines in <80 columns - Fix an off by one index error in the testcase output [*] - Remove unnecessary `extern char * optarg;` (this is already provided by unistd.h) Phabric: D555 Approved by: jmmv (mentor) Obtained from: EMC / Isilon Storage Division [*] Submitted by: Casey Peel [*] Sponsored by: EMC / Isilon Storage Division Added: stable/10/lib/libutil/tests/ - copied from r269904, head/lib/libutil/tests/ Deleted: stable/10/tools/regression/lib/libutil/ Modified: stable/10/etc/mtree/BSD.tests.dist stable/10/lib/libutil/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/etc/mtree/BSD.tests.dist ============================================================================== --- stable/10/etc/mtree/BSD.tests.dist Wed Aug 27 18:00:58 2014 (r270723) +++ stable/10/etc/mtree/BSD.tests.dist Wed Aug 27 18:25:14 2014 (r270724) @@ -87,6 +87,8 @@ .. libmp .. + libutil + .. .. libexec atf Modified: stable/10/lib/libutil/Makefile ============================================================================== --- stable/10/lib/libutil/Makefile Wed Aug 27 18:00:58 2014 (r270723) +++ stable/10/lib/libutil/Makefile Wed Aug 27 18:25:14 2014 (r270724) @@ -81,4 +81,8 @@ MLINKS+=pw_util.3 pw_copy.3 \ pw_util.3 pw_tempname.3 \ pw_util.3 pw_tmp.3 +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 18:48:41 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 6683E28D; Wed, 27 Aug 2014 18:48:41 +0000 (UTC) Received: from zxy.spb.ru (zxy.spb.ru [195.70.199.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1DBAF3A08; Wed, 27 Aug 2014 18:48:41 +0000 (UTC) Received: from slw by zxy.spb.ru with local (Exim 4.82 (FreeBSD)) (envelope-from ) id 1XMiGm-000A3v-Uw; Wed, 27 Aug 2014 22:48:32 +0400 Date: Wed, 27 Aug 2014 22:48:32 +0400 From: Slawa Olhovchenkov To: dteske@FreeBSD.org Subject: Re: svn commit: r270644 - stable/10/usr.sbin/bsdinstall/scripts Message-ID: <20140827184832.GJ2075@zxy.spb.ru> References: <201408260231.s7Q2VbCW087619@svn.freebsd.org> <20140827140902.GA41194@zxy.spb.ru> <1d0501cfc221$1114f850$333ee8f0$@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1d0501cfc221$1114f850$333ee8f0$@FreeBSD.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: slw@zxy.spb.ru X-SA-Exim-Scanned: No (on zxy.spb.ru); SAEximRunCond expanded to false Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-10@freebsd.org, 'Andrew Thompson' X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 18:48:41 -0000 On Wed, Aug 27, 2014 at 11:02:28AM -0700, dteske@FreeBSD.org wrote: > > > > -----Original Message----- > > From: owner-src-committers@freebsd.org [mailto:owner-src- > > committers@freebsd.org] On Behalf Of Slawa Olhovchenkov > > Sent: Wednesday, August 27, 2014 7:09 AM > > To: Andrew Thompson > > Cc: src-committers@freebsd.org; svn-src-all@freebsd.org; svn-src- > > stable@freebsd.org; svn-src-stable-10@freebsd.org > > Subject: Re: svn commit: r270644 - stable/10/usr.sbin/bsdinstall/scripts > > > > On Tue, Aug 26, 2014 at 02:31:37AM +0000, Andrew Thompson wrote: > > > > In zfs directory layout you missing some separate datesets: > > > > usr/home (or, may be, just /home) > > usr/obj > > usr/ports/packages > > usr/ports/distfiles > > > > Can you do it before 10.1? > > You must have missed the following in the evolution of that script: > > http://svnweb.freebsd.org/base?view=revision&revision=257842 > > [snip] > + Remove some unnecessary default ZFS datasets from the automatic "zfsboot" > script. Such as: /usr/ports/distfiles /usr/ports/packages /usr/obj /var/db > /var/empty /var/mail and /var/run (these can all be created as-needed once > the system is installed). > [/snip] > > The idea is that all of those directories you mentioned are empty > by default on a freshly installed system. Compare that to directories > which are not empty -- if the user wants the data in a separate > dataset, they have salvage existing data in the process. /home is not empty on a freshly installed system (I am create account for remoty login). Other datasets have special atributes and removing datasets is simples then creating and to easy to forget create their before use. From owner-svn-src-all@FreeBSD.ORG Wed Aug 27 18:49:42 2014 Return-Path: Delivered-To: svn-src-all@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 ESMTPS id 01F623E3; Wed, 27 Aug 2014 18:49:42 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DF7123A18; Wed, 27 Aug 2014 18:49:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7RInfBN019104; Wed, 27 Aug 2014 18:49:41 GMT (envelope-from pluknet@FreeBSD.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7RInfxC019099; Wed, 27 Aug 2014 18:49:41 GMT (envelope-from pluknet@FreeBSD.org) Message-Id: <201408271849.s7RInfxC019099@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pluknet set sender to pluknet@FreeBSD.org using -f From: Sergey Kandaurov Date: Wed, 27 Aug 2014 18:49:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r270725 - vendor/tzdata/dist X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 18:49:42 -0000 Author: pluknet Date: Wed Aug 27 18:49:41 2014 New Revision: 270725 URL: http://svnweb.freebsd.org/changeset/base/270725 Log: Vendor import of tzdata2014f. - Russia time zone changes. - New zones: Asia/Chita and Asia/Srednekolymsk. - Lots of changes wrt. time zone abbreviations and historical data. - New zone tab data format. Obtained from: ftp://ftp.iana.org/tz/releases/ Added: vendor/tzdata/dist/zone1970.tab Modified: vendor/tzdata/dist/africa vendor/tzdata/dist/antarctica vendor/tzdata/dist/asia vendor/tzdata/dist/australasia vendor/tzdata/dist/backward vendor/tzdata/dist/etcetera vendor/tzdata/dist/europe vendor/tzdata/dist/factory vendor/tzdata/dist/iso3166.tab vendor/tzdata/dist/leap-seconds.list vendor/tzdata/dist/northamerica vendor/tzdata/dist/pacificnew vendor/tzdata/dist/southamerica vendor/tzdata/dist/systemv vendor/tzdata/dist/yearistype.sh vendor/tzdata/dist/zone.tab Modified: vendor/tzdata/dist/africa ============================================================================== --- vendor/tzdata/dist/africa Wed Aug 27 18:25:14 2014 (r270724) +++ vendor/tzdata/dist/africa Wed Aug 27 18:49:41 2014 (r270725) @@ -1,4 +1,3 @@ -# 
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -35,13 +34,13 @@
 # Previous editions of this database used WAT, CAT, SAT, and EAT
 # for +0:00 through +3:00, respectively,
 # but Mark R V Murray reports that
-# `SAST' is the official abbreviation for +2:00 in the country of South Africa,
-# `CAT' is commonly used for +2:00 in countries north of South Africa, and
-# `WAT' is probably the best name for +1:00, as the common phrase for
-# the area that includes Nigeria is ``West Africa''.
-# He has heard of ``Western Sahara Time'' for +0:00 but can find no reference.
+# 'SAST' is the official abbreviation for +2:00 in the country of South Africa,
+# 'CAT' is commonly used for +2:00 in countries north of South Africa, and
+# 'WAT' is probably the best name for +1:00, as the common phrase for
+# the area that includes Nigeria is "West Africa".
+# He has heard of "Western Sahara Time" for +0:00 but can find no reference.
 #
-# To make things confusing, `WAT' seems to have been used for -1:00 long ago;
+# To make things confusing, 'WAT' seems to have been used for -1:00 long ago;
 # I'd guess that this was because people needed _some_ name for -1:00,
 # and at the time, far west Africa was the only major land area in -1:00.
 # This usage is now obsolete, as the last use of -1:00 on the African
@@ -54,7 +53,7 @@
 #	 2:00	SAST	South Africa Standard Time
 # and Murray suggests the following abbreviation:
 #	 1:00	WAT	West Africa Time
-# I realize that this leads to `WAT' being used for both -1:00 and 1:00
+# I realize that this leads to 'WAT' being used for both -1:00 and 1:00
 # for times before 1976, but this is the best I can think of
 # until we get more information.
 #
@@ -131,9 +130,7 @@ Zone	Africa/Gaborone	1:43:40 -	LMT	1885
 			2:00	-	CAT
 
 # Burkina Faso
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Africa/Ouagadougou	-0:06:04 -	LMT	1912
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Burundi
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -161,7 +158,7 @@ Zone	Africa/Bangui	1:14:20	-	LMT	1912
 
 # Chad
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Ndjamena	1:00:12 -	LMT	1912
+Zone	Africa/Ndjamena	1:00:12 -	LMT	1912 # N'Djamena
 			1:00	-	WAT	1979 Oct 14
 			1:00	1:00	WAST	1980 Mar  8
 			1:00	-	WAT
@@ -183,10 +180,20 @@ Zone Africa/Lubumbashi	1:49:52 -	LMT	189
 Zone Africa/Brazzaville	1:01:08 -	LMT	1912
 			1:00	-	WAT
 
-# Cote D'Ivoire
+# Côte D'Ivoire / Ivory Coast
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Abidjan	-0:16:08 -	LMT	1912
 			 0:00	-	GMT
+Link Africa/Abidjan Africa/Bamako	# Mali
+Link Africa/Abidjan Africa/Banjul	# Gambia
+Link Africa/Abidjan Africa/Conakry	# Guinea
+Link Africa/Abidjan Africa/Dakar	# Senegal
+Link Africa/Abidjan Africa/Freetown	# Sierra Leone
+Link Africa/Abidjan Africa/Lome		# Togo
+Link Africa/Abidjan Africa/Nouakchott	# Mauritania
+Link Africa/Abidjan Africa/Ouagadougou	# Burkina Faso
+Link Africa/Abidjan Africa/Sao_Tome	# São Tomé and Príncipe
+Link Africa/Abidjan Atlantic/St_Helena	# St Helena
 
 # Djibouti
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -231,13 +238,9 @@ Rule	Egypt	1990	1994	-	May	 1	1:00	1:00	
 # Egyptians would approve the cancellation."
 #
 # Egypt to cancel daylight saving time
-# 
 # http://www.almasryalyoum.com/en/node/407168
-# 
 # or
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_egypt04.html
-# 
 Rule	Egypt	1995	2010	-	Apr	lastFri	 0:00s	1:00	S
 Rule	Egypt	1995	2005	-	Sep	lastThu	24:00	0	-
 # From Steffen Thorsen (2006-09-19):
@@ -249,7 +252,7 @@ Rule	Egypt	2006	only	-	Sep	21	24:00	0	-
 # From Dirk Losch (2007-08-14):
 # I received a mail from an airline which says that the daylight
 # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07.
-# From Jesper Norgaard Welen (2007-08-15): [The following agree:]
+# From Jesper Nørgaard Welen (2007-08-15): [The following agree:]
 # http://www.nentjes.info/Bill/bill5.htm
 # http://www.timeanddate.com/worldclock/city.html?n=53
 # From Steffen Thorsen (2007-09-04): The official information...:
@@ -288,15 +291,9 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	24:00	
 #
 # timeanddate[2] and another site I've found[3] also support that.
 #
-# [1] 
-# https://bugzilla.redhat.com/show_bug.cgi?id=492263
-# 
-# [2] 
-# http://www.timeanddate.com/worldclock/clockchange.html?n=53
-# 
-# [3] 
-# http://wwp.greenwichmeantime.com/time-zone/africa/egypt/
-# 
+# [1] https://bugzilla.redhat.com/show_bug.cgi?id=492263
+# [2] http://www.timeanddate.com/worldclock/clockchange.html?n=53
+# [3] http://wwp.greenwichmeantime.com/time-zone/africa/egypt/
 
 # From Arthur David Olson (2009-04-20):
 # In 2009 (and for the next several years), Ramadan ends before the fourth
@@ -306,14 +303,10 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	24:00	
 # From Steffen Thorsen (2009-08-11):
 # We have been able to confirm the August change with the Egyptian Cabinet
 # Information and Decision Support Center:
-# 
 # http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html
-# 
 #
 # The Middle East News Agency
-# 
 # http://www.mena.org.eg/index.aspx
-# 
 # also reports "Egypt starts winter time on August 21"
 # today in article numbered "71, 11/08/2009 12:25 GMT."
 # Only the title above is available without a subscription to their service,
@@ -321,19 +314,14 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	24:00	
 # (at least today).
 
 # From Alexander Krivenyshev (2010-07-20):
-# According to News from Egypt -  Al-Masry Al-Youm Egypt's cabinet has
+# According to News from Egypt - Al-Masry Al-Youm Egypt's cabinet has
 # decided that Daylight Saving Time will not be used in Egypt during
 # Ramadan.
 #
 # Arabic translation:
-# "Clocks to go back during Ramadan--and then forward again"
-# 
+# "Clocks to go back during Ramadan - and then forward again"
 # http://www.almasryalyoum.com/en/news/clocks-go-back-during-ramadan-and-then-forward-again
-# 
-# or
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_egypt02.html
-# 
 
 # From Ahmad El-Dardiry (2014-05-07):
 # Egypt is to change back to Daylight system on May 15
@@ -433,10 +421,15 @@ Zone	Africa/Asmara	2:35:32 -	LMT	1870
 			3:00	-	EAT
 
 # Ethiopia
-# From Paul Eggert (2006-03-22):
-# Shanks & Pottenger write that Ethiopia had six narrowly-spaced time zones
-# between 1870 and 1890, and that they merged to 38E50 (2:35:20) in 1890.
-# We'll guess that 38E50 is for Adis Dera.
+# From Paul Eggert (2014-07-31):
+# Like the Swahili of Kenya and Tanzania, many Ethiopians keep a
+# 12-hour clock starting at our 06:00, so their "8 o'clock" is our
+# 02:00 or 14:00.  Keep this in mind when you ask the time in Amharic.
+#
+# Shanks & Pottenger write that Ethiopia had six narrowly-spaced time
+# zones between 1870 and 1890, that they merged to 38E50 (2:35:20) in
+# 1890, and that they switched to 3:00 on 1936-05-05.  Perhaps 38E50
+# was for Adis Dera.  Quite likely the Shanks data are wrong anyway.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Addis_Ababa	2:34:48 -	LMT	1870
 			2:35:20	-	ADMT	1936 May 5    # Adis Dera MT
@@ -448,28 +441,24 @@ Zone Africa/Libreville	0:37:48 -	LMT	191
 			1:00	-	WAT
 
 # Gambia
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Banjul	-1:06:36 -	LMT	1912
-			-1:06:36 -	BMT	1935	# Banjul Mean Time
-			-1:00	-	WAT	1964
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Ghana
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-# Whitman says DST was observed from 1931 to ``the present'';
-# go with Shanks & Pottenger.
-Rule	Ghana	1936	1942	-	Sep	 1	0:00	0:20	GHST
-Rule	Ghana	1936	1942	-	Dec	31	0:00	0	GMT
+# Whitman says DST was observed from 1931 to "the present";
+# Shanks & Pottenger say 1936 to 1942;
+# and September 1 to January 1 is given by:
+# Scott Keltie J, Epstein M (eds), The Statesman's Year-Book,
+# 57th ed. Macmillan, London (1920), OCLC 609408015, pp xxviii.
+# For lack of better info, assume DST was observed from 1920 to 1942.
+Rule	Ghana	1920	1942	-	Sep	 1	0:00	0:20	GHST
+Rule	Ghana	1920	1942	-	Dec	31	0:00	0	GMT
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Accra	-0:00:52 -	LMT	1918
 			 0:00	Ghana	%s
 
 # Guinea
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Conakry	-0:54:52 -	LMT	1912
-			 0:00	-	GMT	1934 Feb 26
-			-1:00	-	WAT	1960
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Guinea-Bissau
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -577,18 +566,8 @@ Zone	Africa/Blantyre	2:20:00 -	LMT	1903 
 			2:00	-	CAT
 
 # Mali
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Bamako	-0:32:00 -	LMT	1912
-			 0:00	-	GMT	1934 Feb 26
-			-1:00	-	WAT	1960 Jun 20
-			 0:00	-	GMT
-
 # Mauritania
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Africa/Nouakchott	-1:03:48 -	LMT	1912
-			 0:00	-	GMT	1934 Feb 26
-			-1:00	-	WAT	1960 Nov 28
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Mauritius
 
@@ -612,9 +591,7 @@ Zone Africa/Nouakchott	-1:03:48 -	LMT	19
 
 # From Steffen Thorsen (2008-07-10):
 # According to
-# 
 # http://www.lexpress.mu/display_article.php?news_id=111216
-# 
 # (in French), Mauritius will start and end their DST a few days earlier
 # than previously announced (2008-11-01 to 2009-03-31).  The new start
 # date is 2008-10-26 at 02:00 and the new end date is 2009-03-27 (no time
@@ -633,18 +610,13 @@ Zone Africa/Nouakchott	-1:03:48 -	LMT	19
 # published on Monday, June 30, 2008...
 #
 # I guess that article in French "Le gouvernement avance l'introduction
-# de l'heure d'ete" stating that DST in Mauritius starting on October 26
-# and ending on March 27, 2009 is the most recent one.
-# ...
-# 
+# de l'heure d'été" stating that DST in Mauritius starting on October 26
+# and ending on March 27, 2009 is the most recent one....
 # http://www.worldtimezone.com/dst_news/dst_news_mauritius02.html
-# 
 
 # From Riad M. Hossen Ally (2008-08-03):
 # The Government of Mauritius weblink
-# 
 # http://www.gov.mu/portal/site/pmosite/menuitem.4ca0efdee47462e7440a600248a521ca/?content_id=4728ca68b2a5b110VgnVCM1000000a04a8c0RCRD
-# 
 # Cabinet Decision of July 18th, 2008 states as follows:
 #
 # 4. ...Cabinet has agreed to the introduction into the National Assembly
@@ -654,33 +626,25 @@ Zone Africa/Nouakchott	-1:03:48 -	LMT	19
 # States of America. It will start at two o'clock in the morning on the
 # last Sunday of October and will end at two o'clock in the morning on
 # the last Sunday of March the following year. The summer time for the
-# year 2008 - 2009 will, therefore, be effective as from 26 October 2008
+# year 2008-2009 will, therefore, be effective as from 26 October 2008
 # and end on 29 March 2009.
 
 # From Ed Maste (2008-10-07):
 # THE TIME BILL (No. XXVII of 2008) Explanatory Memorandum states the
 # beginning / ending of summer time is 2 o'clock standard time in the
 # morning of the last Sunday of October / last Sunday of March.
-# 
 # http://www.gov.mu/portal/goc/assemblysite/file/bill2708.pdf
-# 
 
 # From Steffen Thorsen (2009-06-05):
 # According to several sources, Mauritius will not continue to observe
 # DST the coming summer...
 #
 # Some sources, in French:
-# 
 # http://www.defimedia.info/news/946/Rashid-Beebeejaun-:-%C2%AB-L%E2%80%99heure-d%E2%80%99%C3%A9t%C3%A9-ne-sera-pas-appliqu%C3%A9e-cette-ann%C3%A9e-%C2%BB
-# 
-# 
 # http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-%C3%A9conomie-d-%C3%A9nergie-de-l-heure-d-%C3%A9t%C3%A9-ont-%C3%A9t%C3%A9-atteints-
-# 
 #
 # Our wrap-up:
-# 
 # http://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html
-# 
 
 # From Arthur David Olson (2009-07-11):
 # The "mauritius-dst-will-not-repeat" wrapup includes this:
@@ -704,7 +668,7 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 			3:00	-	EAT
 
 # Morocco
-# See the `europe' file for Spanish Morocco (Africa/Ceuta).
+# See the 'europe' file for Spanish Morocco (Africa/Ceuta).
 
 # From Alex Krivenyshev (2008-05-09):
 # Here is an article that Morocco plan to introduce Daylight Saving Time between
@@ -712,60 +676,43 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 #
 # "... Morocco is to save energy by adjusting its clock during summer so it will
 # be one hour ahead of GMT between 1 June and 27 September, according to
-# Communication Minister and Gov ernment Spokesman, Khalid Naciri...."
+# Communication Minister and Government Spokesman, Khalid Naciri...."
 #
-# 
 # http://www.worldtimezone.net/dst_news/dst_news_morocco01.html
-# 
-# OR
-# 
 # http://en.afrik.com/news11892.html
-# 
 
 # From Alex Krivenyshev (2008-05-09):
 # The Morocco time change can be confirmed on Morocco web site Maghreb Arabe Presse:
-# 
 # http://www.map.ma/eng/sections/box3/morocco_shifts_to_da/view
-# 
 #
 # Morocco shifts to daylight time on June 1st through September 27, Govt.
 # spokesman.
 
 # From Patrice Scattolin (2008-05-09):
 # According to this article:
-# 
 # http://www.avmaroc.com/actualite/heure-dete-comment-a127896.html
-# 
-# (and republished here:
-# 
-# http://www.actu.ma/heure-dete-comment_i127896_0.html
-# 
-# )
-# the changes occurs at midnight:
-#
-# saturday night may 31st at midnight (which in french is to be
-# intrepreted as the night between saturday and sunday)
-# sunday night the 28th  at midnight
-#
-# Seeing that the 28th is monday, I am guessing that she intends to say
-# the midnight of the 28th which is the midnight between sunday and
-# monday, which jives with other sources that say that it's inclusive
-# june1st to sept 27th.
+# (and republished here: )
+# the changes occur at midnight:
+#
+# Saturday night May 31st at midnight (which in French is to be
+# interpreted as the night between Saturday and Sunday)
+# Sunday night the 28th at midnight
+#
+# Seeing that the 28th is Monday, I am guessing that she intends to say
+# the midnight of the 28th which is the midnight between Sunday and
+# Monday, which jives with other sources that say that it's inclusive
+# June 1st to Sept 27th.
 #
 # The decision was taken by decree *2-08-224 *but I can't find the decree
 # published on the web.
 #
 # It's also confirmed here:
-# 
 # http://www.maroc.ma/NR/exeres/FACF141F-D910-44B0-B7FA-6E03733425D1.htm
-# 
-# on a government portal as being  between june 1st and sept 27th (not yet
-# posted in english).
+# on a government portal as being between June 1st and Sept 27th (not yet
+# posted in English).
 #
-# The following google query will generate many relevant hits:
-# 
+# The following Google query will generate many relevant hits:
 # http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search
-# 
 
 # From Steffen Thorsen (2008-08-27):
 # Morocco will change the clocks back on the midnight between August 31
@@ -773,47 +720,32 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 # of September:
 #
 # One article about it (in French):
-# 
 # http://www.menara.ma/fr/Actualites/Maroc/Societe/ci.retour_a_l_heure_gmt_a_partir_du_dimanche_31_aout_a_minuit_officiel_.default
-# 
 #
 # We have some further details posted here:
-# 
 # http://www.timeanddate.com/news/time/morocco-ends-dst-early-2008.html
-# 
 
 # From Steffen Thorsen (2009-03-17):
 # Morocco will observe DST from 2009-06-01 00:00 to 2009-08-21 00:00 according
 # to many sources, such as
-# 
 # http://news.marweb.com/morocco/entertainment/morocco-daylight-saving.html
-# 
-# 
 # http://www.medi1sat.ma/fr/depeche.aspx?idp=2312
-# 
 # (French)
 #
 # Our summary:
-# 
 # http://www.timeanddate.com/news/time/morocco-starts-dst-2009.html
-# 
 
 # From Alexander Krivenyshev (2009-03-17):
 # Here is a link to official document from Royaume du Maroc Premier Ministre,
-# Ministere de la Modernisation des Secteurs Publics
+# Ministère de la Modernisation des Secteurs Publics
 #
 # Under Article 1 of Royal Decree No. 455-67 of Act 23 safar 1387 (2 june 1967)
 # concerning the amendment of the legal time, the Ministry of Modernization of
 # Public Sectors announced that the official time in the Kingdom will be
 # advanced 60 minutes from Sunday 31 May 2009 at midnight.
 #
-# 
 # http://www.mmsp.gov.ma/francais/Actualites_fr/PDF_Actualites_Fr/HeureEte_FR.pdf
-# 
-#
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_morocco03.html
-# 
 
 # From Steffen Thorsen (2010-04-13):
 # Several news media in Morocco report that the Ministry of Modernization
@@ -821,14 +753,10 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 # 2010-05-02 to 2010-08-08.
 #
 # Example:
-# 
 # http://www.lavieeco.com/actualites/4099-le-maroc-passera-a-l-heure-d-ete-gmt1-le-2-mai.html
-# 
 # (French)
 # Our page:
-# 
 # http://www.timeanddate.com/news/time/morocco-starts-dst-2010.html
-# 
 
 # From Dan Abitol (2011-03-30):
 # ...Rules for Africa/Casablanca are the following (24h format)
@@ -838,34 +766,20 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 # The change was broadcast on the FM Radio
 # I ve called ANRT (telecom regulations in Morocco) at
 # +212.537.71.84.00
-# 
 # http://www.anrt.net.ma/fr/
-# 
 # They said that
-# 
 # http://www.map.ma/fr/sections/accueil/l_heure_legale_au_ma/view
-# 
 # is the official publication to look at.
 # They said that the decision was already taken.
 #
 # More articles in the press
-# 
-# http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-lev
-# 
-# e.html
-# 
+# http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-leve.html
 # http://www.lematin.ma/Actualite/Express/Article.asp?id=148923
-# 
-# 
 # http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT%2B1-a-partir-de-dim
-# anche-prochain-5538.html
-# 
 
 # From Petr Machata (2011-03-30):
 # They have it written in English here:
-# 
 # http://www.map.ma/eng/sections/home/morocco_to_spring_fo/view
-# 
 #
 # It says there that "Morocco will resume its standard time on July 31,
 # 2011 at midnight." Now they don't say whether they mean midnight of
@@ -873,20 +787,16 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 # also been like that in the past.
 
 # From Alexander Krivenyshev (2012-03-09):
-# According to Infomédiaire web site from Morocco (infomediaire.ma),
-# on March 9, 2012, (in French) Heure légale:
-# Le Maroc adopte officiellement l'heure d'été
-# 
+# According to Infomédiaire web site from Morocco (infomediaire.ma),
+# on March 9, 2012, (in French) Heure légale:
+# Le Maroc adopte officiellement l'heure d'été
 # http://www.infomediaire.ma/news/maroc/heure-l%C3%A9gale-le-maroc-adopte-officiellement-lheure-d%C3%A9t%C3%A9
-# 
 # Governing Council adopted draft decree, that Morocco DST starts on
 # the last Sunday of March (March 25, 2012) and ends on
 # last Sunday of September (September 30, 2012)
 # except the month of Ramadan.
 # or (brief)
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_morocco06.html
-# 
 
 # From Arthur David Olson (2012-03-10):
 # The infomediaire.ma source indicates that the system is to be in
@@ -897,17 +807,13 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 
 # From Christophe Tropamer (2012-03-16):
 # Seen Morocco change again:
-# 
 # http://www.le2uminutes.com/actualite.php
-# 
-# "...à partir du dernier dimance d'avril et non fins mars,
-# comme annoncé précédemment."
+# "...à partir du dernier dimanche d'avril et non fins mars,
+# comme annoncé précédemment."
 
 # From Milamber Space Network (2012-07-17):
 # The official return to GMT is announced by the Moroccan government:
-# 
 # http://www.mmsp.gov.ma/fr/actualites.aspx?id=288 [in French]
-# 
 #
 # Google translation, lightly edited:
 # Back to the standard time of the Kingdom (GMT)
@@ -1052,7 +958,7 @@ Zone Africa/Casablanca	-0:30:20 -	LMT	19
 # Assume that this has been true since Western Sahara switched to GMT,
 # since most of it was then controlled by Morocco.
 
-Zone Africa/El_Aaiun	-0:52:48 -	LMT	1934 Jan
+Zone Africa/El_Aaiun	-0:52:48 -	LMT	1934 Jan # El Aaiún
 			-1:00	-	WAT	1976 Apr 14
 			 0:00	Morocco	WE%sT
 
@@ -1102,15 +1008,17 @@ Zone	Africa/Niamey	 0:08:28 -	LMT	1912
 Zone	Africa/Lagos	0:13:36 -	LMT	1919 Sep
 			1:00	-	WAT
 
-# Reunion
+# Réunion
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Indian/Reunion	3:41:52 -	LMT	1911 Jun	# Saint-Denis
-			4:00	-	RET	# Reunion Time
+			4:00	-	RET	# Réunion Time
 #
-# Scattered Islands (Iles Eparses) administered from Reunion are as follows.
+# Crozet Islands also observes Réunion time; see the 'antarctica' file.
+#
+# Scattered Islands (Îles Éparses) administered from Réunion are as follows.
 # The following information about them is taken from
-# Iles Eparses (www.outre-mer.gouv.fr/domtom/ile.htm, 1997-07-22, in French;
-# no longer available as of 1999-08-17).
+# Îles Éparses (, 1997-07-22,
+# in French; no longer available as of 1999-08-17).
 # We have no info about their time zone histories.
 #
 # Bassas da India - uninhabited
@@ -1125,28 +1033,17 @@ Zone	Africa/Kigali	2:00:16 -	LMT	1935 Ju
 			2:00	-	CAT
 
 # St Helena
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Atlantic/St_Helena	-0:22:48 -	LMT	1890		# Jamestown
-			-0:22:48 -	JMT	1951	# Jamestown Mean Time
-			 0:00	-	GMT
+# See Africa/Abidjan.
 # The other parts of the St Helena territory are similar:
 #	Tristan da Cunha: on GMT, say Whitman and the CIA
-#	Ascension: on GMT, says usno1995 and the CIA
+#	Ascension: on GMT, say the USNO (1995-12-21) and the CIA
 #	Gough (scientific station since 1955; sealers wintered previously):
 #		on GMT, says the CIA
-#	Inaccessible, Nightingale: no information, but probably GMT
-
-# Sao Tome and Principe
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Sao_Tome	 0:26:56 -	LMT	1884
-			-0:36:32 -	LMT	1912	# Lisbon Mean Time
-			 0:00	-	GMT
+#	Inaccessible, Nightingale: uninhabited
 
+# São Tomé and Príncipe
 # Senegal
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Dakar	-1:09:44 -	LMT	1912
-			-1:00	-	WAT	1941 Jun
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Seychelles
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1160,17 +1057,7 @@ Zone	Indian/Mahe	3:41:48 -	LMT	1906 Jun	
 # Possibly the islands were uninhabited.
 
 # Sierra Leone
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-# Whitman gives Mar 31 - Aug 31 for 1931 on; go with Shanks & Pottenger.
-Rule	SL	1935	1942	-	Jun	 1	0:00	0:40	SLST
-Rule	SL	1935	1942	-	Oct	 1	0:00	0	WAT
-Rule	SL	1957	1962	-	Jun	 1	0:00	1:00	SLST
-Rule	SL	1957	1962	-	Sep	 1	0:00	0	GMT
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Freetown	-0:53:00 -	LMT	1882
-			-0:53:00 -	FMT	1913 Jun # Freetown Mean Time
-			-1:00	SL	%s	1957
-			 0:00	SL	%s
+# See Africa/Abidjan.
 
 # Somalia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1193,9 +1080,9 @@ Zone Africa/Johannesburg 1:52:00 -	LMT	1
 
 # Sudan
 #
-# From 
-# Sudan News Agency (2000-01-13)
-# , also reported by Michael De Beukelaer-Dossche via Steffen Thorsen:
+# From 
+# Sudan News Agency (2000-01-13),
+# also reported by Michaël De Beukelaer-Dossche via Steffen Thorsen:
 # Clocks will be moved ahead for 60 minutes all over the Sudan as of noon
 # Saturday....  This was announced Thursday by Caretaker State Minister for
 # Manpower Abdul-Rahman Nur-Eddin.
@@ -1226,14 +1113,12 @@ Zone Africa/Dar_es_Salaam 2:37:08 -	LMT	
 			3:00	-	EAT
 
 # Togo
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Lome	0:04:52 -	LMT	1893
-			0:00	-	GMT
+# See Africa/Abidjan.
 
 # Tunisia
 
 # From Gwillim Law (2005-04-30):
-# My correspondent, Risto Nykanen, has alerted me to another adoption of DST,
+# My correspondent, Risto Nykänen, has alerted me to another adoption of DST,
 # this time in Tunisia.  According to Yahoo France News
 # , in a story attributed to AP
 # and dated 2005-04-26, "Tunisia has decided to advance its official time by
@@ -1242,7 +1127,7 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
 # Saturday."  (My translation)
 #
 # From Oscar van Vlijmen (2005-05-02):
-# LaPresse, the first national daily newspaper ...
+# La Presse, the first national daily newspaper ...
 # 
 # ... DST for 2005: on: Sun May 1 0h standard time, off: Fri Sept. 30,
 # 1h standard time.
@@ -1256,18 +1141,12 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
 # From Steffen Thorsen (2009-03-16):
 # According to several news sources, Tunisia will not observe DST this year.
 # (Arabic)
-# 
 # http://www.elbashayer.com/?page=viewn&nid=42546
-# 
-# 
 # http://www.babnet.net/kiwidetail-15295.asp
-# 
 #
 # We have also confirmed this with the US embassy in Tunisia.
 # We have a wrap-up about this on the following page:
-# 
 # http://www.timeanddate.com/news/time/tunisia-cancels-dst-2009.html
-# 
 
 # From Alexander Krivenyshev (2009-03-17):
 # Here is a link to Tunis Afrique Presse News Agency
@@ -1275,20 +1154,17 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
 # Standard time to be kept the whole year long (tap.info.tn):
 #
 # (in English)
-# 
 # http://www.tap.info.tn/en/index.php?option=com_content&task=view&id=26813&Itemid=157
-# 
 #
 # (in Arabic)
-# 
 # http://www.tap.info.tn/ar/index.php?option=com_content&task=view&id=61240&Itemid=1
-# 
 
-# From Arthur David Olson (2009--3-18):
-# The Tunis Afrique Presse News Agency notice contains this: "This measure is due to the fact
-# that the fasting month of ramadan coincides with the period concerned by summer time.
-# Therefore, the standard time will be kept unchanged the whole year long."
-# So foregoing DST seems to be an exception (albeit one that may be repeated in the  future).
+# From Arthur David Olson (2009-03-18):
+# The Tunis Afrique Presse News Agency notice contains this: "This measure is
+# due to the fact that the fasting month of Ramadan coincides with the period
+# concerned by summer time.  Therefore, the standard time will be kept
+# unchanged the whole year long."  So foregoing DST seems to be an exception
+# (albeit one that may be repeated in the future).
 
 # From Alexander Krivenyshev (2010-03-27):
 # According to some news reports Tunis confirmed not to use DST in 2010
@@ -1300,12 +1176,8 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
 # coincided with the month of Ramadan..."
 #
 # (in Arabic)
-# 
 # http://www.moheet.com/show_news.aspx?nid=358861&pg=1
-# 
 # http://www.almadenahnews.com/newss/news.php?c=118&id=38036
-# or
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_tunis02.html
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S

Modified: vendor/tzdata/dist/antarctica
==============================================================================
--- vendor/tzdata/dist/antarctica	Wed Aug 27 18:25:14 2014	(r270724)
+++ vendor/tzdata/dist/antarctica	Wed Aug 27 18:49:41 2014	(r270725)
@@ -1,16 +1,13 @@
-# 
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
 # From Paul Eggert (1999-11-15):
 # To keep things manageable, we list only locations occupied year-round; see
-# 
 # COMNAP - Stations and Bases
-# 
+# 
 # and
-# 
 # Summary of the Peri-Antarctic Islands (1998-07-23)
-# 
+# 
 # for information.
 # Unless otherwise specified, we have no time zone information.
 #
@@ -55,19 +52,19 @@ Rule	ChileAQ	2012	max	-	Sep	Sun>=2	4:00u
 
 # Argentina - year-round bases
 # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05
-# Esperanza, San Martin Land, -6323-05659, since 1952-12-17
-# Jubany, Potter Peninsula, King George Island, -6414-0602320, since 1982-01
-# Marambio, Seymour I, -6414-05637, since 1969-10-29
+# Carlini, Potter Cove, King George Island, -6414-0602320, since 1982-01
+# Esperanza, Hope Bay, -6323-05659, since 1952-12-17
+# Marambio, -6414-05637, since 1969-10-29
 # Orcadas, Laurie I, -6016-04444, since 1904-02-22
-# San Martin, Debenham I, -6807-06708, since 1951-03-21
+# San Martín, Barry I, -6808-06706, since 1951-03-21
 #	(except 1960-03 / 1976-03-21)
 
 # Australia - territories
 # Heard Island, McDonald Islands (uninhabited)
 #	previously sealers and scientific personnel wintered
-#	
 #	Margaret Turner reports
-#	 (1999-09-30) that they're UTC+5, with no DST;
+#	
+#	(1999-09-30) that they're UTC+5, with no DST;
 #	presumably this is when they have visitors.
 #
 # year-round bases
@@ -84,14 +81,10 @@ Rule	ChileAQ	2012	max	-	Sep	Sun>=2	4:00u
 # The changes occurred on 2009-10-18 at 02:00 (local times).
 #
 # Government source: (Australian Antarctic Division)
-# 
 # http://www.aad.gov.au/default.asp?casid=37079
-# 
 #
 # We have more background information here:
-# 
 # http://www.timeanddate.com/news/time/antarctica-new-times.html
-# 
 
 # From Steffen Thorsen (2010-03-10):
 # We got these changes from the Australian Antarctic Division: ...
@@ -106,19 +99,17 @@ Rule	ChileAQ	2012	max	-	Sep	Sun>=2	4:00u
 # - Mawson station stays on UTC+5.
 #
 # Background:
-# 
 # http://www.timeanddate.com/news/time/antartica-time-changes-2010.html
-# 
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Antarctica/Casey	0	-	zzz	1969
-			8:00	-	WST	2009 Oct 18 2:00
-						# Western (Aus) Standard Time
+			8:00	-	AWST	2009 Oct 18 2:00
+						# Australian Western Std Time
 			11:00	-	CAST	2010 Mar 5 2:00
 						# Casey Time
-			8:00	-	WST	2011 Oct 28 2:00
+			8:00	-	AWST	2011 Oct 28 2:00
 			11:00	-	CAST	2012 Feb 21 17:00u
-			8:00	-	WST
+			8:00	-	AWST
 Zone Antarctica/Davis	0	-	zzz	1957 Jan 13
 			7:00	-	DAVT	1964 Nov # Davis Time
 			0	-	zzz	1969 Feb
@@ -132,24 +123,27 @@ Zone Antarctica/Mawson	0	-	zzz	1954 Feb 
 						# Mawson Time
 			5:00	-	MAWT
 # References:
-# 
 # Casey Weather (1998-02-26)
-# 
-# 
+# 
 # Davis Station, Antarctica (1998-02-26)
-# 
-# 
+# 
 # Mawson Station, Antarctica (1998-02-25)
-# 
+# 
+
+# Belgium - year-round base
+# Princess Elisabeth, Queen Maud Land, -713412+0231200, since 2007
 
 # Brazil - year-round base
-# Comandante Ferraz, King George Island, -6205+05824, since 1983/4
+# Ferraz, King George Island, -6205+05824, since 1983/4
+
+# Bulgaria - year-round base
+# St. Kliment Ohridski, Livingston Island, -623829-0602153, since 1988
 
 # Chile - year-round bases and towns
 # Escudero, South Shetland Is, -621157-0585735, since 1994
-# Presidente Eduadro Frei, King George Island, -6214-05848, since 1969-03-07
-# General Bernardo O'Higgins, Antarctic Peninsula, -6319-05704, since 1948-02
-# Capitan Arturo Prat, -6230-05941
+# Frei Montalva, King George Island, -6214-05848, since 1969-03-07
+# O'Higgins, Antarctic Peninsula, -6319-05704, since 1948-02
+# Prat, -6230-05941
 # Villa Las Estrellas (a town), around the Frei base, since 1984-04-09
 # These locations have always used Santiago time; use TZ='America/Santiago'.
 
@@ -157,31 +151,35 @@ Zone Antarctica/Mawson	0	-	zzz	1954 Feb 
 # Great Wall, King George Island, -6213-05858, since 1985-02-20
 # Zhongshan, Larsemann Hills, Prydz Bay, -6922+07623, since 1989-02-26
 
-# France - year-round bases
+# France - year-round bases (also see "France & Italy")
 #
 # From Antoine Leca (1997-01-20):
 # Time data are from Nicole Pailleau at the IFRTP
 # (French Institute for Polar Research and Technology).
-# She confirms that French Southern Territories and Terre Adelie bases
-# don't observe daylight saving time, even if Terre Adelie supplies came
+# She confirms that French Southern Territories and Terre Adélie bases
+# don't observe daylight saving time, even if Terre Adélie supplies came
 # from Tasmania.
 #
 # French Southern Territories with year-round inhabitants
 #
-# Martin-de-Vivies Base, Amsterdam Island, -374105+0773155, since 1950
-# Alfred-Faure Base, Crozet Islands, -462551+0515152, since 1964
-# Port-aux-Francais, Kerguelen Islands, -492110+0701303, since 1951;
+# Alfred Faure, Possession Island, Crozet Islands, -462551+0515152, since 1964;
+#	sealing & whaling stations operated variously 1802/1911+;
+#	see Indian/Reunion.
+#
+# Martin-de-Viviès, Amsterdam Island, -374105+0773155, since 1950
+# Port-aux-Français, Kerguelen Islands, -492110+0701303, since 1951;
 #	whaling & sealing station operated 1908/1914, 1920/1929, and 1951/1956
 #
 # St Paul Island - near Amsterdam, uninhabited
 #	fishing stations operated variously 1819/1931
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Indian/Kerguelen	0	-	zzz	1950	# Port-aux-Francais
+Zone Indian/Kerguelen	0	-	zzz	1950	# Port-aux-Français
 			5:00	-	TFT	# ISO code TF Time
 #
 # year-round base in the main continent
-# Dumont-d'Urville, Ile des Petrels, -6640+14001, since 1956-11
+# Dumont d'Urville, Île des Pétrels, -6640+14001, since 1956-11
+#  (2005-12-05)
 #
 # Another base at Port-Martin, 50km east, began operation in 1947.
 # It was destroyed by fire on 1952-01-14.
@@ -191,20 +189,22 @@ Zone Antarctica/DumontDUrville 0 -	zzz	1
 			10:00	-	PMT	1952 Jan 14 # Port-Martin Time
 			0	-	zzz	1956 Nov
 			10:00	-	DDUT	# Dumont-d'Urville Time
-# Reference:
-# 
-# Dumont d'Urville Station (2005-12-05)
-# 
+
+# France & Italy - year-round base
+# Concordia, -750600+1232000, since 2005
 
 # Germany - year-round base
-# Georg von Neumayer, -7039-00815
+# Neumayer III, -704080-0081602, since 2009
 
-# India - year-round base
-# Dakshin Gangotri, -7005+01200
+# India - year-round bases
+# Bharati, -692428+0761114, since 2012
+# Maitri, -704558+0114356, since 1989
+
+# Italy - year-round base (also see "France & Italy")
+# Zuchelli, Terra Nova Bay, -744140+1640647, since 1986
 
 # Japan - year-round bases
-# Dome Fuji, -7719+03942
-# Syowa, -690022+0393524
+# Syowa (also known as Showa), -690022+0393524, since 1957
 #
 # From Hideyuki Suzuki (1999-02-06):
 # In all Japanese stations, +0300 is used as the standard time.
@@ -216,11 +216,11 @@ Zone Antarctica/DumontDUrville 0 -	zzz	1
 Zone Antarctica/Syowa	0	-	zzz	1957 Jan 29
 			3:00	-	SYOT	# Syowa Time
 # See:
-# 
 # NIPR Antarctic Research Activities (1999-08-17)
-# 
+# 
 
 # S Korea - year-round base
+# Jang Bogo, Terra Nova Bay, -743700+1641205 since 2014
 # King Sejong, King George Island, -6213-05847, since 1988
 
 # New Zealand - claims
@@ -269,6 +269,9 @@ Zone Antarctica/Troll	0	-	zzz	2005 Feb 1
 # Poland - year-round base
 # Arctowski, King George Island, -620945-0582745, since 1977
 
+# Romania - year-bound base
+# Law-Racoviță, Larsemann Hills, -692319+0762251, since 1986
+
 # Russia - year-round bases
 # Bellingshausen, King George Island, -621159-0585337, since 1968-02-22
 # Mirny, Davis coast, -6633+09301, since 1956-02
@@ -278,8 +281,8 @@ Zone Antarctica/Troll	0	-	zzz	2005 Feb 1
 #	year-round from 1960/61 to 1992
 
 # Vostok, since 1957-12-16, temporarily closed 1994-02/1994-11
-# 
-# From Craig Mundell (1994-12-15):
+# From Craig Mundell (1994-12-15)
+# :
 # Vostok, which is one of the Russian stations, is set on the same
 # time as Moscow, Russia.
 #
@@ -294,7 +297,7 @@ Zone Antarctica/Troll	0	-	zzz	2005 Feb 1
 #
 # From Paul Eggert (2001-05-04):
 # This seems to be hopelessly confusing, so I asked Lee Hotz about it
-# in person.  He said that some Antartic locations set their local
+# in person.  He said that some Antarctic locations set their local
 # time so that noon is the warmest part of the day, and that this
 # changes during the year and does not necessarily correspond to mean
 # solar noon.  So the Vostok time might have been whatever the clocks
@@ -306,9 +309,12 @@ Zone Antarctica/Vostok	0	-	zzz	1957 Dec 
 
 # S Africa - year-round bases
 # Marion Island, -4653+03752
-# Sanae, -7141-00250
+# SANAE IV, Vesleskarvet, Queen Maud Land, -714022-0025026, since 1997
+
+# Ukraine - year-round base
+# Vernadsky (formerly Faraday), Galindez Island, -651445-0641526, since 1954
 
-# UK
+# United Kingdom
 #
 # British Antarctic Territories (BAT) claims
 # South Orkney Islands
@@ -364,7 +370,7 @@ Zone Antarctica/Palmer	0	-	zzz	1965
 # but that he found it more convenient to keep GMT+12
 # as supplies for the station were coming from McMurdo Sound,
 # which was on GMT+12 because New Zealand was on GMT+12 all year
-# at that time (1957).  (Source: Siple's book 90 degrees SOUTH.)
+# at that time (1957).  (Source: Siple's book 90 Degrees South.)
 #
 # From Susan Smith
 # http://www.cybertours.com/whs/pole10.html

Modified: vendor/tzdata/dist/asia
==============================================================================
--- vendor/tzdata/dist/asia	Wed Aug 27 18:25:14 2014	(r270724)
+++ vendor/tzdata/dist/asia	Wed Aug 27 18:49:41 2014	(r270725)
@@ -1,4 +1,3 @@
-# 
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -32,7 +31,7 @@
 # A reliable and entertaining source about time zones is
 # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
 #
-# I invented the abbreviations marked `*' in the following table;
+# I invented the abbreviations marked '*' in the following table;
 # the rest are from earlier versions of this file, or from other sources.
 # Corrections are welcome!
 #	     std  dst
@@ -47,13 +46,14 @@
 #	7:00 WIB	west Indonesia (Waktu Indonesia Barat)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-all@FreeBSD.ORG  Wed Aug 27 18:50:16 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 9BAFE579;
 Wed, 27 Aug 2014 18:50:16 +0000 (UTC)
Received: from mail-qa0-x22b.google.com (mail-qa0-x22b.google.com
 [IPv6:2607:f8b0:400d:c00::22b])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 1A80A3A2A;
 Wed, 27 Aug 2014 18:50:16 +0000 (UTC)
Received: by mail-qa0-f43.google.com with SMTP id w8so625398qac.2
 for ; Wed, 27 Aug 2014 11:50:14 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:date:message-id:subject
 :from:to:cc:content-type;
 bh=hxN1Y5NX/jge+C6ftnDSdYzJ2whGyNZY4H4O8fORlb0=;
 b=yuIWJah/1otzfovaJn8e0BRIJj2SfbmE0OgFbhid62NhgrOfJx7eaouy75OztjRslN
 hTE8iloJ2a3Vr3HVpWGoCCi3W+vKhn+c2IzZUcldCcTSzsCoWU/71WWB6m1YuyC+crWI
 L4Z2doehrS7hJ3G18/ysLfICxtzyQsoCytXRdTt5vuXiZFS95L5x09B1u1darJMDAK+4
 g755M/NjkpD0CFrgOtxRKWTnM6xT6OlS/FXZ3C1dZln6kMr4WR/ZCRPU7odolaI+3HDY
 jS4mndry/UniRtCLTk0VFD8mlEqlldbeJUSxK+J9QZRMumqbH/4vxFUIBL4XkeqAjZlS
 aDQw==
MIME-Version: 1.0
X-Received: by 10.140.22.19 with SMTP id 19mr51938739qgm.18.1409165414134;
 Wed, 27 Aug 2014 11:50:14 -0700 (PDT)
Sender: adrian.chadd@gmail.com
Received: by 10.224.39.139 with HTTP; Wed, 27 Aug 2014 11:50:14 -0700 (PDT)
In-Reply-To: <201408271321.s7RDLr3d069813@svn.freebsd.org>
References: <201408271321.s7RDLr3d069813@svn.freebsd.org>
Date: Wed, 27 Aug 2014 11:50:14 -0700
X-Google-Sender-Auth: MF6WNFj4bboDEVQl3oC1cjTzchY
Message-ID: 
Subject: Re: svn commit: r270710 - in head/sys: contrib/rdma/krping dev/cxgb
 dev/cxgbe/iw_cxgbe modules/mlx4 modules/mlx4ib modules/mlxen
 ofed/drivers/infiniband/core ofed/drivers/infiniband/hw/mlx4 ofed/driver...
From: Adrian Chadd 
To: Hans Petter Selasky 
Content-Type: text/plain; charset=UTF-8
Cc: "svn-src-head@freebsd.org" ,
 "svn-src-all@freebsd.org" ,
 "src-committers@freebsd.org" 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 27 Aug 2014 18:50:16 -0000

Hi!

Did this get reviewed at all?

Removing those files may make it more annoying to port some other
linux code in the future, as some future linux driver code may include
those files.



-a


On 27 August 2014 06:21, Hans Petter Selasky  wrote:
> Author: hselasky
> Date: Wed Aug 27 13:21:53 2014
> New Revision: 270710
> URL: http://svnweb.freebsd.org/changeset/base/270710
>
> Log:
>   - Update the OFED Linux Emulation layer as a preparation for a
>   hardware driver update from Mellanox Technologies.
>   - Remove empty files from the OFED Linux Emulation layer.
>   - Fix compile warnings related to printf() and the "%lld" and "%llx"
>   format specifiers.
>   - Add some missing 2-clause BSD copyrights.
>   - Add "Mellanox Technologies, Ltd." to list of copyright holders.
>   - Add some new compatibility files.
>   - Fix order of uninit in the mlx4ib module to avoid crash at unload
>   using the new module_exit_order() function.
>
>   MFC after:    1 week
>   Sponsored by: Mellanox Technologies
>
> Added:
>   head/sys/ofed/include/linux/cache.h   (contents, props changed)
>   head/sys/ofed/include/linux/etherdevice.h   (contents, props changed)
>   head/sys/ofed/include/linux/kmod.h   (contents, props changed)
>   head/sys/ofed/include/linux/ktime.h   (contents, props changed)
>   head/sys/ofed/include/linux/math64.h   (contents, props changed)
>   head/sys/ofed/include/net/if_inet6.h   (contents, props changed)
> Deleted:
>   head/sys/ofed/include/asm/current.h
>   head/sys/ofed/include/asm/semaphore.h
>   head/sys/ofed/include/asm/system.h
>   head/sys/ofed/include/linux/atomic.h
>   head/sys/ofed/include/linux/bitmap.h
>   head/sys/ofed/include/linux/ctype.h
>   head/sys/ofed/include/linux/init.h
>   head/sys/ofed/include/linux/rtnetlink.h
>   head/sys/ofed/include/linux/stddef.h
>   head/sys/ofed/include/net/addrconf.h
>   head/sys/ofed/include/net/arp.h
>   head/sys/ofed/include/net/ip6_route.h
>   head/sys/ofed/include/net/neighbour.h
> Modified:
>   head/sys/contrib/rdma/krping/krping.c
>   head/sys/dev/cxgb/cxgb_osdep.h
>   head/sys/dev/cxgbe/iw_cxgbe/cm.c
>   head/sys/dev/cxgbe/iw_cxgbe/qp.c
>   head/sys/modules/mlx4/Makefile
>   head/sys/modules/mlx4ib/Makefile
>   head/sys/modules/mlxen/Makefile
>   head/sys/ofed/drivers/infiniband/core/addr.c
>   head/sys/ofed/drivers/infiniband/core/cm.c
>   head/sys/ofed/drivers/infiniband/core/device.c
>   head/sys/ofed/drivers/infiniband/core/iwcm.c
>   head/sys/ofed/drivers/infiniband/core/sa_query.c
>   head/sys/ofed/drivers/infiniband/core/sysfs.c
>   head/sys/ofed/drivers/infiniband/core/ucm.c
>   head/sys/ofed/drivers/infiniband/core/user_mad.c
>   head/sys/ofed/drivers/infiniband/core/uverbs_cmd.c
>   head/sys/ofed/drivers/infiniband/core/uverbs_main.c
>   head/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c
>   head/sys/ofed/drivers/infiniband/hw/mlx4/cm.c
>   head/sys/ofed/drivers/infiniband/hw/mlx4/mad.c
>   head/sys/ofed/drivers/infiniband/hw/mlx4/main.c
>   head/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_ib.h
>   head/sys/ofed/drivers/infiniband/hw/mlx4/mr.c
>   head/sys/ofed/drivers/infiniband/hw/mlx4/qp.c
>   head/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c
>   head/sys/ofed/drivers/infiniband/hw/mthca/mthca_allocator.c
>   head/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c
>   head/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c
>   head/sys/ofed/drivers/infiniband/hw/mthca/mthca_reset.c
>   head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
>   head/sys/ofed/drivers/net/mlx4/alloc.c
>   head/sys/ofed/drivers/net/mlx4/cmd.c
>   head/sys/ofed/drivers/net/mlx4/cq.c
>   head/sys/ofed/drivers/net/mlx4/en_netdev.c
>   head/sys/ofed/drivers/net/mlx4/en_rx.c
>   head/sys/ofed/drivers/net/mlx4/eq.c
>   head/sys/ofed/drivers/net/mlx4/fw.c
>   head/sys/ofed/drivers/net/mlx4/main.c
>   head/sys/ofed/drivers/net/mlx4/mcg.c
>   head/sys/ofed/drivers/net/mlx4/mr.c
>   head/sys/ofed/drivers/net/mlx4/pd.c
>   head/sys/ofed/drivers/net/mlx4/qp.c
>   head/sys/ofed/drivers/net/mlx4/reset.c
>   head/sys/ofed/drivers/net/mlx4/resource_tracker.c
>   head/sys/ofed/drivers/net/mlx4/sense.c
>   head/sys/ofed/drivers/net/mlx4/srq.c
>   head/sys/ofed/drivers/net/mlx4/xrcd.c
>   head/sys/ofed/include/asm/atomic-long.h
>   head/sys/ofed/include/asm/atomic.h
>   head/sys/ofed/include/asm/byteorder.h
>   head/sys/ofed/include/asm/fcntl.h
>   head/sys/ofed/include/asm/io.h
>   head/sys/ofed/include/asm/page.h
>   head/sys/ofed/include/asm/pgtable.h
>   head/sys/ofed/include/asm/types.h
>   head/sys/ofed/include/asm/uaccess.h
>   head/sys/ofed/include/linux/bitops.h
>   head/sys/ofed/include/linux/cdev.h
>   head/sys/ofed/include/linux/clocksource.h
>   head/sys/ofed/include/linux/compat.h
>   head/sys/ofed/include/linux/compiler.h
>   head/sys/ofed/include/linux/completion.h
>   head/sys/ofed/include/linux/delay.h
>   head/sys/ofed/include/linux/device.h
>   head/sys/ofed/include/linux/dma-attrs.h
>   head/sys/ofed/include/linux/dma-mapping.h
>   head/sys/ofed/include/linux/dmapool.h
>   head/sys/ofed/include/linux/err.h
>   head/sys/ofed/include/linux/errno.h
>   head/sys/ofed/include/linux/ethtool.h
>   head/sys/ofed/include/linux/file.h
>   head/sys/ofed/include/linux/fs.h
>   head/sys/ofed/include/linux/gfp.h
>   head/sys/ofed/include/linux/hardirq.h
>   head/sys/ofed/include/linux/idr.h
>   head/sys/ofed/include/linux/if_arp.h
>   head/sys/ofed/include/linux/if_ether.h
>   head/sys/ofed/include/linux/if_vlan.h
>   head/sys/ofed/include/linux/in.h
>   head/sys/ofed/include/linux/in6.h
>   head/sys/ofed/include/linux/inet.h
>   head/sys/ofed/include/linux/inetdevice.h
>   head/sys/ofed/include/linux/interrupt.h
>   head/sys/ofed/include/linux/io-mapping.h
>   head/sys/ofed/include/linux/io.h
>   head/sys/ofed/include/linux/ioctl.h
>   head/sys/ofed/include/linux/jiffies.h
>   head/sys/ofed/include/linux/kdev_t.h
>   head/sys/ofed/include/linux/kernel.h
>   head/sys/ofed/include/linux/kobject.h
>   head/sys/ofed/include/linux/kref.h
>   head/sys/ofed/include/linux/kthread.h
>   head/sys/ofed/include/linux/linux_compat.c
>   head/sys/ofed/include/linux/linux_idr.c
>   head/sys/ofed/include/linux/linux_radix.c
>   head/sys/ofed/include/linux/list.h
>   head/sys/ofed/include/linux/lockdep.h
>   head/sys/ofed/include/linux/log2.h
>   head/sys/ofed/include/linux/miscdevice.h
>   head/sys/ofed/include/linux/mm.h
>   head/sys/ofed/include/linux/module.h
>   head/sys/ofed/include/linux/moduleparam.h
>   head/sys/ofed/include/linux/mount.h
>   head/sys/ofed/include/linux/mutex.h
>   head/sys/ofed/include/linux/net.h
>   head/sys/ofed/include/linux/netdevice.h
>   head/sys/ofed/include/linux/notifier.h
>   head/sys/ofed/include/linux/page.h
>   head/sys/ofed/include/linux/pci.h
>   head/sys/ofed/include/linux/poll.h
>   head/sys/ofed/include/linux/radix-tree.h
>   head/sys/ofed/include/linux/random.h
>   head/sys/ofed/include/linux/rbtree.h
>   head/sys/ofed/include/linux/rwlock.h
>   head/sys/ofed/include/linux/rwsem.h
>   head/sys/ofed/include/linux/scatterlist.h
>   head/sys/ofed/include/linux/sched.h
>   head/sys/ofed/include/linux/semaphore.h
>   head/sys/ofed/include/linux/slab.h
>   head/sys/ofed/include/linux/socket.h
>   head/sys/ofed/include/linux/spinlock.h
>   head/sys/ofed/include/linux/string.h
>   head/sys/ofed/include/linux/sysfs.h
>   head/sys/ofed/include/linux/timer.h
>   head/sys/ofed/include/linux/types.h
>   head/sys/ofed/include/linux/uaccess.h
>   head/sys/ofed/include/linux/vmalloc.h
>   head/sys/ofed/include/linux/wait.h
>   head/sys/ofed/include/linux/workqueue.h
>   head/sys/ofed/include/net/ip.h
>   head/sys/ofed/include/net/ipv6.h
>   head/sys/ofed/include/net/netevent.h
>   head/sys/ofed/include/net/tcp.h
>   head/sys/ofed/include/rdma/ib_umem.h
>   head/sys/ofed/include/rdma/ib_verbs.h
>
> Modified: head/sys/contrib/rdma/krping/krping.c
> ==============================================================================
> --- head/sys/contrib/rdma/krping/krping.c       Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/contrib/rdma/krping/krping.c       Wed Aug 27 13:21:53 2014        (r270710)
> @@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
>
>  #include 
>  #include 
> -#include 
>  #include 
>  #include 
>  #include 
> @@ -46,7 +45,6 @@ __FBSDID("$FreeBSD$");
>  #include 
>  #include 
>  #include 
> -#include 
>
>  #include 
>
>
> Modified: head/sys/dev/cxgb/cxgb_osdep.h
> ==============================================================================
> --- head/sys/dev/cxgb/cxgb_osdep.h      Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/dev/cxgb/cxgb_osdep.h      Wed Aug 27 13:21:53 2014        (r270710)
> @@ -91,8 +91,6 @@ struct t3_mbuf_hdr {
>  #endif
>  #endif
>
> -#define __read_mostly __attribute__((__section__(".data.read_mostly")))
> -
>  /*
>   * Workaround for weird Chelsio issue
>   */
>
> Modified: head/sys/dev/cxgbe/iw_cxgbe/cm.c
> ==============================================================================
> --- head/sys/dev/cxgbe/iw_cxgbe/cm.c    Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/dev/cxgbe/iw_cxgbe/cm.c    Wed Aug 27 13:21:53 2014        (r270710)
> @@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
>  #include 
>  #include 
>  #include 
> -#include 
>  #include 
>
>  #include 
>
> Modified: head/sys/dev/cxgbe/iw_cxgbe/qp.c
> ==============================================================================
> --- head/sys/dev/cxgbe/iw_cxgbe/qp.c    Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/dev/cxgbe/iw_cxgbe/qp.c    Wed Aug 27 13:21:53 2014        (r270710)
> @@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
>  #include 
>  #include 
>  #include 
> -#include 
>  #include 
>
>  #include 
>
> Modified: head/sys/modules/mlx4/Makefile
> ==============================================================================
> --- head/sys/modules/mlx4/Makefile      Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/modules/mlx4/Makefile      Wed Aug 27 13:21:53 2014        (r270710)
> @@ -12,6 +12,7 @@ CFLAGS+= -I${.CURDIR}/../../ofed/include
>  .include 
>
>  CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS}
> +CFLAGS+= -fms-extensions
>
>  CWARNFLAGS.mcg.c=      -Wno-unused
>  CWARNFLAGS+=           ${CWARNFLAGS.${.IMPSRC:T}}
>
> Modified: head/sys/modules/mlx4ib/Makefile
> ==============================================================================
> --- head/sys/modules/mlx4ib/Makefile    Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/modules/mlx4ib/Makefile    Wed Aug 27 13:21:53 2014        (r270710)
> @@ -14,6 +14,7 @@ CFLAGS+= -I${.CURDIR}/../../ofed/drivers
>  CFLAGS+= -I${.CURDIR}/../../ofed/include/
>  CFLAGS+= -DCONFIG_INFINIBAND_USER_MEM
>  CFLAGS+= -DINET6 -DINET -DOFED
> +CFLAGS+= -fms-extensions
>
>  .include 
>
>
> Modified: head/sys/modules/mlxen/Makefile
> ==============================================================================
> --- head/sys/modules/mlxen/Makefile     Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/modules/mlxen/Makefile     Wed Aug 27 13:21:53 2014        (r270710)
> @@ -8,6 +8,7 @@ SRCS    += en_rx.c en_tx.c
>  SRCS   += opt_inet.h opt_inet6.h
>  CFLAGS+= -I${.CURDIR}/../../ofed/drivers/net/mlx4
>  CFLAGS+= -I${.CURDIR}/../../ofed/include/
> +CFLAGS+= -fms-extensions
>
>  .include 
>
>
> Modified: head/sys/ofed/drivers/infiniband/core/addr.c
> ==============================================================================
> --- head/sys/ofed/drivers/infiniband/core/addr.c        Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/infiniband/core/addr.c        Wed Aug 27 13:21:53 2014        (r270710)
> @@ -36,12 +36,8 @@
>  #include 
>  #include 
>  #include 
> -#include 
> -#include 
>  #include 
>  #include 
> -#include 
> -#include 
>  #include 
>
>  MODULE_AUTHOR("Sean Hefty");
>
> Modified: head/sys/ofed/drivers/infiniband/core/cm.c
> ==============================================================================
> --- head/sys/ofed/drivers/infiniband/core/cm.c  Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/infiniband/core/cm.c  Wed Aug 27 13:21:53 2014        (r270710)
> @@ -45,6 +45,9 @@
>  #include 
>  #include 
>  #include 
> +#include 
> +
> +#include 
>
>  #include 
>  #include 
> @@ -3890,5 +3893,5 @@ static void __exit ib_cm_cleanup(void)
>  }
>
>  module_init_order(ib_cm_init, SI_ORDER_SECOND);
> -module_exit(ib_cm_cleanup);
> +module_exit_order(ib_cm_cleanup, SI_ORDER_FIRST);
>
>
> Modified: head/sys/ofed/drivers/infiniband/core/device.c
> ==============================================================================
> --- head/sys/ofed/drivers/infiniband/core/device.c      Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/infiniband/core/device.c      Wed Aug 27 13:21:53 2014        (r270710)
> @@ -36,7 +36,6 @@
>  #include 
>  #include 
>  #include 
> -#include 
>  #include 
>  #include 
>
>
> Modified: head/sys/ofed/drivers/infiniband/core/iwcm.c
> ==============================================================================
> --- head/sys/ofed/drivers/infiniband/core/iwcm.c        Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/infiniband/core/iwcm.c        Wed Aug 27 13:21:53 2014        (r270710)
> @@ -43,6 +43,7 @@
>  #include 
>  #include 
>  #include 
> +#include 
>
>  #include 
>  #include 
>
> Modified: head/sys/ofed/drivers/infiniband/core/sa_query.c
> ==============================================================================
> --- head/sys/ofed/drivers/infiniband/core/sa_query.c    Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/infiniband/core/sa_query.c    Wed Aug 27 13:21:53 2014        (r270710)
> @@ -33,7 +33,6 @@
>   */
>
>  #include 
> -#include 
>  #include 
>  #include 
>  #include 
>
> Modified: head/sys/ofed/drivers/infiniband/core/sysfs.c
> ==============================================================================
> --- head/sys/ofed/drivers/infiniband/core/sysfs.c       Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/infiniband/core/sysfs.c       Wed Aug 27 13:21:53 2014        (r270710)
> @@ -36,6 +36,7 @@
>
>  #include 
>  #include 
> +#include 
>
>  #include 
>  #include 
>
> Modified: head/sys/ofed/drivers/infiniband/core/ucm.c
> ==============================================================================
> --- head/sys/ofed/drivers/infiniband/core/ucm.c Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/infiniband/core/ucm.c Wed Aug 27 13:21:53 2014        (r270710)
> @@ -32,7 +32,6 @@
>   */
>
>  #include 
> -#include 
>  #include 
>  #include 
>  #include 
> @@ -43,6 +42,7 @@
>  #include 
>  #include 
>  #include 
> +#include 
>
>  #include 
>
> @@ -1295,7 +1295,7 @@ static void ib_ucm_remove_one(struct ib_
>         device_unregister(&ucm_dev->dev);
>  }
>
> -static ssize_t show_abi_version(struct class *class, char *buf)
> +static ssize_t show_abi_version(struct class *class, struct class_attribute *attr, char *buf)
>  {
>         return sprintf(buf, "%d\n", IB_USER_CM_ABI_VERSION);
>  }
>
> Modified: head/sys/ofed/drivers/infiniband/core/user_mad.c
> ==============================================================================
> --- head/sys/ofed/drivers/infiniband/core/user_mad.c    Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/infiniband/core/user_mad.c    Wed Aug 27 13:21:53 2014        (r270710)
> @@ -34,7 +34,6 @@
>   */
>
>  #include 
> -#include 
>  #include 
>  #include 
>  #include 
> @@ -986,7 +985,7 @@ static ssize_t show_port(struct device *
>  }
>  static DEVICE_ATTR(port, S_IRUGO, show_port, NULL);
>
> -static ssize_t show_abi_version(struct class *class, char *buf)
> +static ssize_t show_abi_version(struct class *class, struct class_attribute *attr, char *buf)
>  {
>         return sprintf(buf, "%d\n", IB_USER_MAD_ABI_VERSION);
>  }
>
> Modified: head/sys/ofed/drivers/infiniband/core/uverbs_cmd.c
> ==============================================================================
> --- head/sys/ofed/drivers/infiniband/core/uverbs_cmd.c  Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/infiniband/core/uverbs_cmd.c  Wed Aug 27 13:21:53 2014        (r270710)
> @@ -35,6 +35,7 @@
>
>  #include 
>  #include 
> +#include 
>
>  #include 
>  #include 
>
> Modified: head/sys/ofed/drivers/infiniband/core/uverbs_main.c
> ==============================================================================
> --- head/sys/ofed/drivers/infiniband/core/uverbs_main.c Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/infiniband/core/uverbs_main.c Wed Aug 27 13:21:53 2014        (r270710)
> @@ -35,7 +35,6 @@
>   */
>
>  #include 
> -#include 
>  #include 
>  #include 
>  #include 
> @@ -565,8 +564,12 @@ struct file *ib_uverbs_alloc_event_file(
>          * system call on a uverbs file, which will already have a
>          * module reference.
>          */
> +#ifdef __linux__
>         filp = alloc_file(uverbs_event_mnt, dget(uverbs_event_mnt->mnt_root),
>                           FMODE_READ, fops_get(&uverbs_event_fops));
> +#else
> +       filp = alloc_file(FMODE_READ, fops_get(&uverbs_event_fops));
> +#endif
>         if (!filp) {
>                 ret = -ENFILE;
>                 goto err_fd;
> @@ -767,7 +770,7 @@ static ssize_t show_dev_abi_version(stru
>  }
>  static DEVICE_ATTR(abi_version, S_IRUGO, show_dev_abi_version, NULL);
>
> -static ssize_t show_abi_version(struct class *class, char *buf)
> +static ssize_t show_abi_version(struct class *class, struct class_attribute *attr, char *buf)
>  {
>         return sprintf(buf, "%d\n", IB_USER_VERBS_ABI_VERSION);
>  }
>
> Modified: head/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c
> ==============================================================================
> --- head/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c       Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c       Wed Aug 27 13:21:53 2014        (r270710)
> @@ -39,7 +39,6 @@
>  #include 
>  #include 
>  #include 
> -#include 
>  #include 
>  #include 
>  #include 
> @@ -81,7 +80,7 @@ void mlx4_ib_update_cache_on_guid_change
>         guid_indexes = be64_to_cpu((__force __be64) dev->sriov.alias_guid.
>                                    ports_guid[port_num - 1].
>                                    all_rec_per_port[block_num].guid_indexes);
> -       pr_debug("port: %d, guid_indexes: 0x%llx\n", port_num, guid_indexes);
> +       pr_debug("port: %d, guid_indexes: 0x%llx\n", port_num, (long long)guid_indexes);
>
>         for (i = 0; i < NUM_ALIAS_GUID_IN_REC; i++) {
>                 /* The location of the specific index starts from bit number 4
> @@ -145,7 +144,7 @@ void mlx4_ib_notify_slaves_on_guid_chang
>         guid_indexes = be64_to_cpu((__force __be64) dev->sriov.alias_guid.
>                                    ports_guid[port_num - 1].
>                                    all_rec_per_port[block_num].guid_indexes);
> -       pr_debug("port: %d, guid_indexes: 0x%llx\n", port_num, guid_indexes);
> +       pr_debug("port: %d, guid_indexes: 0x%llx\n", port_num, (long long)guid_indexes);
>
>         /*calculate the slaves and notify them*/
>         for (i = 0; i < NUM_ALIAS_GUID_IN_REC; i++) {
>
> Modified: head/sys/ofed/drivers/infiniband/hw/mlx4/cm.c
> ==============================================================================
> --- head/sys/ofed/drivers/infiniband/hw/mlx4/cm.c       Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/infiniband/hw/mlx4/cm.c       Wed Aug 27 13:21:53 2014        (r270710)
> @@ -333,7 +333,7 @@ int mlx4_ib_demux_cm_handler(struct ib_d
>                 *slave = mlx4_ib_find_real_gid(ibdev, port, gid.global.interface_id);
>                 if (*slave < 0) {
>                         mlx4_ib_warn(ibdev, "failed matching slave_id by gid (0x%llx)\n",
> -                                       gid.global.interface_id);
> +                                       (long long)gid.global.interface_id);
>                         return -ENOENT;
>                 }
>                 return 0;
>
> Modified: head/sys/ofed/drivers/infiniband/hw/mlx4/mad.c
> ==============================================================================
> --- head/sys/ofed/drivers/infiniband/hw/mlx4/mad.c      Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/infiniband/hw/mlx4/mad.c      Wed Aug 27 13:21:53 2014        (r270710)
> @@ -1664,12 +1664,12 @@ static void mlx4_ib_tunnel_comp_worker(s
>                                                              (MLX4_NUM_TUNNEL_BUFS - 1));
>                                 if (ret)
>                                         pr_err("Failed reposting tunnel "
> -                                              "buf:%lld\n", wc.wr_id);
> +                                              "buf:%lld\n", (long long)wc.wr_id);
>                                 break;
>                         case IB_WC_SEND:
>                                 pr_debug("received tunnel send completion:"
>                                          "wrid=0x%llx, status=0x%x\n",
> -                                        wc.wr_id, wc.status);
> +                                        (long long)wc.wr_id, wc.status);
>                                 ib_destroy_ah(tun_qp->tx_ring[wc.wr_id &
>                                               (MLX4_NUM_TUNNEL_BUFS - 1)].ah);
>                                 tun_qp->tx_ring[wc.wr_id & (MLX4_NUM_TUNNEL_BUFS - 1)].ah
> @@ -1685,7 +1685,7 @@ static void mlx4_ib_tunnel_comp_worker(s
>                 } else  {
>                         pr_debug("mlx4_ib: completion error in tunnel: %d."
>                                  " status = %d, wrid = 0x%llx\n",
> -                                ctx->slave, wc.status, wc.wr_id);
> +                                ctx->slave, wc.status, (long long)wc.wr_id);
>                         if (!MLX4_TUN_IS_RECV(wc.wr_id)) {
>                                 ib_destroy_ah(tun_qp->tx_ring[wc.wr_id &
>                                               (MLX4_NUM_TUNNEL_BUFS - 1)].ah);
> @@ -1837,7 +1837,7 @@ static void mlx4_ib_sqp_comp_worker(stru
>                                 if (mlx4_ib_post_pv_qp_buf(ctx, sqp, wc.wr_id &
>                                                            (MLX4_NUM_TUNNEL_BUFS - 1)))
>                                         pr_err("Failed reposting SQP "
> -                                              "buf:%lld\n", wc.wr_id);
> +                                              "buf:%lld\n", (long long)wc.wr_id);
>                                 break;
>                         default:
>                                 BUG_ON(1);
> @@ -1846,7 +1846,7 @@ static void mlx4_ib_sqp_comp_worker(stru
>                 } else  {
>                         pr_debug("mlx4_ib: completion error in tunnel: %d."
>                                  " status = %d, wrid = 0x%llx\n",
> -                                ctx->slave, wc.status, wc.wr_id);
> +                                ctx->slave, wc.status, (long long)wc.wr_id);
>                         if (!MLX4_TUN_IS_RECV(wc.wr_id)) {
>                                 ib_destroy_ah(sqp->tx_ring[wc.wr_id &
>                                               (MLX4_NUM_TUNNEL_BUFS - 1)].ah);
>
> Modified: head/sys/ofed/drivers/infiniband/hw/mlx4/main.c
> ==============================================================================
> --- head/sys/ofed/drivers/infiniband/hw/mlx4/main.c     Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/infiniband/hw/mlx4/main.c     Wed Aug 27 13:21:53 2014        (r270710)
> @@ -37,15 +37,14 @@
>  #include 
>  #endif
>
> -#include 
>  #include 
>  #include 
>  #include 
>  #include 
> -#include 
>  #include 
>  #include 
>  #include 
> +#include 
>
>  #include 
>  #include 
>
> Modified: head/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_ib.h
> ==============================================================================
> --- head/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_ib.h  Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_ib.h  Wed Aug 27 13:21:53 2014        (r270710)
> @@ -38,6 +38,7 @@
>  #include 
>  #include 
>  #include 
> +#include 
>
>  #include 
>  #include 
>
> Modified: head/sys/ofed/drivers/infiniband/hw/mlx4/mr.c
> ==============================================================================
> --- head/sys/ofed/drivers/infiniband/hw/mlx4/mr.c       Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/infiniband/hw/mlx4/mr.c       Wed Aug 27 13:21:53 2014        (r270710)
> @@ -159,7 +159,7 @@ static int mlx4_ib_umem_write_mtt_block(
>         if (len & (mtt_size-1ULL)) {
>                 WARN(1 ,
>                 "write_block: len %llx is not aligned to mtt_size %llx\n",
> -                       len, mtt_size);
> +                       (long long)len, (long long)mtt_size);
>                 return -EINVAL;
>         }
>
> @@ -416,7 +416,7 @@ int mlx4_ib_umem_calc_optimal_mtt_size(s
>
>         WARN((total_len & ((1ULL<                 " misaligned total length detected (%llu, %llu)!",
> -               total_len, block_shift);
> +               (long long)total_len, (long long)block_shift);
>
>         *num_of_mtts = total_len >> block_shift;
>  end:
> @@ -426,7 +426,7 @@ end:
>                 */
>                 WARN(1,
>                 "mlx4_ib_umem_calc_optimal_mtt_size - unexpected shift %lld\n",
> -               block_shift);
> +               (long long)block_shift);
>
>                 block_shift = min_shift;
>         }
>
> Modified: head/sys/ofed/drivers/infiniband/hw/mlx4/qp.c
> ==============================================================================
> --- head/sys/ofed/drivers/infiniband/hw/mlx4/qp.c       Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/infiniband/hw/mlx4/qp.c       Wed Aug 27 13:21:53 2014        (r270710)
> @@ -34,7 +34,6 @@
>  #include 
>  #include 
>  #include 
> -#include 
>  #include 
>
>  #include 
>
> Modified: head/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c
> ==============================================================================
> --- head/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c    Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c    Wed Aug 27 13:21:53 2014        (r270710)
> @@ -34,6 +34,7 @@
>  #include "mlx4_ib.h"
>  #include 
>  #include 
> +#include 
>
>  #include 
>  /*show_admin_alias_guid returns the administratively assigned value of that GUID.
>
> Modified: head/sys/ofed/drivers/infiniband/hw/mthca/mthca_allocator.c
> ==============================================================================
> --- head/sys/ofed/drivers/infiniband/hw/mthca/mthca_allocator.c Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/infiniband/hw/mthca/mthca_allocator.c Wed Aug 27 13:21:53 2014        (r270710)
> @@ -32,7 +32,6 @@
>
>  #include 
>  #include 
> -#include 
>
>  #include "mthca_dev.h"
>
>
> Modified: head/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c
> ==============================================================================
> --- head/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c      Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c      Wed Aug 27 13:21:53 2014        (r270710)
> @@ -33,7 +33,6 @@
>   */
>
>  #include 
> -#include 
>  #include 
>  #include 
>  #include 
>
> Modified: head/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c
> ==============================================================================
> --- head/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c  Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c  Wed Aug 27 13:21:53 2014        (r270710)
> @@ -40,6 +40,7 @@
>
>  #include 
>  #include 
> +#include 
>
>  #include "mthca_dev.h"
>  #include "mthca_cmd.h"
>
> Modified: head/sys/ofed/drivers/infiniband/hw/mthca/mthca_reset.c
> ==============================================================================
> --- head/sys/ofed/drivers/infiniband/hw/mthca/mthca_reset.c     Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/infiniband/hw/mthca/mthca_reset.c     Wed Aug 27 13:21:53 2014        (r270710)
> @@ -30,7 +30,6 @@
>   * SOFTWARE.
>   */
>
> -#include 
>  #include 
>  #include 
>  #include 
>
> Modified: head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
> ==============================================================================
> --- head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c     Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c     Wed Aug 27 13:21:53 2014        (r270710)
> @@ -40,7 +40,6 @@ static        int ipoib_resolvemulti(struct ifn
>
>  #include 
>
> -#include 
>  #include 
>  #include 
>  #include 
>
> Modified: head/sys/ofed/drivers/net/mlx4/alloc.c
> ==============================================================================
> --- head/sys/ofed/drivers/net/mlx4/alloc.c      Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/net/mlx4/alloc.c      Wed Aug 27 13:21:53 2014        (r270710)
> @@ -34,8 +34,7 @@
>  #include 
>  #include 
>  #include 
> -//#include   /* XXX SK probabaly not needed in freeBSD XXX */
> -#include 
> +#include 
>  #include 
>  #include 
>
>
> Modified: head/sys/ofed/drivers/net/mlx4/cmd.c
> ==============================================================================
> --- head/sys/ofed/drivers/net/mlx4/cmd.c        Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/net/mlx4/cmd.c        Wed Aug 27 13:21:53 2014        (r270710)
> @@ -640,7 +640,7 @@ static int mlx4_ACCESS_MEM(struct mlx4_d
>             (slave & ~0x7f) | (size & 0xff)) {
>                 mlx4_err(dev, "Bad access mem params - slave_addr:0x%llx "
>                               "master_addr:0x%llx slave_id:%d size:%d\n",
> -                             slave_addr, master_addr, slave, size);
> +                             (long long)slave_addr, (long long)master_addr, slave, size);
>                 return -EINVAL;
>         }
>
> @@ -1553,7 +1553,7 @@ static int mlx4_master_activate_admin_st
>                                 return err;
>                         }
>                         mlx4_dbg((&(priv->dev)), "alloc mac %llx idx  %d slave %d port %d\n",
> -                                vp_oper->state.mac, vp_oper->mac_idx, slave, port);
> +                                (long long)vp_oper->state.mac, vp_oper->mac_idx, slave, port);
>                 }
>         }
>         return 0;
> @@ -2117,7 +2117,7 @@ int mlx4_set_vf_mac(struct mlx4_dev *dev
>         s_info = &priv->mfunc.master.vf_admin[vf].vport[port];
>         s_info->mac = mlx4_mac_to_u64(mac);
>         mlx4_info(dev, "default mac on vf %d port %d to %llX will take afect only after vf restart\n",
> -                 vf, port, s_info->mac);
> +                 vf, port, (long long)s_info->mac);
>         return 0;
>  }
>  EXPORT_SYMBOL_GPL(mlx4_set_vf_mac);
>
> Modified: head/sys/ofed/drivers/net/mlx4/cq.c
> ==============================================================================
> --- head/sys/ofed/drivers/net/mlx4/cq.c Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/net/mlx4/cq.c Wed Aug 27 13:21:53 2014        (r270710)
> @@ -34,7 +34,6 @@
>   * SOFTWARE.
>   */
>
> -#include 
>  #include 
>
>  #include 
>
> Modified: head/sys/ofed/drivers/net/mlx4/en_netdev.c
> ==============================================================================
> --- head/sys/ofed/drivers/net/mlx4/en_netdev.c  Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/net/mlx4/en_netdev.c  Wed Aug 27 13:21:53 2014        (r270710)
> @@ -1581,7 +1581,7 @@ int mlx4_en_init_netdev(struct mlx4_en_d
>
>         if (ILLEGAL_MAC(priv->mac)) {
>                 en_err(priv, "Port: %d, invalid mac burned: 0x%llx, quiting\n",
> -                        priv->port, priv->mac);
> +                        priv->port, (long long)priv->mac);
>                 err = -EINVAL;
>                 goto out;
>         }
>
> Modified: head/sys/ofed/drivers/net/mlx4/en_rx.c
> ==============================================================================
> --- head/sys/ofed/drivers/net/mlx4/en_rx.c      Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/net/mlx4/en_rx.c      Wed Aug 27 13:21:53 2014        (r270710)
> @@ -136,7 +136,7 @@ static void mlx4_en_free_rx_desc(struct
>                 frag_info = &priv->frag_info[nr];
>                 dma = be64_to_cpu(rx_desc->data[nr].addr);
>
> -               en_dbg(DRV, priv, "Unmaping buffer at dma:0x%llx\n", (u64) dma);
> +               en_dbg(DRV, priv, "Unmaping buffer at dma:0x%llx\n", (long long) dma);
>                 pci_unmap_single(mdev->pdev, dma, frag_info->frag_size,
>                                  PCI_DMA_FROMDEVICE);
>                 m_free(mb_list[nr]);
>
> Modified: head/sys/ofed/drivers/net/mlx4/eq.c
> ==============================================================================
> --- head/sys/ofed/drivers/net/mlx4/eq.c Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/net/mlx4/eq.c Wed Aug 27 13:21:53 2014        (r270710)
> @@ -31,7 +31,6 @@
>   * SOFTWARE.
>   */
>
> -#include 
>  #include 
>  #include 
>  #include 
>
> Modified: head/sys/ofed/drivers/net/mlx4/fw.c
> ==============================================================================
> --- head/sys/ofed/drivers/net/mlx4/fw.c Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/net/mlx4/fw.c Wed Aug 27 13:21:53 2014        (r270710)
> @@ -1078,14 +1078,14 @@ int mlx4_QUERY_FW(struct mlx4_dev *dev)
>         MLX4_GET(fw->comm_bar,  outbox, QUERY_FW_COMM_BAR_OFFSET);
>         fw->comm_bar = (fw->comm_bar >> 6) * 2;
>         mlx4_dbg(dev, "Communication vector bar:%d offset:0x%llx\n",
> -                fw->comm_bar, fw->comm_base);
> +                fw->comm_bar, (long long)fw->comm_base);
>         mlx4_dbg(dev, "FW size %d KB\n", fw->fw_pages >> 2);
>
>         MLX4_GET(fw->clock_offset, outbox, QUERY_FW_CLOCK_OFFSET);
>         MLX4_GET(fw->clock_bar,    outbox, QUERY_FW_CLOCK_BAR);
>         fw->clock_bar = (fw->clock_bar >> 6) * 2;
>         mlx4_dbg(dev, "Internal clock bar:%d offset:0x%llx\n",
> -                fw->comm_bar, fw->comm_base);
> +                fw->comm_bar, (long long)fw->comm_base);
>
>         /*
>          * Round up number of system pages needed in case
>
> Modified: head/sys/ofed/drivers/net/mlx4/main.c
> ==============================================================================
> --- head/sys/ofed/drivers/net/mlx4/main.c       Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/net/mlx4/main.c       Wed Aug 27 13:21:53 2014        (r270710)
> @@ -34,7 +34,6 @@
>   */
>
>  #include 
> -#include 
>  #include 
>  #include 
>  #include 
> @@ -42,6 +41,7 @@
>  #include 
>  #include 
>  #include 
> +#include 
>
>  #include 
>  #include 
>
> Modified: head/sys/ofed/drivers/net/mlx4/mcg.c
> ==============================================================================
> --- head/sys/ofed/drivers/net/mlx4/mcg.c        Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/net/mlx4/mcg.c        Wed Aug 27 13:21:53 2014        (r270710)
> @@ -886,7 +886,7 @@ int mlx4_flow_detach(struct mlx4_dev *de
>         err = mlx4_QP_FLOW_STEERING_DETACH(dev, reg_id);
>         if (err)
>                 mlx4_err(dev, "Fail to detach network rule. registration id = 0x%llx\n",
> -                        reg_id);
> +                        (long long)reg_id);
>         return err;
>  }
>  EXPORT_SYMBOL_GPL(mlx4_flow_detach);
>
> Modified: head/sys/ofed/drivers/net/mlx4/mr.c
> ==============================================================================
> --- head/sys/ofed/drivers/net/mlx4/mr.c Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/net/mlx4/mr.c Wed Aug 27 13:21:53 2014        (r270710)
> @@ -32,7 +32,6 @@
>   * SOFTWARE.
>   */
>
> -#include 
>  #include 
>  #include 
>  #include 
>
> Modified: head/sys/ofed/drivers/net/mlx4/pd.c
> ==============================================================================
> --- head/sys/ofed/drivers/net/mlx4/pd.c Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/net/mlx4/pd.c Wed Aug 27 13:21:53 2014        (r270710)
> @@ -31,7 +31,6 @@
>   * SOFTWARE.
>   */
>
> -#include 
>  #include 
>  #include 
>
>
> Modified: head/sys/ofed/drivers/net/mlx4/qp.c
> ==============================================================================
> --- head/sys/ofed/drivers/net/mlx4/qp.c Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/net/mlx4/qp.c Wed Aug 27 13:21:53 2014        (r270710)
> @@ -33,8 +33,6 @@
>   * SOFTWARE.
>   */
>
> -#include 
> -
>  #include 
>  #include 
>
>
> Modified: head/sys/ofed/drivers/net/mlx4/reset.c
> ==============================================================================
> --- head/sys/ofed/drivers/net/mlx4/reset.c      Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/net/mlx4/reset.c      Wed Aug 27 13:21:53 2014        (r270710)
> @@ -31,7 +31,6 @@
>   * SOFTWARE.
>   */
>
> -#include 
>  #include 
>  #include 
>  #include 
>
> Modified: head/sys/ofed/drivers/net/mlx4/resource_tracker.c
> ==============================================================================
> --- head/sys/ofed/drivers/net/mlx4/resource_tracker.c   Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/net/mlx4/resource_tracker.c   Wed Aug 27 13:21:53 2014        (r270710)
> @@ -1166,7 +1166,7 @@ static int qp_res_start_move_to(struct m
>                 switch (state) {
>                 case RES_QP_BUSY:
>                         mlx4_dbg(dev, "%s: failed RES_QP, 0x%llx\n",
> -                                __func__, r->com.res_id);
> +                                __func__, (long long)r->com.res_id);
>                         err = -EBUSY;
>                         break;
>
> @@ -1174,7 +1174,7 @@ static int qp_res_start_move_to(struct m
>                         if (r->com.state == RES_QP_MAPPED && !alloc)
>                                 break;
>
> -                       mlx4_dbg(dev, "failed RES_QP, 0x%llx\n", r->com.res_id);
> +                       mlx4_dbg(dev, "failed RES_QP, 0x%llx\n", (long long)r->com.res_id);
>                         err = -EINVAL;
>                         break;
>
> @@ -1184,7 +1184,7 @@ static int qp_res_start_move_to(struct m
>                                 break;
>                         else {
>                                 mlx4_dbg(dev, "failed RES_QP, 0x%llx\n",
> -                                         r->com.res_id);
> +                                         (long long)r->com.res_id);
>                                 err = -EINVAL;
>                         }
>
> @@ -3766,7 +3766,7 @@ static int _move_all_busy(struct mlx4_de
>                                                 mlx4_dbg(dev,
>                                                          "%s id 0x%llx is busy\n",
>                                                           ResourceType(type),
> -                                                         r->res_id);
> +                                                         (long long)r->res_id);
>                                         ++busy;
>                                 } else {
>                                         r->from_state = r->state;
>
> Modified: head/sys/ofed/drivers/net/mlx4/sense.c
> ==============================================================================
> --- head/sys/ofed/drivers/net/mlx4/sense.c      Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/net/mlx4/sense.c      Wed Aug 27 13:21:53 2014        (r270710)
> @@ -53,7 +53,7 @@ int mlx4_SENSE_PORT(struct mlx4_dev *dev
>         }
>
>         if (out_param > 2) {
> -               mlx4_err(dev, "Sense returned illegal value: 0x%llx\n", out_param);
> +               mlx4_err(dev, "Sense returned illegal value: 0x%llx\n", (long long)out_param);
>                 return -EINVAL;
>         }
>
>
> Modified: head/sys/ofed/drivers/net/mlx4/srq.c
> ==============================================================================
> --- head/sys/ofed/drivers/net/mlx4/srq.c        Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/net/mlx4/srq.c        Wed Aug 27 13:21:53 2014        (r270710)
> @@ -31,8 +31,6 @@
>   * SOFTWARE.
>   */
>
> -#include 
> -
>  #include 
>  #include 
>
>
> Modified: head/sys/ofed/drivers/net/mlx4/xrcd.c
> ==============================================================================
> --- head/sys/ofed/drivers/net/mlx4/xrcd.c       Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/drivers/net/mlx4/xrcd.c       Wed Aug 27 13:21:53 2014        (r270710)
> @@ -31,7 +31,6 @@
>   * SOFTWARE.
>   */
>
> -#include 
>  #include 
>
>  #include "mlx4.h"
>
> Modified: head/sys/ofed/include/asm/atomic-long.h
> ==============================================================================
> --- head/sys/ofed/include/asm/atomic-long.h     Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/include/asm/atomic-long.h     Wed Aug 27 13:21:53 2014        (r270710)
> @@ -2,6 +2,7 @@
>   * Copyright (c) 2010 Isilon Systems, Inc.
>   * Copyright (c) 2010 iX Systems, Inc.
>   * Copyright (c) 2010 Panasas, Inc.
> + * Copyright (c) 2013, 2014 Mellanox Technologies, Ltd.
>   * All rights reserved.
>   *
>   * Redistribution and use in source and binary forms, with or without
> @@ -25,6 +26,7 @@
>   * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
>   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>   */
> +
>  #ifndef        _ATOMIC_LONG_H_
>  #define        _ATOMIC_LONG_H_
>
>
> Modified: head/sys/ofed/include/asm/atomic.h
> ==============================================================================
> --- head/sys/ofed/include/asm/atomic.h  Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/include/asm/atomic.h  Wed Aug 27 13:21:53 2014        (r270710)
> @@ -2,6 +2,7 @@
>   * Copyright (c) 2010 Isilon Systems, Inc.
>   * Copyright (c) 2010 iX Systems, Inc.
>   * Copyright (c) 2010 Panasas, Inc.
> + * Copyright (c) 2013, 2014 Mellanox Technologies, Ltd.
>   * All rights reserved.
>   *
>   * Redistribution and use in source and binary forms, with or without
> @@ -32,7 +33,6 @@
>  #include 
>  #include 
>  #include 
> -#include 
>
>  typedef struct {
>         volatile u_int counter;
> @@ -90,7 +90,6 @@ static inline int atomic_add_unless(atom
>          for (;;) {
>                  if (unlikely(c == (u)))
>                          break;
> -                // old = atomic_cmpxchg((v), c, c + (a)); /*Linux*/
>                  old = atomic_cmpset_int(&v->counter, c, c + (a));
>                  if (likely(old == c))
>                          break;
>
> Modified: head/sys/ofed/include/asm/byteorder.h
> ==============================================================================
> --- head/sys/ofed/include/asm/byteorder.h       Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/include/asm/byteorder.h       Wed Aug 27 13:21:53 2014        (r270710)
> @@ -2,6 +2,7 @@
>   * Copyright (c) 2010 Isilon Systems, Inc.
>   * Copyright (c) 2010 iX Systems, Inc.
>   * Copyright (c) 2010 Panasas, Inc.
> + * Copyright (c) 2013, 2014 Mellanox Technologies, Ltd.
>   * All rights reserved.
>   *
>   * Redistribution and use in source and binary forms, with or without
> @@ -25,6 +26,7 @@
>   * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
>   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>   */
> +
>  #ifndef        _ASM_BYTEORDER_H_
>  #define        _ASM_BYTEORDER_H_
>
>
> Modified: head/sys/ofed/include/asm/fcntl.h
> ==============================================================================
> --- head/sys/ofed/include/asm/fcntl.h   Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/include/asm/fcntl.h   Wed Aug 27 13:21:53 2014        (r270710)
> @@ -2,6 +2,7 @@
>   * Copyright (c) 2010 Isilon Systems, Inc.
>   * Copyright (c) 2010 iX Systems, Inc.
>   * Copyright (c) 2010 Panasas, Inc.
> + * Copyright (c) 2013, 2014 Mellanox Technologies, Ltd.
>   * All rights reserved.
>   *
>   * Redistribution and use in source and binary forms, with or without
>
> Modified: head/sys/ofed/include/asm/io.h
> ==============================================================================
> --- head/sys/ofed/include/asm/io.h      Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/include/asm/io.h      Wed Aug 27 13:21:53 2014        (r270710)
> @@ -1,7 +1,8 @@
> -/*-
> +/*
>   * Copyright (c) 2010 Isilon Systems, Inc.
>   * Copyright (c) 2010 iX Systems, Inc.
>   * Copyright (c) 2010 Panasas, Inc.
> + * Copyright (c) 2013, 2014 Mellanox Technologies, Ltd.
>   * All rights reserved.
>   *
>   * Redistribution and use in source and binary forms, with or without
> @@ -26,4 +27,9 @@
>   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>   */
>
> +#ifndef _ASM_IO_H_
> +#define _ASM_IO_H_
> +
>  #include 
> +
> +#endif /* _ASM_IO_H_ */
>
> Modified: head/sys/ofed/include/asm/page.h
> ==============================================================================
> --- head/sys/ofed/include/asm/page.h    Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/include/asm/page.h    Wed Aug 27 13:21:53 2014        (r270710)
> @@ -2,6 +2,7 @@
>   * Copyright (c) 2010 Isilon Systems, Inc.
>   * Copyright (c) 2010 iX Systems, Inc.
>   * Copyright (c) 2010 Panasas, Inc.
> + * Copyright (c) 2013, 2014 Mellanox Technologies, Ltd.
>   * All rights reserved.
>   *
>   * Redistribution and use in source and binary forms, with or without
> @@ -26,4 +27,9 @@
>   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>   */
>
> +#ifndef _ASM_PAGE_H_
> +#define _ASM_PAGE_H_
> +
>  #include 
> +
> +#endif /*_ASM_PAGE_H_*/
>
> Modified: head/sys/ofed/include/asm/pgtable.h
> ==============================================================================
> --- head/sys/ofed/include/asm/pgtable.h Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/include/asm/pgtable.h Wed Aug 27 13:21:53 2014        (r270710)
> @@ -2,6 +2,7 @@
>   * Copyright (c) 2010 Isilon Systems, Inc.
>   * Copyright (c) 2010 iX Systems, Inc.
>   * Copyright (c) 2010 Panasas, Inc.
> + * Copyright (c) 2013, 2014 Mellanox Technologies, Ltd.
>   * All rights reserved.
>   *
>   * Redistribution and use in source and binary forms, with or without
>
> Modified: head/sys/ofed/include/asm/types.h
> ==============================================================================
> --- head/sys/ofed/include/asm/types.h   Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/include/asm/types.h   Wed Aug 27 13:21:53 2014        (r270710)
> @@ -2,6 +2,7 @@
>   * Copyright (c) 2010 Isilon Systems, Inc.
>   * Copyright (c) 2010 iX Systems, Inc.
>   * Copyright (c) 2010 Panasas, Inc.
> + * Copyright (c) 2013, 2014 Mellanox Technologies, Ltd.
>   * All rights reserved.
>   *
>   * Redistribution and use in source and binary forms, with or without
> @@ -25,43 +26,36 @@
>   * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
>   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>   */
> +
>  #ifndef        _ASM_TYPES_H_
>  #define        _ASM_TYPES_H_
>
> -typedef unsigned short umode_t;
> -
> -typedef signed char __s8;
> -typedef unsigned char __u8;
> -
> -typedef signed short __s16;
> -typedef unsigned short __u16;
> -
> -typedef signed int __s32;
> -typedef unsigned int __u32;
> -
> -#if defined(__GNUC__) // && !defined(__STRICT_ANSI__)
> -typedef signed long long __s64;
> -typedef unsigned long long __u64;
> -#endif
> -
>  #ifdef _KERNEL
>
> -typedef signed char s8;
> -typedef unsigned char u8;
> -
> -typedef signed short s16;
> -typedef unsigned short u16;
> -
> -typedef signed int s32;
> -typedef unsigned int u32;
> -
> -typedef signed long long s64;
> -typedef unsigned long long u64;
> +typedef uint8_t u8;
> +typedef uint8_t __u8;
> +typedef uint16_t u16;
> +typedef uint16_t __u16;
> +typedef uint32_t u32;
> +typedef uint32_t __u32;
> +typedef uint64_t u64;
> +typedef uint64_t __u64;
> +
> +typedef int8_t s8;
> +typedef int8_t __s8;
> +typedef int16_t s16;
> +typedef int16_t __s16;
> +typedef int32_t s32;
> +typedef int32_t __s32;
> +typedef int64_t s64;
> +typedef int64_t __s64;
>
>  /* DMA addresses come in generic and 64-bit flavours.  */
>  typedef vm_paddr_t dma_addr_t;
>  typedef vm_paddr_t dma64_addr_t;
>
> +typedef unsigned short umode_t;
> +
>  #endif /* _KERNEL */
>
>  #endif /* _ASM_TYPES_H_ */
>
> Modified: head/sys/ofed/include/asm/uaccess.h
> ==============================================================================
> --- head/sys/ofed/include/asm/uaccess.h Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/include/asm/uaccess.h Wed Aug 27 13:21:53 2014        (r270710)
> @@ -2,6 +2,7 @@
>   * Copyright (c) 2010 Isilon Systems, Inc.
>   * Copyright (c) 2010 iX Systems, Inc.
>   * Copyright (c) 2010 Panasas, Inc.
> + * Copyright (c) 2013, 2014 Mellanox Technologies, Ltd.
>   * All rights reserved.
>   *
>   * Redistribution and use in source and binary forms, with or without
> @@ -25,6 +26,7 @@
>   * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
>   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>   */
> +
>  #ifndef _ASM_UACCESS_H_
>  #define _ASM_UACCESS_H_
>
>
> Modified: head/sys/ofed/include/linux/bitops.h
> ==============================================================================
> --- head/sys/ofed/include/linux/bitops.h        Wed Aug 27 12:25:46 2014        (r270709)
> +++ head/sys/ofed/include/linux/bitops.h        Wed Aug 27 13:21:53 2014        (r270710)
> @@ -2,6 +2,7 @@
>   * Copyright (c) 2010 Isilon Systems, Inc.
>   * Copyright (c) 2010 iX Systems, Inc.
>   * Copyright (c) 2010 Panasas, Inc.
> + * Copyright (c) 2013, 2014 Mellanox Technologies, Ltd.
>   * All rights reserved.
>   *
>   * Redistribution and use in source and binary forms, with or without
> @@ -37,6 +38,8 @@
>  #define        BITS_TO_LONGS(n)        howmany((n), BITS_PER_LONG)
>  #define BIT_WORD(nr)           ((nr) / BITS_PER_LONG)
>
> +#define BITS_PER_BYTE           8
> +
>  static inline int
>  __ffs(int mask)
>  {
> @@ -463,6 +466,27 @@ bitmap_find_free_region(unsigned long *b
>  }
>
>  /**
> + * bitmap_allocate_region - allocate bitmap region
> + *      @bitmap: array of unsigned longs corresponding to the bitmap
> + *      @pos: beginning of bit region to allocate
> + *      @order: region size (log base 2 of number of bits) to allocate
> + *
> + * Allocate (set bits in) a specified region of a bitmap.
> + *
> + * Return 0 on success, or %-EBUSY if specified region wasn't
> + * free (not all bits were zero).
> + */
> +
> +static inline int
> +bitmap_allocate_region(unsigned long *bitmap, int pos, int order)
> +{
> +        if (!__reg_op(bitmap, pos, order, REG_OP_ISFREE))
> +                return -EBUSY;
> +        __reg_op(bitmap, pos, order, REG_OP_ALLOC);
> +        return 0;
> +}
> +
> +/**
>   * bitmap_release_region - release allocated bitmap region
>   *      @bitmap: array of unsigned longs corresponding to the bitmap
>   *      @pos: beginning of bit region to release
> @@ -480,4 +504,9 @@ bitmap_release_region(unsigned long *bit
>  }
>
>
> +#define for_each_set_bit(bit, addr, size) \
> +       for ((bit) = find_first_bit((addr), (size));            \
> +            (bit) < (size);                                    \
> +            (bit) = find_next_bit((addr), (size), (bit) + 1))
> +
>  #endif /* _LINUX_BITOPS_H_ */
>
> Added: head/sys/ofed/include/linux/cache.h
> ==============================================================================
> --- /dev/null   00:00:00 1970   (empty, because file is newly added)
> +++ head/sys/ofed/include/linux/cache.h Wed Aug 27 13:21:53 2014        (r270710)
> @@ -0,0 +1,37 @@
> +/*-
> + * Copyright (c) 2010 Isilon Systems, Inc.
> + * Copyright (c) 2010 iX Systems, Inc.
> + * Copyright (c) 2010 Panasas, Inc.
> + * Copyright (c) 2013, 2014 Mellanox Technologies, Ltd.
> + * 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 unmodified, 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 ``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.
> + */
> +
> +#ifndef        _LINUX_CACHE_H_
>
> *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
>

From owner-svn-src-all@FreeBSD.ORG  Wed Aug 27 18:51:54 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id AE6507B7;
 Wed, 27 Aug 2014 18:51:54 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7FBC93AC8;
 Wed, 27 Aug 2014 18:51:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7RIpsaG022633;
 Wed, 27 Aug 2014 18:51:54 GMT (envelope-from pluknet@FreeBSD.org)
Received: (from pluknet@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7RIpsZF022632;
 Wed, 27 Aug 2014 18:51:54 GMT (envelope-from pluknet@FreeBSD.org)
Message-Id: <201408271851.s7RIpsZF022632@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: pluknet set sender to
 pluknet@FreeBSD.org using -f
From: Sergey Kandaurov 
Date: Wed, 27 Aug 2014 18:51:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r270726 - vendor/tzdata/tzdata2014f
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 27 Aug 2014 18:51:54 -0000

Author: pluknet
Date: Wed Aug 27 18:51:54 2014
New Revision: 270726
URL: http://svnweb.freebsd.org/changeset/base/270726

Log:
  Tag of tzdata2014f

Added:
  vendor/tzdata/tzdata2014f/
     - copied from r270725, vendor/tzdata/dist/

From owner-svn-src-all@FreeBSD.ORG  Wed Aug 27 18:56:13 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 15882B32;
 Wed, 27 Aug 2014 18:56:13 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DC3033B19;
 Wed, 27 Aug 2014 18:56:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7RIuCSg023315;
 Wed, 27 Aug 2014 18:56:12 GMT (envelope-from jmg@FreeBSD.org)
Received: (from jmg@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7RIuCL9023312;
 Wed, 27 Aug 2014 18:56:12 GMT (envelope-from jmg@FreeBSD.org)
Message-Id: <201408271856.s7RIuCL9023312@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jmg set sender to jmg@FreeBSD.org
 using -f
From: John-Mark Gurney 
Date: Wed, 27 Aug 2014 18:56:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270727 - head/tools/tools/perforce
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 27 Aug 2014 18:56:13 -0000

Author: jmg
Date: Wed Aug 27 18:56:12 2014
New Revision: 270727
URL: http://svnweb.freebsd.org/changeset/base/270727

Log:
  add scripts for generating a diff from p4...
  
  awkdiff is the script from scottl that he got from ken a long time
  ago...  It no longer lives in his home dir, so give it a new home...
  This does simple massaging of p4 output to create a useful diff...
  
  The script p4diffbranch will create a diff that includes new and
  deleted files unlike the normal diff2 -b command...  So will be useful
  for extracting patches from p4...  It does take a changeset that will
  be used to diff against...

Added:
  head/tools/tools/perforce/
  head/tools/tools/perforce/awkdiff   (contents, props changed)
  head/tools/tools/perforce/p4diffbranch   (contents, props changed)

Added: head/tools/tools/perforce/awkdiff
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/tools/perforce/awkdiff	Wed Aug 27 18:56:12 2014	(r270727)
@@ -0,0 +1,42 @@
+#!/usr/bin/awk -f
+#
+#	$FreeBSD$
+#
+
+BEGIN {
+	#parentpath = "//depot/vendor/freebsd/src/sys/"
+	#childpath = "//depot/projects/opencrypto/"
+}
+$1 == "====" {
+	last_line = $0
+	last_filename = $2
+	#gsub(parentpath, "", last_filename)
+	gsub(/#[0-9]*$/, "", last_filename)
+	did_sub = 0
+}
+$1 == "====" && $2 == "" {
+	new_file = $4
+	gsub(childpath, "", new_file)
+	gsub(/#[0-9]*$/, "", new_file)
+	cmd = "p4 print \"" $4 "\" | sed '/^\\/\\/depot/d' | diff -u /dev/null /dev/stdin | sed s@/dev/stdin@" new_file "@"
+	#print "x" cmd "x"
+	system(cmd)
+}
+$1 == "====" && $4 == "" {
+	del_file = $2
+	gsub(parentpath, "", del_file)
+	gsub(/#[0-9]*$/, "", del_file)
+	cmd = "p4 print \"" $2 "\" | sed '/^\\/\\/depot/d' | diff -u /dev/stdin /dev/null | sed s@/dev/stdin@" del_file "@"
+	#print "x" cmd "x"
+	system(cmd)
+}
+$1 != "====" {
+	if (!did_sub && (($1 == "***************") || ($1 == "@@"))) {
+		print "--- ", last_filename ".orig"
+		print "+++ ", last_filename
+		print $0
+		did_sub = 1
+	} else {
+		print $0
+	}
+}

Added: head/tools/tools/perforce/p4diffbranch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/tools/perforce/p4diffbranch	Wed Aug 27 18:56:12 2014	(r270727)
@@ -0,0 +1,19 @@
+#!/bin/sh -
+#
+#	$FreeBSD$
+#
+
+if [ x"$#" != x"2" ]; then
+	echo "Usage: $0  "
+	exit 1
+fi
+
+basescript="$(realpath "$0")"
+awkdiff="${basescript%/*}/awkdiff"
+
+branch="$1"
+changenum="$2"
+
+p4 branch -o "$branch" |
+	awk ' /^View:/ { doview = 1; next; } /^[^	]/ {doview = 0; next; } $1 && $2 && doview == 1 { system("p4 diff2 -du " $1 "@" changenum " " $2) }' changenum="$changenum" |
+	"$awkdiff"

From owner-svn-src-all@FreeBSD.ORG  Wed Aug 27 18:59:10 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 128FAF40;
 Wed, 27 Aug 2014 18:59:10 +0000 (UTC)
Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6FCBD3B59;
 Wed, 27 Aug 2014 18:59:09 +0000 (UTC)
Received: from tom.home (kib@localhost [127.0.0.1])
 by kib.kiev.ua (8.14.9/8.14.9) with ESMTP id s7RIx4f7049532
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
 Wed, 27 Aug 2014 21:59:04 +0300 (EEST)
 (envelope-from kostikbel@gmail.com)
DKIM-Filter: OpenDKIM Filter v2.9.2 kib.kiev.ua s7RIx4f7049532
Received: (from kostik@localhost)
 by tom.home (8.14.9/8.14.9/Submit) id s7RIx3ah049531;
 Wed, 27 Aug 2014 21:59:03 +0300 (EEST)
 (envelope-from kostikbel@gmail.com)
X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com
 using -f
Date: Wed, 27 Aug 2014 21:59:03 +0300
From: Konstantin Belousov 
To: Mateusz Guzik 
Subject: Re: svn commit: r270444 - in head/sys: kern sys
Message-ID: <20140827185903.GJ2737@kib.kiev.ua>
References: <201408240904.s7O949sI083660@svn.freebsd.org>
 <201408261509.26815.jhb@freebsd.org>
 <20140826193210.GL71691@funkthat.com>
 <201408261723.10854.jhb@freebsd.org>
 <20140826215522.GG2737@kib.kiev.ua>
 <20140827165432.GA28581@dft-labs.eu>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature"; boundary="xfRG4nlyOLmJPu0j"
Content-Disposition: inline
In-Reply-To: <20140827165432.GA28581@dft-labs.eu>
User-Agent: Mutt/1.5.23 (2014-03-12)
X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00,
 DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no
 autolearn_force=no version=3.4.0
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on tom.home
Cc: src-committers@freebsd.org, John Baldwin ,
 Mateusz Guzik , svn-src-all@freebsd.org,
 svn-src-head@freebsd.org, John-Mark Gurney 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 27 Aug 2014 18:59:10 -0000


--xfRG4nlyOLmJPu0j
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Wed, Aug 27, 2014 at 06:54:32PM +0200, Mateusz Guzik wrote:
> So how about the following:

You need to update kinfo_proc32 in sys/compat/freebsd32/freebsd32.h
and freebsd32_kinfo_proc_out() in kern/kern_proc.c.  Otherwise,
32bit kinfo_proc is broken, in particular, you can see 32 bit
ps(1) dumping garbage.

--xfRG4nlyOLmJPu0j
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBAgAGBQJT/ip3AAoJEJDCuSvBvK1BTIkP/0KKZDix3vjQzUmg53rLyfvJ
zKlfmL3kM7yctyIIl/MYQnRLPsXaw9DiCsbrHQ7jVHDLttt+85QimsJ+8mqvANHK
9SLOpnGKaqstdi/lVGe5Or7uKWGHeB2cvLgOTNd9tn7ot+gih3uN9bf1CkLG5HcE
KsnAUldQftixgULs5BVIu5FnkHZqzcb36sX2jAYCv039AUTULKbVuJirPQRYV48v
RZY3Ai1oYQur4TmZ0D8NGjdCrkyk1f+FhVuDIaNhdV4X+UcjHbhi9NUWN/9sFii0
N/FIVuxtOOi4PUIWh5GWx+XRIgOo11fEW3D92PHGpau4DCcvdqEoC/WPkZbMcayE
eNpafh+IecQhxKDrvnEoYb87Y3D7HbhxwHiXn5K7zgix/zlWD710bW08Q95qHLrK
7Gkdaf0TlDOanpSIfT5MtipK9cjA9o6KkA0ihrF4qNwry7ier85v517p3NIlhmSb
m2TvLZCOzhsDyEocCbqvgV2JatqTKY5A4cFpMNLddu4ukKIAzWqGQtW4HAkTuMlo
LFYB3Cu6Ao7ibL4FNLas/dG52S8QxK7O7yF//cnm91+LmXe/IV1dQTO1izOKakiX
uxFeC7q55MzA4EiFa2uXIbKzwfmSjjWWT4LNWZVCeMJBzB56NEkdi5B8E8izw/b8
cHyHW6l4wuLIGmsiJIni
=atq9
-----END PGP SIGNATURE-----

--xfRG4nlyOLmJPu0j--

From owner-svn-src-all@FreeBSD.ORG  Wed Aug 27 18:59:48 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 76B0C150;
 Wed, 27 Aug 2014 18:59:48 +0000 (UTC)
Received: from mail.turbocat.net (heidi.turbocat.net [88.198.202.214])
 (using TLSv1.1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 30B993B67;
 Wed, 27 Aug 2014 18:59:47 +0000 (UTC)
Received: from laptop015.home.selasky.org
 (cm-176.74.213.204.customer.telag.net [176.74.213.204])
 (using TLSv1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits))
 (No client certificate requested)
 by mail.turbocat.net (Postfix) with ESMTPSA id 33D341FE027;
 Wed, 27 Aug 2014 20:59:39 +0200 (CEST)
Message-ID: <53FE2AA3.6070403@selasky.org>
Date: Wed, 27 Aug 2014 20:59:47 +0200
From: Hans Petter Selasky 
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
 rv:24.0) Gecko/20100101 Thunderbird/24.1.0
MIME-Version: 1.0
To: Adrian Chadd 
Subject: Re: svn commit: r270710 - in head/sys: contrib/rdma/krping dev/cxgb
 dev/cxgbe/iw_cxgbe modules/mlx4 modules/mlx4ib modules/mlxen
 ofed/drivers/infiniband/core
 ofed/drivers/infiniband/hw/mlx4 ofed/driver...
References: <201408271321.s7RDLr3d069813@svn.freebsd.org>
 
In-Reply-To: 
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Cc: "svn-src-head@freebsd.org" ,
 "svn-src-all@freebsd.org" ,
 "src-committers@freebsd.org" 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 27 Aug 2014 18:59:48 -0000

Hi,

On 08/27/14 20:50, Adrian Chadd wrote:
> Hi!
>
> Did this get reviewed at all?

Yes.

>
> Removing those files may make it more annoying to port some other
> linux code in the future, as some future linux driver code may include
> those files.
>

At the stage where this emulation layer is, you will most likely need to 
edit the include files anyway, which should not be that hard.

Do you know of any code outside the tree using this emulation layer?

--HPS


From owner-svn-src-all@FreeBSD.ORG  Wed Aug 27 19:06:17 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id A5A4A58A;
 Wed, 27 Aug 2014 19:06:17 +0000 (UTC)
Received: from mail-qc0-x233.google.com (mail-qc0-x233.google.com
 [IPv6:2607:f8b0:400d:c01::233])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 429373C55;
 Wed, 27 Aug 2014 19:06:17 +0000 (UTC)
Received: by mail-qc0-f179.google.com with SMTP id m20so767923qcx.38
 for ; Wed, 27 Aug 2014 12:06:16 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:date:message-id:subject
 :from:to:cc:content-type;
 bh=Oi4x2+baIq0B9vjeAYUWwJSJ+6PK2WrtZtNosfttJSM=;
 b=e8erZGd5bv3pTi4WY5bvr8ReW3S/h+w9yi+RCnV9sFJEQYiUSswtV6nTN3T3O/gWeO
 dFUz8ZxcQKKStRHv1cQNldgRUaQm53MsC+tBG0FcDw5m+hjT+xXu/63fvGc+nyZeaP0u
 6XO7nr4Lr/hhptXptxX8EjwcFC92ATntWppE2HW92tXvpCduVTpzXc/rONNQcvGr3t/7
 9fUtFpVJyL0yi//25GeXWWkK/lBVU0IWK60FUM3U+0MXWRgYU1AfvHcg7OEPR8K7cMCm
 s3xUhZt4jhUaSL/k0o6k6BHcIuFnsH52Tdm+qWmunN0+xwshy69WND0vJSDxKLm36zIG
 fYKQ==
MIME-Version: 1.0
X-Received: by 10.140.104.69 with SMTP id z63mr56576048qge.81.1409166376136;
 Wed, 27 Aug 2014 12:06:16 -0700 (PDT)
Sender: adrian.chadd@gmail.com
Received: by 10.224.39.139 with HTTP; Wed, 27 Aug 2014 12:06:15 -0700 (PDT)
In-Reply-To: <53FE2AA3.6070403@selasky.org>
References: <201408271321.s7RDLr3d069813@svn.freebsd.org>
 
 <53FE2AA3.6070403@selasky.org>
Date: Wed, 27 Aug 2014 12:06:15 -0700
X-Google-Sender-Auth: DUBeFXjUBsWqQFI_9qYs1F7sdgM
Message-ID: 
Subject: Re: svn commit: r270710 - in head/sys: contrib/rdma/krping dev/cxgb
 dev/cxgbe/iw_cxgbe modules/mlx4 modules/mlx4ib modules/mlxen
 ofed/drivers/infiniband/core ofed/drivers/infiniband/hw/mlx4 ofed/driver...
From: Adrian Chadd 
To: Hans Petter Selasky 
Content-Type: text/plain; charset=UTF-8
Cc: "svn-src-head@freebsd.org" ,
 "svn-src-all@freebsd.org" ,
 "src-committers@freebsd.org" 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 27 Aug 2014 19:06:17 -0000

On 27 August 2014 11:59, Hans Petter Selasky  wrote:
> Hi,
>
>
> On 08/27/14 20:50, Adrian Chadd wrote:
>>
>> Hi!
>>
>> Did this get reviewed at all?
>
>
> Yes.
>
>
>>
>> Removing those files may make it more annoying to port some other
>> linux code in the future, as some future linux driver code may include
>> those files.
>>
>
> At the stage where this emulation layer is, you will most likely need to
> edit the include files anyway, which should not be that hard.
>
> Do you know of any code outside the tree using this emulation layer?

A couple of us were about to review using the ofed linux compat code
for the drm2 code from dragonflybsd.


-a

From owner-svn-src-all@FreeBSD.ORG  Wed Aug 27 19:08:47 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 1EED18D6;
 Wed, 27 Aug 2014 19:08:47 +0000 (UTC)
Received: from mail-lb0-x234.google.com (mail-lb0-x234.google.com
 [IPv6:2a00:1450:4010:c04::234])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 0BA2B3CA0;
 Wed, 27 Aug 2014 19:08:45 +0000 (UTC)
Received: by mail-lb0-f180.google.com with SMTP id 10so988703lbg.39
 for ; Wed, 27 Aug 2014 12:08:43 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:date:message-id:subject
 :from:to:cc:content-type;
 bh=Gj4uHGfi533Bons7EewkBovZ+cDNnoGvaeFpD/DwAso=;
 b=etVmpfYc792Cx/XAw1vqVlIVIBt/IeykPeP0WZEsHi8KvtTItLbqYRnrN7TOAqb9WH
 h3+ynpknb0TNuU1NtuS3YacWGTVCytKC0J8EtZDVbyonz4AJI207zE+3oxQi6hhWPTFw
 e2KWZaXQpbDMaLgsXlaI96qGYDPsUPca/MQtsXGVLUMBuk+YmYC7pzbcXczywyygtQ1i
 X03AxZCxfA8MUDPRalijQ76q1XDlW0ZPt7Qd1TMCCNcWqx0SAcOzwto1EQ8d5JwxOWMu
 AUPpe6pZUmrccd9gGqLpT69yHta74rHDHiNt8GKIqP8HDuipIQhBYELCCw+5n0IP45AR
 7m6A==
MIME-Version: 1.0
X-Received: by 10.153.6.9 with SMTP id cq9mr35687675lad.48.1409166523450; Wed,
 27 Aug 2014 12:08:43 -0700 (PDT)
Sender: davide.italiano@gmail.com
Received: by 10.25.207.196 with HTTP; Wed, 27 Aug 2014 12:08:43 -0700 (PDT)
In-Reply-To: <53FE2AA3.6070403@selasky.org>
References: <201408271321.s7RDLr3d069813@svn.freebsd.org>
 
 <53FE2AA3.6070403@selasky.org>
Date: Wed, 27 Aug 2014 12:08:43 -0700
X-Google-Sender-Auth: L_6Yu7NRcWnpDcY8ZBnCEUYcK5Q
Message-ID: 
Subject: Re: svn commit: r270710 - in head/sys: contrib/rdma/krping dev/cxgb
 dev/cxgbe/iw_cxgbe modules/mlx4 modules/mlx4ib modules/mlxen
 ofed/drivers/infiniband/core ofed/drivers/infiniband/hw/mlx4 ofed/driver...
From: Davide Italiano 
To: Hans Petter Selasky 
Content-Type: text/plain; charset=UTF-8
Cc: "svn-src-head@freebsd.org" ,
 Adrian Chadd ,
 "src-committers@freebsd.org" ,
 "svn-src-all@freebsd.org" 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 27 Aug 2014 19:08:47 -0000

On Wed, Aug 27, 2014 at 11:59 AM, Hans Petter Selasky  wrote:
>> Removing those files may make it more annoying to port some other
>> linux code in the future, as some future linux driver code may include
>> those files.
>>
>

On a (somewhat) related note, I would like to see sema(9) replaced by
sx(9) in the compatibility layer. I've a couple of patches that get
rid of the deprecated primitive in aio/ips code, and planned to look
at ofed as well, but if somebody with deep driver knowledge can do
that on my behalf it would be great.

-- 
Davide

"There are no solved problems; there are only problems that are more
or less solved" -- Henri Poincare

From owner-svn-src-all@FreeBSD.ORG  Wed Aug 27 19:26:36 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 8FFBB24D;
 Wed, 27 Aug 2014 19:26:36 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7A1893F19;
 Wed, 27 Aug 2014 19:26:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7RJQavh037322;
 Wed, 27 Aug 2014 19:26:36 GMT (envelope-from pluknet@FreeBSD.org)
Received: (from pluknet@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7RJQZSY037318;
 Wed, 27 Aug 2014 19:26:36 GMT (envelope-from pluknet@FreeBSD.org)
Message-Id: <201408271926.s7RJQZSY037318@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: pluknet set sender to
 pluknet@FreeBSD.org using -f
From: Sergey Kandaurov 
Date: Wed, 27 Aug 2014 19:26:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270728 - head/contrib/tzdata
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 27 Aug 2014 19:26:36 -0000

Author: pluknet
Date: Wed Aug 27 19:26:35 2014
New Revision: 270728
URL: http://svnweb.freebsd.org/changeset/base/270728

Log:
  MFV of r270725, tzdata2014f
  
  - Russia time zone changes.
  - New zones: Asia/Chita and Asia/Srednekolymsk.
  - Lots of changes wrt. time zone abbreviations and historical data.
  - New zone tab data format.

Added:
  head/contrib/tzdata/zone1970.tab
     - copied, changed from r270725, vendor/tzdata/dist/zone1970.tab
Modified:
  head/contrib/tzdata/africa
  head/contrib/tzdata/antarctica
  head/contrib/tzdata/asia
  head/contrib/tzdata/australasia
  head/contrib/tzdata/backward
  head/contrib/tzdata/etcetera
  head/contrib/tzdata/europe
  head/contrib/tzdata/factory
  head/contrib/tzdata/leap-seconds.list
  head/contrib/tzdata/northamerica
  head/contrib/tzdata/pacificnew
  head/contrib/tzdata/southamerica
  head/contrib/tzdata/systemv
  head/contrib/tzdata/yearistype.sh
  head/contrib/tzdata/zone.tab
Directory Properties:
  head/contrib/tzdata/   (props changed)

Modified: head/contrib/tzdata/africa
==============================================================================
--- head/contrib/tzdata/africa	Wed Aug 27 18:56:12 2014	(r270727)
+++ head/contrib/tzdata/africa	Wed Aug 27 19:26:35 2014	(r270728)
@@ -1,4 +1,3 @@
-# 
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -35,13 +34,13 @@
 # Previous editions of this database used WAT, CAT, SAT, and EAT
 # for +0:00 through +3:00, respectively,
 # but Mark R V Murray reports that
-# `SAST' is the official abbreviation for +2:00 in the country of South Africa,
-# `CAT' is commonly used for +2:00 in countries north of South Africa, and
-# `WAT' is probably the best name for +1:00, as the common phrase for
-# the area that includes Nigeria is ``West Africa''.
-# He has heard of ``Western Sahara Time'' for +0:00 but can find no reference.
+# 'SAST' is the official abbreviation for +2:00 in the country of South Africa,
+# 'CAT' is commonly used for +2:00 in countries north of South Africa, and
+# 'WAT' is probably the best name for +1:00, as the common phrase for
+# the area that includes Nigeria is "West Africa".
+# He has heard of "Western Sahara Time" for +0:00 but can find no reference.
 #
-# To make things confusing, `WAT' seems to have been used for -1:00 long ago;
+# To make things confusing, 'WAT' seems to have been used for -1:00 long ago;
 # I'd guess that this was because people needed _some_ name for -1:00,
 # and at the time, far west Africa was the only major land area in -1:00.
 # This usage is now obsolete, as the last use of -1:00 on the African
@@ -54,7 +53,7 @@
 #	 2:00	SAST	South Africa Standard Time
 # and Murray suggests the following abbreviation:
 #	 1:00	WAT	West Africa Time
-# I realize that this leads to `WAT' being used for both -1:00 and 1:00
+# I realize that this leads to 'WAT' being used for both -1:00 and 1:00
 # for times before 1976, but this is the best I can think of
 # until we get more information.
 #
@@ -131,9 +130,7 @@ Zone	Africa/Gaborone	1:43:40 -	LMT	1885
 			2:00	-	CAT
 
 # Burkina Faso
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Africa/Ouagadougou	-0:06:04 -	LMT	1912
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Burundi
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -161,7 +158,7 @@ Zone	Africa/Bangui	1:14:20	-	LMT	1912
 
 # Chad
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Ndjamena	1:00:12 -	LMT	1912
+Zone	Africa/Ndjamena	1:00:12 -	LMT	1912 # N'Djamena
 			1:00	-	WAT	1979 Oct 14
 			1:00	1:00	WAST	1980 Mar  8
 			1:00	-	WAT
@@ -183,10 +180,20 @@ Zone Africa/Lubumbashi	1:49:52 -	LMT	189
 Zone Africa/Brazzaville	1:01:08 -	LMT	1912
 			1:00	-	WAT
 
-# Cote D'Ivoire
+# Côte D'Ivoire / Ivory Coast
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Abidjan	-0:16:08 -	LMT	1912
 			 0:00	-	GMT
+Link Africa/Abidjan Africa/Bamako	# Mali
+Link Africa/Abidjan Africa/Banjul	# Gambia
+Link Africa/Abidjan Africa/Conakry	# Guinea
+Link Africa/Abidjan Africa/Dakar	# Senegal
+Link Africa/Abidjan Africa/Freetown	# Sierra Leone
+Link Africa/Abidjan Africa/Lome		# Togo
+Link Africa/Abidjan Africa/Nouakchott	# Mauritania
+Link Africa/Abidjan Africa/Ouagadougou	# Burkina Faso
+Link Africa/Abidjan Africa/Sao_Tome	# São Tomé and Príncipe
+Link Africa/Abidjan Atlantic/St_Helena	# St Helena
 
 # Djibouti
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -231,13 +238,9 @@ Rule	Egypt	1990	1994	-	May	 1	1:00	1:00	
 # Egyptians would approve the cancellation."
 #
 # Egypt to cancel daylight saving time
-# 
 # http://www.almasryalyoum.com/en/node/407168
-# 
 # or
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_egypt04.html
-# 
 Rule	Egypt	1995	2010	-	Apr	lastFri	 0:00s	1:00	S
 Rule	Egypt	1995	2005	-	Sep	lastThu	24:00	0	-
 # From Steffen Thorsen (2006-09-19):
@@ -249,7 +252,7 @@ Rule	Egypt	2006	only	-	Sep	21	24:00	0	-
 # From Dirk Losch (2007-08-14):
 # I received a mail from an airline which says that the daylight
 # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07.
-# From Jesper Norgaard Welen (2007-08-15): [The following agree:]
+# From Jesper Nørgaard Welen (2007-08-15): [The following agree:]
 # http://www.nentjes.info/Bill/bill5.htm
 # http://www.timeanddate.com/worldclock/city.html?n=53
 # From Steffen Thorsen (2007-09-04): The official information...:
@@ -288,15 +291,9 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	24:00	
 #
 # timeanddate[2] and another site I've found[3] also support that.
 #
-# [1] 
-# https://bugzilla.redhat.com/show_bug.cgi?id=492263
-# 
-# [2] 
-# http://www.timeanddate.com/worldclock/clockchange.html?n=53
-# 
-# [3] 
-# http://wwp.greenwichmeantime.com/time-zone/africa/egypt/
-# 
+# [1] https://bugzilla.redhat.com/show_bug.cgi?id=492263
+# [2] http://www.timeanddate.com/worldclock/clockchange.html?n=53
+# [3] http://wwp.greenwichmeantime.com/time-zone/africa/egypt/
 
 # From Arthur David Olson (2009-04-20):
 # In 2009 (and for the next several years), Ramadan ends before the fourth
@@ -306,14 +303,10 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	24:00	
 # From Steffen Thorsen (2009-08-11):
 # We have been able to confirm the August change with the Egyptian Cabinet
 # Information and Decision Support Center:
-# 
 # http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html
-# 
 #
 # The Middle East News Agency
-# 
 # http://www.mena.org.eg/index.aspx
-# 
 # also reports "Egypt starts winter time on August 21"
 # today in article numbered "71, 11/08/2009 12:25 GMT."
 # Only the title above is available without a subscription to their service,
@@ -321,19 +314,14 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	24:00	
 # (at least today).
 
 # From Alexander Krivenyshev (2010-07-20):
-# According to News from Egypt -  Al-Masry Al-Youm Egypt's cabinet has
+# According to News from Egypt - Al-Masry Al-Youm Egypt's cabinet has
 # decided that Daylight Saving Time will not be used in Egypt during
 # Ramadan.
 #
 # Arabic translation:
-# "Clocks to go back during Ramadan--and then forward again"
-# 
+# "Clocks to go back during Ramadan - and then forward again"
 # http://www.almasryalyoum.com/en/news/clocks-go-back-during-ramadan-and-then-forward-again
-# 
-# or
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_egypt02.html
-# 
 
 # From Ahmad El-Dardiry (2014-05-07):
 # Egypt is to change back to Daylight system on May 15
@@ -433,10 +421,15 @@ Zone	Africa/Asmara	2:35:32 -	LMT	1870
 			3:00	-	EAT
 
 # Ethiopia
-# From Paul Eggert (2006-03-22):
-# Shanks & Pottenger write that Ethiopia had six narrowly-spaced time zones
-# between 1870 and 1890, and that they merged to 38E50 (2:35:20) in 1890.
-# We'll guess that 38E50 is for Adis Dera.
+# From Paul Eggert (2014-07-31):
+# Like the Swahili of Kenya and Tanzania, many Ethiopians keep a
+# 12-hour clock starting at our 06:00, so their "8 o'clock" is our
+# 02:00 or 14:00.  Keep this in mind when you ask the time in Amharic.
+#
+# Shanks & Pottenger write that Ethiopia had six narrowly-spaced time
+# zones between 1870 and 1890, that they merged to 38E50 (2:35:20) in
+# 1890, and that they switched to 3:00 on 1936-05-05.  Perhaps 38E50
+# was for Adis Dera.  Quite likely the Shanks data are wrong anyway.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Addis_Ababa	2:34:48 -	LMT	1870
 			2:35:20	-	ADMT	1936 May 5    # Adis Dera MT
@@ -448,28 +441,24 @@ Zone Africa/Libreville	0:37:48 -	LMT	191
 			1:00	-	WAT
 
 # Gambia
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Banjul	-1:06:36 -	LMT	1912
-			-1:06:36 -	BMT	1935	# Banjul Mean Time
-			-1:00	-	WAT	1964
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Ghana
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-# Whitman says DST was observed from 1931 to ``the present'';
-# go with Shanks & Pottenger.
-Rule	Ghana	1936	1942	-	Sep	 1	0:00	0:20	GHST
-Rule	Ghana	1936	1942	-	Dec	31	0:00	0	GMT
+# Whitman says DST was observed from 1931 to "the present";
+# Shanks & Pottenger say 1936 to 1942;
+# and September 1 to January 1 is given by:
+# Scott Keltie J, Epstein M (eds), The Statesman's Year-Book,
+# 57th ed. Macmillan, London (1920), OCLC 609408015, pp xxviii.
+# For lack of better info, assume DST was observed from 1920 to 1942.
+Rule	Ghana	1920	1942	-	Sep	 1	0:00	0:20	GHST
+Rule	Ghana	1920	1942	-	Dec	31	0:00	0	GMT
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Accra	-0:00:52 -	LMT	1918
 			 0:00	Ghana	%s
 
 # Guinea
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Conakry	-0:54:52 -	LMT	1912
-			 0:00	-	GMT	1934 Feb 26
-			-1:00	-	WAT	1960
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Guinea-Bissau
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -577,18 +566,8 @@ Zone	Africa/Blantyre	2:20:00 -	LMT	1903 
 			2:00	-	CAT
 
 # Mali
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Bamako	-0:32:00 -	LMT	1912
-			 0:00	-	GMT	1934 Feb 26
-			-1:00	-	WAT	1960 Jun 20
-			 0:00	-	GMT
-
 # Mauritania
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Africa/Nouakchott	-1:03:48 -	LMT	1912
-			 0:00	-	GMT	1934 Feb 26
-			-1:00	-	WAT	1960 Nov 28
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Mauritius
 
@@ -612,9 +591,7 @@ Zone Africa/Nouakchott	-1:03:48 -	LMT	19
 
 # From Steffen Thorsen (2008-07-10):
 # According to
-# 
 # http://www.lexpress.mu/display_article.php?news_id=111216
-# 
 # (in French), Mauritius will start and end their DST a few days earlier
 # than previously announced (2008-11-01 to 2009-03-31).  The new start
 # date is 2008-10-26 at 02:00 and the new end date is 2009-03-27 (no time
@@ -633,18 +610,13 @@ Zone Africa/Nouakchott	-1:03:48 -	LMT	19
 # published on Monday, June 30, 2008...
 #
 # I guess that article in French "Le gouvernement avance l'introduction
-# de l'heure d'ete" stating that DST in Mauritius starting on October 26
-# and ending on March 27, 2009 is the most recent one.
-# ...
-# 
+# de l'heure d'été" stating that DST in Mauritius starting on October 26
+# and ending on March 27, 2009 is the most recent one....
 # http://www.worldtimezone.com/dst_news/dst_news_mauritius02.html
-# 
 
 # From Riad M. Hossen Ally (2008-08-03):
 # The Government of Mauritius weblink
-# 
 # http://www.gov.mu/portal/site/pmosite/menuitem.4ca0efdee47462e7440a600248a521ca/?content_id=4728ca68b2a5b110VgnVCM1000000a04a8c0RCRD
-# 
 # Cabinet Decision of July 18th, 2008 states as follows:
 #
 # 4. ...Cabinet has agreed to the introduction into the National Assembly
@@ -654,33 +626,25 @@ Zone Africa/Nouakchott	-1:03:48 -	LMT	19
 # States of America. It will start at two o'clock in the morning on the
 # last Sunday of October and will end at two o'clock in the morning on
 # the last Sunday of March the following year. The summer time for the
-# year 2008 - 2009 will, therefore, be effective as from 26 October 2008
+# year 2008-2009 will, therefore, be effective as from 26 October 2008
 # and end on 29 March 2009.
 
 # From Ed Maste (2008-10-07):
 # THE TIME BILL (No. XXVII of 2008) Explanatory Memorandum states the
 # beginning / ending of summer time is 2 o'clock standard time in the
 # morning of the last Sunday of October / last Sunday of March.
-# 
 # http://www.gov.mu/portal/goc/assemblysite/file/bill2708.pdf
-# 
 
 # From Steffen Thorsen (2009-06-05):
 # According to several sources, Mauritius will not continue to observe
 # DST the coming summer...
 #
 # Some sources, in French:
-# 
 # http://www.defimedia.info/news/946/Rashid-Beebeejaun-:-%C2%AB-L%E2%80%99heure-d%E2%80%99%C3%A9t%C3%A9-ne-sera-pas-appliqu%C3%A9e-cette-ann%C3%A9e-%C2%BB
-# 
-# 
 # http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-%C3%A9conomie-d-%C3%A9nergie-de-l-heure-d-%C3%A9t%C3%A9-ont-%C3%A9t%C3%A9-atteints-
-# 
 #
 # Our wrap-up:
-# 
 # http://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html
-# 
 
 # From Arthur David Olson (2009-07-11):
 # The "mauritius-dst-will-not-repeat" wrapup includes this:
@@ -704,7 +668,7 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 			3:00	-	EAT
 
 # Morocco
-# See the `europe' file for Spanish Morocco (Africa/Ceuta).
+# See the 'europe' file for Spanish Morocco (Africa/Ceuta).
 
 # From Alex Krivenyshev (2008-05-09):
 # Here is an article that Morocco plan to introduce Daylight Saving Time between
@@ -712,60 +676,43 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 #
 # "... Morocco is to save energy by adjusting its clock during summer so it will
 # be one hour ahead of GMT between 1 June and 27 September, according to
-# Communication Minister and Gov ernment Spokesman, Khalid Naciri...."
+# Communication Minister and Government Spokesman, Khalid Naciri...."
 #
-# 
 # http://www.worldtimezone.net/dst_news/dst_news_morocco01.html
-# 
-# OR
-# 
 # http://en.afrik.com/news11892.html
-# 
 
 # From Alex Krivenyshev (2008-05-09):
 # The Morocco time change can be confirmed on Morocco web site Maghreb Arabe Presse:
-# 
 # http://www.map.ma/eng/sections/box3/morocco_shifts_to_da/view
-# 
 #
 # Morocco shifts to daylight time on June 1st through September 27, Govt.
 # spokesman.
 
 # From Patrice Scattolin (2008-05-09):
 # According to this article:
-# 
 # http://www.avmaroc.com/actualite/heure-dete-comment-a127896.html
-# 
-# (and republished here:
-# 
-# http://www.actu.ma/heure-dete-comment_i127896_0.html
-# 
-# )
-# the changes occurs at midnight:
-#
-# saturday night may 31st at midnight (which in french is to be
-# intrepreted as the night between saturday and sunday)
-# sunday night the 28th  at midnight
-#
-# Seeing that the 28th is monday, I am guessing that she intends to say
-# the midnight of the 28th which is the midnight between sunday and
-# monday, which jives with other sources that say that it's inclusive
-# june1st to sept 27th.
+# (and republished here: )
+# the changes occur at midnight:
+#
+# Saturday night May 31st at midnight (which in French is to be
+# interpreted as the night between Saturday and Sunday)
+# Sunday night the 28th at midnight
+#
+# Seeing that the 28th is Monday, I am guessing that she intends to say
+# the midnight of the 28th which is the midnight between Sunday and
+# Monday, which jives with other sources that say that it's inclusive
+# June 1st to Sept 27th.
 #
 # The decision was taken by decree *2-08-224 *but I can't find the decree
 # published on the web.
 #
 # It's also confirmed here:
-# 
 # http://www.maroc.ma/NR/exeres/FACF141F-D910-44B0-B7FA-6E03733425D1.htm
-# 
-# on a government portal as being  between june 1st and sept 27th (not yet
-# posted in english).
+# on a government portal as being between June 1st and Sept 27th (not yet
+# posted in English).
 #
-# The following google query will generate many relevant hits:
-# 
+# The following Google query will generate many relevant hits:
 # http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search
-# 
 
 # From Steffen Thorsen (2008-08-27):
 # Morocco will change the clocks back on the midnight between August 31
@@ -773,47 +720,32 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 # of September:
 #
 # One article about it (in French):
-# 
 # http://www.menara.ma/fr/Actualites/Maroc/Societe/ci.retour_a_l_heure_gmt_a_partir_du_dimanche_31_aout_a_minuit_officiel_.default
-# 
 #
 # We have some further details posted here:
-# 
 # http://www.timeanddate.com/news/time/morocco-ends-dst-early-2008.html
-# 
 
 # From Steffen Thorsen (2009-03-17):
 # Morocco will observe DST from 2009-06-01 00:00 to 2009-08-21 00:00 according
 # to many sources, such as
-# 
 # http://news.marweb.com/morocco/entertainment/morocco-daylight-saving.html
-# 
-# 
 # http://www.medi1sat.ma/fr/depeche.aspx?idp=2312
-# 
 # (French)
 #
 # Our summary:
-# 
 # http://www.timeanddate.com/news/time/morocco-starts-dst-2009.html
-# 
 
 # From Alexander Krivenyshev (2009-03-17):
 # Here is a link to official document from Royaume du Maroc Premier Ministre,
-# Ministere de la Modernisation des Secteurs Publics
+# Ministère de la Modernisation des Secteurs Publics
 #
 # Under Article 1 of Royal Decree No. 455-67 of Act 23 safar 1387 (2 june 1967)
 # concerning the amendment of the legal time, the Ministry of Modernization of
 # Public Sectors announced that the official time in the Kingdom will be
 # advanced 60 minutes from Sunday 31 May 2009 at midnight.
 #
-# 
 # http://www.mmsp.gov.ma/francais/Actualites_fr/PDF_Actualites_Fr/HeureEte_FR.pdf
-# 
-#
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_morocco03.html
-# 
 
 # From Steffen Thorsen (2010-04-13):
 # Several news media in Morocco report that the Ministry of Modernization
@@ -821,14 +753,10 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 # 2010-05-02 to 2010-08-08.
 #
 # Example:
-# 
 # http://www.lavieeco.com/actualites/4099-le-maroc-passera-a-l-heure-d-ete-gmt1-le-2-mai.html
-# 
 # (French)
 # Our page:
-# 
 # http://www.timeanddate.com/news/time/morocco-starts-dst-2010.html
-# 
 
 # From Dan Abitol (2011-03-30):
 # ...Rules for Africa/Casablanca are the following (24h format)
@@ -838,34 +766,20 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 # The change was broadcast on the FM Radio
 # I ve called ANRT (telecom regulations in Morocco) at
 # +212.537.71.84.00
-# 
 # http://www.anrt.net.ma/fr/
-# 
 # They said that
-# 
 # http://www.map.ma/fr/sections/accueil/l_heure_legale_au_ma/view
-# 
 # is the official publication to look at.
 # They said that the decision was already taken.
 #
 # More articles in the press
-# 
-# http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-lev
-# 
-# e.html
-# 
+# http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-leve.html
 # http://www.lematin.ma/Actualite/Express/Article.asp?id=148923
-# 
-# 
 # http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT%2B1-a-partir-de-dim
-# anche-prochain-5538.html
-# 
 
 # From Petr Machata (2011-03-30):
 # They have it written in English here:
-# 
 # http://www.map.ma/eng/sections/home/morocco_to_spring_fo/view
-# 
 #
 # It says there that "Morocco will resume its standard time on July 31,
 # 2011 at midnight." Now they don't say whether they mean midnight of
@@ -873,20 +787,16 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 # also been like that in the past.
 
 # From Alexander Krivenyshev (2012-03-09):
-# According to Infomédiaire web site from Morocco (infomediaire.ma),
-# on March 9, 2012, (in French) Heure légale:
-# Le Maroc adopte officiellement l'heure d'été
-# 
+# According to Infomédiaire web site from Morocco (infomediaire.ma),
+# on March 9, 2012, (in French) Heure légale:
+# Le Maroc adopte officiellement l'heure d'été
 # http://www.infomediaire.ma/news/maroc/heure-l%C3%A9gale-le-maroc-adopte-officiellement-lheure-d%C3%A9t%C3%A9
-# 
 # Governing Council adopted draft decree, that Morocco DST starts on
 # the last Sunday of March (March 25, 2012) and ends on
 # last Sunday of September (September 30, 2012)
 # except the month of Ramadan.
 # or (brief)
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_morocco06.html
-# 
 
 # From Arthur David Olson (2012-03-10):
 # The infomediaire.ma source indicates that the system is to be in
@@ -897,17 +807,13 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 
 # From Christophe Tropamer (2012-03-16):
 # Seen Morocco change again:
-# 
 # http://www.le2uminutes.com/actualite.php
-# 
-# "...à partir du dernier dimance d'avril et non fins mars,
-# comme annoncé précédemment."
+# "...à partir du dernier dimanche d'avril et non fins mars,
+# comme annoncé précédemment."
 
 # From Milamber Space Network (2012-07-17):
 # The official return to GMT is announced by the Moroccan government:
-# 
 # http://www.mmsp.gov.ma/fr/actualites.aspx?id=288 [in French]
-# 
 #
 # Google translation, lightly edited:
 # Back to the standard time of the Kingdom (GMT)
@@ -1052,7 +958,7 @@ Zone Africa/Casablanca	-0:30:20 -	LMT	19
 # Assume that this has been true since Western Sahara switched to GMT,
 # since most of it was then controlled by Morocco.
 
-Zone Africa/El_Aaiun	-0:52:48 -	LMT	1934 Jan
+Zone Africa/El_Aaiun	-0:52:48 -	LMT	1934 Jan # El Aaiún
 			-1:00	-	WAT	1976 Apr 14
 			 0:00	Morocco	WE%sT
 
@@ -1102,15 +1008,17 @@ Zone	Africa/Niamey	 0:08:28 -	LMT	1912
 Zone	Africa/Lagos	0:13:36 -	LMT	1919 Sep
 			1:00	-	WAT
 
-# Reunion
+# Réunion
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Indian/Reunion	3:41:52 -	LMT	1911 Jun	# Saint-Denis
-			4:00	-	RET	# Reunion Time
+			4:00	-	RET	# Réunion Time
 #
-# Scattered Islands (Iles Eparses) administered from Reunion are as follows.
+# Crozet Islands also observes Réunion time; see the 'antarctica' file.
+#
+# Scattered Islands (Îles Éparses) administered from Réunion are as follows.
 # The following information about them is taken from
-# Iles Eparses (www.outre-mer.gouv.fr/domtom/ile.htm, 1997-07-22, in French;
-# no longer available as of 1999-08-17).
+# Îles Éparses (, 1997-07-22,
+# in French; no longer available as of 1999-08-17).
 # We have no info about their time zone histories.
 #
 # Bassas da India - uninhabited
@@ -1125,28 +1033,17 @@ Zone	Africa/Kigali	2:00:16 -	LMT	1935 Ju
 			2:00	-	CAT
 
 # St Helena
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Atlantic/St_Helena	-0:22:48 -	LMT	1890		# Jamestown
-			-0:22:48 -	JMT	1951	# Jamestown Mean Time
-			 0:00	-	GMT
+# See Africa/Abidjan.
 # The other parts of the St Helena territory are similar:
 #	Tristan da Cunha: on GMT, say Whitman and the CIA
-#	Ascension: on GMT, says usno1995 and the CIA
+#	Ascension: on GMT, say the USNO (1995-12-21) and the CIA
 #	Gough (scientific station since 1955; sealers wintered previously):
 #		on GMT, says the CIA
-#	Inaccessible, Nightingale: no information, but probably GMT
-
-# Sao Tome and Principe
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Sao_Tome	 0:26:56 -	LMT	1884
-			-0:36:32 -	LMT	1912	# Lisbon Mean Time
-			 0:00	-	GMT
+#	Inaccessible, Nightingale: uninhabited
 
+# São Tomé and Príncipe
 # Senegal
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Dakar	-1:09:44 -	LMT	1912
-			-1:00	-	WAT	1941 Jun
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Seychelles
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1160,17 +1057,7 @@ Zone	Indian/Mahe	3:41:48 -	LMT	1906 Jun	
 # Possibly the islands were uninhabited.
 
 # Sierra Leone
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-# Whitman gives Mar 31 - Aug 31 for 1931 on; go with Shanks & Pottenger.
-Rule	SL	1935	1942	-	Jun	 1	0:00	0:40	SLST
-Rule	SL	1935	1942	-	Oct	 1	0:00	0	WAT
-Rule	SL	1957	1962	-	Jun	 1	0:00	1:00	SLST
-Rule	SL	1957	1962	-	Sep	 1	0:00	0	GMT
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Freetown	-0:53:00 -	LMT	1882
-			-0:53:00 -	FMT	1913 Jun # Freetown Mean Time
-			-1:00	SL	%s	1957
-			 0:00	SL	%s
+# See Africa/Abidjan.
 
 # Somalia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1193,9 +1080,9 @@ Zone Africa/Johannesburg 1:52:00 -	LMT	1
 
 # Sudan
 #
-# From 
-# Sudan News Agency (2000-01-13)
-# , also reported by Michael De Beukelaer-Dossche via Steffen Thorsen:
+# From 
+# Sudan News Agency (2000-01-13),
+# also reported by Michaël De Beukelaer-Dossche via Steffen Thorsen:
 # Clocks will be moved ahead for 60 minutes all over the Sudan as of noon
 # Saturday....  This was announced Thursday by Caretaker State Minister for
 # Manpower Abdul-Rahman Nur-Eddin.
@@ -1226,14 +1113,12 @@ Zone Africa/Dar_es_Salaam 2:37:08 -	LMT	
 			3:00	-	EAT
 
 # Togo
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Lome	0:04:52 -	LMT	1893
-			0:00	-	GMT
+# See Africa/Abidjan.
 
 # Tunisia
 
 # From Gwillim Law (2005-04-30):
-# My correspondent, Risto Nykanen, has alerted me to another adoption of DST,
+# My correspondent, Risto Nykänen, has alerted me to another adoption of DST,
 # this time in Tunisia.  According to Yahoo France News
 # , in a story attributed to AP
 # and dated 2005-04-26, "Tunisia has decided to advance its official time by
@@ -1242,7 +1127,7 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
 # Saturday."  (My translation)
 #
 # From Oscar van Vlijmen (2005-05-02):
-# LaPresse, the first national daily newspaper ...
+# La Presse, the first national daily newspaper ...
 # 
 # ... DST for 2005: on: Sun May 1 0h standard time, off: Fri Sept. 30,
 # 1h standard time.
@@ -1256,18 +1141,12 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
 # From Steffen Thorsen (2009-03-16):
 # According to several news sources, Tunisia will not observe DST this year.
 # (Arabic)
-# 
 # http://www.elbashayer.com/?page=viewn&nid=42546
-# 
-# 
 # http://www.babnet.net/kiwidetail-15295.asp
-# 
 #
 # We have also confirmed this with the US embassy in Tunisia.
 # We have a wrap-up about this on the following page:
-# 
 # http://www.timeanddate.com/news/time/tunisia-cancels-dst-2009.html
-# 
 
 # From Alexander Krivenyshev (2009-03-17):
 # Here is a link to Tunis Afrique Presse News Agency
@@ -1275,20 +1154,17 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
 # Standard time to be kept the whole year long (tap.info.tn):
 #
 # (in English)
-# 
 # http://www.tap.info.tn/en/index.php?option=com_content&task=view&id=26813&Itemid=157
-# 
 #
 # (in Arabic)
-# 
 # http://www.tap.info.tn/ar/index.php?option=com_content&task=view&id=61240&Itemid=1
-# 
 
-# From Arthur David Olson (2009--3-18):
-# The Tunis Afrique Presse News Agency notice contains this: "This measure is due to the fact
-# that the fasting month of ramadan coincides with the period concerned by summer time.
-# Therefore, the standard time will be kept unchanged the whole year long."
-# So foregoing DST seems to be an exception (albeit one that may be repeated in the  future).
+# From Arthur David Olson (2009-03-18):
+# The Tunis Afrique Presse News Agency notice contains this: "This measure is
+# due to the fact that the fasting month of Ramadan coincides with the period
+# concerned by summer time.  Therefore, the standard time will be kept
+# unchanged the whole year long."  So foregoing DST seems to be an exception
+# (albeit one that may be repeated in the future).
 
 # From Alexander Krivenyshev (2010-03-27):
 # According to some news reports Tunis confirmed not to use DST in 2010
@@ -1300,12 +1176,8 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
 # coincided with the month of Ramadan..."
 #
 # (in Arabic)
-# 
 # http://www.moheet.com/show_news.aspx?nid=358861&pg=1
-# 
 # http://www.almadenahnews.com/newss/news.php?c=118&id=38036
-# or
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_tunis02.html
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S

Modified: head/contrib/tzdata/antarctica
==============================================================================
--- head/contrib/tzdata/antarctica	Wed Aug 27 18:56:12 2014	(r270727)
+++ head/contrib/tzdata/antarctica	Wed Aug 27 19:26:35 2014	(r270728)
@@ -1,16 +1,13 @@
-# 
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
 # From Paul Eggert (1999-11-15):
 # To keep things manageable, we list only locations occupied year-round; see
-# 
 # COMNAP - Stations and Bases
-# 
+# 
 # and
-# 
 # Summary of the Peri-Antarctic Islands (1998-07-23)
-# 
+# 
 # for information.
 # Unless otherwise specified, we have no time zone information.
 #
@@ -55,19 +52,19 @@ Rule	ChileAQ	2012	max	-	Sep	Sun>=2	4:00u
 
 # Argentina - year-round bases
 # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05
-# Esperanza, San Martin Land, -6323-05659, since 1952-12-17
-# Jubany, Potter Peninsula, King George Island, -6414-0602320, since 1982-01
-# Marambio, Seymour I, -6414-05637, since 1969-10-29
+# Carlini, Potter Cove, King George Island, -6414-0602320, since 1982-01
+# Esperanza, Hope Bay, -6323-05659, since 1952-12-17
+# Marambio, -6414-05637, since 1969-10-29
 # Orcadas, Laurie I, -6016-04444, since 1904-02-22
-# San Martin, Debenham I, -6807-06708, since 1951-03-21
+# San Martín, Barry I, -6808-06706, since 1951-03-21
 #	(except 1960-03 / 1976-03-21)
 
 # Australia - territories
 # Heard Island, McDonald Islands (uninhabited)
 #	previously sealers and scientific personnel wintered
-#	
 #	Margaret Turner reports
-#	 (1999-09-30) that they're UTC+5, with no DST;
+#	
+#	(1999-09-30) that they're UTC+5, with no DST;
 #	presumably this is when they have visitors.
 #
 # year-round bases
@@ -84,14 +81,10 @@ Rule	ChileAQ	2012	max	-	Sep	Sun>=2	4:00u
 # The changes occurred on 2009-10-18 at 02:00 (local times).
 #
 # Government source: (Australian Antarctic Division)
-# 
 # http://www.aad.gov.au/default.asp?casid=37079
-# 
 #
 # We have more background information here:
-# 
 # http://www.timeanddate.com/news/time/antarctica-new-times.html
-# 
 
 # From Steffen Thorsen (2010-03-10):
 # We got these changes from the Australian Antarctic Division: ...
@@ -106,19 +99,17 @@ Rule	ChileAQ	2012	max	-	Sep	Sun>=2	4:00u
 # - Mawson station stays on UTC+5.
 #
 # Background:
-# 
 # http://www.timeanddate.com/news/time/antartica-time-changes-2010.html
-# 
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Antarctica/Casey	0	-	zzz	1969
-			8:00	-	WST	2009 Oct 18 2:00
-						# Western (Aus) Standard Time
+			8:00	-	AWST	2009 Oct 18 2:00
+						# Australian Western Std Time
 			11:00	-	CAST	2010 Mar 5 2:00
 						# Casey Time
-			8:00	-	WST	2011 Oct 28 2:00
+			8:00	-	AWST	2011 Oct 28 2:00
 			11:00	-	CAST	2012 Feb 21 17:00u
-			8:00	-	WST
+			8:00	-	AWST
 Zone Antarctica/Davis	0	-	zzz	1957 Jan 13
 			7:00	-	DAVT	1964 Nov # Davis Time
 			0	-	zzz	1969 Feb
@@ -132,24 +123,27 @@ Zone Antarctica/Mawson	0	-	zzz	1954 Feb 
 						# Mawson Time
 			5:00	-	MAWT
 # References:
-# 
 # Casey Weather (1998-02-26)
-# 
-# 
+# 
 # Davis Station, Antarctica (1998-02-26)
-# 
-# 
+# 
 # Mawson Station, Antarctica (1998-02-25)
-# 
+# 
+
+# Belgium - year-round base
+# Princess Elisabeth, Queen Maud Land, -713412+0231200, since 2007
 
 # Brazil - year-round base
-# Comandante Ferraz, King George Island, -6205+05824, since 1983/4
+# Ferraz, King George Island, -6205+05824, since 1983/4
+
+# Bulgaria - year-round base
+# St. Kliment Ohridski, Livingston Island, -623829-0602153, since 1988
 
 # Chile - year-round bases and towns
 # Escudero, South Shetland Is, -621157-0585735, since 1994
-# Presidente Eduadro Frei, King George Island, -6214-05848, since 1969-03-07
-# General Bernardo O'Higgins, Antarctic Peninsula, -6319-05704, since 1948-02
-# Capitan Arturo Prat, -6230-05941
+# Frei Montalva, King George Island, -6214-05848, since 1969-03-07
+# O'Higgins, Antarctic Peninsula, -6319-05704, since 1948-02
+# Prat, -6230-05941
 # Villa Las Estrellas (a town), around the Frei base, since 1984-04-09
 # These locations have always used Santiago time; use TZ='America/Santiago'.
 
@@ -157,31 +151,35 @@ Zone Antarctica/Mawson	0	-	zzz	1954 Feb 
 # Great Wall, King George Island, -6213-05858, since 1985-02-20
 # Zhongshan, Larsemann Hills, Prydz Bay, -6922+07623, since 1989-02-26
 
-# France - year-round bases
+# France - year-round bases (also see "France & Italy")
 #
 # From Antoine Leca (1997-01-20):
 # Time data are from Nicole Pailleau at the IFRTP
 # (French Institute for Polar Research and Technology).
-# She confirms that French Southern Territories and Terre Adelie bases
-# don't observe daylight saving time, even if Terre Adelie supplies came
+# She confirms that French Southern Territories and Terre Adélie bases
+# don't observe daylight saving time, even if Terre Adélie supplies came
 # from Tasmania.
 #
 # French Southern Territories with year-round inhabitants
 #
-# Martin-de-Vivies Base, Amsterdam Island, -374105+0773155, since 1950
-# Alfred-Faure Base, Crozet Islands, -462551+0515152, since 1964
-# Port-aux-Francais, Kerguelen Islands, -492110+0701303, since 1951;
+# Alfred Faure, Possession Island, Crozet Islands, -462551+0515152, since 1964;
+#	sealing & whaling stations operated variously 1802/1911+;
+#	see Indian/Reunion.
+#
+# Martin-de-Viviès, Amsterdam Island, -374105+0773155, since 1950
+# Port-aux-Français, Kerguelen Islands, -492110+0701303, since 1951;
 #	whaling & sealing station operated 1908/1914, 1920/1929, and 1951/1956
 #
 # St Paul Island - near Amsterdam, uninhabited
 #	fishing stations operated variously 1819/1931
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Indian/Kerguelen	0	-	zzz	1950	# Port-aux-Francais
+Zone Indian/Kerguelen	0	-	zzz	1950	# Port-aux-Français
 			5:00	-	TFT	# ISO code TF Time
 #
 # year-round base in the main continent
-# Dumont-d'Urville, Ile des Petrels, -6640+14001, since 1956-11
+# Dumont d'Urville, Île des Pétrels, -6640+14001, since 1956-11
+#  (2005-12-05)
 #
 # Another base at Port-Martin, 50km east, began operation in 1947.
 # It was destroyed by fire on 1952-01-14.
@@ -191,20 +189,22 @@ Zone Antarctica/DumontDUrville 0 -	zzz	1
 			10:00	-	PMT	1952 Jan 14 # Port-Martin Time
 			0	-	zzz	1956 Nov
 			10:00	-	DDUT	# Dumont-d'Urville Time
-# Reference:
-# 
-# Dumont d'Urville Station (2005-12-05)
-# 
+
+# France & Italy - year-round base
+# Concordia, -750600+1232000, since 2005
 
 # Germany - year-round base
-# Georg von Neumayer, -7039-00815
+# Neumayer III, -704080-0081602, since 2009
 
-# India - year-round base
-# Dakshin Gangotri, -7005+01200
+# India - year-round bases
+# Bharati, -692428+0761114, since 2012
+# Maitri, -704558+0114356, since 1989
+
+# Italy - year-round base (also see "France & Italy")
+# Zuchelli, Terra Nova Bay, -744140+1640647, since 1986
 
 # Japan - year-round bases
-# Dome Fuji, -7719+03942
-# Syowa, -690022+0393524
+# Syowa (also known as Showa), -690022+0393524, since 1957
 #
 # From Hideyuki Suzuki (1999-02-06):
 # In all Japanese stations, +0300 is used as the standard time.
@@ -216,11 +216,11 @@ Zone Antarctica/DumontDUrville 0 -	zzz	1
 Zone Antarctica/Syowa	0	-	zzz	1957 Jan 29
 			3:00	-	SYOT	# Syowa Time
 # See:
-# 
 # NIPR Antarctic Research Activities (1999-08-17)
-# 
+# 
 
 # S Korea - year-round base
+# Jang Bogo, Terra Nova Bay, -743700+1641205 since 2014
 # King Sejong, King George Island, -6213-05847, since 1988
 
 # New Zealand - claims
@@ -269,6 +269,9 @@ Zone Antarctica/Troll	0	-	zzz	2005 Feb 1
 # Poland - year-round base
 # Arctowski, King George Island, -620945-0582745, since 1977
 
+# Romania - year-bound base
+# Law-Racoviță, Larsemann Hills, -692319+0762251, since 1986
+
 # Russia - year-round bases
 # Bellingshausen, King George Island, -621159-0585337, since 1968-02-22
 # Mirny, Davis coast, -6633+09301, since 1956-02
@@ -278,8 +281,8 @@ Zone Antarctica/Troll	0	-	zzz	2005 Feb 1
 #	year-round from 1960/61 to 1992
 
 # Vostok, since 1957-12-16, temporarily closed 1994-02/1994-11
-# 
-# From Craig Mundell (1994-12-15):
+# From Craig Mundell (1994-12-15)
+# :
 # Vostok, which is one of the Russian stations, is set on the same
 # time as Moscow, Russia.
 #
@@ -294,7 +297,7 @@ Zone Antarctica/Troll	0	-	zzz	2005 Feb 1
 #
 # From Paul Eggert (2001-05-04):
 # This seems to be hopelessly confusing, so I asked Lee Hotz about it
-# in person.  He said that some Antartic locations set their local
+# in person.  He said that some Antarctic locations set their local
 # time so that noon is the warmest part of the day, and that this
 # changes during the year and does not necessarily correspond to mean
 # solar noon.  So the Vostok time might have been whatever the clocks
@@ -306,9 +309,12 @@ Zone Antarctica/Vostok	0	-	zzz	1957 Dec 
 
 # S Africa - year-round bases
 # Marion Island, -4653+03752
-# Sanae, -7141-00250
+# SANAE IV, Vesleskarvet, Queen Maud Land, -714022-0025026, since 1997
+
+# Ukraine - year-round base
+# Vernadsky (formerly Faraday), Galindez Island, -651445-0641526, since 1954
 
-# UK
+# United Kingdom
 #
 # British Antarctic Territories (BAT) claims
 # South Orkney Islands
@@ -364,7 +370,7 @@ Zone Antarctica/Palmer	0	-	zzz	1965
 # but that he found it more convenient to keep GMT+12
 # as supplies for the station were coming from McMurdo Sound,
 # which was on GMT+12 because New Zealand was on GMT+12 all year
-# at that time (1957).  (Source: Siple's book 90 degrees SOUTH.)
+# at that time (1957).  (Source: Siple's book 90 Degrees South.)
 #
 # From Susan Smith
 # http://www.cybertours.com/whs/pole10.html

Modified: head/contrib/tzdata/asia
==============================================================================
--- head/contrib/tzdata/asia	Wed Aug 27 18:56:12 2014	(r270727)
+++ head/contrib/tzdata/asia	Wed Aug 27 19:26:35 2014	(r270728)
@@ -1,4 +1,3 @@
-# 
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -32,7 +31,7 @@
 # A reliable and entertaining source about time zones is
 # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
 #
-# I invented the abbreviations marked `*' in the following table;
+# I invented the abbreviations marked '*' in the following table;
 # the rest are from earlier versions of this file, or from other sources.
 # Corrections are welcome!
 #	     std  dst
@@ -47,13 +46,14 @@
 #	7:00 WIB	west Indonesia (Waktu Indonesia Barat)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-all@FreeBSD.ORG  Wed Aug 27 19:34:49 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id CDDDC5D8;
 Wed, 27 Aug 2014 19:34:49 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B99FC3FF8;
 Wed, 27 Aug 2014 19:34:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7RJYnDB041654;
 Wed, 27 Aug 2014 19:34:49 GMT (envelope-from pluknet@FreeBSD.org)
Received: (from pluknet@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7RJYnCA041653;
 Wed, 27 Aug 2014 19:34:49 GMT (envelope-from pluknet@FreeBSD.org)
Message-Id: <201408271934.s7RJYnCA041653@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: pluknet set sender to
 pluknet@FreeBSD.org using -f
From: Sergey Kandaurov 
Date: Wed, 27 Aug 2014 19:34:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270729 - head/share/zoneinfo
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 27 Aug 2014 19:34:49 -0000

Author: pluknet
Date: Wed Aug 27 19:34:49 2014
New Revision: 270729
URL: http://svnweb.freebsd.org/changeset/base/270729

Log:
  Fix comments on updating tzdata releases.

Modified:
  head/share/zoneinfo/Makefile

Modified: head/share/zoneinfo/Makefile
==============================================================================
--- head/share/zoneinfo/Makefile	Wed Aug 27 19:26:35 2014	(r270728)
+++ head/share/zoneinfo/Makefile	Wed Aug 27 19:34:49 2014	(r270729)
@@ -17,15 +17,15 @@
 # $ cd ~/svn/vendor/tzdata
 # $ svn cp svn+ssh://svn.freebsd.org/base/vendor/tzdata/dist \
 #	svn+ssh://svn.freebsd.org/base/vendor/tzdata/tzdata2008X
-# $ svn update	# Commit message: "Tag of tzdata2008X"
+# $ svn commit	# Commit message: "Tag of tzdata2008X"
 #
 # Merge-from-vendor
 #
-# $ cd ~/svn/head/share/zoneinfo
+# $ cd ~/svn/head/contrib/tzdata
 # $ svn update
 # $ svn merge -c X --accept=postpone \
 #	svn+ssh://svn.freebsd.org/base/vendor/tzdata/dist .
-# $ svn update	# Commit message: "MFV of tzdata2008X"
+# $ svn commit	# Commit message: "MFV of tzdata2008X"
 #
 
 CLEANFILES+=	yearistype

From owner-svn-src-all@FreeBSD.ORG  Wed Aug 27 19:51:09 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 2D691AC9;
 Wed, 27 Aug 2014 19:51:09 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0D4CF31D1;
 Wed, 27 Aug 2014 19:51:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7RJp88i050445;
 Wed, 27 Aug 2014 19:51:08 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7RJp8YU050440;
 Wed, 27 Aug 2014 19:51:08 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201408271951.s7RJp8YU050440@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston 
Date: Wed, 27 Aug 2014 19:51:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r270730 - stable/9/lib/libproc
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 27 Aug 2014 19:51:09 -0000

Author: markj
Date: Wed Aug 27 19:51:07 2014
New Revision: 270730
URL: http://svnweb.freebsd.org/changeset/base/270730

Log:
  MFC r265255, r270506:
  Allow "a.out" as an alias for the executable if no other matching entries
  are found.

Modified:
  stable/9/lib/libproc/_libproc.h
  stable/9/lib/libproc/proc_create.c
  stable/9/lib/libproc/proc_rtld.c
  stable/9/lib/libproc/proc_sym.c
Directory Properties:
  stable/9/lib/libproc/   (props changed)

Modified: stable/9/lib/libproc/_libproc.h
==============================================================================
--- stable/9/lib/libproc/_libproc.h	Wed Aug 27 19:34:49 2014	(r270729)
+++ stable/9/lib/libproc/_libproc.h	Wed Aug 27 19:51:07 2014	(r270730)
@@ -46,6 +46,8 @@ struct proc_handle {
 	size_t	rdobjsz;
 	size_t	nobjs;
 	struct lwpstatus lwps;
+	rd_loadobj_t *rdexec;		/* rdobj index of program executable. */
+	char	execname[MAXPATHLEN];	/* Path to program executable. */
 };
 
 #ifdef DEBUG

Modified: stable/9/lib/libproc/proc_create.c
==============================================================================
--- stable/9/lib/libproc/proc_create.c	Wed Aug 27 19:34:49 2014	(r270729)
+++ stable/9/lib/libproc/proc_create.c	Wed Aug 27 19:51:07 2014	(r270730)
@@ -26,8 +26,10 @@
  * $FreeBSD$
  */
 
-#include "_libproc.h"
-#include 
+#include 
+#include 
+#include 
+
 #include 
 #include 
 #include 
@@ -35,7 +37,37 @@
 #include 
 #include 
 #include 
-#include 
+
+#include "_libproc.h"
+
+static int	proc_init(pid_t, int, int, struct proc_handle *);
+
+static int
+proc_init(pid_t pid, int flags, int status, struct proc_handle *phdl)
+{
+	int mib[4], error;
+	size_t len;
+
+	memset(phdl, 0, sizeof(*phdl));
+	phdl->pid = pid;
+	phdl->flags = flags;
+	phdl->status = status;
+
+	mib[0] = CTL_KERN;
+	mib[1] = KERN_PROC;
+	mib[2] = KERN_PROC_PATHNAME;
+	mib[3] = pid;
+	len = sizeof(phdl->execname);
+	if (sysctl(mib, 4, phdl->execname, &len, NULL, 0) != 0) {
+		error = errno;
+		DPRINTF("ERROR: cannot get pathname for child process %d", pid);
+		return (error);
+	}
+	if (len == 0)
+		phdl->execname[0] = '\0';
+
+	return (0);
+}
 
 int
 proc_attach(pid_t pid, int flags, struct proc_handle **pphdl)
@@ -54,12 +86,12 @@ proc_attach(pid_t pid, int flags, struct
 	if ((phdl = malloc(sizeof(struct proc_handle))) == NULL)
 		return (ENOMEM);
 
-	memset(phdl, 0, sizeof(struct proc_handle));
-	phdl->pid = pid;
-	phdl->flags = flags;
-	phdl->status = PS_RUN;
 	elf_version(EV_CURRENT);
 
+	error = proc_init(pid, flags, PS_RUN, phdl);
+	if (error != 0)
+		goto out;
+
 	if (ptrace(PT_ATTACH, phdl->pid, 0, 0) != 0) {
 		error = errno;
 		DPRINTF("ERROR: cannot ptrace child process %d", pid);
@@ -123,9 +155,9 @@ proc_create(const char *file, char * con
 		_exit(2);
 	} else {
 		/* The parent owns the process handle. */
-		memset(phdl, 0, sizeof(struct proc_handle));
-		phdl->pid = pid;
-		phdl->status = PS_IDLE;
+		error = proc_init(pid, 0, PS_IDLE, phdl);
+		if (error != 0)
+			goto bad;
 
 		/* Wait for the child process to stop. */
 		if (waitpid(pid, &status, WUNTRACED) == -1) {

Modified: stable/9/lib/libproc/proc_rtld.c
==============================================================================
--- stable/9/lib/libproc/proc_rtld.c	Wed Aug 27 19:34:49 2014	(r270729)
+++ stable/9/lib/libproc/proc_rtld.c	Wed Aug 27 19:51:07 2014	(r270730)
@@ -49,6 +49,9 @@ map_iter(const rd_loadobj_t *lop, void *
 		if (phdl->rdobjs == NULL)
 			return (-1);
 	}
+	if (strcmp(lop->rdl_path, phdl->execname) == 0 &&
+	    (lop->rdl_prot & RD_RDL_X) != 0)
+		phdl->rdexec = &phdl->rdobjs[phdl->nobjs];
 	memcpy(&phdl->rdobjs[phdl->nobjs++], lop, sizeof(*lop));
 
 	return (0);

Modified: stable/9/lib/libproc/proc_sym.c
==============================================================================
--- stable/9/lib/libproc/proc_sym.c	Wed Aug 27 19:34:49 2014	(r270729)
+++ stable/9/lib/libproc/proc_sym.c	Wed Aug 27 19:51:07 2014	(r270730)
@@ -90,17 +90,25 @@ proc_obj2map(struct proc_handle *p, cons
 	rd_loadobj_t *rdl;
 	char path[MAXPATHLEN];
 
+	rdl = NULL;
 	for (i = 0; i < p->nobjs; i++) {
-		rdl = &p->rdobjs[i];
-		basename_r(rdl->rdl_path, path);
+		basename_r(p->rdobjs[i].rdl_path, path);
 		if (strcmp(path, objname) == 0) {
-			if ((map = malloc(sizeof(*map))) == NULL)
-				return (NULL);
-			proc_rdl2prmap(rdl, map);
-			return (map);
+			rdl = &p->rdobjs[i];
+			break;
 		}
 	}
-	return (NULL);
+	if (rdl == NULL) {
+		if (strcmp(objname, "a.out") == 0 && p->rdexec != NULL)
+			rdl = p->rdexec;
+		else
+			return (NULL);
+	}
+
+	if ((map = malloc(sizeof(*map))) == NULL)
+		return (NULL);
+	proc_rdl2prmap(rdl, map);
+	return (map);
 }
 
 int
@@ -358,8 +366,9 @@ proc_name2map(struct proc_handle *p, con
 		free(kves);
 		return (NULL);
 	}
-	if (name == NULL || strcmp(name, "a.out") == 0) {
-		map = proc_addr2map(p, p->rdobjs[0].rdl_saddr);
+	if ((name == NULL || strcmp(name, "a.out") == 0) &&
+	    p->rdexec != NULL) {
+		map = proc_addr2map(p, p->rdexec->rdl_saddr);
 		return (map);
 	}
 	for (i = 0; i < p->nobjs; i++) {

From owner-svn-src-all@FreeBSD.ORG  Wed Aug 27 19:51:44 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 385A9C4F;
 Wed, 27 Aug 2014 19:51:44 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1808931E2;
 Wed, 27 Aug 2014 19:51:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7RJphUd051113;
 Wed, 27 Aug 2014 19:51:43 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7RJphpl051109;
 Wed, 27 Aug 2014 19:51:43 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201408271951.s7RJphpl051109@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston 
Date: Wed, 27 Aug 2014 19:51:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270731 - stable/10/lib/libproc
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 27 Aug 2014 19:51:44 -0000

Author: markj
Date: Wed Aug 27 19:51:42 2014
New Revision: 270731
URL: http://svnweb.freebsd.org/changeset/base/270731

Log:
  MFC r265255, r270506:
  Allow "a.out" as an alias for the executable if no other matching entries
  are found.

Modified:
  stable/10/lib/libproc/_libproc.h
  stable/10/lib/libproc/proc_create.c
  stable/10/lib/libproc/proc_rtld.c
  stable/10/lib/libproc/proc_sym.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libproc/_libproc.h
==============================================================================
--- stable/10/lib/libproc/_libproc.h	Wed Aug 27 19:51:07 2014	(r270730)
+++ stable/10/lib/libproc/_libproc.h	Wed Aug 27 19:51:42 2014	(r270731)
@@ -46,6 +46,8 @@ struct proc_handle {
 	size_t	rdobjsz;
 	size_t	nobjs;
 	struct lwpstatus lwps;
+	rd_loadobj_t *rdexec;		/* rdobj index of program executable. */
+	char	execname[MAXPATHLEN];	/* Path to program executable. */
 };
 
 #ifdef DEBUG

Modified: stable/10/lib/libproc/proc_create.c
==============================================================================
--- stable/10/lib/libproc/proc_create.c	Wed Aug 27 19:51:07 2014	(r270730)
+++ stable/10/lib/libproc/proc_create.c	Wed Aug 27 19:51:42 2014	(r270731)
@@ -26,8 +26,10 @@
  * $FreeBSD$
  */
 
-#include "_libproc.h"
-#include 
+#include 
+#include 
+#include 
+
 #include 
 #include 
 #include 
@@ -35,7 +37,37 @@
 #include 
 #include 
 #include 
-#include 
+
+#include "_libproc.h"
+
+static int	proc_init(pid_t, int, int, struct proc_handle *);
+
+static int
+proc_init(pid_t pid, int flags, int status, struct proc_handle *phdl)
+{
+	int mib[4], error;
+	size_t len;
+
+	memset(phdl, 0, sizeof(*phdl));
+	phdl->pid = pid;
+	phdl->flags = flags;
+	phdl->status = status;
+
+	mib[0] = CTL_KERN;
+	mib[1] = KERN_PROC;
+	mib[2] = KERN_PROC_PATHNAME;
+	mib[3] = pid;
+	len = sizeof(phdl->execname);
+	if (sysctl(mib, 4, phdl->execname, &len, NULL, 0) != 0) {
+		error = errno;
+		DPRINTF("ERROR: cannot get pathname for child process %d", pid);
+		return (error);
+	}
+	if (len == 0)
+		phdl->execname[0] = '\0';
+
+	return (0);
+}
 
 int
 proc_attach(pid_t pid, int flags, struct proc_handle **pphdl)
@@ -54,12 +86,12 @@ proc_attach(pid_t pid, int flags, struct
 	if ((phdl = malloc(sizeof(struct proc_handle))) == NULL)
 		return (ENOMEM);
 
-	memset(phdl, 0, sizeof(struct proc_handle));
-	phdl->pid = pid;
-	phdl->flags = flags;
-	phdl->status = PS_RUN;
 	elf_version(EV_CURRENT);
 
+	error = proc_init(pid, flags, PS_RUN, phdl);
+	if (error != 0)
+		goto out;
+
 	if (ptrace(PT_ATTACH, phdl->pid, 0, 0) != 0) {
 		error = errno;
 		DPRINTF("ERROR: cannot ptrace child process %d", pid);
@@ -123,9 +155,9 @@ proc_create(const char *file, char * con
 		_exit(2);
 	} else {
 		/* The parent owns the process handle. */
-		memset(phdl, 0, sizeof(struct proc_handle));
-		phdl->pid = pid;
-		phdl->status = PS_IDLE;
+		error = proc_init(pid, 0, PS_IDLE, phdl);
+		if (error != 0)
+			goto bad;
 
 		/* Wait for the child process to stop. */
 		if (waitpid(pid, &status, WUNTRACED) == -1) {

Modified: stable/10/lib/libproc/proc_rtld.c
==============================================================================
--- stable/10/lib/libproc/proc_rtld.c	Wed Aug 27 19:51:07 2014	(r270730)
+++ stable/10/lib/libproc/proc_rtld.c	Wed Aug 27 19:51:42 2014	(r270731)
@@ -49,6 +49,9 @@ map_iter(const rd_loadobj_t *lop, void *
 		if (phdl->rdobjs == NULL)
 			return (-1);
 	}
+	if (strcmp(lop->rdl_path, phdl->execname) == 0 &&
+	    (lop->rdl_prot & RD_RDL_X) != 0)
+		phdl->rdexec = &phdl->rdobjs[phdl->nobjs];
 	memcpy(&phdl->rdobjs[phdl->nobjs++], lop, sizeof(*lop));
 
 	return (0);

Modified: stable/10/lib/libproc/proc_sym.c
==============================================================================
--- stable/10/lib/libproc/proc_sym.c	Wed Aug 27 19:51:07 2014	(r270730)
+++ stable/10/lib/libproc/proc_sym.c	Wed Aug 27 19:51:42 2014	(r270731)
@@ -113,17 +113,25 @@ proc_obj2map(struct proc_handle *p, cons
 	rd_loadobj_t *rdl;
 	char path[MAXPATHLEN];
 
+	rdl = NULL;
 	for (i = 0; i < p->nobjs; i++) {
-		rdl = &p->rdobjs[i];
-		basename_r(rdl->rdl_path, path);
+		basename_r(p->rdobjs[i].rdl_path, path);
 		if (strcmp(path, objname) == 0) {
-			if ((map = malloc(sizeof(*map))) == NULL)
-				return (NULL);
-			proc_rdl2prmap(rdl, map);
-			return (map);
+			rdl = &p->rdobjs[i];
+			break;
 		}
 	}
-	return (NULL);
+	if (rdl == NULL) {
+		if (strcmp(objname, "a.out") == 0 && p->rdexec != NULL)
+			rdl = p->rdexec;
+		else
+			return (NULL);
+	}
+
+	if ((map = malloc(sizeof(*map))) == NULL)
+		return (NULL);
+	proc_rdl2prmap(rdl, map);
+	return (map);
 }
 
 int
@@ -381,8 +389,9 @@ proc_name2map(struct proc_handle *p, con
 		free(kves);
 		return (NULL);
 	}
-	if (name == NULL || strcmp(name, "a.out") == 0) {
-		map = proc_addr2map(p, p->rdobjs[0].rdl_saddr);
+	if ((name == NULL || strcmp(name, "a.out") == 0) &&
+	    p->rdexec != NULL) {
+		map = proc_addr2map(p, p->rdexec->rdl_saddr);
 		return (map);
 	}
 	for (i = 0; i < p->nobjs; i++) {

From owner-svn-src-all@FreeBSD.ORG  Wed Aug 27 20:05:27 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 7E6DF8C8;
 Wed, 27 Aug 2014 20:05:27 +0000 (UTC)
Received: from mail.turbocat.net (heidi.turbocat.net [88.198.202.214])
 (using TLSv1.1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 368F235B6;
 Wed, 27 Aug 2014 20:05:26 +0000 (UTC)
Received: from laptop015.home.selasky.org
 (cm-176.74.213.204.customer.telag.net [176.74.213.204])
 (using TLSv1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits))
 (No client certificate requested)
 by mail.turbocat.net (Postfix) with ESMTPSA id EF6CA1FE027;
 Wed, 27 Aug 2014 22:05:23 +0200 (CEST)
Message-ID: <53FE3A0C.1050006@selasky.org>
Date: Wed, 27 Aug 2014 22:05:32 +0200
From: Hans Petter Selasky 
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
 rv:24.0) Gecko/20100101 Thunderbird/24.1.0
MIME-Version: 1.0
To: Davide Italiano 
Subject: Re: svn commit: r270710 - in head/sys: contrib/rdma/krping dev/cxgb
 dev/cxgbe/iw_cxgbe modules/mlx4 modules/mlx4ib modules/mlxen
 ofed/drivers/infiniband/core
 ofed/drivers/infiniband/hw/mlx4 ofed/driver...
References: <201408271321.s7RDLr3d069813@svn.freebsd.org>		<53FE2AA3.6070403@selasky.org>
 
In-Reply-To: 
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Cc: "svn-src-head@freebsd.org" ,
 Adrian Chadd ,
 "src-committers@freebsd.org" ,
 "svn-src-all@freebsd.org" 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 27 Aug 2014 20:05:27 -0000

On 08/27/14 21:08, Davide Italiano wrote:
> On Wed, Aug 27, 2014 at 11:59 AM, Hans Petter Selasky  wrote:
>>> Removing those files may make it more annoying to port some other
>>> linux code in the future, as some future linux driver code may include
>>> those files.
>>>
>>
>
> On a (somewhat) related note, I would like to see sema(9) replaced by
> sx(9) in the compatibility layer. I've a couple of patches that get
> rid of the deprecated primitive in aio/ips code, and planned to look
> at ofed as well, but if somebody with deep driver knowledge can do
> that on my behalf it would be great.
>

Hi,

If you have a patch for ofed/, send it to me and I can test it for you.

Thanks!

--HPS

From owner-svn-src-all@FreeBSD.ORG  Wed Aug 27 21:11:20 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id C9846BE6;
 Wed, 27 Aug 2014 21:11:20 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B40983D28;
 Wed, 27 Aug 2014 21:11:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7RLBKbW089542;
 Wed, 27 Aug 2014 21:11:20 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7RLBKXj089538;
 Wed, 27 Aug 2014 21:11:20 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201408272111.s7RLBKXj089538@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston 
Date: Wed, 27 Aug 2014 21:11:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r270733 - in stable/9: share/man/man4 sys/dev/mfi
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 27 Aug 2014 21:11:20 -0000

Author: markj
Date: Wed Aug 27 21:11:19 2014
New Revision: 270733
URL: http://svnweb.freebsd.org/changeset/base/270733

Log:
  MFC r261491 (by ambrisko):
  Add a tunable "hw.mfi.mrsas_enable" to allow mfi(4) to drop priority and
  allow mrsas(4) from LSI to attach to newer LSI cards that are support by
  mrsas(4).  If mrsas(4) is not loaded into the system at boot then mfi(4)
  will always attach.  If a modified mrsas(4) is loaded in the system.  That
  modification is return "-30" in it's probe since that is between
  BUS_PROBE_DEFAULT and BUS_PROBE_LOW_PRIORITY.
  
  This option is controller by a new probe flag "MFI_FLAGS_MRSAS" in mfi_ident
  that denotes cards that should work with mrsas(4).  New entries that should
  have this option.
  
  This is the first step to get mrsas(4) checked into FreeBSD and to avoid
  collision with people that use mrsas(4) from LSI.  Since mfi(4) takes
  priority, then mrsas(4) users need to rebuild GENERIC.  Using the
  .disabled="1" method doesn't work since that blocks attaching and the
  probe gave it to mfi(4).
  
  MFC r267451 (by delphij):
  Correct variable for loader tunable variable hw.mfi.mrsas_enable.

Modified:
  stable/9/share/man/man4/mfi.4
  stable/9/sys/dev/mfi/mfi_pci.c
  stable/9/sys/dev/mfi/mfivar.h
Directory Properties:
  stable/9/share/man/man4/   (props changed)
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/share/man/man4/mfi.4
==============================================================================
--- stable/9/share/man/man4/mfi.4	Wed Aug 27 21:11:19 2014	(r270732)
+++ stable/9/share/man/man4/mfi.4	Wed Aug 27 21:11:19 2014	(r270733)
@@ -72,6 +72,17 @@ If the sysctl
 .Va dev.mfi.%d.delete_busy_volumes
 is set to 1,
 then the driver will allow mounted volumes to be removed.
+.Pp
+A tunable is provided to adjust the
+.Nm
+driver's behaviour when attaching to a card.  By default the driver will
+attach to all known cards with high probe priority.  If the tunable
+.Va hw.mfi.mrsas_enable
+is set to 1,
+then the driver will reduce its probe priority to allow
+.Cd mrsas
+to attach to the card instead of
+.Nm .
 .Sh HARDWARE
 The
 .Nm

Modified: stable/9/sys/dev/mfi/mfi_pci.c
==============================================================================
--- stable/9/sys/dev/mfi/mfi_pci.c	Wed Aug 27 21:11:19 2014	(r270732)
+++ stable/9/sys/dev/mfi/mfi_pci.c	Wed Aug 27 21:11:19 2014	(r270733)
@@ -112,6 +112,11 @@ TUNABLE_INT("hw.mfi.msi", &mfi_msi);
 SYSCTL_INT(_hw_mfi, OID_AUTO, msi, CTLFLAG_RDTUN, &mfi_msi, 0,
     "Enable use of MSI interrupts");
 
+static int	mfi_mrsas_enable = 0;
+TUNABLE_INT("hw.mfi.mrsas_enable", &mfi_mrsas_enable);
+SYSCTL_INT(_hw_mfi, OID_AUTO, mrsas_enable, CTLFLAG_RDTUN, &mfi_mrsas_enable,
+     0, "Allow mrasas to take newer cards");
+
 struct mfi_ident {
 	uint16_t	vendor;
 	uint16_t	device;
@@ -120,19 +125,19 @@ struct mfi_ident {
 	int		flags;
 	const char	*desc;
 } mfi_identifiers[] = {
-	{0x1000, 0x005b, 0x1028, 0x1f2d, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT, "Dell PERC H810 Adapter"},
-	{0x1000, 0x005b, 0x1028, 0x1f30, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT, "Dell PERC H710 Embedded"},
-	{0x1000, 0x005b, 0x1028, 0x1f31, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT, "Dell PERC H710P Adapter"},
-	{0x1000, 0x005b, 0x1028, 0x1f33, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT, "Dell PERC H710P Mini (blades)"},
-	{0x1000, 0x005b, 0x1028, 0x1f34, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT, "Dell PERC H710P Mini (monolithics)"},
-	{0x1000, 0x005b, 0x1028, 0x1f35, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT, "Dell PERC H710 Adapter"},
-	{0x1000, 0x005b, 0x1028, 0x1f37, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT, "Dell PERC H710 Mini (blades)"},
-	{0x1000, 0x005b, 0x1028, 0x1f38, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT, "Dell PERC H710 Mini (monolithics)"},
-	{0x1000, 0x005b, 0x8086, 0x9265, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT, "Intel (R) RAID Controller RS25DB080"},
-	{0x1000, 0x005b, 0x8086, 0x9285, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT, "Intel (R) RAID Controller RS25NB008"},
-	{0x1000, 0x005b, 0xffff, 0xffff, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT, "ThunderBolt"},
-	{0x1000, 0x005d, 0xffff, 0xffff, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_INVADER, "Invader"},
-	{0x1000, 0x005f, 0xffff, 0xffff, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_FURY, "Fury"},
+	{0x1000, 0x005b, 0x1028, 0x1f2d, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_MRSAS, "Dell PERC H810 Adapter"},
+	{0x1000, 0x005b, 0x1028, 0x1f30, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_MRSAS, "Dell PERC H710 Embedded"},
+	{0x1000, 0x005b, 0x1028, 0x1f31, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_MRSAS, "Dell PERC H710P Adapter"},
+	{0x1000, 0x005b, 0x1028, 0x1f33, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_MRSAS, "Dell PERC H710P Mini (blades)"},
+	{0x1000, 0x005b, 0x1028, 0x1f34, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_MRSAS, "Dell PERC H710P Mini (monolithics)"},
+	{0x1000, 0x005b, 0x1028, 0x1f35, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_MRSAS, "Dell PERC H710 Adapter"},
+	{0x1000, 0x005b, 0x1028, 0x1f37, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_MRSAS, "Dell PERC H710 Mini (blades)"},
+	{0x1000, 0x005b, 0x1028, 0x1f38, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_MRSAS, "Dell PERC H710 Mini (monolithics)"},
+	{0x1000, 0x005b, 0x8086, 0x9265, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_MRSAS, "Intel (R) RAID Controller RS25DB080"},
+	{0x1000, 0x005b, 0x8086, 0x9285, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_MRSAS, "Intel (R) RAID Controller RS25NB008"},
+	{0x1000, 0x005b, 0xffff, 0xffff, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_MRSAS, "ThunderBolt"},
+	{0x1000, 0x005d, 0xffff, 0xffff, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_MRSAS| MFI_FLAGS_INVADER, "Invader"},
+	{0x1000, 0x005f, 0xffff, 0xffff, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_MRSAS| MFI_FLAGS_FURY, "Fury"},
 	{0x1000, 0x0060, 0x1028, 0xffff, MFI_FLAGS_1078,  "Dell PERC 6"},
 	{0x1000, 0x0060, 0xffff, 0xffff, MFI_FLAGS_1078,  "LSI MegaSAS 1078"},
 	{0x1000, 0x0071, 0xffff, 0xffff, MFI_FLAGS_SKINNY, "Drake Skinny"},
@@ -179,7 +184,13 @@ mfi_pci_probe(device_t dev)
 
 	if ((id = mfi_find_ident(dev)) != NULL) {
 		device_set_desc(dev, id->desc);
-		return (BUS_PROBE_DEFAULT);
+
+		/* give priority to mrsas if tunable set */
+		TUNABLE_INT_FETCH("hw.mfi.mrsas_enable", &mfi_mrsas_enable);
+		if ((id->flags & MFI_FLAGS_MRSAS) && mfi_mrsas_enable)
+			return (BUS_PROBE_LOW_PRIORITY);
+		else
+			return (BUS_PROBE_DEFAULT);
 	}
 	return (ENXIO);
 }

Modified: stable/9/sys/dev/mfi/mfivar.h
==============================================================================
--- stable/9/sys/dev/mfi/mfivar.h	Wed Aug 27 21:11:19 2014	(r270732)
+++ stable/9/sys/dev/mfi/mfivar.h	Wed Aug 27 21:11:19 2014	(r270733)
@@ -199,6 +199,7 @@ struct mfi_softc {
 #define MFI_FLAGS_GEN2		(1<<6)
 #define MFI_FLAGS_SKINNY	(1<<7)
 #define MFI_FLAGS_TBOLT		(1<<8)
+#define MFI_FLAGS_MRSAS		(1<<9)
 #define MFI_FLAGS_INVADER	(1<<10)
 #define MFI_FLAGS_FURY		(1<<11)
 	// Start: LSIP200113393

From owner-svn-src-all@FreeBSD.ORG  Wed Aug 27 21:11:20 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 1935BBE5;
 Wed, 27 Aug 2014 21:11:20 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 037053CBD;
 Wed, 27 Aug 2014 21:11:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7RLBJw2089528;
 Wed, 27 Aug 2014 21:11:19 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7RLBJGM089506;
 Wed, 27 Aug 2014 21:11:19 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201408272111.s7RLBJGM089506@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston 
Date: Wed, 27 Aug 2014 21:11:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270732 - in stable/10: share/man/man4 sys/dev/mfi
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Wed, 27 Aug 2014 21:11:20 -0000

Author: markj
Date: Wed Aug 27 21:11:19 2014
New Revision: 270732
URL: http://svnweb.freebsd.org/changeset/base/270732

Log:
  MFC r261491 (by ambrisko):
  Add a tunable "hw.mfi.mrsas_enable" to allow mfi(4) to drop priority and
  allow mrsas(4) from LSI to attach to newer LSI cards that are support by
  mrsas(4).  If mrsas(4) is not loaded into the system at boot then mfi(4)
  will always attach.  If a modified mrsas(4) is loaded in the system.  That
  modification is return "-30" in it's probe since that is between
  BUS_PROBE_DEFAULT and BUS_PROBE_LOW_PRIORITY.
  
  This option is controller by a new probe flag "MFI_FLAGS_MRSAS" in mfi_ident
  that denotes cards that should work with mrsas(4).  New entries that should
  have this option.
  
  This is the first step to get mrsas(4) checked into FreeBSD and to avoid
  collision with people that use mrsas(4) from LSI.  Since mfi(4) takes
  priority, then mrsas(4) users need to rebuild GENERIC.  Using the
  .disabled="1" method doesn't work since that blocks attaching and the
  probe gave it to mfi(4).
  
  MFC r267451 (by delphij):
  Correct variable for loader tunable variable hw.mfi.mrsas_enable.

Modified:
  stable/10/share/man/man4/mfi.4
  stable/10/sys/dev/mfi/mfi_pci.c
  stable/10/sys/dev/mfi/mfivar.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/man/man4/mfi.4
==============================================================================
--- stable/10/share/man/man4/mfi.4	Wed Aug 27 19:51:42 2014	(r270731)
+++ stable/10/share/man/man4/mfi.4	Wed Aug 27 21:11:19 2014	(r270732)
@@ -72,6 +72,17 @@ If the sysctl
 .Va dev.mfi.%d.delete_busy_volumes
 is set to 1,
 then the driver will allow mounted volumes to be removed.
+.Pp
+A tunable is provided to adjust the
+.Nm
+driver's behaviour when attaching to a card.  By default the driver will
+attach to all known cards with high probe priority.  If the tunable
+.Va hw.mfi.mrsas_enable
+is set to 1,
+then the driver will reduce its probe priority to allow
+.Cd mrsas
+to attach to the card instead of
+.Nm .
 .Sh HARDWARE
 The
 .Nm

Modified: stable/10/sys/dev/mfi/mfi_pci.c
==============================================================================
--- stable/10/sys/dev/mfi/mfi_pci.c	Wed Aug 27 19:51:42 2014	(r270731)
+++ stable/10/sys/dev/mfi/mfi_pci.c	Wed Aug 27 21:11:19 2014	(r270732)
@@ -112,6 +112,11 @@ TUNABLE_INT("hw.mfi.msi", &mfi_msi);
 SYSCTL_INT(_hw_mfi, OID_AUTO, msi, CTLFLAG_RDTUN, &mfi_msi, 0,
     "Enable use of MSI interrupts");
 
+static int	mfi_mrsas_enable = 0;
+TUNABLE_INT("hw.mfi.mrsas_enable", &mfi_mrsas_enable);
+SYSCTL_INT(_hw_mfi, OID_AUTO, mrsas_enable, CTLFLAG_RDTUN, &mfi_mrsas_enable,
+     0, "Allow mrasas to take newer cards");
+
 struct mfi_ident {
 	uint16_t	vendor;
 	uint16_t	device;
@@ -120,19 +125,19 @@ struct mfi_ident {
 	int		flags;
 	const char	*desc;
 } mfi_identifiers[] = {
-	{0x1000, 0x005b, 0x1028, 0x1f2d, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT, "Dell PERC H810 Adapter"},
-	{0x1000, 0x005b, 0x1028, 0x1f30, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT, "Dell PERC H710 Embedded"},
-	{0x1000, 0x005b, 0x1028, 0x1f31, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT, "Dell PERC H710P Adapter"},
-	{0x1000, 0x005b, 0x1028, 0x1f33, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT, "Dell PERC H710P Mini (blades)"},
-	{0x1000, 0x005b, 0x1028, 0x1f34, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT, "Dell PERC H710P Mini (monolithics)"},
-	{0x1000, 0x005b, 0x1028, 0x1f35, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT, "Dell PERC H710 Adapter"},
-	{0x1000, 0x005b, 0x1028, 0x1f37, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT, "Dell PERC H710 Mini (blades)"},
-	{0x1000, 0x005b, 0x1028, 0x1f38, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT, "Dell PERC H710 Mini (monolithics)"},
-	{0x1000, 0x005b, 0x8086, 0x9265, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT, "Intel (R) RAID Controller RS25DB080"},
-	{0x1000, 0x005b, 0x8086, 0x9285, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT, "Intel (R) RAID Controller RS25NB008"},
-	{0x1000, 0x005b, 0xffff, 0xffff, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT, "ThunderBolt"},
-	{0x1000, 0x005d, 0xffff, 0xffff, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_INVADER, "Invader"},
-	{0x1000, 0x005f, 0xffff, 0xffff, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_FURY, "Fury"},
+	{0x1000, 0x005b, 0x1028, 0x1f2d, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_MRSAS, "Dell PERC H810 Adapter"},
+	{0x1000, 0x005b, 0x1028, 0x1f30, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_MRSAS, "Dell PERC H710 Embedded"},
+	{0x1000, 0x005b, 0x1028, 0x1f31, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_MRSAS, "Dell PERC H710P Adapter"},
+	{0x1000, 0x005b, 0x1028, 0x1f33, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_MRSAS, "Dell PERC H710P Mini (blades)"},
+	{0x1000, 0x005b, 0x1028, 0x1f34, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_MRSAS, "Dell PERC H710P Mini (monolithics)"},
+	{0x1000, 0x005b, 0x1028, 0x1f35, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_MRSAS, "Dell PERC H710 Adapter"},
+	{0x1000, 0x005b, 0x1028, 0x1f37, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_MRSAS, "Dell PERC H710 Mini (blades)"},
+	{0x1000, 0x005b, 0x1028, 0x1f38, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_MRSAS, "Dell PERC H710 Mini (monolithics)"},
+	{0x1000, 0x005b, 0x8086, 0x9265, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_MRSAS, "Intel (R) RAID Controller RS25DB080"},
+	{0x1000, 0x005b, 0x8086, 0x9285, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_MRSAS, "Intel (R) RAID Controller RS25NB008"},
+	{0x1000, 0x005b, 0xffff, 0xffff, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_MRSAS, "ThunderBolt"},
+	{0x1000, 0x005d, 0xffff, 0xffff, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_MRSAS| MFI_FLAGS_INVADER, "Invader"},
+	{0x1000, 0x005f, 0xffff, 0xffff, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_MRSAS| MFI_FLAGS_FURY, "Fury"},
 	{0x1000, 0x0060, 0x1028, 0xffff, MFI_FLAGS_1078,  "Dell PERC 6"},
 	{0x1000, 0x0060, 0xffff, 0xffff, MFI_FLAGS_1078,  "LSI MegaSAS 1078"},
 	{0x1000, 0x0071, 0xffff, 0xffff, MFI_FLAGS_SKINNY, "Drake Skinny"},
@@ -179,7 +184,13 @@ mfi_pci_probe(device_t dev)
 
 	if ((id = mfi_find_ident(dev)) != NULL) {
 		device_set_desc(dev, id->desc);
-		return (BUS_PROBE_DEFAULT);
+
+		/* give priority to mrsas if tunable set */
+		TUNABLE_INT_FETCH("hw.mfi.mrsas_enable", &mfi_mrsas_enable);
+		if ((id->flags & MFI_FLAGS_MRSAS) && mfi_mrsas_enable)
+			return (BUS_PROBE_LOW_PRIORITY);
+		else
+			return (BUS_PROBE_DEFAULT);
 	}
 	return (ENXIO);
 }

Modified: stable/10/sys/dev/mfi/mfivar.h
==============================================================================
--- stable/10/sys/dev/mfi/mfivar.h	Wed Aug 27 19:51:42 2014	(r270731)
+++ stable/10/sys/dev/mfi/mfivar.h	Wed Aug 27 21:11:19 2014	(r270732)
@@ -201,6 +201,7 @@ struct mfi_softc {
 #define MFI_FLAGS_GEN2		(1<<6)
 #define MFI_FLAGS_SKINNY	(1<<7)
 #define MFI_FLAGS_TBOLT		(1<<8)
+#define MFI_FLAGS_MRSAS		(1<<9)
 #define MFI_FLAGS_INVADER	(1<<10)
 #define MFI_FLAGS_FURY		(1<<11)
 	// Start: LSIP200113393

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 00:05:02 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id DFAFF4FF;
 Thu, 28 Aug 2014 00:05:02 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C9E8F3D82;
 Thu, 28 Aug 2014 00:05:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7S052Z9070925;
 Thu, 28 Aug 2014 00:05:02 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7S052qK070923;
 Thu, 28 Aug 2014 00:05:02 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201408280005.s7S052qK070923@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: adrian set sender to
 adrian@FreeBSD.org using -f
From: Adrian Chadd 
Date: Thu, 28 Aug 2014 00:05:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270734 - in head/sys: contrib/dev/iwn modules/iwnfw
 modules/iwnfw/iwn100
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 00:05:03 -0000

Author: adrian
Date: Thu Aug 28 00:05:02 2014
New Revision: 270734
URL: http://svnweb.freebsd.org/changeset/base/270734

Log:
  Add iwn-100 firmware.
  
  The firmware is from the Linux firmware git repository; the intel
  licence is the same as other firmware blobs.
  
  Tested: iwn1:  mem 0xf4800000-0xf4801fff irq 19 at device 0.0 on pci5

Added:
  head/sys/contrib/dev/iwn/iwlwifi-100-39.31.5.1.fw.uu
  head/sys/modules/iwnfw/iwn100/
  head/sys/modules/iwnfw/iwn100/Makefile   (contents, props changed)
Modified:
  head/sys/modules/iwnfw/Makefile

Added: head/sys/contrib/dev/iwn/iwlwifi-100-39.31.5.1.fw.uu
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/contrib/dev/iwn/iwlwifi-100-39.31.5.1.fw.uu	Thu Aug 28 00:05:02 2014	(r270734)
@@ -0,0 +1,5925 @@
+begin-base64 644 iwlwifi-100-39.31.5.1
+AAAAAElXTAoxMDAgZncgdjM5LjMxLjUuMSBidWlsZCAzMjg5NQoAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAQUfJ3+AAAABAAAAAAAAAAEAAAAw7AEAICCADwAAQABpIAAAaSBAAGkg
+AABpIEAAICCADwAA6ABpIAAAaSBAAGkgAABpIEAAICCADwAAMAVpIAAAaSBAAGkgAABKIAAASiEA
+AEoiAABKIwAASiQAAEolAABKJgAASicAAEogABBKIQAQSiIAEEojABBKJAAQSiUAEEomABBKJwAQ
+SiAAIEohACBKIgAgSiMAIEokACBKJQAgSiYAIEonACBKIAAwSiEAMAokgD+AAADAQSycMEAsnDBC
+JBw0CiKAP4AA1FkKIwA3jg4AAEomAHBpIEAASiYAcEomAHBKJgBwSiYAcAAWAHCAAHAEQHggIECH
+AAAAAAAAAAAAAArIz3GgAMgfDhkYgAvIDxkYgAzIEBkYgA0SAjYAyER4ERkYgA7ILRkYgOB+4cT8
+HMi+/BxIvuHA4cHhwuHD/BwIsfwcSLH8HIix/BzIsfwcCLL8HEiy/ByIsvwcyLL8HAi/aiSAEOHE
+aiTAEOHE8cDPcKAA0BsUgM9xgABsBAQggI/PUQThAKEK8i8pAQDPcIAAYAnwIEAAQHja/9HAwcRr
+JMAQwcRrJIAQwcSfdAQUCzQEFAo0BBQJNAQUCDQEFAc0BBQGNAQUBTQEFAQ0wcPBwsHBwcDBxEUs
+fhAKJkB+wcRrJIAUwcQgIECHCsiHuAoaGDALyJu4CxoYMAzIDBoYMA3Ih7gNGhgwDsiFIMMPDhoY
+MOB+4HjxwArIlbgKGhgwC8ibuAsaGDANyIq4jbiQuA0aGDDPcIAAiAoYiIHgC/QNyM9xAAAQCqy4
+DRoYMEINIAAP2GfY6g3gAIohRwHRwOB+8cDPcQMAQA3PcKAAqCAtoM9ygAC4BCCCAWkAoqINIAFI
+2M9wgADECCWAI4EggcdxAACIE44OgAfi8eB4z3CAAMQIHQaAB+B48cBmC0ABgODPdoAAbAQG8oHg
+BvQB2APwANgLroDhBvKB4Qb0AdgD8ADYCq6A4gbygeIG9AHYA/AA2AyuANjPdaAAyB8YHRiQC46A
+4IohEAAO8giOgOAM8s9wAwBADUUdGBAwpQLYGB0YkAPwMaUKjoDgGvIJjoDgFvLPcAEAMOwgHRiQ
+z3CAACgAIR0YkM9wgABoBCIdGJAYFQCWRSAAAxgdGJAMjoDgB/IYFQCWhSABBBgdGJCA4xjyANiU
+uM92gACoBACmcdgGuAYIIAH82SCGz3AAAEwc9g/gAJ+5GBUAloW4GB0YkOkCQAFpIEAA/vHgePHA
+pcFBwELBDBwAMRAcQDHPcYAA/Fo0GcAPMBkADywZwA4oGYAOJBlADs9wgAD8WiAYQAvPcIAA/Foc
+GAALz3CAAPxaGBjACs9wgAD8WhQYgArPcIAA/FoQGMAIz3CAAPxaDBiACM9wgAD8WggYQAjPcYAA
+gFqAGQAIfBnAB3gZgAd0GUAHcBkAB2wZAAdoGYAGZBlABmAZAAZcGcAFWBmABVQZQAVQGQAFTBnA
+BEgZgAREGUAEQBkABO+hzqGtoYyhLBnAAigZgAIkGUACIBkAAhwZwAEYGYABFBlAARAZAAFjoWog
+AAPYGQAAaiDAAtQZAABqIIAC0BkAAGogQAHIGQAAaiAAAcQZAABqIMAAwBkAAGoggAC8GQAAaiBA
+ALgZAABqIAAAtBkAAGoggAHMGQAAz3GfALj/GIFTJ841UyXENVMmxTWUuBihQMMBwALB17oMFAYw
+yXMA3ZYL4AAQFAcwz3CgALQPvKDPcaAAyDsugS4L4AB92LYJQAGSDuAAqXAI2ADZUg7gAJm5NvHx
+wLYIYAF72AoL4ADX2c9xgAD8WjQZwA8wGQAPLBnADigZgA4kGUAOz3CAAPxaIBhAC89wgAD8WhwY
+AAvPcIAA/FoYGMAKz3CAAPxaFBiACs9wgAD8WhAYwAjPcIAA/FoMGIAIz3CAAPxaCBhACM9xgACA
+WoAZAAh8GcAHeBmAB3QZQAdwGQAHbBkAB2gZgAZkGUAGYBkABlwZwAVYGYAFVBlABVAZAAVMGcAE
+SBmABEQZQARAGQAE76HOoa2hjKEsGcACKBmAAiQZQAIgGQACHBnAARgZgAEUGUABEBkAAWOhaiAA
+A9gZAABqIMAC1BkAAGoggALQGQAAaiBAAcgZAABqIAABxBkAAGogwADAGQAAaiCAALwZAABqIEAA
+uBkAAGogAAC0GQAAaiCAAcwZAADrds91oADQG1wVEBDPcAAARBziCSABCifAHzpwz3CAAHAWA4CA
+4AbyF4VRIMCAlAcCAQfYwgkgAQq4UyBBBwfY2gzgAAq4z3CgANQLGIBCIAAISCAAAM9zgADMFc9x
+gACoBCCBnBsAAAshQITKICIDOPRMIICgDvRRIYClCvKg4Ej3USFApRzYyiDhBirwBNgo8IwgAaAh
+8kIgQSCP4T4ADQAzJkFwgAAAQEAnAHI0eAB4SiBAIA3YFPBKIIAg6PFKIAAhE9gM8EogACIU2Ajw
+SiAAJBXYBPAW2ALwD9hxg+lxyXIKJAAEWQTv/wolQATgeBEDz//xwCYJwAB12OII4ACKIQoDVgsA
+AJ4PgAGf/qIIAAAKIcAP63IG2IojSgdKJAAAHQTv/wolAAHgeIDh8cAD8qDgi/YKIcAP63IF2Onb
+SiRAAPkD7/+4c89ygABgCRV6IKLRwOB+ANmeuRl5z3KAAFgJAYIleOB/AaIA2Z65GXnPcoAAWAkB
+giZ44H8BogDZnrkZec9wgABYCQGAJHhCIACA4H/KIGIA4HjPcIAAWAkBgOB/LygBAOB48cDyCM//
+4HjgeOB44HhpIIABbyE/AGkgAAD38fHAatgSCOAAiiFEAwDYjbjuC6ADCBoYMBDMhiD/ignyz3CA
+AAUFAIiA4CwIwgOw8fHAUgjAA89xgADMEfAhAABAeIDZz3CgANAbMKCg8eB48cCSDQABz3CAAGwE
+oIDPcIAAiAoIgAQljR8PAADg67gF9FILgAmA4A70z3GgALRHANhLGRiAAdh3GRiAANieuFQZGIAE
+JYIfAQAAABJqz3OAAHwEIIOkeOGDBCWOHwAAAEAHeSCjBHkGJUAQA74EJYEfAAAAgKR+XXpFecd/
+5H7GeAK5BCWNHwIAAACkeSZ4LygBAE4gQQTPcIAAiApVEIAA4aOA4M92oADIHxkaWDAP8s9woAAU
+BCqgCYC44En3z3KgAIggAdg1egCiM/DPcYAADAUA2AChAN+RvxMe2JPPcIAA3AIQeM91oAC0R0kd
+GJDPcYAAdHrPcIAAEAUgoG8gQwBUHRiQAdimCqADCBoYMGIKgAmA4A30Ex7Yk89wgAAMBBB4SR0Y
+kG8gQwBUHRiQyQQAAeB48cDhxc9xgADcCIARAADPdaAAyB8vKgEAz3ADAEANRR0YEPAhgABAeIDY
+FR0YkKUEAAHgePHAz3GAAGwEfNhSDqAAIIEKIcAP63IF2IojxABKJAAAmQHv/wolAAHxwOHFz3CA
+AGwEoIBr2AQljR8PAADgHg6gAIohSAMvKEEDqg6gDU4gQAQKJQCAyiHCD8oiwgfKIGIByiOCDwAA
+EwJQAeL/yiRiAH/YCrjPcaAA0BsToX/YEKEdBAAB4HjxwGvYzg2gAIohCAheDqANBNgKJQCAyiHC
+D8oiwgfKIGIByiOCDwAAIgIIAeL/yiRiABkFz//gePHAVguADYDZz3CgANAbMKABBc//SiRAdQDZ
+qCDAA89wgADgCTZ4YYBAgM9wgADcCAHhVXhgoOB+4H7geFEhQMfxwB3yz3CAAMwFAICD4Mohwg/K
+IsIHyiBiAcojgg8AAEwCyiTCAJQA4v/KJSIAWg0ACAvIvbgLGhgwANmduc9woADQGzGgjQTP/+B4
+8cCB4MwgooAF9M9ygACICgTwz3KAAPCez3GAAFxbgeDMIOKAKfRogmChaYJhoXyKaKl9immpKhKD
+AGqpKxKDAGupLBKDAGypdJJ2qW2SZ7F3kmixaILAu3SpaIIEI4MPAAYAAIDjAdvAe3KphBICAFQZ
+mAAc8GCBaKJhgWmiaIl8qmmJfapqiSoawgBriSsawgBsiSwawgB2iXSyZ5FtsmiRd7JUEQMGhBrA
+AILgBvSeDuAAQCEABtHA4H7xwB4KAAHPdYAA8J4Ahc92oACAJQamApUHpgKFCqYGlQumVgggDgDf
+gOAG8uim6abxpvKmAIUVpgKVFqZJAgAB8cDeCQABAN7PcIAAKIUmCCAO1KiA4BTyCN/JdYDlzCWi
+kMwlIpHMJWKR+AkiBMogQgNhv4DnAeUy9x3wSiSAfc9xgAAIcKgggAEEGZAD4HgA2UokAHLPcoAA
+iFyoIMACFiJAAHaQz3CAAHhwNHgB4WCwz3WAAPCez3eAABR/QCUAEiRv0gngAAbaqXBAJ4ESxgng
+AAbaQCUAEkAnARS6CeAABtoYjYTgDvSKIA8KZgugAIohGQ8oFYAQEgngDiiF1g6ADQmFUSBAgQry
+iiCHDkILoACKIZoEHgrAB1oPwA2A4OgKQgLPcQAA///PcIAAsHssoCugBBqYM7L/SQEAAfHA3ggg
+AQDahCgLCgAhg3+AAFyhWaPPdoAAEEC0aLpmUoIChgAhgX+AAOygz3eAAKxcXqNhhtgZwABlhtwZ
+AAAGhuAZwADkGQAAFieAEBYmgRAI4AThrg4gBAja3WUUhRZ+Fn9AJwASJG6aDiAECNrVAAAB8cAA
+2OL/dghgBADYz3CAADQF9g1gBATZ0gmABI4OwAIB2ADZ9gygDIDaCglACR4NgA3+CMAH4gyACEYL
+AAgA2D4IIA4Icd4IAA5GDYAKBg2ACPkFz//gePHA4cUA3c9wgABIBaCgz3CAAACFrLAiDOAHqXBO
+DI//9g8gCqlwDgrABAINAASaD2AKqXBmD0AKUQAAAfHA2g/AAILgo8EG9M91gACICgjwhCgLCgAh
+jX+AAPCeguAG9M92gADMiwnwz3GAALShhCgLCgAhTg4tlTx6KHCGIfEPR7nCuoYg/gMkekS4UHHK
+IcIPyiLCB8ogYgHKI4IPAABlBMokIgAABaL/yiUCAUiFO7pTIgKAQK5NlcC6Qa4M8neVhiP/CUO7
+Z653lYYj/gdFu2iugOIS8s9ygAAsJBUiAwAAizV6Aq4BiwOuAosErgOLBa4DigvwAdkprgLYAq4j
+rgDYBK4D2AWuBq6LcMlxJg0gBAzaAMABwU4I4AoCwotwyXESDSAEDNoAwAHBugjgCgLCz3GAAMQG
+AKENlUS44LgA2S+lBfKKIQgAL6XhuAPyi7kvpVEggIAE8o25L6UhB+AAo8DgePHAqg7gAJhwhCgL
+CgAhgH+AAPCeViAGBSiAViDFBVEhwICKIQgAyiEhANQYRABKJAByANmoIIAPz3WAABRB/IguZeR+
+LyqBA04igwfPcoAAOEFvYgAmQwDgq1QQjwDkfi8ugRNOJo8X7mLIq8iAUSbAkA/yXYiG4dMipgAv
+KoEATiKNB89ygABAQapiEPDPdoAAKEEuZs5lvIjEfWwQjgDEfS8tQRNOJY4XymJQqwHhSiQAcgDa
+qCCBANyIz3OAACBBT2PPdYAAOEHkfi8pgQNOIY8H72UAJoEA/KlUEI8A5H4vLoETTiaPF+5lJBmC
+A8iAUSbAkA/yfYiA4tMjoQAvK8EATiONB89zgABAQatjEfCA4gPyyWoC8Eh2zmN8iMR7bBCOAMR7
+LyvBAE4jjgfLZSwZwgAB4kokAHEA2qggQAXPcYAAHEF9iElhACWMAAHiZHkvKUEATiGDB89xgABA
+QWlhIKzGCKAGiHClBcAA8cA6DcAAguAF9M9xgACICgfwhCgLCgAhgX+AAPCeqYF4iUEtwhDAuhe6
+ACKODwAAgBzkvc8mIhbgvU7azyaiEMoigg8AAE4BhuPPImEC5b0V9M9zgADwns93gAD8oeKXKBME
+AZB3DPTDEw8GUSdAkQX0aYNRI0CBAvKBvs9zgADkoWyLh+PMI2KCzCMiggP0g75RJQCSzyaiFYLg
+iBmAA4wZgAAF9M9wgACICgfwhCgLCgAhgH+AAPCeaRCCAE4QDQEOIoEPAAA6AQm5Qn0lfTqQQnkS
+uSV9O5BCeRe5JX0EJb6fAPAAAMohwg/KIsIHyiBiAcojgg8AAKgAzyPiAsokwgDIAaL/yiVCA5UE
+4ACQGEAD8cAmDMAAguAIdQb0z3aAAIgKCPCELQsaACGOf4AA8J4B2WgeQhAA34AewBNM2E4eBBAF
+2BCmCtgbthDYGrYU2EweBBAt2FAeBBAm2FIeBBBKJABy6XKoIIANz3CAAGRB9CCDAM9wgADEfFR4
+YLDPcIAAdEH0IIMAz3CAANR8VHhgsM9wgACEQfQggwDPcIAA5HxUeGCwz3CAAJRB9CCDAM9wgAD0
+fFR4YLDPcIAApEH0IIMAz3CAAAR9VHgB4mCwCIbluAXyBNpiHoIQA/BiHsIT5LgK8gnZah5EEC7a
+XbYC2mkeghAK8BTaah6EEDLaXbZpHkIQFNlZjlEgAIBZYTB5ah5EEBrhPLYK8grYZB4EEAbYZh4E
+EAfYCPAQ2GQeBBBmHsQTBdgQpqlwyf5cjlQeghBsHoIQ5rrKIIEAyiGBAAryUCLDAW94CHFUHsIQ
+bB7CEOW6CPIoc4YjAwBveVQewhDkugXypbhsHgIQUSLAgAXypLlUHkIQguUX8qlw//7PcIAAwKGE
+LQsaMCBADlEgQIDx2MAoIgHKIIEPAACTAMAoIQGcHgAQGNiNuBemCIbPcYAA8J7juAbyuhGBAIm5
+BPChEYEANqbPcaAArC85gTC5UyEBgM9ygACEBFUeQhAT8s9xAADECSKySiQAcgDZqCCAAoDbz3KA
+AGx+NHpgsgHhFPCA2SKyk9kEuc9ygABsfiCyIbIisoojFwdjsiSyZbJmsoohBAAnsgQgvo8ABgAA
+C/I2uMC4G3gB4G4eBBAC2IAeABAD8G4exBMA2BymHaapcCb/KIYB2kEpAAU1uVIgAABSIQEAwLjA
+uVoOb/9IcxkCwADPcIAAiAoIgM9xpAAcQMC4E3jBuBKh4H7xwOHFz3GAAIgKd5HPcoAAyAbgu1fY
+AKID8l/YAKLiuwPyhbgAolEjQIAE8oe4AKLPcoAAzIugigDagOXKIIEAz3OlAOgPBqPPc6AApDAB
+g4DlzyDiANAg4QABo89woADsJ0ugUIHPcKAAyBxIoBIJIAsPgZkBwADxwB4J4AAH2c91oADIH0gd
+WJDPcIAAiAqAEAAAAN5MHRiQz3CrAKD/2aA6oNigiiAEAA+lz3CAAIgKahABAc93gABoM7AdQBC0
+HUAQH9kIuS6lCIBRIACAANiLuCXyEKUgj+C5ZNjKIIEDUSFAgAanCfIM2H4dGJABhwOnAocEpwXw
+fh2Yk8OnxKfPcIAAiAoJgFEgQIEkCcINz3GgAKQwAYGEuBDwEaV+HZiTyXCGCOANyXHDp8SnxqfP
+caAApDABgaS4AaGr/44PgAqv/89wAABVVVodGJAB2FkdGJDPdYAAiApuFQERz3CmAOgHJqDSDEAD
+jg5gCg2Vz3CAALBlB4iA4GQNggHPcIAAiAqIEAIAz3GgAMQnDxmYgIwQAgDPcKAAMBBEoM9wgADI
+dRB4jxkYgM9wgAB0dhB6liACABC4RXiQGRiAiiAEAJIZGIDPcoAAiAqQEgAAQBkAgM9wgADUGFMZ
+GIAPEQCGn7gPGRiAD9gQGQCAVRKAAIDgyiCCDwAAvA/KIIEPAAC8HxwZGIDPcKYA9M/DoO0HgADg
+ePHAdg+gACjaOnAacYQoCwovds91gACICgAmgB+AAPCeig9gAKlxz3GAAMyLACaAH4AAtKHCD2AA
+DNoA3892oAC0D/ymSIVTIgAAZgkgCjSVhP9MIQCgaArhCsogYQADyFEggIAE8vIOwAEJ8ADZnrnP
+cKAA/EQhoPymTCAAoMogYgAQD6INyiECAE0HgADgePHA4g6AAAolAJChwQHYEvIDyFEggIAN9Aoh
+wA/rcgXYiiNHC0okAABZBG//uHMA2IQtCxrPdoAA8J46cAAmTx4Jh0AmARmEKQsqJbhTIBIAMCFA
+DiW4UyAQAOlwEg5gAA3Z/g9gDqlw6YeA5SW/wL8F9APY6Pwn/QPwAg2ADYDnIPJMIgCgyiHCD8oi
+wgfKI4IPAAAPAsogYgHG9UYLQAYSD6AAAdhMIACgPfSKIIkGcghgAIohyAbSD6AHANgz8PIOoAAA
+2IDlA/Rv/SDwqgyADXIMgA2A4ATyrgyADRjwZgyADYDgFPLPcIAA5KEMiIngzCDigQz0z3CAABBA
+GYAE2UDAi3AyC2AAvdpMIACgCfRMIUCgBvQuDIANgOAD8m/9qXBp/o4NIAGpcATYGgygDQMaGDCA
+4BL0z3CAAPyhApA0lhBxDPIGDIANgOAv8oDlLfRWDIANgOAp8qlw6XGE/3/ZEbnPcKAAsB80oIoN
+AAbWC4ANgOAI9M9wgAD8oQKQNJYQcQj0DcgFIIAPAQAA/AvwDcgFIIAPAAAAPA0aGDANyJC4DRoY
+MJoLgA2A4A/yz3CAAPyhApA0lhBxCfQYjs9xgACIChipCYYJoQHeIg3gCclwz3CAAKkGrgvgCcCo
+geUT9M9wgADkoQyIieDMIOKBA/SA5wf0iOAH9EoLgA2A4APybguADVIKQAYmDEAAYghgAQDYJQWg
+AKHA4HjxwADYd//WCE//+goADqECj//gePHAtgyAAAh1z3aAAPCehCgLCgAmUB4kEAAgUSBAgcoh
+wQ/KIsEHyiBhAcojgQ8AALkCyiQhABgCYf/KJQEBz3CAANwKAYiA5QAWAUAx9M9ygABcWyCiABYD
+QIDgYaIAFoNAaKoAFoNAaaoAFgBBA/IPtgAWgEAKqgAWgEALqgAWgEAMqgAWgEAAFgBBB7IAFgBB
+CLIAFgBABCGADwAGAACA4AHYwHgSqgTYTvw38MIeWBAAFgFAz3KAAOiiwx5YEAAWgUCA4AwaQoAA
+FoFADRpCgMxwB/IgkM9wgADAoTuwAvAAkAAWgEDPcYAA7KIaGgKAABaAQBsaAoAAFoBAHBoCgAAW
+gEAAFgBBBhkEgAAWAEEaGQSAABYAQK943v1iCyABqXDuCYANgODPd4AA/KEP9AKXNJYQcQvy4gmA
+DYDgJvKA5ST0MgqADYDgIPIkEAEgqXAlucC5+f66CYANgOAF9AKXNJYQcQf0DcgFIIAPAQAA/Arw
+DcgFIIAPAAAAPA0aGDANyJC4DRoYMHIKQACJA4AA8cAA2Jr/VgkADv0Aj//gePHAANnPcKAAtA88
+oM9woADsJyugz3CAAPSLIaAioOIK4AoocM9xgACwZSCR/9iC4cogog//2s9xqwCg/1mhGKEC2BoK
+YAADGhgwrQCP/+B4hCgLCgAhgH+AAOyg3BACAM9xgABYXdgQAwBgGYCA4BACAOQQAABcGcCAbBmA
+gOB/cBkAgPHAigqgABLZqcEIduYLYACLcEokAHEA2qgggAIWJIAwKIiB4cP2YbkoqAHiAcICwYQu
+CxoAIYB/gADsoNgYgAAFwtwYQAAGwbRu4BiAAMd1gAAQQEgVERDkGEAAz3CAAKxcCiBALhYgQAQI
+4IPBSgjgAwja9IXPcIAArFyHwfZ4COA2COADCNoAwAAgjS+AAPCeUSAAgLQdGBAF8rkd2BMD8Lkd
+WBRGCIANgOAF9EYIgA2A4APyANgC8AHYEHYQD+H/yiCBA7QVABZRIECA8djAKCIByiCBDwAAkwDA
+KCEB9ghgAJwdABABAqAAqcDgeADYiPHxwKXBi3AaCWAABdkAwuC6E/LPcIAAiAoYiIHgDfQA2Jq4
+z3GgAMgfD6EBwKQZAADD2Bq4DqFRIoCAFvIFEgI2ANlKJABy4HioIIADuHGDcSiJESJAgAAiQDFc
+GEIACfJAJUEAfghAAKXA0cDgfgohwA/rcgXYiiOPDbkGL/9KJEAA4HjxwOHFz3WAAPCeCYVRIECB
+yiHCD8oiwgfKIGIByiOCDwAA2gbKJGIAhAYi/8olwgAODgAKCg1gBwHYz3CAAOShDIiH4B/0wxUA
+FlEgQIEb8moPQA3PcYAAeIUEkCWBCrgwcMohwg/KIsIHyiBiAcojgg8AAOQGyiQiADQGIv/KJcIA
+8gwP/5oI4AkA2AYNgAnODwAA/QCAAPHAAtgW/dj9WQZP//HAdgiAAADez3WgALQP3KWWCuAJaHf4
+/54LoArpcAPIUSCAgATyKgjAAQnwANmeuc9woAD8RCGg3KWlAIAA4HiEKAsKz3GAANShMCFCDs9w
+gACIXFZ4dpDPcYAAXFvEGdwAF5DPc4AAWF3FGRwAz3CAAKxcVngMiJAbAoAA2OB/xxkcAPHAig9P
+/3YOQA3aD0//xQVP/+B48cDiD2AARNrPdYAAEEDEbc9xgACwXEIIYACpcEokgHAA2aggAAgUadhg
+cYCEKQsKACGCf4AAXKEAIYB/gADsoH6iANt5omGFQoUB4dgYwABlhdwYgABGheAYwADkGIAA7QdA
+AM9wgABcW40DIACKIQUF4HjxwGYPQAChwQDdQMUAFo5AABaCQAAWg0AAFpBAgOId8kh3z3GAANiL
+I4mGJ/wXRb/DuuZ54LnKJYIQYMXhucolghDKJSEQARxCM1EhgIDKIiEAAhyCMIDgJPTPcIAAXFu2
+iPSIsXPMJsGTEfIKIcAP63JAKwQEEL4F2IojHA0FJEQDfQQv/wUmxRMAxUAgDgbPd4AA8J5UGFgD
+hB9AEyHwz3CAAPyhApAQcwr0z3eAAPCewhcAFsC4EHYN8gohwA/rcgXYiiNcD5hzNQQv/0olAAAA
+xc92gADApNsfWBNAIEEgSSEBBjR5Ag4gAMlwQiDAJUggAACA4ADby/cA2gAWAUAB4oPivfcB4xBz
+uPdWJgAZ2g0gAAbZqgxADYDgCfTPcIAA/KECkDSXMHAO9LIKYADJcM9wgAAEC6KgTyXBF14IIACK
+IBINZg0AAH0GYAChwOB4ANhW8fHAocGLcI4NIAAB2QAUBTBMJQCAyiHBD8oiwQfKIGEByiOBDwAA
+ggd8AyH/yiRhAM9wgADYiyINIAADGEIBocDRwOB+8cDODUAAz3OAALwLQ4MA3891oAAsILCF0mrU
+fn5mpaYEpgHijCICgCamQ6OF9wKD46MB4AKjAQZAAOB4ANjPcaAAyB8YoRmhAdgOoeB+4HjxwFYN
+QAAId5pxunLacwoiACEKI0AhCiGAIc9wAADIG6YPIAAKIMAh+nDPcAAAzBuWDwAAG3DPcAAABByK
+DwAAz3agAMgfO3AB2BOmBdjPdYAAKAsApeGlDsAgHQAUCaUVhhwdQBQKpRiGGB3AFAulGYYUHYAU
+DKWgFgAQEB2AFQ2lpBYAEAwdQBUOpagWABAIHQAVD6XPcAEAHycQpSoPIAAo2BGlIg8gAADYEqVT
+J8B1E6UByFQdABcWpRIWAJZQHQAXF6UTFgCWz3GgAMgcGKUUFgCWUyECMxmlFRYAlhC6GqUkFgCW
+G6UWFgCWHKXPcIAAzBURgB2lz3CAACgLeBiACs9wgAAoC3wYwArPcIAApAsEGAALz3CAAKQLCBhA
+CyiBI6DPcYAAbAUggSSgLyHHBQi5JXovIQcGRXlZBGAAJaDhxeHGQCkNAiV9QC0DFIjipXsIdZD3
+UyV+kAbyAR1SEGG6+/FBKo4AwbpCJk6QBB3QEP31gOIK8i8kiXDgeKgggAEBHVIQ4HjBxuB/wcXg
+eChyANnW8eB48cDmC0AACHbPcKAALCCwgAvwKggP/89wDwBAQuIMYAapcYHgDfLPcKAA1AsYgEIg
+AAhIIAAAEHYt9xkEQAAKIcAP63IF2Ioj0gmKJMMPKQEv/7hz8cCKC0AAocEacM92oACsLxmGBCCA
+D3AAAADXcCAAAAAB2MB4LyYH8Ch1AN8T9IogSQaSDe//iiEMBjmGhg3v/4ogCQaKIAkGeg3v/6lx
+6XAr8A/MABxEM08gwQMB4BB4j7gCHEQwDxocMM9woADUCziAQiEBCIDhyiHMA0AgACIQcSwPxf9A
+IMAhBCCADwAA/P8FIIAPgK4AAOxxAKEAwexwIKAB2EkDYAChwCK5BvDscmCiBOBhuYHhYIA69wDZ
+z3CgANQLbaDPcKAARB01oOB+4HjxwL4KQAAIdih1KHBIccj/geDKIIEDxA/h/8ohQQMNA0AA4HjP
+c9C6/srPcp8AuP9+ohqiO6LPcKAAOC4FgAQggA/AAAAA13DAAAAA9fNp2Bi4GaLgfuB48cBiCkAA
+CHfPcYAAxAQIiQDegOCpwUDGQfQB3aipz3GAAABoz3CgAMwrLaAA2I+4DxocMB0agjMeCqAKi3De
+D8AFz3ABAB8nQcCKIFQAQsDPcIAAQE8AiGTFAt0RHAIwAMASHEIzExwCMM9wgAC8C0XAz3CAACgL
+RsDPcIAAbAUAgEPGINlIx0fAgcAB2sf/CNgB2c7/AxpYMzECYACpwAPaz3GgABQERaHPcaAA1AsN
+oeB+8cDhxQPdANvPcqAA1AuxonCiz3WArhgA7HKgogLaHBqCMAcSDTbscqCiDxICNwHiDxqcMOxy
+AKIBEgI27HBAoOxwIKAB2M91oADIHxOlOIXscCCgGYXm/3Qd2JDPcaAAyDsOgYi4DqG9AUAA8cAA
+2AQSgTDj/wQShTAKIcAP63IH2IojkQG9Bu/+SiQAAOB4ANoD8AHiQSiBADByvPfgfs9xgADMFUQZ
+wAeduJ64z3GgAMgcDaHgeOB44HjgeOB44HjgeOB44H4D2s9xoAAUBEWhz3GgAPwLDKngfgPaz3Gg
+ABQERaHPcaAACAwAseB+A8zXcAAAAEDKIYsPgK4EAMohig8ArgQA7HAgoM9woAAUBAPZJaAByM9x
+oADUCwDaDaHPcKAARB1VoOB+gOFU8kAhwgPDuY/hnAAtACS6MyZBcIAAfEBAJ4NyNHsAewAWAUAE
+GFAAABYBQAQYUAAAFgFABBhQAAAWAUAEGFAAABYBQAQYUAAAFgFABBhQAAAWAUAEGFAAABYBQAQY
+UAAAFgFABBhQAAAWAUAEGFAAABYBQAQYUAAAFgFABBhQAAAWAUAEGFAAABYBQAQYUAAAFgFABBhQ
+AAAWAUBCIkKABBhQAL/14H7geIDi4cUi8mNqwbqD4jwALQAiuzMmgnCAAIxAQCeNclR9AH0EEAIE
+BBmQAAQQAgQEGZAABBACBAQZkABCI0OABBACBAQZkADv9eB/wcWA4uHFU/JAIsMDw7qP4p4ALQAk
+uzMmgnCAAJBAQCcNclR9AH0BEIIEARmSAAEQggQBGZIAARCCBAEZkgABEIIEARmSAAEQggQBGZIA
+ARCCBAEZkgABEIIEARmSAAEQggQBGZIAARCCBAEZkgABEIIEARmSAAEQggQBGZIAARCCBAEZkgAB
+EIIEARmSAAEQggQBGZIAARCCBAEZkgBCI0OAARCCBAEZkgC+9arx8cDiDgAAKHZGIc0AHWUiuZP/
+wb6B5g7yguYI8oPmDfQAFoBAAR0SEAAWgEABHRIQABaAQACtGQcAAOB4gOHKJE1w4HjoIK0BABYB
+QQIYVADgfuB48cCODiAAUyFCAE4iDQEgEgI2z3agABQEyYYA28J6UHHKIcYPyiLGB8ogZgHKI4YP
+AAAZAsokZgDkA+b+yiXGAIDhyiRNcMoizQDoIG0CTmDPcaAAOAQB4sipgeUN8oLlB/KD5Q30z3Cg
+ADgEaKjPcKAAOARoqM9woAA4BGiofQYAAOB4z3OfALj/GqM+o8K6BSKCDwBsAABZo+B+z3KgADgu
+RYIEIoIPwAAAANdywAAAAADbC/LPcp8AuP8aojuiadgYuBmiAdgC8Ghw4H7geM9y0Lr+ys9xnwC4
+/16hGqHPcKAAOC4FgAQggA/AAAAA13DAAAAA9vNq2Bi4GaEcgeB+4HjxwIYNAADPcIAAsGUAkIbg
+AN4a9AXYCbgaGhgwGxoYMBwaGDAdGhgwCdgIuB4aGDAfGhgwiiAQACAaGDCKIAgAIRoYMADdCNjP
+dwAABB2YcBUiQDMaEAEGANjPcqAAFASqosiiJ6IEoj5miOFoucohDgDpcJ/+QiRAAIDgIOcB5Sf3
+bQUAAOB4QSmBgAryLyRJcOB4qCCAAQQQAgTscUCh4H7gePHA5gwgAADaCHUods9woADUCziAQiEB
+CIDhyiGMAEAmABIQcdwIxf8HbgQggA8AAPz/BSCAD4CuAADscQChAcjscQChIr4G8OxxAKEE5WG+
+geYAhTr3s/75BAAAB9nPcqAA1AcaGliAgOAO8hkSAYYJIEMADxIBhgIgwIB5YQ8aWID29eB+4Hih
+wfHAz3OADggA7HJgouxyAKIocKH+0cDgf6HA8cA6DEAKXgxACtHA4H7gePHA4cXPcIAAsGUmiIDh
+RPIniIDhQPKgkEptiOIJ9zMmgnCAAKBAQCeBclR5AHkA2SXwJJCA4Qf0JZCB4cwhooAD8gDZAvAB
+2QLdGfAkkAXdgeEB2cB5E/AkkATdg+EB2cB5DfAkkAbdguEB2cB5B/AkkArdhOEB2cB5geEM8ggQ
+BQEKIcAP63IQ2IojDg81Ae/+mHURBAAAocHgf6HA4HjgfuB48cCOCyAAuHHPcoAAqF0FuTAiRABR
+JECDosEG8s9zgAB4ogXwz3OAAJCfQCMCBkAjAQdRJECCyiHCD8oiwgfKI4IPAAAoBNgA4v7KIGIB
+z3aAALBhQC2NAaZm6L5AxiDFBPLCvaphD/BRJkCSB/JEJQEcRLkqYom6BfBTJcEQPHkqY89xgACw
+YBYhQQEiiQ65RXkgoGUDIACiwOB48cDmCgAAOnAacUh1aHBGDCAGCtlhaCpwR/+keAQlARQwcBXy
+INrPdqAAyB9QpgrYQx4YEADYjbhq/lGmYbuMI/+PAN8p9ulwAvAB2PkCAADxwJoKAAAacADdNNg2
+/1AgQQQ02P39NNgz/08gAQWVuTTY+v2pdwTwqXcIdQPYCrgQdX4ABgAybQQhgQ8AAPz/LNjy/SzY
+AdnPcwAAiBMoctj/gOAt8izYI/9BKA4ENNgh//W4GvT0uAvyNNge/08gAQU02OX9R9haDK//AdmA
+5hHyqXCAIBAA13AAAAAMwiBhABB2yvMN8EfYOgyv/wLZB/CA5Qf0RtgqDK//ANkA2ATwABjEIwHY
+RQIAAPHA2gkAAAh3CHYodRpyMNgG/whxhiEGADDYzf002AP/UCBBBDTYyv002AD/TyABBZW5NNjG
+/RHw9LgM8jTY+/5PIAEFNNjC/UfYzguv/wHZAh1UFAHmACDAIxB2QAAGADJuBCGBDwAA/P8s2Lj9
+LNgB2c9zAACIEyhyn/+A4A7yLNjq/kEoEQQ02Oj+9bjW80fYhguv/wLZANgD8AHYnQEAAOB48cA+
+CQAACHXPcIAAxAQBgCh2geChwUh3F/SA4wzyi3Cg/4DgANgl8gAUADEB4LhgEHgH8AAlgB8AAAAM
+EHjJcelyx/8V8IDjDvSWJQIQsH0K8M9woABgHbKwFJAB5bB9Ah4UEGG/jCf/n/X1Adg5ASAAocDx
+wAHbMNjD/lMgggCE4ghxC/czJoJwgACsQEAngHJUeAB4aHAF8NoKr/9I2ADYgODKIcEPyiLBB8og
+YQHKI4EPAADMBcokIQAUBqH+yiUBAc9zgADEBDTYrv7wuAHYyiAhADcE7/8Bo/HA4cUIdc9wgADc
+CgGIgOAQ8gTwpgyP/s9woADUCxiAANlCIAAIgODKIEwAEHU096kAAAD8HIi2/BxItvwcCLb8HMi1
+/ByItfwcSLX8HAi1/BzItPwciLT8HEi0/BwItPwcyLP8HIiz/BxIs+B+4HgE3DjdNfDgeATcNN0z
+8OB4BNww3THw4HgE3CzdL/DgeATcKN0t8OB4BNwk3Svw4HgE3CDdKfDgeATcHN0n8OB4BNwY3SXw
+4HgE3BTdI/DgeATcEN0h8OB4BNwM3R/w4HgE3AjdHPDgeATcBN0Z8DQUGjAwFBkwLBQYMCgUFzAk
+FBYwIBQVMBwUFDAYFBMwFBQSMBAUETAMFBAwAscBxrAkTTOwJB8z4H7gfuB44H7geOB+4HjgfuB4
+ANmWuc9woACsLzyg4H7gePHAocGLcKYOr/8B2UDYmgrv/0DAWg6P/6HA0cDgfuB48cAKIcAP63IF
+2DDbiiTDD40Er/64c+B44H7geOB+4HjgfuB44H7geOB/AdjgfuB44H7geOB/AdjxwM4Oz/8Ids9w
+oABkLvAgjwMZEhA2GRqYM/XYBbgiDK//yXEZyM91oAAUBAqlCYWA4NQOQgXPcKAAwC9REACGCyDA
+g/X1z3AAAGQezgjP/xEggIPt8wmFgODr9RkaGDT12AW42guv/wpxGcgKpcUGz//gePHAog2P/+UD
+j/7geJUFj//xwFIO7/8A2UokAHLgeKgggAIAFgJAFSJAMBoYmAAB4QAWDUAAFg5AogjP/89woAAU
+BKygz3CgANQL3KBWDY//fQbP/+HF4cYkiM9ygAC0QKaIwrkuYgDZDyGBA4Dlz3OAAPxwdhMCBgX0
+Jnp2G5gAHPBFeXYbWAAliBUjjQN5HVgQJohFiFlhfB1YECCAjCEQgEX3iiEQACCgI7l3G1gAAIAq
+uHgbGAAA2c9woADwNiygeRMBBiWgfBMBBiagehMBBiegfRMBBiigexMBBimgfhMBBiqgdxMBBiug
+eBMBBi2gdhMBBiSgwcbgf8HF4HjxwOHFosGLdalw1gyv/wLZqXDR/44Mj/+9Be//osDgeIDg8cAH
+9M9wgADUckoJr/8k2dHA4H7gePHAJg3v/5hwkODKIcYPyiLGB8ogZgHKI4YPAABUA5wCpv7KJSYE
+ANpKJAB0z3aAANAEqCCAD0AsgwFVe8dzgACwYSCDz3WAAKhdQCxAAd25AGUgo/G40SEiggnyoIvP
+d4AAvECtZ4HlCvbPdYAAsGAWJQ0RoI1RJQCQBPKeuRbwLbjAuBUmDxDjh1IhTQILJ0CTDfLPdYAA
+EJ+EKAsKMCVAHv647POfuSCjAeLhBM//8cBmDM//osEAFhFBABYAQUApTSHHdYAAqF0AhUwhAKQt
+uFMgEgCO9wohwA/rcgXYiiPVB0okQADRAa/+CiVABM9wgACwYBYgQAQacKoLr/8C2c9wgAAwYRYg
+QASaC6//AtlAKZMhACOAL4AAsGGKC6//ENmLcIILr/8B2QCFUSBAggfyNguP/zUE7/+iwAAjgC+A
+ALBhrgrgCRDZARCAIJDgyiHKD8oiygfKI4oPAACMBYQH6v/KIGoBSiQAdADZqCBBCxUjQCDPcoAA
+sGEwIgUABCWOjwAAAAEEHEAxS/Ihw89wgAC8QAQljQ8GAAAAQS1CFG9goOP4YtEl4YIP8oDmBPKB
+5w32BCWEDwAAACQMJICPAAAAJAP0ANsp8ILiPfeC4gX0gOb584Ln9/WA5gPyzOMz9oDmBfKB58P2
+gOXt9c9ygACwZUaSUHcn9lElwIIO8s9zgAAQn4QqCyowI0IOBCK+jwAGAADZ8wHbb3sD8AHYCHME
+JYIPAQAAwC66z3WAAABESmVQcAHYwiANAIDjzCAigBLyAeECEIAgz3GAAAxBCGGB4B3yCiHAD+ty
+BdiKI9YIEfDPc4AAEJ+EKgsqMCNEDgohwA/rcgXYPQCv/oojFghKJEAAMQCv/kolAAADEIAgCGGC
+4Mohwg/KIsIHyiOCDwAApQUF2O31KnBU/89wgAAwYRYgQARAkM9xAAAYFQkiQQAgsDbx8cDPcIAA
+0ASyC6//AtmSCY//HwXP/+B44cU1aM9ygACoXSFiz3KAABCfLbnAuYQpCwowIkEOUSEAgM9xgADY
+i0GBxSKCDwAACgLFImEDSiQAdADbqCCAAjZodXkAIY0PgACwYUClAeMO2c91gACwYBYlAhAgqgDb
+YaoB2SKqA9kjqkokAHFocagggAG6YRZ6ZKoB4eB/wcVlA8//YQPP//HAABYAQIHgz3GAAHAWAKEN
+9AAWAEAMuAQggA8BAADwAaEAFgBAAqER8ILgABYAQAv0RiDCAEOhABYAQM9woADQG16gA/AAFgBA
+A8zXcAAAAEDKIYsPgK4IAMohig8ArggA7HAgoAHI7HEAoY4Pb/8B2ADZz3CgAEQdNaATBM//8cDh
+xQAWAUChwUDBARSAMFEgAIAF8s9ygABYfATwz3KAAHB8IKJgigHZCPAAFgBAFSJMAACkAeF9eBBx
++PdRIwCACPIAFgBBFSJMAACkAeGF4QDdB/cVIkwAAeGF4aCk+/fPcYCuCADscCCgAcjscQCh5g9v
+/wKKz3CgAEQdtaAxAe//ocDgePHAABYAQAAWAEAAFgBAABYAQM9xgK4IAOxwIKAByOxxAKHSDm//
+AtgA2c9woABEHTWgVwPP/+B48cDhxc91gADQBARtkgmv/wjZAYXPcaAAuB4CoQKFA6GeD0//zQDP
+//HA4cWhwQDdQMUAFgFAABYAQIHhDfLPcYCuDADscCCgAcjscQCh7HCgoKlwE/AaCCAKi3AB2s9x
+gK4QAOxwIKAByOxxAKHscECgAMHscCCgSHBCDk//z3CgAEQdtaCe8fHA5g+P/wogAKBacQDdFvIK
+cS8oQQBOIIIHz3CgAAwtT3rwIIAAwrgPJQ0QANgPIIAABiEBgO/1gOXPd6AAFAQl8i8oQQNOII4H
+GRqYM/XYBbgODW//yXEZyM9xoABkLgqn8CERACmHvglv/9rYSnBGCWAFBCEBJL4PoALJcADYDyCA
+AwYlDZDd9QfYCgkgBBkaGDAZyAqnqQeP//HAUg+v/wjZosEBEg42z3WgADguHBUQEGIIr/+LcAAU
+BDAA3wQkvo/w/wAAyiHCD8oiwgfKIGIByiOCDwAASgaoBGL+yiXCAFEkQILKIcIPyiLCB8ogYgHK
+I4IPAABMBogEYv7KJcIA56V+DaAMP9gAwAQUATEHpYK5u/8cHQAUGg5v/wEamDMtB6//osDgeOHF
+4cYA3s9zoADAL6UbmIMP3Qi9oxMChqR6jCIQgPzzFBuYgxQbmIOjEwKGCyJAg/z1FLgFeaQbWICk
+EwCG/7j98yEBz//gePHAbg6P/wfdz3CgAFQuK4DPd6AAwC+lFxKWFBcRli8oQQBOIJMHz3agABQE
+qqaA2OL/89gFuIDZsgtv/5+5GRIQNvXYBbimC2//qXGqphkaWDME8APYBaaphoDlG/KA5frzQS2A
+kAryLyQJcOB4qCCAAQAWAEDgeFMlTZAJ8i8kSXPgeKggQAEAFoBA4Hiphufx89gyCK//Bbj/uOH1
+9dgFuEoLb/8KcRkaGDQoHgAUz3CgABgs8CDBBM9woABoLBUgwAQgoEArACHHcIAATG41gFaAJXo3
+gBiARXkFIESAyiHCD8oiwgfKIGIByiOCDwAA1AYcA2L+yiUiAIDZz3CgANAbMKClH5iUFB9YlLkF
+j//gePHAXg2v/xfZt8FKIUAgAN7aDG//i3AMFJAwz3WAADQFTCAApMohxg/KIsYHyiBmAcojhg8A
+ALADyiRGBMACZv7KJQYEIMBRIACAb/QSwO24yiGBIwTyz3WAADgFz3eAAKhdQChOIcBn/mZRIECC
+yiHBD8oiwQfKIGEByiOBDwAAvgPKJGEAeAJh/solAQQBwALBCnK+DeACZm6A4EHy/9pHrkokAHEA
+2aggQAMoZQAhgw+AAChdFiMDBASrKGUB4QCrDRSAMEUgwAANHAIwiiD/D1PAAIapuACmEsCGIPsP
+KLgMrkokAHQA2KgggAL7YEAoQSEQ4ztjQKsB4AEUgDAIrgIUgDAJrs9wgACwBBUgQAQggA8hAQQg
+oAHfAvAC3wpwgv4N8EAoTiHHdoAAqF0AhlEgQILKJ0EUyiciEoHn2gICACCGz3CAAIgKGIhacYHg
+hiL7LxLyZgqADIDgIIYZ8s9wgADkoQyIh+AT9EEpQANRIACAD/ITwOi4EsIL8oYi+w9BKgQCTI6Q
+cgPyqLhTwBAUADGGIPMPQigRAhPAEsIGeUR4JXgApkwiAKAIcYYh+w8J8oDhB/QKcADZYgqgDA/a
+AIYA2c9ygADIXxYiAgT1uCCiIaIE9ADZi7khova4BvIBgoUgAQ4BohAUADHruIoiwy8E9B4UkjAN
+FIAwUSBAgQ3yWBQAMQW2gODKIAIEyiEiAAgKogzKIuIDDRSAMFEgAICx8gCG7bgK8s91gAA4BYog
+VQJmDS//iiGQDxAUADHjuD30IIbruRTy/9gHrkokAHEA2aggQAMoZQAhgg+AAChdFiICBASqKGUB
+4QCqW/BMIQChjfYKIcAP63IF2IojUQRKJEAAdQBv/golQATuuAeOMiVBFAAhgi+AAChdFiICBAny
+JKoE2QApQQQleAeuPPAgqg8gQARh8EwiAKSR9owiw68b8gohwA/rcgXYiiPRCUokQAAlAG/+CiWA
+BKYJIAOLcBAUADHuuAbyAhSBMCmuBfABFIEwKK4ghuu5GvIA2EokAHEHrqggQAMAIIEPgAAoXRYh
+AQQEGYIEABmCBAHgARSAMAiuAhSAMAmuK/BMIQChyiHKD8oiygfKI4oPAACHBD4H6v/KIGoB7rgH
+jgAhgS+AAChdFiEBBAnyBBmCBATZAClBBCZ4B67e8QAZggQA2Q8hQQQmeAeuARSAMAiuDRSAMFEg
+QIAa8lAUADGA4AK2FPIA3RDYOnAClhEgQIPKIAIEyiFCA3AIogzKIkIDQiFAIIDgAeUx9w0UgDBR
+IACBBvIjwGoLIANVFIEwDRSAMFEgwIAd8jXBVhQCMQpwxgsgAxLDuHCMIAKAyiHBD8oiwQfKIGEB
+yiOBDwAA3wT4BiH+yiRhAFElwIHKJyIRCnAL/c9xgK4IAOxwIKAByOxxAKGCDy//6XAA2c9woABE
+HTWggQGv/7fA8cAiCa//AdmkwUohQCCeCG//gcAA3lLwgsCSCG//AtkCwItyWgjgAgPBBCBABC8h
+B6BD8gDAANnPcoAAqF0PIQEABbgAYs9ygABIBWCCMn8tuFMgEAAEJ8CQAKIG9IDjqA5iB8ogIggg
+wI4KIAMQ2QDAAN01aAAhgg+AAKhdiiEIAKKyIKKpcVYPYAwP2s9wgACwBBUgAAQggOR5IKAAwc9w
+gADIXzZ4oKChoM9wgACoXzR4oLAB5iHAEHZcB8X/z3GArggA7HAgoAHI7HEAoXYPL/8qcK0Ar/+k
+wPHAIg+AAo4PD/8bA4//4HjxwDoIj/+EKAsKz3GAALAE8CEOAAAhj3+AAPCeSIcEIoEPgAAAAEQi
+AwIvuQa7JXsEIoEPAAEAAEEpTQMsuWV9JX3PcYAA0AQVIRAADBAAIBB1M/IEIr6PgAEAACDyz3CA
+AOShDIiH4Br0Kg5ADIDgFvIIh764RCABAgQggg+AAAAACKcEIIAPAAEAAAa5L7pBKE0DRXklfSy4
+BX2A5gwYQCML8i8pgQNOIYAHECYOEJr8gOb49ekHT//gePHAosGLcKIIb/8I2QDAgODPcYAAnAQA
+oQfyBhQAMQOxBBQAMQKxog4P/6LA0cDgfvHApMGLcHIIb/8Q2c9xgK4IAOxwIKAByOxxAKEAwFEg
+AIADwAb0AsH2C2ADANoF8EoNIAQBwV4ND/8A2c9woABEHTWgpMDRwOB+4HjxwAYPT/86Dm//AN5/
+2M93oADIHxkfGJAB2AhxCHKKCy/+CHPPcIAAFADXcIAAFAAL8gohwA/rcgXYX9uKJIMPWQQv/rhz
+z3WgANAP1aUaCoAGegpP/0DZz3CfALj/MqAiCU//gNnPcKAAFAQsoB0dWJCaC0AGAgjABbIKYAbJ
+cKoLIAkD3s91oACsLxiFmrgYpRLw4HjgeOB44HjgeOB44HjgeOB44HjgeOB44HjgeOB44Hhhvowm
+/5/u9RiFs7i6uBilB9hIHxiQxg7P/i4MwAiyC8AITgnACRqFwLiB4AHYwHgvJgfwBfKOCWAJAd4F
+8APeGIWauBilMg7P/t4MgAKKDgADz3CAADQFrgvgAgTZdg/AAhIIQAOWDoAHlgoAB+4NwAt2DEAM
+AgxP/oogxg3PcYAAiAoNsQPYbRkCABvZz3CAAHAj/gtgATCopgsABXIOT/+yDIAIsgzADB4LQA1y
+CQAKQgsv/8lwAQZP/+B+4HjgfuB44H7geOB+4HjgfuB44H7gePHACiHAD+tyBdha24okgw8BAy/+
+uHPgePHAYg1P/xpwKHfPdoAAiAoUls91gADAZRC4VgngBwClgODKJyIQz3GAruQB7HAgoOxxABkA
+BAiGUSAAgATyAIWBuAClz3CAAMAGAIiA4AX0AIWDuAClz3CgACwgEIAA3kokwHBtHRgQyXCoIAAE
+z3GAACisRCi+AzMhQQ4AIIIPgABAZwHgIKqA5x7yAIViFQ8WqXJjFQQWgLgApQDZB/DscwCjBBqQ
+AwHh9+EAgrr3z3GgANQLDaHAomId2BNjHRgREPAA2alzBfDscgCiBOMB4ffhAIO7989xoADUCw2h
+5QRv/9QdgBPxwOHFocEIdToOL/4T2M9wgADkBACAgOAj9M9woADUCxiAANlCIAAIgODKIEwAjCAH
+ikn3z3GAAEgWCYEB4AmhD/Cd2AAcBDAPzAIcBDAB4BB4j7gPGhwwAMCpca//FgkABZUEb/+hwADY
+zPHxwOHFABYNQAHIUyUBEKj/USVAkM9xgADkBAHYyiAhAGkEb/8AoeB48cDhxc9zpwAUSADZKKMH
+g89ygAD4ch+iEIPPdacANESAGgAAz3DzD//8J6MQo6DYmrg2o/UdGBDPcKUACAwIEAUATCUAgMoh
+wg/KIsIHyiBiAcojgg8AACQDJAEi/sokIgDPc6QAuD2bEw0Gu6KmEw0GvKKSEw0GvaKjEw0GvqJQ
+3aKgmxtYAP/YphsYAJIbGACjGxgAz3OkAOz/z3AAAP//J6MGowHYz3WgAMgcEaWKIMQAz3OgAOwn
+BqMKg2QaBACKIM0ABqMKg2YaBADPcCgAAgEGo4ogjQAGozGlhQNP/+B48cDhxQhyAd2A4cohwQ/K
+IsEHyiBhAcojgQ8AAMQAyiQhAHgAIf7KJQEBgOJE9lN6iiX/H4DhRPYzebN9FCGAAEoMYAU7eax4
+NQNv/y9w4HjxwJ4KT/96cJpxGnI6cwolACEA2s9xqwCg/1mhB9gaoVihIN/PdaAAyB/wpQHeQx2Y
+EwDYdgkv/4248aXPcKcAmEfaoN4OYAke2M9xpwAUSB2B3oH7gXAREgAAGAAgABmAI/e4xSCCDwD/
+AADTIOEF977FJoIfAP8AANMm4RWKIRAAzP8IdclwiiEQAMn/CHZALwASiiEIAMb/CHdAKgAiiiEI
+AMP/sXkZ4Sx5L3HRehniTHovcjB3ABtAIwAcgCOD9gDYBPBQcH32AdghAm//AB0CIPHA4glv/wDZ
+z3OgALQPvIM8o89wgAD4cmQQAgEQuk8iTgCIvs9yoADsJ8aiZhAOARC+hSaNEMai34DPd6cAFEjH
+p4AQDgDQp892pQAIDCKm+4DPdqQAuD2bHtgT/ICmHtgT/YCSHtgTHoCjHhgQz3CkAOz/JqCKIIoA
+BqK8o84M4AEB2MUBT//xwDIJT//PcIAAsGUHiIDgfAQhAKvBz3CrAKD/ZBAXAM9wqwCg/2gQGADP
+cKsAoP9gEBkAB95P/wDZz3CrAKD/OaDaoDigVg+gCAHYANjPcacAFEgMoQ2hDqEPoc9wAAABKs91
+oADsJwalz3ClAOgPx6DPd6AAyB8g2BCnBdhDHxgQANjKD+/+jbgg2BGnAdnPcKAAtA88oM9wAAAC
+Lwalz3AAAMIwBqXPcAAAQkgGpc9wAAACSgalz3AAAAJiBqXPcAAAwmMGpUojACDPcIAAsGUkkAWQ
+RCm+BxhgFXgVI8EkJ3AZYcdxgACAFgMRkgAEEZQAARGQAAIRlgAAiRC4BSCADwAAQi0GpQCJELgF
+IIAPAACCRgalAIkQuAUggA8AAEJgBqUg2BCnBdhDHxgQANgeD+/+jbgg2BGnANgQ8M9wgAB4cRYg
+QAREGIABIYZIGEABN6BYoEAhQCA6cM9wgACwZQaQMnCOAg4Az3GnABRIXBlABEAoACRPIEEAh7mJ
+uSalCHGFIYsAJqWFIIwABqVMIQCgQCQVOhTyTCFAoBzyTCGAoCb0QCoAJAUggQ8AAIJgJqUFIIAP
+AABCYhnwQCoAJAUggQ8AAIItJqUFIIAPAABCLw3wQCoAJAUggQ8AAMJGJqUFIIAPAACCSAalINgQ
+pwXYQx8YEADYUg7v/o24INgRp4twgcGIwonDCiRABSX/CMFAKUAhACCOD4AA/HAJwCCmAaYAwBim
+AcAZpkAuACSFIIoABqUg2BCnBdhDHxgQANgKDu/+jbgg2BGngsCDwYjCicMKJEAFEv8IwEwhAKAC
+pgnAA6YCwBqmA8AbphTyTCFAoBzyTCGAoCb0QCwAJAUggQ8AAIJgJqUFIIAPAABCYhnwQCwAJAUg
+gQ8AAIItJqUFIIAPAABCLw3wQCwAJAUggQ8AAMJGJqUFIIAPAACCSAalINgQpwXYQx8YEADYeg3v
+/o24INgRp4TAhcGIwonDCiRABe/+CMAGpgnAB6YEwB6mBcAfpiDYEKcF2EMfGBAA2EYN7/6NuCDY
+EadAKAAkhSCKAAalhsCHwYjCicMKJEAF3/4IwAbDBKYJwHymBaYHwADBHaYCwAIgQgAEwVtjAiNF
+gDryInhMeC9wqHHA/gLBQCuOINR+FSZOFAJ5x3aAAPhyAcADwiGmB8MCIgEABcA7YwIjBYAq8gJ6
+LHovcKhxs/4DwQTDAiECAALAR6YCIwaANB6AESHyBcACIEWAnAXi/0weQBEKIcAP63IF2IojRQ0I
+8AohwA/rcgXYiiOFCiUD7/2KJIMPCiHAD+tyBdiKI4UL9vEKIcAP63IF2IojhQyKJIMPAQPv/Qol
+gAFAI1MgTCOAoNAExf8A2M9xoAC0Dxyh2/7qcM9xqwCg/xmhaBkABmAZQAZKJABxANioIAANCHGA
+IYINMHkGuYG5l7kmpQhxgCFCDzB5BrmBuZe5JqUIcYAhxAYweQa5gbmXuSalCHGAIYQIMHkGuYG5
+l7kmpQhxgCGGADB5BrmBuZe5JqUIcYAhRgIweQa5gbmXuSalAeDlBC//q8DgePHAtgwv/5hwocHP
+coAA6AQgis9zgAD4cgGChBMDAJBxzCDBgOrycHAG8s9wgAAQdCGIIKpKJMBwSiAAEKggwALPcIAA
+EHQyIAACkHAD8kAgSBBMIMCQpAEGAM9wgAAQdAGIkHAG9AQhAQEvJUcABvAHIAABLyUHAGGiANvP
+cKAAtA9wEBIAfKAAGgIBFPBAIIAhEHgGuIG4QCkBJCV4BqZAI4ERMHkGuYG5QCoAFCV4BqYB489w
+gACwZQaQEHMyAQYAANkPIcEACyFAgQHYyicCAA30CyEAge3zz3CAABB0AYiQcOfzCicAAoDjEfKB
+42fyguMG9IoghiCKIUYCDPAKIcAP63IF2IojjwNk8Lbavdkacnlxz3agAOwnSiEAIEokAHEKIkAU
+KnWoIIECACBBI1RrQC8AARR4GmK1esdygABwcwiSMHlAKYkBTyFBEBx/EL/leSamwLi4eAUgQAQv
+IQggACNPEwmS8H8Gv08nRhAceUApEwQFI4EhJqbAuLh4BSCBAi8iSBBFIcAQBqYKhotxALEIki8m
+AQAAFAAx0HAU9EUnzxDmpgqGALEJkgAUATEceDBwFPQB5WnxiiLEBoohhAin8QohwA/rcgXYiiOP
+CEokAACBAO/9CiUAAQohwA/rcgXYiiMPCfTxz3GgALQPcBmABBUDL/+hwOB4ANnPcIAAEHQgqCGo
+4H8iqPHAjgoP/67Bz3CAAIgKCIDPdYAAgBbAuEDAz3CAALBlJJAFkEQpvgcAwRhgFXgncDV5OGAZ
+ZSOJQcEZZSSJuGACiELBQ8DPcIAA+HJqEAEBz3CAALwGQJBQcUokACAo9M9xgABwIw2JhiD/AXto
+z3CAABB0wIgCI4ODzokvicojYgCGJv8R+27BiAKIhiH/AUO5DibOk8omYhAOIECA237KIGIAxXsC
+uGV4A/AH2IDgpAMhAETAz3CgALRHRxAAhoDglAMBAM9xgABwIw2Jz3OAABB0hiD/AUO4AKsOiYYg
+/wFDuAGrD4kA2Z65hiD/AUO4AqvPcIAA+HJqGIQAz3CgALRHUxhYgHH9z3CAALBlJJAFkM93oADs
+J0QpvgcAwRhgFXgncDV5OGAJZRC5BSGBDwAAQi0mpwllELkFIYEPAACCRianCGUQuAUggA8AAEJg
+BqfPcKcAFEgMgM9xDwAA/M92gAD4ckXAAMACuBR4ACYEEB1mG2YaZgAmBRAeZgmGBBQEAKeFBcZI
+goDmYoMMFQUAH/JALI4CJH7JvaV+z3WnABRIzaUKu2R5ybpFec9ypwAUSC6iQC2BAgQhgQ8PAAD8
+ybgFec9wpwAUSC+gHvAKvSR9iHbJvsV9z3anABRIraYKukR5ybtlec9ypwAUSC6iCrgEIIEPDwAA
+/KhwybgleM9xpwAUSA+hSiAAIAPYRsAKIgAlBMARIACECgIBAM9xgAAQdDIhAAQCcUfBz3GgALRH
+YBkYgBC4m7jPcYAAzIsgiZ+4gOEB2cB5D7kleM9xoAC0R18ZGIDPcKAAtEdxEACGBCCADw4AAAAx
+uIHg9vMA3QPwAeXPcIAAsGUGkBB1ogEGAAfAAIgRIECD9PMBwQLAgOUCIFkAAMACuBR4SMDPcKcA
+FEi3oArygeUN8oLlEfSKIIYAiiFGAgvwiiSCLYoiQi8H8IogxAaKIYQImnBacUojACFqdkAtWBFh
+vgPBFW4leBB4ELiFIIoABqcAJgAVEHgGuIG4l7gGpwAmgBQQeAa4gbiXuAanQCSAIRB4BriBuAan
+QCKAIRB4BriBuAanQCQEPYnAisGLwozDNP0twIDgDfTPcIAA+HJoEAABz3GAAPhyAeAQeGgZBAAF
+wIDgEvKJwCCAisBAgInAQKCKwCCgjMFAgYvAAICLwUChjMEAoRYggDMJwQAglg+AAPxwCsDwHkAg
+9B4AIAghgA///wH/LyVAJgQtPiAIwBUgUQMAIYAvgAD4ci2AL3AA/Q4glw8AAAABCsCIIHwABCh+
+BQAhgC+AAPhyM4AvcPj8DiCCDwAAAAEJJ4EvAAD/AQkigA8AAP8BSCEBAEggAAAtwlQeWCCB4lUe
+GCAM9FRtQCgDIXR7emLVesdygABwcyiyCbJCI1MgTCMAoMAGzf8q8QbAYbiA4EAgUCDoBe3/RsAK
+DIAEJ/3PcKAAtEdxEACGBCCADw4AAAAxuIHg9vN5Bu/+rsDgePHAocGLcHoPr/4E2QDAUSAAgPAM
+gv8AwFEgQICIC8L/AMBRIICA1AqCCQDAUSDAgDgNggkAwFEgAIHAC4IEhgmgAQHYz3GAruAB7HAg
+oAHI7HEAoc9ygAD8cIokgX0A2aggwAHwIkMA7HBgoAHhLgyv/gDYocDRwOB+4HjxwN4Nz/7PcKUA
+6A8HgM9ypAAMQlMgBIBEII0ARCADAQKCz3YPAAD8CHHJucR444IquNh3xH9BL4US5IJTJkYC6XLJ
+uuR+Kr4G8p7hhPeMIU+IxPcA2QPwAdlMJACABPKe4ET3ANgG8IwgT4g89wHYgOUbeCV4BfJMJoCH
+Q/cA2QXwjCZPiD33AdmA5QK5BXkE8kwlgIdE9wDYBvCMJU+IPPcB2IDjA7gFeQTynuJE9wDYBvCM
+Ik+IPPcB2IDjBLgFeQTynuZE9wDYBvCMJk+YPPcB2AW4JXhCIACAaQXv/sogYgDxwP4Mz/7G/4Dg
+CfTPcIAAkAUAgIXgpAAFAM9yoACsLxqCwLiB4AHYwHgvJgfwAN1E8s9wgADwcymAz3aAAPSLAeFg
+himggOMjhjV4BfIqgAHhKqAE8DiAAeE4oBiCmrgYonX+GIKzuLq4GKL+D4AIoaYuCaABoqbPcKAA
+eEUAgAQggA8OAAAAMbiB4Pbzz3GAAIgKSIE0kVMiAADqC2/+AdteDgAIgOAI8p3/gOAG8voNr/0O
+2AXwBg6v/Q7YrQTP/uB48cChwQHYQMDPcIAA3BYKgFEgAIDKIAIHyiKCDwAAZwBcCaL+yiEiAaHA
+0cDgfuB4ocHxwAIMz/6jwQh2R8DPdYAA3BYahfuFPIUEfyR/x39BxxoOb/6KINgEiiDYBA4Ob/7J
+cYDnWfIEFAExgOEa8hwUADELIECADPLPcIAAdAVggM9xAACwVQzYYHsD2grwgOAI9M9wgAB4BSCA
+YHkM2AYUATGA4RryHhQAMQsgQIAM8s9wgAB0BWCAz3EAALBVDdhgewTaCvCA4Aj0z3CAAHgFIIBg
+eQ3YCyeAkwvyCg2v/QXYiiDYBIINb/6KIYgEEvCA5hD0iiDYBHINb/6KIYgF+gyv/QXYiiAYBF4N
+b/7pcbz/3KUI3IcD7/6jwOB48cAOC8/+CHcFgUCBAN0g3si4ELjIugUgkAABgSaByLjIuRC5BSER
+AADYDyBAAwsgAIQN8vAnQROA4QnyBCBABEIgAIBgecogYgBhvoDmAeUs9x0Dz/7gePHAvgrP/s91
+gADcFiWFQIXIuci6QCkDBAUjg4BGhSGFyLoQusi5BSJGAEeFIoXIuhC6yLkFIkUASIUjhci6yLkQ
+ugUiRAAj8i8pwQDggE4hjgcA2g8iggNSfgQigQHEfyV/4KD6hcR/5Xk6pTmFBCIPAQQiQgHEeeV5
+OaU4hcR5BCODg0V5OKXg9Z0Cz/7gePHAJgrP/qLBz3WAANwWOoUbhSR4PIVVJU4XBCEQAEYMb/6K
+IJgDTCAAoEohACAq8kwhAKhG9xEgQKTAIWEg+vPwJkAUXB1AFIDgyiHBD8oiwQfKIGEByiOBDwAA
+RQLKJAEEYAdh/colQQRAeIogmAPyC2/+KnEA2A8gQAQGIBAgCnBq/4ogmAPaC2/+PIX5Ae/+osDx
+wJIJz/6nwTpxGnJAwADYYcAB2AUcAjAGHAIwi3CGDiAJgsEFwQpwIyBABAbCBMCA4A30CiHAD+ty
+BdiKI4QGiiTDD+kGb/24c0B4pQHv/qfA4HjxwEIJz/4acCh1SHdodjhjqg1v/mbZgeAJ9ApwLgyv
+/qlx6XBCDm/+yXF9Ac/+4HjxwOHFo8EB2EDAz3WAANwWqXAqCq/+XNk6hRuFJHg8hQR5gcBBwY3/
+AcA7hQR5QcEaC2/+iiBYBFUlQB+pcXH/z3CAAFQYQCUBG27/i3DqC6/+BNkBwC//AIWA4AX0BYWA
+4IAMwf8pAe/+o8DxwKoIz/4IdgDdiiDYA9IKb/7Jcc9wgADcFlqAO4BEeQDaDyKCAwQiQwBCIwOA
+yiNiAC8mx/AB38ogQQMG8hyAJHhFeBj/6XDJAM/+4H8A2M9ygADcClSKWWEweUFpUHDE9iJ4EHgD
+8ALYz3GgAMgfHqEQ2A6hAdgVGRiA4H7gePHAKgjP/gDfz3WgANAP9aUD3hLw4HjgeOB44HjgeOB4
+4HjgeOB44HjgeOB44HjgeOB44Hhhvowm/5/u9QPYGqXPcIAA3ArvqAHYFaVFAM/+8cDaD6/+BdgA
+3Qu4qXHd/89xgADIdR6B67hg8h2BUSAAgFzyDgxP/QDZnLnPcKAA0BswoAHZz3CkAJhAPKAEIL7P
+MAAAAAHlyiUiEFEjAMAn9FEgQMUF8lEhgMMo8lEgwMUO8lEhgMMK8s9wqgAABAGAhiA/C4PgGvLO
+/yDfz3agAMgf8KYB2EMeGBAA2EIOb/6NuPGmhOWmB8X/CPDF/89xgAA0ZwmBAeAJoVEgAMcA2Q/y
+ANrPcKAA0BuculCgz3CAALwEQIAQggHgEKLPcKQAmEA8oD3wWgtP/VEgQMU39FEgAMUB5colIhBR
+IwDAz3agAMgfIN8O9PCmAdhDHhgQANjKDW/+jbjxpoTlQgAGAObxz3WgANAPANgVpfCmAdhDHhgQ
+ANimDW/+jbgD2PGmGqUA2M9xgADcCg+pz3GAADRnCYEB4AmhAdgVpfUGj/7gePHAhg6P/s9xoAD8
+RAWBAN/PdaAA0A+8uAWh9aUD3hLw4HjgeOB44HjgeOB44HjgeOB44HjgeOB44HjgeOB44Hhhvowm
+/5/u9QPZOqXPcIAA3ArvqDqlAdgVpc9xgADIdR2BgLgdoZL/TgiAAoEGj/7xwOHFz3KgANAPsILP
+cIAA3AoviDB1ANsF9APZOqJvqALw3P9pBo/+ANvPcqAAxCeKIBgIPBrAgM9xoADIHw6hgBEAAFEg
+QIDPcIAAfH4N8kISAoYEIr6PAMAAAAXyQYCA4gPyQqCAGcAA4H9hoOB4EMwEIL6PAAAoQEXy47gh
+8hESAjeA2M9xgAC4Zuu6EBocMAbyGIEB4BihBfAQgQHgEKFRIsCAB/QA2c9woAAsIC+gEcxGIIAC
+4H8RGhwwUSBAgRfyiiAEABAaHDDPcYAAuGYPgQHgD6ERzADZRiCAAhEaHDDPcKAALCAvoOB+BNgQ
+Ghwwz3GAAMwVHoEB4OB/HqHgfvHADg2P/gDdINjPdoAA9HveD2AFAKbPcKAAyB8B2TOgWIB5gDWA
++BAAAEAmEBXPd4AAyHVMH0QTAnkCIgKAI6bPcYAAiAoDI0MDQaZiphSRUB9EEyiBCba9tlMhAAAI
+ts9ypQAIDECCTh9EE1MiRQFTIkMASB9CEYPjyiHBD8oiwQfKI4EPAABJDcokgQ8AAP4AFAJh/cog
+YQEEIoMPAAAA4EWmXoctu+u6lh/CEAzyBLuBu2V4CLYH2AfwFSAMIKCkA/AE2AHgiOC69+u5RAyC
+BB6HqXcruFMgEABRIIDFsfKA56/0QSmAQ8C4EnAB38onIhDKJWIQz3GAANwKD4kB4A94D6nPcaAA
+tA83gTBwAN4J9M9woACoIAaAjCCDjsv3AN9a/89wgAC8BCCAAd0IgQHgCKGA54Xyz3GAAPR7BYHP
+cqQAkEEEIIAPAAAA4EEoRAMVgnaCUSQAgLhzaKHPc4AAyHUHoQTyTBsEAAnwTBuEAwQggA///wAA
+B6FRJECABvIwuE4bBAAG8E4bhAMQeAehUSSAgATyUBtEAQnwUBuEAwQlgA///wAACKENggahBCCA
+DwAAAP4puFIbBAAeg+u4IvLPcKoAAAQEgAmhz3CAAFh8QIiA4kAgBAEz8oDiXAAuAAIQhQD0JIMD
+FdgTuPAgwwDPcIAAMHzVeAHmUHZgoLP3HPDPcIAAcHxAiIDiQCAEARfygOICEIUA0Pf0JIMDKdgS
+uPAgwwDPcIAAMHzVeAHmUHZgoLT3QakCGUIBgOcX9AQgvs9gAAAAE/TPcIAAvAQggAHdAYFhuAGh
+B4EB4AehiiCFB94ML/4QEgE3USMAwBTyAN8F/4ogxQfGDC/+6XHPcIAAvAQggAHdAYFhuAGhB4EB
+4AehBCC+z4ABAADMJyKQzCUhkBjzz3CgADAQA4CA4ADZC/LPcIAAvARAgAHdKHcMggHgDKKA5RTy
+AtnPcKAAyBwqoCT/z3CAAMh1QNk9oBDMhiD5jwb0ANiPuBAaHDB5Aq/+6XDgeOHFMNsA3c9woADI
+HGmgA9rPcaAAzBchGZiATqGnoGqg4H/BxfHA4cXPcYAAzBUOgQHgDqHPcaAAxCcZEQCGgOAA2gXy
+AtgQGRiAz3WgANQLV6UH/89xgADIdR2Bh7gdoej/EIWA4A3yA9gRpeB44HjgeOB44HgRpcX+EQKP
+/gohwA/rcgXYz3MAAL4JSiQAABUHL/0KJQABUSEAxvHATfTPcKAADCQHgIDgR/LPcIAARHYLgM9x
+oADIH2TgHqEQ2A6hAdgVGRiAPghv/gvYUSEAxjP0USBAxwDaJPLPcaAA1AsWgTiBJOAwcE/3USEA
+xgT0USMAwPzzUSMAwBL0USCAxBD0GfAA2c9woAD8RJ65IaBFoM9xgADMFQ+BAeAPoc9wnwC4/1wY
+wAjPcJ8AuP9cGAAIvP/RwOB+4HjxwNYIj/4Idc92gADIdR2GLyYI8Dz04L0Q9IK4z3GAALwEQIEd
+pgOCAeADoiCBiiBFCdoKL/4jgVElQJAdhhH0hLjPcoAAvAQggh2mBIEB4AShIIKKIIUJsgov/iSB
+z3CgAAwkA4BRIMCAHYYQ8oS4z3KAALwEIIIdpgWBAeAFoSCCiiCFCYYKL/4lgT2GLyZI8ADfDvQK
+IcAP63IF2M9zAAATCYokgw/BBS/9SiUAAM91oADQDxEVAJaA4GfyRCF+ghPyUSEAgBfyz3KAALwE
+IIICgQHgAqEggoogRQguCi/+IoEJ8FEhAIEV8pz/HYZRIMCBSfTPcKAAxCcZEACGgOAH8gLZz3Cg
+AJAjPaBR/hvwk/8dhlEgwIE39DmF6XIF8AARAFAB4k96QSmAABByufcA2gXwABGAUAHiT3pTIUAA
+EHK59wPYEh0YkOB44HjgeOB44HgSHRiQdv4ehvO4CfLPcIAAbIXrqM9wgAAAheywz3AAAP8/z3Gg
+AAwkAaEb2AShUP+5B0/+CiHAD+tyz3MAAFoJBdiG8eB48cDhxVDdANrPc6AAyB+vo16jAiBCAF6j
+AdoVG5iAQNpOowQgvs8AAgAQuA6B/4UHT/7gePHABg9P/s9wgADIdTGAUSFAghHyz3GAANwKLolE
+EIIARHlRIYCASNrKIoEPAACQAALwDtoA289xoACoICeBqBANAFlhsXHCJUUQyiXmErB4CtmX/UP+
+z3CAANQbAJDPdqAAxCdRIACBBPKMJQOSBPcA3xXwz3CgALQPfKDPcKsAoP96oGoOoAgA2BkWAJaA
+4ATyAtgQHhiQAd8ZFgCWgOAr9FEhAMYp9M9wgADIdRGAUSAAggXyD8xhuA8aHDAD2c9woADUCzGg
+4HjgeOB44HjgeDGgz3GAAMwVFIFqvQHgFKEVgbhgFaESDS/+AdiCCSABAdjj/XkGb/7pcOHF4cbA
+2M9xgAD0e0GJHBoCMBJqR+AEIIAPAAD8/5e47HMAowfI7HMAow/MAN1KJMBzAeAQeI+4EHsPGhww
+z3CgAIgkfqCpcKggwAHwIQ4A7HPAowHggOIA2cz3z3CAADB88CBDAOxwYKAB4VBxuPfPcKAA1Aut
+oAHYwcbgf8HFwdgcGgIwz3GAAMh1FoHPcoAAiAp4igzghuMB28IjwQAYIMAAA+AEIIAPAAD8/5e4
+nbifuOxzAKMHyOxzAKMYijaBhuAB2MIgAQAYIQEA7HAgoOB/AdjgePHA4cXPcoAAyHUWgpjgz3GA
+AJx+BfJUEoAAgOAE8hmCuoIE8BuCvIJRgs9z/v//P2R4pHsEIoIPAAAAEEV4AKEA2AGhZXpKoQ7a
+S6HPcYAA8J66CUABMgtAC4DgB/LPcYAA2KGmCWABAdhBBU/+4HjxwMYMb/4b2M92oADEJxUWDZYW
+HhiQA9nPcKAA1AsxoOB44HjgeOB44HgxoIogBAzGDu/9ANm6/eS9E/LPcIAAvAQggBGBAeARoX39
+GRYAloDgBfIC2BAeGJCW/ijwUhYAllMgQQCD4dEl4ZAD8uD+HvDPcIAAqQgB2SCoz3CAALwEQIAG
+ggHgBqLPcIAAyHUegO64BvLPcIAAfAUgoAjw77gG8s9wgACABSCghQRP/vHAFgxv/gDaz3AAAP8/
+z3WgAMQnEx0YkBvYFh0YkAHYEB0YkM92gADIdRGGsghgAjaGqB4AEJn+HYbnuAPyANgf8C0VAZZW
+hjByB/KAuB2mANi7/vXxBCWBXwAAcMcehiV4HqYRFQCW4LgG8s9wAAA0eAfw6bgH8s9wAACIdgUE
+T/5RIMCAG/II2BMdGJAg/4Dg1/UC2DwdAJAhFQGWz3CAAHx+IaARFQCWUSCAgAf0ev4dhlEgwIHD
+9REVBZZRJYCADPQKIcAP63IF2IojBgDVAC/9iiSDDwTYEx0YkJ3/r/HgePHAIgtv/gDZz3KAAMh1
+PaI+olQaQgA/ooDYlBoCAIAaQACoGkAAz3CAAKyDOaDPcIAAiH4goM9woAAEJTSgMNnPcKAAUAwi
+oFEgQMYE9Bf9oQBAADv9gNnPcKAAsB83oDagUSGAw892gADIdc9xgADAZc91gACIChzyANiLuB6m
+z3CAALwEVOEgoBuVHLYdlZIeBBCKIIQOHraKIEQLxgzv/QDZBtnPcKAAyBwpoBTwz3CAALwEBOEg
+oBqVHLYclZIeBBBOFQARHraKIIQLlgzv/QDZz3GAALwEQIEAggHgAKIggQGBAeABofrYANl6/Ev9
+gOD8BwEAz3CgAAwkz3EAAP8/IaDPcKAA0A8REACGgOAN8gohwA/rcgXYiiPOA4okgw+dB+/8uHMB
+2c9woADQDxEYWIBoFYEQHJYCIFAAHobruAQCIQAvIAgkANhAHgQQz3KqAAAEAoLPcaUACAxggQQg
+gQ8AAAD/KLkEI4MPAAAA4Ht7iblleWiFBCO+jwAGAAAxpgTyjLkxps9zgAD0ewyjLaMggkQWjxCU
+5yqjGfIG9ornGfQjuQ7wt+cO8u7nE/RFKf4CQSnBcFEgwIHCIWIAANgL8EUp/gJBKQFx+vEiufjx
+ANkB2DamQYI8s0uj5LrKIGIA4brKIGEAhiL+DyS66JNJHoIQHablekizVSFDBeC4z3IAAGQPCSOC
+AAPyANg38I7hjPecFQMQcHEI989zoADQD4ATAwBwcQnygLgdpi4L7/2KIAUI6/HPcKAA0A8ZEACG
+QiAACEggAAAQctj3z3GfALj/GIGQuBihGIGwuBihHYaDuB2mz3CAALwEIICKIMUI6grv/SWBy/EB
+2IDgCPTPdaAA1AsA2PP9XQYAAApwANlX/mIVgBBEFoIQz3OAAKifBCCEAIYi/wNEJAEBRLpZYcG5
+K2OJu3umbBaNEEkWgxAEJQ8QhiX/E2R/RL2/Z891gAC0QfQlzxNeHsQTz3eAAJCiKWeJuTymcBaB
+ECR4hiH/A2R4RLk4YPQlABAEIwMBYB4EEBGGemLPcYAA1EH0IYMAGabPcYAA5EH0IYEAih7EEBqm
+jB7EEI4eRBCQHkQQANjPdaAA1AsHBSAASh4CEM9wpgAIBAGABCCADzAAAAA0uFEgQMZAHgQQQBYB
+EQz0z3CgAKggCIAZYTB5Yg9v/wpwBPAKcB7+BCCAT4ABAADXcAABAAAA2RX0z3KAAPR7QB5EEEke
+QhA2pimilhaBEAHYSh4CEAiSBLmJuSV4CLLa8EkeQhDPcKYAjANdgFEgwMfPdYAAyHUEIoEPOAAA
+AEEpwASWHgIQBCKADwAAAPAsuCW5JXgRpgTyEYWMuBGlUyLBAkQVhBA2pVEkAIDRIuKHANgC9AHY
+z3OAAPR7SaOWFYIQyJMEusV6SLPRhTyzUyTCAFx6z3eAAJifT2cdpfulbBWPEMO/LyXBA893gADE
+fPQnTxHNo14dxBPPd4AAgKJPZ9ml/KVwFY8Qw78vJcEDz3eAAMR89CdPEdqlYB3EE893gADkfPQn
+hRDPd4AA9Hz0J4IQih1EEYwdRBGOHYQQkB2EEM9ypgCMA12CBCKPDwEAAAAwv0odwhNJo0oVghCA
+4gDeFfJMJECDCfKAuB2liiBFCJYI7/2KIdAHHYVRIACAmPRRIADG//NE8FUhQwXPcgAAZA8JI4IA
+4LjPc6AA0A8D8gDYNPCO4Yv3z3eAAAQL6IfxcQX3gBMPAPFxCPKAuB2lRgjv/YogBQjt8RkTAIZC
+IAAIgODKIIwDEHLX989xnwC4/xiBkLgYoRiBsLgYoR2Fg7gdpc9wgAC8BCCAiiDFCAYI7/0lgc3x
+AdiA4FLyz3aAAMh1ShaAEM91oADUC4DgygIBAIogxQDeD6/9iiGRAc9xpgDUBCwRAIA0ERGAOBEP
+gMsREgYqcca56XKGIv0PBrpFeSpyhiL9DwS6RXkEIIIPAgAAACe6RXlEJwIcDbpFeelyhiLzDwQg
+gA84AAAADrpFeSW4JXhEJ4EQFLkleEQnARKIuFIgQAVBKcGAEaZUHkIQDfLPcQAA//8M8ADYE/3P
+daAA1AvZAgAAz3EAABAfGnE2hj+2BCGBL/8DAP8ouTamygkgAgDa8r+YcKgeABA68kQWgxARhqDj
+0SDhgjTyBCCCjwAAAAEH8s9xgAC8QGlhgeEJ9gQggQ8AAAAk13EAAAAkIPIEIIUPBgAAAEEtQQSC
+4TAADQCC4Qr0gOIU8s9xgAC8QGlhguEO9IDiBPLM4wr2NoYScQb3z3EBAIgNkHFP9wwkgI8BAIgN
+x/fPcYAAzBUWgQHgFqEB2iDwgOLPcYAAvEBpYQbygeHE9kwlAIAV9M9ygACwZUaSUHEP9uu4C/LP
+cIAAiAoIgAQgvo8ABgAAA/IA2gLwAtrPc4AA9HsoG0AE66NUFo8QMBuABBdvKJOIuCV4NoYIsxGG
+PLOA4Q2jXabc8s9ygACcBECCgOLMJyKQHfIA2Y25rgggAiDaz3GAAJwEI5ECIE8AEYY2hpoIIAIg
+2hB3CHFI9xC/z3AAAHgeJgnv/eV5NobPcKAA0A+AEAAAEHEL8h2Gz3KAALhmgLgdpgCCAeAAolQW
+gBCA4FThDPKJIZkEWCFCBM9woADQDyIYmIAH8M9wAABkDwkhAQDPcKAA0A8ZEACGQiAACEggAAAQ
+cd33z3GfALj/GIGQuBihGIGwuBihHYaDuB2mz3CAALwEIICKIMUIYg2v/SWBz3GAALhmAoEB4AKh
+HYZEIP6CFPKGIL+NCvKKIMULPg2v/YohkgFhAs//z3GAALhmCYEB4Amh+/xY8M4PwANU8ELZz3Cg
+AHgmMqA2ho7hDPQRzFMgQIAI8s9wgACICgmAUSBAgDLyVOEYhUIgAAhIIAAAEHE+AA4Az3GfALj/
+GIHPdYAAvASQuBihGIGwuBihHYYghYO4HaaKIMUIwgyv/SWBIIUFgQHgBaEA2Gr8HvAc/Tv9EMyG
+IP+FBfICyAGA/bgC8k39lP0KJgCQC/QD2BGl4HjgeOB44HjgeBGlBPDiCsAHQH4A2BCljQIP/s9x
+gABEdiuBz3KgAMgfZOE+ohDZLqIB2RUaWIAhgIDhBPRRIwDA/PMhgMG5g+EQ9M9wgACpCAHZIKjP
+cIAAvAQggAaBAeAGoQDYF/AhgFEhAIAI9M9ygADIdT2Cgrk9ogGAUSBAgAj0z3GAAMh1HYGEuB2h
+AdjgfvHAz3CAAHB80g2v/RjZz3CAAFh8xg2v/RjZzwCP/+B4AdoA2c9woAC0D1ygz3CAADRnKaBR
+A+/8FNjgeKHB8cBqCQ/+ocEIdlpyz3CAAJiFBoAA2oHgAdjAeIDmQMFAKBQDQfLPcIAAyHWUEIEA
+57kI9M9ygACoXQW5ImItusC6yXGGIfwAjCEChVR4EPTPcYAARAUggVEhgIAG8iDdjhAPAQnwmN2K
+EA8BBfBeEA8BDt2KIIUAQguv/alxiiCFADYLr/3pcc9wgACIfgCAUSAAgMAlIhGwei8gyCNKJUAg
+B/DPcIAAiH5AoLpyGnICEgEhQCAAJTBwSPYCIQEESCEBAC8jSCAE8EojACAAwQDdqXAKcx4JYAKY
+dQohAKAc9FEgAMMK9M9woAD8RB2ABCC+jyAGAAD281EgAMMA2Ar0z3GAAMwVCYEB4AmhANiYuDpw
+AN1MIQCgAN+V9EwlAKDPd4AAiH6ip4jyAIdRIACAOvLPcYAAAHZMic9xgAC8QDIhhQCwdUAAJgAf
+2Klyz3MDABQAVnvPcaMAsP9Q4zAjRADPcwMAGABWe1DjIWMB4i8rQQAvKQEBInsQc8ogxQCwcqf3
+TyTUI0AtQQFCIQEIGWHPcIAAMEQoYCGHCbgleKV4AqcFJIAjDXEAsQ1wABjEBAwSASANcCCgEBIB
+IQ1wILCKIIUA8gmv/clxjCYClRPyjCYDkRzyjCYDlSDyCiHAD+tyBdjPcwAA/guKJIMPJQWv/Lhz
+z3CAALwEIIAPgQHgD6GiDqABSnAR8M9wgAC8BCCADoEB4A6hCfDPcIAAvAQggA2BAeANoQCHgOAG
+8iKHDXAgoKCnz3CgAPQHpKAB389xoADIH/gRAgAAIMAkQniA4MogTANfgRB4UHBGAAUADBICIM9w
+gAB8fkKgoNgPob+hz3KAANwKz3CAAMh1VYockEwhAKBCeGJwH6EC2BUZGIAF8lEgQMYg2ALygNgO
+oYwmA5UH9M9wgADIdRyQCPCMJgORCfTPcIAAQHYNkIoPb/+pcRoJT/8QzIYg+Y8K9IwmA5EA2M8g
+oQPKICIBEBocMM9wgACIfqCg6XAI3MsG7/2hwOB48cCGDu/9ANkIdQGAwbiD4MogQSDKIEEABfKp
+cA3/SiBAIIHgEPIQhVEggIFL8hCFz3aAAMh17rgb8s9wgADcCgKII/AB2wDfP/AA31UmQBrpcc9z
+gAB0M6IJ4ACQ2kAlABKcHgAQANgFtQTbLfAQhe+4B/LPcIAA3AoDiAXwBYUmhdoPAAFRIMCBlB4C
+EAjyHYaVuB2mHoaXuB6mH4YEIL6PEHAAAMonIhDh9Zy4MgzgCh+mgODL8xCF7bjH8wHfxvEA3+lz
+z3KAAMh1VBKOAM9xoAD0JoDmz3CAAHx+EfTPdoAAJnb0Js4TXJLaYs92gADcCtWOwnoQuoC6AvAC
+2kOhJYVMIACgIaAO9M9wgACpCAHZIKjPcIAAvAQggAaBAeAGocIPD//BBe/9aHDgePHAVg3v/QDZ
+CHYBgMG4g+DKIEEgyiBBAAXyyXDB/kogQCDPcaAALCAmgYHgMHkb8hCGUSCAgTfyz3WAAMh1HJUQ
+ccn2JYbPcIAAfH4CgBBxWfQQhu64CvLPcIAA3AoCiBDwAdgA3zTwEIbvuAbyz3CAANwKA4gG8AWG
+JoauDgABlB0CEB+FBCC+jxBwAAAL9B4LwAqA4DXyEIbtuDHyAd8D8ADfEfBVJUAa6XHPc4AAeDMa
+COAAkNofhZ64H6VAJgASnB0AEPIOD/8A2M91gADIdVQVghCA4s9xoAD0JiH0z3KAACZ29CLDA1yV
+emLPc4AA3Ap1i2J6ELqAuhLwAN/T8c9xgAC8BECBC4IB4AuiIIGKIEULeg5v/SuBw/EC2kOhRYZM
+IACgz3GAAHx+QaEN9M9xgACpCAHaQKnPcYAAvARAgSaCAeEmonEEz/3gePHACgzP/Qh2EcxTIECA
+CvIGEgE2ANiYEQEAwgygAAhyAYbBuIPgyichEMolwRMG8slwaP4IdQHfgeXKI2EAOPIQhlEggIEF
+9ADbaHEx8BDMUSDAgCHyEcxTIECAEvQZyAHaACCBD4AAiHDPcIAAcCMSiECpUSAAgPgOYgDKIIIA
+ENgQGhwwz3GAALhmEoEB4BKhCN3a8c9wgAA8ZiuAAeEroJ4Nb/2KIMUJANsB2QLYz3KgAPQmA6JD
+hoDnz3CAAHx+QaAN9M9wgACpCAHaQKjPcIAAvARAgAaCAeAGooDhCfIA2J64z3GgAPxEAaEA2AWh
+dg0P/30D7/0FI0AD4HjxwA4Lz/0IdgGAwbiD4ADdyiBBAwTyyXAu/gHdgeAA2SzyEIZRIICBKPIQ
+zM9ygADAZVEgQIEZ8kDYEBocMFASAAYB4FAaGAAZyM9ygAAIcBR6IKoCEgE2ANiYEQEAfgugAAhy
+CvCkEgEAAeGkGkAAzgxv/YogBQoC2c9woAD0JiOgI4aA5c9wgAB8fiGgDvTPcIAAqQgB2SCoz3CA
+ALwEIIAGgQHgBqG+DA//zQLv/QDY4HjxwM9ygADIdVQSgQCA4RT0PJLPcoAA3ApUikJ5ELlFIUMB
+z3GgAPQmY6EA2s9xgAB8fkGh+v2B4MogYQAE8nYMD/8A2DcBT//xwAoKz/0IdRpxQSkAAc9xgADo
+Q8O4CGEklQQhgQ8AAACA13EAAACAAdnAeTV4IZUE4TBwDfKMIAKkCfTPcIAAyHUWgIwgAoYD8hDY
+N/AklfILb/2KIMQLjCACrCLyDvaMIAKgJPKMIAKkJvKMIAKoJ/SpcMT+I/CMIAOkFfII9owgA6Ad
+9Klwn/8Z8IwgA6jMIIKvAADwABP0qXDH/w/wqXAF/wvwqXBX/wnwVgxgAalwBfA2DmABqXC1Ac/9
+TXGCC2/9iiCFCMHx4HjxwEYJz/3PdYAAyHUfhQQgvo8AcAAASvIvKQEAz3CAAPAE9CBAAKQVARAA
+3pwVAhCCuMlz4v2A4DjyH4X+uDDyz3WAAHAjEI0ujRBxLPISjVEgwIAo9DCtUgxgAAPYUSAAwxr0
+ANmeuc9woAD8RCGgMI2GIf8BQ7kQuU8hwgbPcYAAzIsgiZ+6gOEB2cB5D7lFeS2gEo2EuBKtBvDP
+cIAA9ITAqE4LgAEJAc/98cDhxRoPL/8A3c9ygADIdR2CUSDAgVr0z3CgAAQlIoAEIYEP/wBfb1Mh
+gACH4ED0USKA0zzyHoL6uDr0BCC+jwAeAAAI8lEigMD/9VEiAMDPIWIBz3KAAMh1HoL5uM8hIgLP
+ISIDzyHiAs8hogMg9Pu4EfIdgoi5ibmNuQQggA8CAAAAi7mOuVIgQAQquAV5DvD8uMUhgg8AAAAF
+zyHiAs8hogPFIYEPAAAAB89wgABUdgiIxLgYuFEggMQFIE0AyA5i/cogIghFAO/9qXDgePHADxIB
+NwHhMHmPuQ8aXDDPcaAA1AsNoc9xgACICiiB67kO8lEgAIEK9MoIgAPPcIAA6HSg2doMb/3E2q8G
+D//xwIIPr/2KIAgAz3agAMQnEx4YkM91gAB0duSV6XDiCeADhiD8AxpwqXDpcYYh/ANS/wh3hP9E
+J36UD/JRJwCRB/LPcYAAyHUdgYC4HaEBhWIOD/9e8EwgAKAM8qX/z3GAAMh1PYFRIcCBVPTV/w3w
+A9nPcKAA1AsxoOB44HjgeOB44HgxoM91gADIdR6F7rgH8gHZz3CAAHwFIKAI8O+4BvIB2c9wgACA
+BSCgUSfAkAbyz3CAAIh8igtAAhEWAJZRIICAFvRKDQ//HYVRIMCBIPQRFgWWUSWAgAz0CiHAD+ty
+BdiKI8kDMQRv/Iokgw8E2BMeGJAb2BYeGJDPdYAArIMZhYDgBvISCIABANgZpdUGj/3PcqAAxCct
+EgCGTdjPcYAAHHYJuBoaGIAAiYDgBvIB289woADUC3KgBNgQGhiATXCGIPMPjCAMgAHYwHgYYBR4
+IIke4IDhwCAiA1EggMQF9FEhAMb7889xoADQDxAZGIAlEQCGJREAhs9xoADEJxoRAIYEIIAP////
+ABoZGIAREQCG67gI8gDYi7gTGRiAGtgZGRiA4H8A2PHA1g2P/c92gADIdc9woAAMJDyAVoahwQIi
+QABkuBB4hh4EEBByyiHOD8oizgfKIG4ByiOODwAALAXKJC4AMANu/MolDgECyAGA/bgJ8i8ghwqM
+IAKGBfQehp64HqbPdaAAxCchFRCWUgjAA4Dg5AEhAJgeABBRJYDTz3aAAMh1z3WAAIgKBfJWFYAQ
+C/BRJcDTBfJXFYAQBfADhg4P4AAkhpQeAhAehkQgAQyg4Qj0USXA0gT0gNmUHkIQlBaBEFEhwIEE
+8rO4l7geplEggIEm8hSWUSBAgSL0Ig7ABoDgHvTPcKAALCAPgIDgBfICyAGA/bgU8h6GkLg2C6AK
+HqaA4AbyUSVA0wHZA/QA2Ytwz3OAAHQzNgigAJDaz3CAAMh1lBCBAEApAgaGIf0PUiHBAUW5RXnP
+cqAAiCQwoimF47legAPy6boD8gDYAvAB2FEhAIHRImKCANnKIWIA97oleA94FfRRIoDTE/KA4BH0
+RCI+0wv0z3CAAMh1AYBRIACABfK+CMADA/C+CcADz3WAAMh1HoXzuB3yBNnPcKAAkCM9oE1xag4v
+/YogRA5RIIDEBfRRIQDG+/PPdYAAyHWGFQARz3GAAIgK1g0gBC+RFfAAlQQggA8AAMyA13AAAMiA
+CPQLhVEgAIAE8l//B/AE2c9woACQIz2gAtjPd6AAxCc8HwCQlBWAEM9xgAB8flEgwIEEGQAECfId
+hZW4HaWKIAUJ6g0v/QDZx/4Idh2FUSDAgcX0UyZAEIPgBvQVFwCWUSDAgD7yvgov/8lwufDPcYAA
+PGYNgQHgDaED2c9woADUCzGg4HjgeOB44HjgeDGgENgQHRiQAtg8HQCQz3GAAHx+3gkv/wQZAAQd
+hlEgwIGX9BEVBZZRJYCAC/QKIcAP63IF2IojFwvFAG/8iiSDDwTYEx0YkBvYFh0YkIHwEMxRIMCA
+PoUL8gQhgA8AQEAA13AAQEAAA/SYuT6l8LkJ8gDB1NipcgHbW/yA4JwNQgHPcIAAqQgB3+Coz3CA
+ALwEIIAGgQHgBqEehfO48AlCBB6F8LggDcH+HoXuuAjyAdnPcIAAfAUgoAnw77gH8gHZz3CAAIAF
+IKDPcaAAyBwA2AehMNgKoclws/6KIIQNvgwv/clxAsgBgP24FfIehfi4E/IQ2BAaHDDPcIAAiHwm
+DwACGcgAIIEPgACIcB6F4Km4uB6lAJWGIPwAjCACgBD00g8ABIDgDPQD2c9woADUCzGg4HjgeOB4
+4HjgeDGgHoXzuAX0AJWuDWAFNJV9Aq/9ocDPcoAA3ApUillhMHlBaVBwxPYieBB4A/AC2M9xoADI
+Hx+hiiAYCA6hAtgVGRiA4H7xwOIJj/3PdoAA7AUAhoDg4A/CBRDM4LgA3zzyz3GgAMgfsBECAM9z
+gACICmoTAAFjuAgiAAAeoRDYDqEB2BUZGIDPcYAAdHoCGlgwz3GAADR7BhpYMCiDz3WgALRH67kF
+8ksd2JN3HRiQxgjAAlcVAJa8uFcdGJDPcIAABAUAiIDgOAxCBwQgkE8wAAAAKvDtuCfyJg4P/891
+oAD8RAWFvLgFpc9wgAA0ZwmAjCACjYj35gpv/BTYz3CgALQP/KDPcIAAiAoIgOu4BfIA2J64AqUQ
+zO+4z3CgAMgfFvQadwDZz3CAAMwVI6AloM9xoAAsICOBJ6Ba8J4Kb/wU2M9woAC0D9ygUvAE2Qga
+WDA/gIDhiiEMAMohgg8AAAACLqAD2RW5EhhYgACGgODgDsIFIwMAAFEgQMUt8s91gADMFQOFAeAD
+pXYNL/8B389woAD8RCWAvLkloM9xgAA0ZymBjCECjZQH5v8A3s9xgACICiiB67kE8gDZnrkioM9w
+gADIdR2AhiC+jwTyBYUB4AWlAd8QzOS4dPTmuH30hiD/hb/yUSMAwIf0CMgEIL6PA4DoQ8L1USBA
+xb71z3WgAMgfP4WgFQAQCSEAAOTgAN7T9s9wgACwXACAUSBAgAvy3qUQ3z4MIAPpcIDgBfQB2B6l
+7qWKIAgAoB2AEw6lH4Wo4Ej3gOAE9IogBAAOpUoIQAcv2JW4Eh0YkM9wAQDA/BUdGJCqCIAAZgng
+AQfYz3CAAOwFAICA4NgNwgXPcoAAzBUDgiSCCCEAAASiJoIFggghAAAGojyFZ4IIgmJ5CCBAAAii
+z3GAAPYEAImI4Nj0wKkD2c9woABALTCg1PARzFMgQICU8wbIAhIBNgIaGDAGGlgwng6AAs9woAD8
+RCWAvLkloM9wgAAEBQCIgOAMCkIHfPFRIEDFevUQzM91gAC4ZlEgwIAg8oDYEBocMBHM67gG8hiF
+AeAYpQDfBfAQhQHgEKXPcIAAcCMSiFEgAIBgCiIAyiBiAEwgAKAT8heFAeAXpQ/wiiAEABAaHDAP
+hUwgAKAB4A+lBfIWhQHgFqUQzOe4PvIRzAQggA8AAAAY13AAAAAIGvJaCYAAEcxRIMCAI/LPcKAA
+LCAlgAaACuEQcRf3AhIBNgLYEBocMFDYdgwgAJgRAQCX8R4PIAHpcFEgAIAH8gjYm7gIGhgwFvEE
+2AgaGDAS8QLIoBAAAPC4ANg98uIOQAAA2Ja4OfDouCb06bg49O64DvJRIwDACvKKIQQAz3CgALAf
+NKAE2AgaGDARzO+45AXB/89xoACoIEiBz3GAAEB2LZEwctAFxf+vuMkF7/8RGhwwig9gAIogBACe
+CKAAAN0CyKAQAADwuKlwBfJyDkAAANiVuN4IgAC58WIOYAAB2ADYkLj58QHgAKnPcIAAiAoIgOu4
+FfLPcIAA6AMQeM9xoAC0R0kZGIDPcABEFABLGRiATBmYgwPYdxkYgPUFT/3geM9wgAAFBUCI4LoI
+8s9xoACsLxmBirgZoVEiQIAH8s9xoACsLxmBjrgZoeB+8cAH2M9xoADUBxoZGIAOEQKGGRoYMM9w
+oABILF6gHxEAhgkamDABGhgwBMqc4Mwggo8AAJEABvIAFgBAABYAQAPMz3GfALj/GKGKIEYESg/v
+/AESATYEytHA4H7xwOHFz3GAAIgKSIFRIgCALPLPcqAAyBxIgoYg/wFDuM9ygAAMQQpiANuA4soh
+wQ/KIsEHyiBhAcojgQ8AAFoAyiTBAFQCIfzKJSEAgeLPcKoADFC+gcf3gL2+oQHZJaAE8KC9vqFl
+oBUFT/3xwJIMT/0acM93gABwIxCPz3agALRHRCABDkIp0QAqdXEWAZYEIYEPDgAAADG5geH480MW
+AZZGIQENQx5YkFcWAZa8ub+5Vx5YkF8WAZa/uV8eWJAA2Z65Ux5YkGAeGJDN/89wgACwZQeIgOAU
+8hCPhiD/AWIPL/5DuM93gAAIBRSPEHUI8s9wgABsJxaAQHgUH0IUQxYAlkwgwKBFIAANQx4YkIAA
+DQAKcDMmAHCAAJBEQCeBchR5AHkQvZu9z3CAAMyLAIifvYDgAdjAeA+4pXhfHhiQIPDPcIAAzIsA
+iBC9gOAB2MB4D7iYuJ+4pXhFIMABXx4YkA7wEL3PcIAAzIsAiJ+9gOAB2MB4D7ileF8eGJAIyITg
+MA0h/MogoQPRA0/9CiHAD+tyBdiKIw8ISiQAAPkAL/wKJQAB8cBeC2/9AdnPcIAAiAoIgMC4G3gA
+3s91oAC0R0sdmJN3HViQz3GgAIRE2KEC2XcdWJAA2Z65Ux1YkFQdWJDPcYAANAFHHViQjrjPcYAA
+KABFIAYNSB1YkM9wgACICkkdmJMakAK4bLhEHRiQHNhFHRiQz3CAAGgzAYhGHRiQz3CAAHAjEIh1
+/0okwHDPcYAAnH7JcqgggAPPcIAA2ItWeGGA82r1fz9nAoBipwHiA6fPd4AACAUAh4DgBPJkHRiQ
+Qx2YkQHYgP/PcIAAiAoogOu5EfLPcIAA6AMQeEkdGJDPcABEFABLHRiQTB2YkwPYBPBLHZiTAdh3
+HRiQUSEAgECHDvJTIkEAErlEIgADDrgleIYi/wMKukV4EvBIcIYg8w8KuAQigQ8AAAAMBrkleAQi
+gQ8AAAAwArkleM9xgABYM4UCb/0CoaHB8cACCk/9OnDPcIAA2ItAgKTBSHCGIP4DJLgOuAZ5wrpA
+KoADJXhMwAQggw8BAADALrtAKw0GnL3PcYAAiAoogZ+9z3KAAAgFUSEAgM9xgACUGXZ5BvLQgcSi
+MYEF8MCBIYHEoiOiAhICNieKUSHAgAv0z3GAANAEIIGGIX8PPXkPuSV9USGAocoiISIK8gvZBCC+
+jwAAABjKIeIDWnFRIQChzyXiFgX0USEAos8lYhfpuDDyBCCBDwEAAMAuuc92gAAMQSlmSSGBAGG5
+0mnUfsd2gAAMfigWEBAsFhMQz3aAAIgKYhaOECzHCLsY4QQggA8AAAAQ5H6GJv8eCb7Fe2V/BX+e
+vS95uRpCAIoh/w9f8Oi4JvJDwCPBoOHKI0IAyiMhAM92gAC8QClmBCCPDwYAAAAxvwQghA8BAADA
+ACdFEM9xgAAMQUEshAMyIQEBAiFBARYjRQAswStmFvBTIMEAz3OAAPhDPXkpYwQggw8BAADALrvP
+doAADEFrZmG7FiHFAAHbTCUAhov3CiHAD+tyBdiKI8YJEQbv+4okgw9ALYEANHnHcYAAFH0AERAA
+BBETAAQggA/vAADdIoFhuya4ZXhSIM8DuRpCATAUBDAA2M92oAC0R3EWApYEIoIPDgAAADG6geL5
+84wh/4/PcqcAiEkL8s9zgADcFnqDUSMAggPyL6IB2A6iCnBSDKAHiHGKIP8Pbx4YkGseGJAD2Q+5
+z3CgAMgfExhYgFke2JRaHhiUWx7Yk1gemJRRIYCiSiAAIAfyz3CAAIgKahAQAfu9yiAhAA/ymgoA
+BM9woADIHx6AAnACuG64SCAAAAhxybklfYYn4x+MJxyQ0CXhE88l4hNXHliTz3GAALBlJJGB4Q30
+hBYCllAiAQMEIoIPAAAADK25ArpFeQPwhBYBlhYeWJCMIM+PyiHGD8oixgfKIGYByiOGDwAAFwHK
+JMYA2ATm+8olJgAI3IMHL/2kwOB4ocHxwB4PD/0acM9wgADYi2CApMFocIYg/gMkuA64BnnCuw67
+ZXlMwQQhgw8BAADALruB4gHawHoGulYiQghAKw0GnL3PcIAAiAoIgJ+9z3aAAAgFUSAAgM9wgACU
+GXZ4BfLwgOSmEYAE8OCAAYDkpum5A6Yx8gQhgA8BAADALrjPdoAADEEIZkkggABhuAK4LMcUeAAg
+jg+AAAx+KBYRECwWEhDPdoAAiApiFo4QCLuKIP8Pnr3kfoYm/x4JvsV7ZX8EIYMPAAAAEGV/TyIT
+AU8j0yFf8FEgQKLPImIBzyIhAei5enIi8kPBI8Kg4somghDKJiEQz3OAALxASmMEIY8PBgAAADG/
+BCGADwEAAMD6Yi64z3eAAAxBCGdCeBYmBRAswApjFvBTIcAAz3KAAPhDHXgIYgQhgg8BAADALrrP
+c4AADEFKY2G6FiCFAAHaTCUAhov3CiHAD+tyBdiKI0oEZQPv+4okgw9ALYAAFHjHcIAAFH0AEBEA
+BBASAAQhjw/vAADdAoBhuia/RX9SJ88Tz3agALRHcRYClgQigg8OAAAAMbqB4vjzjCD/j89ypwCI
+SQvyz3OAANwWeoNRIwCCBfIPogHYAvAA2A6irgmgBypwiiD/D28eGJBrHhiQA9kPuc9woADIHxMY
+WIBZHpiUWh5YlFse2JNYHtiUUSCAogDYBvLPcIAAiApqEAAB+70acMogIQAP8vYPwAPPcKAAyB8e
+gAJwArhuuEggAAAIccm5JX2GJ+MfjCcckNAl4RPPJeITVx5Yk89xgACwZSSRgeEN9IQWApZQIgED
+BCKCDwAAAAytuQK6RXkD8IQWAZYWHliQjCDPj8ohxg/KIsYHyiBmAcojhg8AABcByiTGADQC5vvK
+JSYAXwXP/+B48cB2DC/9A7k6cM9wgACICh+ANXkAIY0PgACcfoDgWnOf8gmFRXi6cAmlEBUUEBQV
+EBBGhRwVFhAgFRMQIIXPdqAAtEdxFgCWBCCADw4AAAAxuIHg+POMIv+Pz3OnAIhJC/LPcIAA3BYa
+gFEgAIIF8k+jAdgC8ADYDqNiCKAHCnCKIP8Pbx4YkGseGJAD2A+4z3egAMgfEx8YkFkeGJVaHhiU
+Wx6YlVgeWJVRI8CmyiEhAA7yug7AAx6HArhCIIEDSCEBAChyyboFI5MgynCGIOMPjCAcgAX0UCPA
+IwPwTyPAI1ceGJDPcIAAsGUEkIHgDfSEFgKWUCIAAwQigg8AAAAMrbgCukV4A/CEFgCWFh4YkIwh
+z4/KIcYPyiLGB8ogZgHKI4YPAAAXAcokxgD4AOb7yiUmAAASASB+FwCW4LnPIOIA0CDhAH4fGJAv
+IUMAABpAIADZz3CAAIgKP6AghWEDL/0AGUAg8cAqCy/9ANuA4aXBCvJIgQQigg8AAAAwQiIDgMoj
+YgADuBV4ACCCD4AAnH7Agui+QMYS8iDAz3WAALxAMiUEEACKDWUEJoAfBgAAADG4ACBFAwXwAdiY
+cLhwrr6vvrC+QMaA48whIoCM9M9wgADYi89zgADIdZYTgQADiAshAIA38kgTgwAA2QDfUyNNAA8h
+QQNEIw0DQr2GI/8DDydPE7xrBCcPkADbBHkPI0MDZHjKJwEQgOHKIcEDTCVAgBTyTCWAgBPyTCXA
+gEPyCiHAD+tyBdiKIwwGSiQAAOEHr/sKJQABDrklfjbw5Xn88SGCz3WAAKhddWljZVEjQIIL8i8o
+AQBOIIEHANiOuDh4BX4i8EwlQIAP8kwlgIAR8kwlwIAX8gohwA/rcgXYiiPMC9Txz3CAALBgNngC
+iAbwz3CAALBgNngDiA64BX4E8I6+j76QvgQmgB8BAADALrjPcYAAAEQIYbBwVAAmAEDGCiHAD+ty
+BdiKI8wNRQev+5h2DZEogYYgfwwEIYEPAAAAMCy5qWkceEAlgRMRIECDDyZOEEDGDPQKIcAP63IF
+2IojDQCKJMMPCQev+7h1z3GAANiLAIGLc6CDhiD+AyS4DrgGfaCjAIHCuA64BX2gowDAz3aAAAgF
+BCCBDwEAAMAuuUApAwZPIwUHz3OAAIgKqINPJcUHUSUAkM91gACUGTZ9BfLwheSmsYUE8OCFoYXk
+pum4o6Yu8qeCCLklfaeiBCCADwEAAMAuuM91gAAMQQhlSSCAAGG4ArgUeMdwgAAMfsqAq4BiE4AA
+IMcEIMQDz3CAAAB2ERCGAE8lhQcEJgABCbgFeSV/iiAGBooh/w9T8Oi4HvJEwCTGoObKJYITyiUh
+EM93gAC8QM5nBCCPDwYAAAAxvwQggQ8BAADA/mYuuc93gAAMQSlnwnkT8FMgwQA9ec91gAD4Qy1l
+BCCBDwEAAMAuuc92gAAMQSlmYbk2fZjljfcKIcAP63IF2IojjQ6KJIMPyQWv+7h1Mm00ecdxgAAU
+fcCBoYEEIIAP7wAA3SKBQiRPACa4BX9SJ88TiiAEAqSixaImoiAaQAEJoueiAdgfo10AL/2lwOB4
+ANiQuM9xoADIHxUZGIDPcIAAsFxGkFt6TyIDAFoRAoY4EIAAZHpYYNgZAADgfuB44cUA289ygAAI
+cBQiDQBgtWi1GmIgGsIAuB3EEM9xgACwXBZ5IpEoGsIAyB3EEHAdRBAB2YAaQgDPcYAAoHAVeWCh
+4H/BxeB48cDhxQh1GRIBNs9wgAAIcDR4EYiA4BLyAsgBgO24DvLPcIAAEFrwIEAAz3GAAIQEFHkA
+kRDgALFKC4ACGcjf/wLIAdmgGEAAz3EPAP//7gigAqlwmQfP/PHAHg/v/EokAHLPcqAAiCAA3qgg
+QQGH5kDyAILPcYAAsFzPc4AAeIXWeaiJZ4O7Y4Dgz3WAAAhw1H0j9AAmgB+AAHhw8IiC5wr0cBUP
+Eft/I5GAvyR/cB3EEwfwgecF9CKRcB1EEADZMKjPcKAAyBz6gHAVARHkeYgdRBAF8IgVAREwcMP3
+eGEE8IgdBBB4YIkgzw8EGhAAAeYA2c9wgAB4heUG7/wnoPHAdg7P/FEgwIEZEg42z3CAAAhwAhIB
+Ns9zgACsfM9ygADMFdR48YgQEIYAEfIB55h3MhGFAAeTAhuCAQazGoIB4Bqiz3BBAIMA46sR8EAm
+RAAxEYUAAhsCAbgQAAHjqwazG4IB4Buiz3AhAIIADCRAgcX3aQbv/ASjz3CAAChwyGAB4ASrAYEA
+2lEgAIGwiTjyLyXIA89+SSbEENVtz3eAAKhdxmf2vhKJCPLPdoAAsGC2fsGOA/BIdgAkjw+AALBg
+tn/kjwggwAMIIIADoHBJIM4DFm3VeM92gACwYQBmz3aAAMhftn6hhs92gACICt2GxX0EJY0fAAAA
+CKZ4A/ADgQKjmBGAAKiLEHUF8kSrYNgYuLDxANiduK7x4cXhxs9woAAUBAPZI6AZyM9ygACsfGGS
+z3GAAAhwxIoUIQ0AaLUAIIMPgAAocDDhwKtighV5BpJgoQISAza4HQQQBIKgEwEAhiHDDyV4oBsA
+AMHG4H/BxRkSAjYEIL6PYAAAAM9zgAAIcFR7x3KAAHhwCHEG8gLIHJBRIICCCvIEIYEPYQAAANdx
+AQAAAAb0ANgAswHYHvAQzFEgwIECEgE2DfIyEYEAAYswcAT0ANgBq/LxAeABqwvwMRGBAACLMHAF
+9ADYAKvm8QHgAKsC2OB/EKrxwIYM7/wE2Qh1GRIONgbYGRoYMM93oAAUBAqnz3CAAJRE3g2P/ACF
+1g2v/ATZAYXODa/8ONkihYDhBvIBhQCQEHHM9wohwA/rcgXYddtKJEAAyQGv+7hzpg2v/AOFAYVC
+hSCQBYWaDa/8QnnKp4EE7/wZGpgz4HjPcYAAIAXgfwOh4HjxwAIMz/wKJQCQyiHBD8oiwQfKI4EP
+AACtAMogYQEi8iGFgOHKIcEPyiLBB8ojgQ8AAK4ABdgW8hCJz3KAAKhdBbgHYsKBLb8BhoDgwL8F
+8gCGgOAL9AohwA/rcgXYtdtKJEAAMQGv+7hzUSCAwQb0sgwABoDgDfKKIM4Cug1v/LzZAIaA2Sig
+AYZAeCnwAYUgkCDIEHHKIc0PyiLNB8ojjQ8AAMIAvAft/wXYqXC0/wGG0f/PcIAA1KGELwsaiiEQ
+ADAgQA4YeQDIJngAGhgwz3CAABBa5qD2Cm/86XCNA8/84HjPcYAAIAUjgeB/IKDxwOHFAhIBNqKB
+iiH/DwAaWDAghXYLr/wk2gGFgODiIAIAaQPP/OB48cDqCu/8BtgZEg82GRoYMM92oAAUBAqmCYaA
+4ADdE/K6C0ACCYaA4A3yJBYFEAohwA/rcgXYiiNEA0UAr/tKJEAAiiD/D+qmABoYMM9xoADQGxCB
+z3KAAAhwhrgQoROBkLgToR2KgOAZGtgzDPLPcIAAEFoGgM9xgACEBBR5AJEQ4ACxprKusiYaQgPE
+GkQDiiBPC4oMb/yKIQQItQLP/PHA4cUIdc9wgAAQWkaAz3CAAJCfhCoLCgAgQg7PcIAAXFsAgFEg
+wIChwRTyFmnPc4AAsGEAY1EgQIIM9M9wgACwYDZ4W4oCiIm6DrhFeAbwcg6v/ItwAMAApWkC7/yh
+wOB44HjgeOB44HjgeAokgPAFIEQA4CDBB0Qk/oBBKsQAhAACAC8kAvFCIQEBQiADAeggogQEEQQC
+BBEFAgQRBgIEEQcCBBsIAQQbSAEEG4gBBBvIASwAJQBEIj6BPAAiAEQi/IBAIcEA4CDBB0AjwwCo
+IIABARGEAgEbCgEgIMAHBBEEAgQRBQIEGwgB1Afh/wQbSAFEIvyABBEEAskH7/8EGwgBQiFBAEIg
+QwCoIIABARGEAgEbCgEgIMAH8cAyCe/8ANjPdoAAsH9KJAB0gN2oIEAFCHEB4E8gwgEWJkMQR6uK
+IggAQClEAQAkgQ+AAKhdQKEA2kKxpqnA2H8eAhDPdoAAMAWgrs9wgAAwgIDZogxv/Chyoa7PcoAA
+3Aqiqs9xgAAcorKpz3CAAESfoqijqrOpJQHv/KOo4HiiwfHAqgjv/JhyRcFBKAECQSgDBAd5J3vG
+u8dzgAAwgCCL57kS9BQUDjHPcoAAsH8WIk0A4IXxcAT04pXRdwjyJ43nuWdt8/MA2Dbw5o2A5wb0
+gN7PcIAAMAXBqM9wgADcCsKI0XcN9IDewqjPcIAAHKLSqM9wgABEn8KoDvDDiNF3DPSA3sOoz3CA
+AByi06jPcIAARJ/DqMaNNnoAHIADB42HuQCrz3CAADAFYIggqAHYZ6oM3GMAz/zgePHA5g+P/M9x
+gACYRCGBo8FCwc9xgACwBBUhEAAAEA4ggOYvKIEDTiCNB1TyFW0AIJEPgACoXQYRgCDPcYAAsH8W
+eQCBIpGO5QgcRDDKIGEABPKLcgLBvP+A4DXyANjPcYAASAVAgQ8gQAMvIgogBCKAoAChBvSA4lgN
+ogTKICIIr3g+CWAAENkA3wQZxCOKIQgAABlAIKlw6XEODqAJD9rPcIAAyF8AEAEgtnjgoOGgz3CA
+AKhfBCGBBAAYQCC0eOCwECZOky8ogQNOII0HsPVxB6/8o8DgeKLB8cAWD4/8RcHPcYAA8J6igbFw
+EPSmkRQUDjGxdgz0z3WAANwKQq3PdYAAHKJSrVYZggC8EQ0GsXAU9M91gADAobKVFBQOMbF2DPTP
+dYAA3ApDrc91gAAcolOtVxmCAIDiDPTPdYAAMAXBjYDmANnKIEEAI/IhrY7iBPQB2B/wQSgNAgd9
+QSgBBKd5z3eAADAFoI9TJUURTCUAhMa5i/YKIcAP63IF2LvbBQRv+4okgw9RJYCRBPIA2DTxz3WA
+ALB/FiVNEceNAKUUFAAxwK9GrQK1x3GAADCAAIkHrQAZQgEAG0IBzPGiwUHBQSgCAgd6QSgBBEd5
+z3KAADCAxrkqYue6EPQEFAMxz3GAALB/VnlAgVBwBfRCkXByBvJHiee69fOA2APwBongf6LA4Hjx
+wO4Nr/y4cEokQACQ4Mohyg/KIsoHyiOKDwAAEwFgA2r7yiBqAUAtQwHHc4AAqF3Gi4wmApAA2A3y
+z3CAALB/FiCNA6CFoKEmizZ4ApAAsohwCQaP/OB48cB+Da/8AdmlwRpwCiKAL4AANAX+DG/8i3BM
+IECgABSFMAEUkTAG9AoigC+AADgFTCUAgMT2TCUAgcv2CiHAD+tyBdic2+ECb/tKJEAATCUAgCYB
+DgCocAAWjkAAFpRATCQApHpwhfaMJMOvKPQAFgBBABaPQAAWgEAAFgBBTCQApH4ACgCA5yXyz3CA
+ADQFAoBALM0gtX0Q4Lhgdgxv/ATZz3CAADQFAoBMIUCgHWXMJ2GTFfQA2Iy4FPAKIcAP63IF2Kfb
+SiRAAF0Cb/sKJQAFCiHAD+tyBdiw2/XxANgAtc9wgAA0BSKAQCzAIBV4EmEZYQUiQAQAsQTdBvCB
+wATdEgxv/KlxACKMIwAcAhXPcIAAsATwIAIEHt+A4i8pgQACJ0AQJPLPc4AAr101aCtjESOAgwny
+ACaBH4AAKF0WeQAZAgUALYETCyHAgAnyACaBH4AAKF0WeQQZAgUQIgKALymBAAInQBDg9UIjQCCA
+4OgGzf9iC0/8WQSv/KXAANhA8fHA4cWtwYt1qXCGC2/8DdkAwB14UyABAEQpPg2pcAAhgX+AAEhg
+Fgxv/A3aJgtP/FUEr/ytwOB48cDhxSDbz3GgAMgcaaEAFgBAz3KgABAUDKIAFgVAAd1MJQCAyiHB
+D8oiwQfKIGEByiOBDwAACQEwAWH7yiRBAxgaQAFoGUABA9gPormhaqHKCk/8+QOP/PHAfguP/KQQ
+AQD5uaLBcPQg2c9zoADIHCmjpBABAFEhwIEu8jGIz3WgABAUI7nAuQO5BeED2k+lRoVBwo3hEN7K
+JuIRBhQPMYwnw58I9AQUDzHxdswn6pAB3kP2AN6A5ur1xYBFfselsYiGJfwfGL2les91oADMF1qg
+F/BFgM9xoAAQFEehpBABAFEhgIIJ8jGI17qGIfwPGLlFeTqgz3WgAMwXDdkB2gPhDR2YkA4dWJAm
+gBkdWJAngBodWJAogBsdWJAD2RQdWJBwEAEBEB1YkHAQAQHPdaAA9AcE4SelR6OkEAEAmbmkGEAA
++QKv/KLA4HjxwC4O4AUQ2G/ZB7nPcqAA8Bcxos9xAADw/ziirg/ABdHA4H4A2oDhyiRNcOB46CDt
+Af/ZXGAgrAHi4H7xwPr/8P/w8Q97SLgPeM9ygAAARvQiAABAKAECSLgFefQiwAAweeB/J3jgePHA
+IgqP/KXBCHYCiyh1mHBkwACLABIGAREcAjB5cAISBwEEEggBEBQAMeSSBhIFAQAgyQMAkS8hSBIH
+IEACEHjn/wAgigEBlS8iiBIHIIACEHjj/wAgxgEClS8miAEHIIABEHje/wAgBwIDlS8nyAEHIMAB
+EHja/wAlBQAElS8lSAEHIEABEHjV/x9nBZXwf+d4EHjS/yaVIXAQeAd5PHoPuSV6UHoAIoECMHkA
+HEQwR5Unelx5D7pFeTB5ACGCAVB6XHkCHIQwD7pFeTB5ACHCAVB6XHkEHIQwD7pFeTB5ACFCAVB6
+XHkGHIQwD7pFeTB5P2fwf/x5CBzEMw+/5XkweThgaXHGuYW5CLkFIcECILYQeCCVChwEMCd4HHgI
+uAUgAAEBtgDAAaYBwAKmAsADplkBr/ylwOB+4HjxwOHFCHU+iM9wgAA0BUKAQCUAFAO5NXlZYfoI
+b/wK2qlw9/85AY/88cC+CK/8mHClwSh3uHMA3gQjgA//AAAAGLoFem95CLn/2Ai4ZHgouAV5RXkI
+3fQkgAMneETAEBQAMZD/EhQCMWG9QCgBBAV5R3lEwRAUAjEUJIAzgOVAsAHmK/dTJcIFQKcAFA0B
+B9kG8BB9FCdMEAC0YbkUJEAwu3tPvQCQpXuB4XB7eGAz9wQggA8AAAD/ELgFekCnnfHxwCYIr/wg
+2QDaz3WgAMgcKaXPcaAAlBNboc9zgAA0BWKD82jPdoAAyHUMhvV/UyDEBfBj+2NTII8Ag+ekwYtx
+GvQehpu4HqY0FoAQ4ovxcAr0KHBAIwEERGtAJgMcav8N2irwHYaRuJK4HabPcKAAzBcr8IXnDvRB
+KgJSQCMABMG6iHO5/x6GnLgepg3aFPAsuFMgAgAehgO6mbgepuSDBeIFJwARAKEFgwGhBoMCoQeD
+A6ED4s9woADMF89xoACUE1yhAdqA4gf0HoaXuB6mINgKpRjwAMED2hgYWIABwRkYWIACwRoYWIAD
+wRsYWIAUGJiAhhYBERAYWIAE2SelFhiYgIkHb/ykwOB48cDhxc91gAAwg89xgACICgCBdBUCFhBy
+IfQCkeoVAhcQch30dhUAFsII7/93FQEWjCACgBPyz3KAAEQFIYIA2w8jAwAFuGZ5IaIAIIEPgACo
+XQCBqriIuAChANg1B2/89B0cEM9wgABUdiiIz3KAABCFjCECgAKSQSgDAwvy67gJ9AW5x3GAAKhd
+ApEPIMAAArEA2OB/BLIA2kokAHRIcagggAPPcIAAFITPc4AAlIQ0e0CzNnhAoEGgAeFKJMBzANmo
+IEACz3CAAKhfNHhAsAHhz3CAAEQFQaDPcIAAEIXgf0Sw8cA2Dm/8VGiGIvgDibpTIcMARXvPcoAA
+qF8Ueo/hiiUPHMogKQAJ9gCSAN4PJk4QiiXPH8Z4ALJKJAB0ANqoIEAGz3eAAIyEVH/El6R+0XPP
+cIAAFIQM9ADexLdWeMCgwaDPcIAAtIRVeMCgAeIxBk/84HjxwMINb/yYcgh1z3aAAJSE9CZAEM93
+gAAUhFEgQILKIEEAyiQidMogIgDoIGIC9CYCEFEiQIID8gHgkOBGAAYALbvAu89ygACoX7R6QCuF
+AmCSBL2GJfgTib0PI0MAYLIA2hZ/QKdBp8O5pXkFIUMBFH5gts9xgAC0hBV5ABkAAQLwgNilBU/8
+CHHDuM9zgACUhPQjAgDJulBxyiQidMogIgDoIGIC9CMCAMm6UHED8gHg4H7xwA4Nb/wA2Qh1AYDB
+uIPgyiBBAMAKYv7KIEIDgeAR8hCFUSCAgQ/yEIXPdoAAyHXuuBnyz3CAANwKAogf8AHeAvAA3gLZ
+z3CgAPQmI6Alhc9wgAB8fhYPr/0hoBkFb/zJcBCF77gH8s9wgADcCgOIBfAFhSaFag6P/5QeAhAf
+hgQgvo8QcAAAEvTaCkAJgOAF8lElQNMB2QL0ANlVJkAaz3OAAHQz2g8v/5DaEYXPcYAARAUAoUEo
+DwPDv5QWgRBBKAUFUSHAgRRpBSDEAwbyHYaVuB2mf/BPJEACvv+Q4PIABgDPcYAAtITwIQMAlBaB
+EEApAgaGIf0PUiHBAUW5JXrPcaAAxCdBGZiAAiXCgMAihA8AAAAQDL/XcgAAAAiQv1L2BSdPEWIZ
+2IOMIgKAx/bPcYAAzBUMgQHgDKEA2Z25S/Dle2IZ2IDXcgAAwA9SAAwADiKBDwAAABDPc4AAFIQW
+e6DhQIMBg1H3ANsPI0MAQiNFAE4hDwgBKsMDOHoFIkIBOHgFexbwQiEBCADYDyBAAGG4OHoFIgMA
+iiL/Dwrwz3GAAMwVDYGKIv8PSHMB4A2hAdnPcIAA8IQkqM9xgAAwg+MZHAFyGZgAcxnYALfxANmc
+uR+GJXgfpkAlABKcHgAQL/HgePHAGgtP/Ah1VSBPBBHMosHtuNEgYoAK8gYSATYA2JgRAQDWCy//
+CHLPcIAARHYLgM9xoADIH2TgHqEQ2A6hAdgVGRiAAYWA4AT0USMAwPzzAYXBuIPgdPQAh0HABBQA
+MUEoEAMQhVEggIEGFBExRfIRzOu4RPIQhc92gADIde64BvLPcIAA3AoCiA7wEIXvuAbyz3CAANwK
+A4gG8AWFJoVWDI//USDAgZQeAhDKImEgC/IdhpW4HaaKIAUJngzv+wDZSiIAIJQWgBDPcYAAXH4E
+uEaRBSAABFBwCvLPcoAAzBUAgkoiACAB4ACiBJHXcAAA//8Q9EoiACAO8M9wgAA8ZiuAAN4B4Sug
+Ugzv+4ogBQxadgGVnOAU9MGH4ofPcKAA9CYC2SOgI4XPcIAAfH4hoL4PL/6pcIHgBvQB2IPwENiB
+8EwiAKAi8s9woADELMegz3GAAFR26KAoiUAoAiMQuZ+5RXlBKQIhRXkmoBHM67gO8hDZq7gQGlww
+ERocMM9xgAA0ZwKBAeACofYLj/0REgE37LkH8gjYrLkRGlwwAvAA2EwiAKBN8s9zgAAwg+ATBAAU
+FQUQRCw+BwAjQQ4AGUABTJVCsc9ygABUdkiKz3WAAFx+SKkJGQIEChlEBMOhxJXkoUAkTQDgG0AD
+ELpAKAMjZXpBKQMhZXrKsc91oADAL0cdmJDPcqAAaCzwIoIDS7GPFQOWCPCjFQKWjxUDllEiAIEF
+9Oe7+fME8Oe7yiMhAEDDARSCMMa7xrpYqXmpNQFv/KLA8cDaCE/8z3GAAPCEJImA4Rbyz3GAADCD
+chEOBnMRDQbPcoAAzBXjERAHz3GAAEQF4IEigjS/AeEiojLwz3KgAMQnERIBhlEhgIEA3/jzZBID
+hmQa2IMC2RMaWICA4y8pwQBOIYIHE/LPcYAAFIRWecCBoYHPcYAAlIT0IZAAz3GAALSE8CGPAArw
+z3KAAMwVIYLpdel2GncB4SGiQYANcUChJJANcCCwz3GAAIh+AIGA4AfyQoENcECgANgAoc9wgACI
+CgiA67jKIIIDyiFCA8oiwgPwDyICyiMCBFMgwCDPcYAARAUggRS/USGAgAy45XgK8oK4DXEAoQ1w
+wKANcKCgIPANcQChSiQAdOB4qCAAA0QmgRAPuVMmABAleA1xAKEivkokAHTgeKggAANEJYEQD7lT
+JQAQJXgNcQChIr39Bw/8z3KAABSEz3GgAAQlT6FWIgAEEaFWIgAFEKHgfkokAHQA2agggAIA2s9w
+gACUhDR4QLAB4ebx4HjxwFYPD/zPdYAAXH5Elc9xoABoLPAhkQCA4M93oADAL1PyL43PcIAAsGDP
+cqAALCDPdoAAiAo2eCKIPBISAA6NOBYQEYDghAApAMogqQCMIgGkeAAlAATYANgFolDYRSFBAhja
+YgzgACDb+LgI2C70A9jPcaAA9AcFoYTaDXBAsEIiACgNcgCyQIUNcECgQpUNcECwQIYNcECgQpYN
+cECwBpVAKQIlw7gMuIK4BXoNcECgANgEoQ6NAeAOrVoI4AAKcAHYFfAA2ADZSB9YkEkfWJBmlQy7
+n7sFI0IERx+YkC6tz3KAALhmOYIB4TmixQYP/OB48cDhxQDdCvBELT4XJ3Ac2aYL7/vF2gHlz3CA
+ADCD4BABADB1svfBBg/84HjhxeHGgODPcYAAeIVFgSbyz3OgAMgfQBMOBkAogQLPdYAAyHVAFQAR
+0H7YYNyVPmbPcYAAiAppEY0Aon4IJg0QAn0JIkIDAtgVGxiAX6Migc9wgAB8fiKgwcbgf8HF4HgA
+2c9wgAB8fiCgIaDgfyKgANnPcIAAfH4hoM9wgADIdTyQz3CAANwKFYjPcqAAyB8CeR+CMHkQeAgh
+AQAweQLYFRoYgD+i4H7xwOHFCHXPcIAAsGUAkIbgDvSKIBQNug+v+6lxANjPcacAiEmB5cogYQAO
+oeUFD/zPcIAAsGUAkIbgB/QG2c9wpwCISTCg4H5RIADD8cAv8s9woAD0ByeAGYAweThgA7iWIEIF
+z3GgAMgfHqEQ2A6hAdgVGRiAGgzv+4HYUSAAwxXyz3CAAEwFAdkhoALIpBABAJq5pBhAAGoI7/4B
+2M9xgABIFgSBAeAEodHA4H7gePHA6gwv/JhwQYHkunCJOfKyic93gACoXdVrxmdkyva+CBGFAEkg
+wAAH8s92gACwYHZ+wY4C8ADex3CAALBgdngEiAglDRAIJY0TACVAEUkgzQMWa7V4z3WAALBhBWXP
+cIAAyF92eM9zgACICn2DAYBleAQggA8AAAAIBn0C8KOB6L2YGUADANsJ8qQRAAAA25e7kbiUuKQZ
+AABRJACAJPIZyM92gAAQWsC68CYOEM9wgAAQn4QuCxowIEAOBCCADwBAAAA+uB7gGHpFff69mBlA
+Aw3ypBEAAIUjAQSMuJG4pBkAAJwZwAAd8P+9z3KAAIgKEoIQ8qQRDQCFIwEElruYu429kb2kGUAD
+nBnAAJ64EqIJ8JS7lrucGcAAnrifuBKiMQQP/OB44cXhxpgQDgAZEgI2BCaBHwAAAAg7eQQmjR8A
+AAAQJX3PcYAAEFrwIYIAz3GAAJCfhCoLCgAhQg7pvkAiAQaYEIMACfJEIwIMRLpOYYm+yXIW8FEm
+AJI6kgvyHOLCu35iyI56YlCKpX7QfiV6CPDDu3x7fmJ6YlCKyI4leogYgAOleowYgADBxuB/wcWh
+wfHAJgsP/Ah1R8DovShw3gAhAEh2A7hAIJEFJ8HPcIAAvEAEJZIfBgAAAEEqQiQrYAQlgB/AAAAA
+Nripd3piz3OAAABIxr8IY0pjGmJBLYASUiAAAMC4A7gY4IXiyiCNDwEAiQ3VII4ALyAIIAQlgh8A
+AAAYz3CAAPhB13IAAAAIHgAiAPAgwAOg4RIAAQDPcUJ70F4FKH4ACiDADipxBSk+AAogwA5MIgCg
+JLgB4ATyUyABADhg7b0CKIEjz3KAAMQKVZIR8s9zgAD0QWCTBSs+AAAhgH8AAP8/Lrg4YI8AIABY
+YBV5hwAgAFhhUSVAklAAIQAnxbflIgALADNoUyUCEM9wgAAwQfAggAAFKT4ACiDADgHgBvCK5cAo
+4QDAKKIAz3GAANwKLonA2qR5hiH/DiK5OnraejcAIABYYDNoUyXAEBx4z3KAAERB8CIAABbhBSk+
+AAogwA7PcoAAxAo1kgHgFXkIktp4OGAQeAjcFwIP/OB48cCyCQ/8ocEacCh1ANikGQAAz3eAAIgK
+EqcJyAQggA8AwAAA13AAwAAA0IkW9BnIz3GAAAhwFHkRiYDgDvTPcIAAMGHWeCKICI0Qccb2CnCG
+DO//qXHT8FEgAKB/8gQVBBBRJACBO/IZyM9ygAAIcBR6ERKFAM9zgACoXVVuQmMPePa6Mo1JIMAA
+CPLPcoAAsGDWekGKA/AA2sdwgACwYNZ4BIgIIQEACCGBAAAhQAFJIMEDFm41eM9xgACwYQFhz3CA
+AMhf1nhdhwGARXgEIIAPAAAACAZ5AvAjhZgdQBAZyM9ygAAQWvAiAgDPcIAAEJ+EKgsKMCBADlMk
+AgAEIIAPAEAAAD64HuAYekV5/rmYHUAQCfIA2Iy4pB0AEFDYnB0AEGvw/7kO8gDYjbikHQAQz3BA
+AVAAnB0AEADYnrgSp13wANikHQAQBdgUuJwdABDA2Bi4EqdR8FEgQKdC8gGFUSAAgTPyMo1kEoIw
+SSLCABVuz3OAAKhdAGP2uAjyz3CAALBg1ngBiAPwANjHcoAAsGDWekSKCCGBAAghAABJIMEDFm41
+eM9xgACwYQFhz3CAAMhf1nhBgB2HRXgEIIAPAAAACAZ5AvAjhZgdQBAZyM9ygAA4cBV6IKIA2ATw
+BdgUuJwdABBRIAClANjPIGIEyiAhAKQdABACyAGAz3GgAMAd7LgAgdAg4gDPIOEAAKERjc9xgAAI
+RMK4CWF0HUQQz3GAABBE8CEBAKQVABAleJgVARBRIUCCpB0AEAvyO5eAuHYdRBB4HUQQpB0AEBHw
+KIdal1EhwIB2HYQQCfI7l4O4eB1EEKQdABAD8HgdhBCOC+//qXCkFQAQRCB+gowVghAV8mIXgRBE
+eYYi/wNEuoYh/w5ZYc9ygADEQfQiUgDPcoAAtEH0IlEADfDDus9xgADUfFx69CGSAM9xgADEfPQh
+kQCYFQUQ4LjKIUIEFfSIFYEQUSUAgsO5PHnRICKFCPLPcoAA9Hz0IkEAB/DPcoAAxHz0IkEAQYVR
+IsCAyiEhAFElAIKEHUQQI/KYFYIQz3GAALxAz3OAAKhdSWEEJYIPBgAAADG6WWFVbkJj+7oS8pe4
+pB0AEATYuB0CEADYj7i6HQQQz3AMQKj+GaUC8AHZBCW+jwEAAMAL9AohwA/rcgXYiiOXDOkDr/qK
+JIMPgeEa8oLhzCHigMohwg/KIsIHyiBiAcojgg8AAP4FyiQiALwDovrKJQIBz3CAALBg1ngDiAfw
+z3CAALBg1ngCiIwVARAOuCV4jB0AEP/YQMC2CaAJi3AIcoQXABAglXQVDhGYFQMQgODZYcwiIYA4
+8hnIhuA28rXhaAAMAM92gAAIcBR+EY6A4Cz0AsikEAAAUSAAgCb0USAAoCLynhUAEa67r7uKuJ4d
+BBCA4rC7mB3AEAn0hBcCEC8qgQBOIoAHI7hAwADADuAPIwIAmB2AEFEiAIIA2MogYQOYHQIQmBUA
+EDYK7/8A2qQVARAEIb6PAAAAMIIdBBBQ8owVAxCcFQIRlB3AEJIdhBDsuYAdRBQCEg42D/IU2pAd
+hBB+HYQUeBYCEQIijiDQfrIdhBMQ8A7akB2EEADafh2EEHgWAhFKIgAgAiGOINB+sh2EE89ygACw
+XECChiJ/jwr0mBUOEFEmQJIG9JG5krmkHUAQELpFeaQdQBAyhwQjgw8AAAAQUiMDA2V5BCGCDwAA
+ABBdekV5Mqcd8JgVARBglZQdQBCeFQERdBUCEbIdBBCSHUQQuBWBEHpiWWEweZAdRBAA2TpxWnGA
+HUQQfh1EEAAiQSQ4YIQVAREZYTB5sB1EEL0E7/uhwOB48cBmDM/7ug+ACYDgggIBAAjIUSCAgXoC
+AgACEgM2z3WgAMgfKoOkFQAQjCH/jw3yInjXcACAAABH94fYkLhTAiAAoBsAADCLFWnHcIAAqF1A
+gAQivo8AAAATV/Lpugjyi9iQuCsCIACgGwAA7Loz9EWQgOIa9AnIBCCADwDAAADXcADAAAAK9BHY
+FLigGwAACg5v++bYI/CI2JC4oBsAAPoNb/vn2Bvw6NjyDW/7SHECyKQQAQC0uaQYQACSEAEBp7mS
+GEQAnhABAae5nhhEAAXwhdiQuKAbAADPcIAAiAoYiITg1fQCyM9xgACgMVCIDIEPIIAADKHPcYAA
+PAgAgQHgAKHF8CKQMxOAABEhAIAm8gnIBCCADwDAAADXcADAAAAV9AiLgOAV9qQTAAC0uKQbAACS
+EwABp7iSGwQAnhMAAae4nhsEAArwAYNRIICBBvKN2JC4oBsAAJvwCMgEIL6PAAABEHTyog+AAgIS
+AzYIcrATDgGoGwAAFYVVJkEW1bgwcM91gAB4hUT3BdknpSWFAnnk4cogJQAJIIAArBsAAKQTAADy
+uFbymBOBAMO5Ccg8eQQghg8BAADwGcjPdYAAsFwWfeWVrBMNAEEuBgMJJcQTz3WAABBa8CUFEIAT
+DwF+Ew0B/WXPd4AAxAr3lxS4/WUIJE8Don8D5891gADIQ/AlTRAivwUt/hNTIQ9wACdNHi8kQgNA
+LU0BNX3HdYAAiHXglc9xoADELO+hoZWuoUAuDQaevQV9BSRAAwqhz3GAAEwFAdgAoQbwoBUCELAT
+DgHRckb3BdgYuKAbAADPcIAAiAQAkCCTCSEBAM9woAAUBAmAEHHL9wPYGLigGwAAz3GAALhmDoEB
+4A6hQQLP++B4BCiADwAAL7pCKcJ0UHpEKv4CAiBADhB4gOAE8gHiUHqD4ECxA/aA4AP0ANgC8IDY
+4H7geKHB4cXhxkLBz3WlAKz/WKXPcoAAxArVkkiS2mJCewPjIrt6Y3piSCJCAAW6RSJCAye4VqVT
+IAIAIsAEIYEPAAAAIAe6JblFeCV4ibiOuBmlwcbBxeB/ocDpuQf0BCC+jwAGAAAL8lEhgIIJ9M9w
+oAD8RBmAUSCAgvrz4H7xwCIJ7/tKJEAAz3WgALRHVxUAls92oADIHwDfBCC+jwAoAADCJAIBbxUA
+lkwkAIAEIIUPgAAAAAQggw8gAAAABCCCDwAGAAAF8kAWARaD4YP3ANkC8AHZ+HETFgGWBCC+jwA4
+AAAEIYYPAAAAgMwnIYDAJ2EQBSNBAQUhgQEFIb6ABfSJ56QHzv9MJgCABvKA48wiIYBg8msVAZbj
+uQnyz3GAALhmDIEB4AyhTPBTIb6ACfLPcYAAuGYLgQHgC6FC8Oe5QPSA4wjyz3GAAMwVCYEB4Amh
+OPCA4iLy+rgJ8s9zgABIFkaDAeJGownw+bgJ8s9zgABIFkeDAeJHo7j/IvBxFQSWbxUFlgohwA/r
+cs9zAADhDqEFb/oF2FEhgIHPcYAAzBUG8hyBAeAcoQzwANieuFMdGJAA2FcdGJAKgQHgCqHd2ADd
+mL0OCm/7qXGpcB7wExYAlvC4yiAhALgOYfvPIKEDaxUBllgVAJYLIECADfIWC2/+AdgD2c9woAD0
+ByqgBdiYuALwANj9B4/7ocHxwIYPj/uhwUfBCHZIdWh36bkEIZEPAQAAwAogACEv8gLZz3CgAMgc
+KaAnwVNt7uFQeAT0i3Fi/xnwt+EH9Bt4EHiLcV//EPCU4QP0HHgJ8IrhBPQAHIQwB/DPcAAA//8A
+HAQw4HgA2M9yqQCk/7miABQBMYK4N6Iaoijw6LkO8kwgAKDRJuKRyiCBA8oiQQNkDeH/yiPBAxrw
+J8CA4MohwQ/KIsEHyiBhAcojgQ8AAD4OyiQhAGwEYfrKJcEABb2leM9xpQCs/xahaf8KJQCQE/Tn
+vgzyTCAAoA30AdnPcKAA9AcsoAPZBvAD2c9woAD0ByWgz3CAAPAFAICA4Afyz3GAADQdBYEfZ+Wh
+z3GAALhmCoFRJoCSAeAKoQbyTgugBUEpgCOpcAjcvwav+6HA4HjxwGIOj/sIdc92gABMBQeGEHUK
+8vXYBbhaCK/7qXGB4AL0p6apBo/78cA2Do/7pBEAACh18rgA2DHyz3KAAEwFIIKA4THyAKJ+FQER
+gBUAEThgz3GAAMQK95EfZ1EhgMX+889woADELMuA5NgmCG/7yXFTJoEU/r7MISKADfKYFQAQqgqv
+/wDaz3GAAMQKKJEiePhgCfAA2AfwGcjPcYAAsFwWeQWRgOCsFQEQB/SkFQIQsbqkHYAQA/AJIQEA
+A9oYus9zoADIH0+j+BMNAEFtCCGBAKJ5oBtAAADZmLkuo+UFj/vhxeHGpBACAPi6CfK2EAEBz3Cg
+AJgDPqB+8AAWAUE8sAAWA0FEIQ0DfbAAFgNAhOVvoAAWA0FAGMQAABYDQHGgABYDQUgYxAAZ8hjb
+chjEAAAWA0CI5XOgABYDQVAYxAAAFgNBVBjEAAf0KHOGI/MPjCMMgAzyGN4U8BDechiEAwDdz3OA
+AKx8p7MM8B7echiEAwAWA0B2oAAWA0FcGMQAKHOGI/0MjCMCggn0AubQfnIYhAMAFgNBAvAA2+G+
+YBjEAATyABYDQbgQgwCgkNtjcHtyGMQAwn2wfboQAwFwGEQDSHSEJAyQZXk8sAvyABYBQGi9OqAA
+FgFAsH07oHAYRAOYus9xoACYA6QYgAA+gbYYRAArAY//PJAIckQhAAOE4CbyGcjPc4AAwHD0IwAA
+JXgcsgGC7bgJ8lQSAQG8EgABw7kleFQaBAAJyM9xgACsfAQggA8AwAAA13AAwAAAANjKICIAzyDi
+Agex4H7gePHABgyP+89wgACICmoQEAEZyM9xgAAQWvAhAgDPcYAAkJ+EKgsKACFGDhESDTdAJggG
+RiXBEREaXDACEgI2AN6kEgEAhLmkGkAAIYJAJgcC7rmiwYYahAMD9KC9sH1TJX6QogIBAM9xgAA0
+ZyeBz3OAADRnAeEnowYSATbPd6AAvC2kGYADDqdvh/e7/vNvh/a7UyPPAiHyjudK989ygABIFuOC
+trsB5+OiF/Bkv/B/kBnEAwQjjw8AAADwLL/wqXQZhAPAseGCyKmGJ/8dhL/hoVKKUqn2uyoCAQAA
+2vW7lrqkGYAAEfI6Dm//ANgGEgE2pBEAAAQggg8CAAAALbqlelB9PfBBgVEiAIFP8nCJD3hJIMQA
+z3eAAKhdFWsAZ/a4UokH8s9wgACwYHZ4AYgC8ADYACSPD4AAsGB2f+SPCCLCAwgiAABJIMIDFmtV
+eM9ygACwYQBiz3KAAMhfdnrPc4AAiAp9g0GCZXoEIoIPAAAACEZ4mBkAAADYlrj0uEGBhiL/DSDy
+gOJT8pgRggBAJgAJSGDPc4AA9HxAwCDCw7pcevQjggBV8AohwA/rcgXYz3MAAIIKiiSDD+EHL/pK
+JQAAmBEDAOm7nBmAAyTygOKAuKQZAAAr8pgRgADPcoAAiApiEoIAhiD/A0S4MiAAEIm4QMAgw2R6
+hiP/A4Yi/w5Eu3piT3rPc4AAtEH0I4IAIfBRIwCCCfKA4gnymBGCAEAmAAlIYAzwgOIE9ADaSHAR
+8JgRgADDuBx4MicAAEDAIMLPc4AAxHzDulx69COCAIgZAACYEQAAhBmEAJARAQF2Dm//ANoGEgI2
+AhIBNs93oADIH4QSDgGCGgQAHmbQfrAahAP4FwAQsBEDAQJ7ACMABM9zgACICmQTAwF4YNhgoBcP
+EBB48XBaAA0Az3CAAIgKEoCYEQ8ACyDAgyP0UIoQiRBy0ScikhHymBGPAM9ygAC8QOpigeLJ9gW4
+z3KAAKhdAGLxuA3022Nwe4YZxADPcYAANGcIgREaXDMB4AihaQGv+6LA8cACCY/7z3agAMgfoBYE
+EPgWAxCE4CX0AhICNqQSAAD0uHYSAQEH8s9wgABMfqGAA/CCEg0BEcxRIACBhBIAAQjyAiXCEAIk
+gwAIIwMABfCGEgMBG2PPd4AAiAps8IHgR/QREgI3AsjkungQAQEh8lEiQIDPd4AAiApkFwIRCfJ+
+EA0BQn1ifQIkQwMq8IAQAwHPdYAAMGEAI4QAcIh2fWCVACMNAYQQAwG7YxrwpBACAPS6CPJwiM9y
+gAAwYXZ6YJIE8IIQAwGAEA0Bz3eAAIgKZBcCEV1lu2OEEA0Bu2OAEA0BumJ+EA0BIn0l8ILgz3eA
+AIgKHfQCEg02EcxRIACBeBUBEWQXAhEJ8oAVABFCeGJ4AiQDAAfwghUDEYQVABFbYxtjgBUNESJ9
+BfAA22hxaHVochHMUSBAgGkXhBAI8gLIdhABAQIhAQFZYQnwgOMCIQEBxfZqFwARGWH4FgAQPWUC
+fR+GEHWM96DYD6YA2B+mP6YC2BUeGJCA2A6m6Qdv+3B44HjPcYAAuGYNgQHgDaEZyMdwgAAkcCyI
+AeEveSyoz3CAAGgzAogQccr2iiAIAAgaGDDPcAEIAAAN8APZz3CgABQEI6CKIBAACBoYMAnYGLjg
+fvHALg9v+wDZz3CgAPxEvYDZgAQmgp8AAAACDPQEJb6fAAYAAAb0AsikEAAA+rhU8s9wgADECheQ
+z3GgAMgf+r0foSDYDqES8gLIz3EDAIQAoBhAAIogCAAIGhgwiiAEAP4IL/sA2Sjw+b0M8tH/AhIC
+NghxoBoAAOYIL/v82BzwAhIBNqQRAAD6uMogYgHAKCIEDPSA4hDyz3KAAMwVCYIB4AmiCNiQuKAZ
+AACKIAgACBoYMKlwyXFL/QPez3WgANQH0qVWDM/8Ex2YkwLIoBAAAAPwKHDFBk/74HjxwFIOT/v6
+CG//CHbG/89xoADIHwh1QNgPoUARAQYwedYNr/zJcJkGb/upcPHAAsikEAAAUSAAgM9wgACICgTy
+HZAD8ByQ7/+A4D30z3CgABQEA9kjoCDYEBocMM9xgAC4ZhGBAeARoQLIANqYEAEAdBADAZQYQACe
+EAEBkhhEACCQO2O4EIEAeWEweZAYRACkEAEArLmtuaQYQACAEAEBfhADAYAYhAA7Y7AQAQFieTB5
+sBhEAIIQAQF+GIQAshhEAJ8AT//geM9wgACYhQaAA9vPcaAA9AdloYHgAdjAeAy4hSADAQ1zALMC
+yADafZANcGCwAshxgA1wYKACyEgQAwENcGCwRKHgfuB48cBCDW/7CHMQiTMRjQAB2kCrGRIPNs92
+gAAwcO5mz3KAAFhwQNzBqxkSDzYCIg4D9CbOE8GzGRIONvAiggNBo0GBUSIAgRDy0onPcoAAsGAW
+etyrQIqGIn8MXHoEukV+3KsE8IDaXKsEuAV9vasckc9ygACgcA+zGcjwIgAABLMJyAWjVBEAAQyz
+AJENs6ARggBIowjIBCCADwIAQQDXcAIAAAAD9Ii6SKMIyAQgvo8AAEEQA/KJukijnBEAAc9zgABM
+BSa4wLhAKAIDD4HAuA24RXjVBG/7BaPgePHAagxP+wh1AsgHiFEgwIAL8gDYRgsv+5C4ANmSuc9w
+oADQGzGgz3CgANQLGIBCIAAISCAAALDgTAgl+8ogJQzPcYAMLADscCCgAcjscQChIIXscCCgIYXs
+cCCgIoXscCCgI4XscCCgJIXscCCgJYXscCCgJoXscCCgJ4XscCCgKIXscCCgz3CgAMAvoxAAhlEg
+AIH58wnIz3GgAGgsBCCADwEAAPAsuPAhDQDPcIAATAXFgNnY5g3v+gUmQRPqCS/7BSZAExEET/vg
+ePHAmgtP+wh1z3GgAMAvoxEAhlEgAIEA3/jzCchAGRiAGRIBNobhqXAE9GIIj/4R8MH/z3aAAIh8
+0XUL9CqOgOEH8oogUg2KDe/6h7nqrrUDT/vgePHARgtP+xkSAzbPcYAACHAA3XR5AhIONqCxQYbu
+ug/0qLHIGUQDUI4FusdygACoXeWSgOfD9mG/5bIAI4IPgAAkcKSqrKrPcoAAsFx2ekKSuBlEA3AZ
+hADPcYAAoHB1eaChIYYEIYEPAAAAYNdxAAAAIA70z3GAABBa8CHCAM9xgACEBFR5QJEQ4kCxA9rP
+caAAFARQocb/2djiDO/6ARIBNg0DT/vgeKHB8cCWCk/7ocEodQh2GnIEIb6PAQAAwGh3LPTovUDF
+DfIgwc9wgAC8QClgBCWAHwYAAAAxuDhgAvAB2AQlgR8CAAAB13ECAAAByiChAIHgDfKC4Ajyg+AA
+2Mog4QHAKKEDB/AD2A64A/AA2I64BX3JcBoIL/6pcclwqXEKculzSiRAAKL8gOAZ9FEgAMML9M9w
+oAD8RB2ABCC+jyAGAAD181EgAMMA2An0z3GAAMwVCYEB4AmhANiYuAjcQwJv+6HA4HihwfHA4cVR
+IACCCHWYACEAQsAiw89wgAC8QAQlgh8GAAAAMbprYAQlgB/AAAAANrh6Ys9zgAAASEpjCGNYYEEt
+ghJSIgIAwLoDuhjiheDKIo0PAQCJDdUiDgBQcUIAJQAA2O29GAAhAAIhgADPcRxHx3EFKH4ACiDA
+DgPwIripcsa6673PcYAALEP0IYIABfI8alR5MHoFKj4AQSmAcAjcswFP+wohwA/rcgXYd9uMu0ok
+AAC5Bu/5CiUAAfHAGglP+wh2MIjPcoAAMGERzDZ6USBAgGCSDPLPcKAALCAPgIQWDREIIEADongD
+8GhwsBYNEWTlsXAyAQ4Az3WAAKhdBbkhZQDfBCGND4ADAAA3vWW9SCUNEAQhgQ8YAAAAM7kN4Q8n
+TxAJIMEAAxKQANYO7/+YFgAQmBYDEAkgwQNocsa667vPcIAALEP0IIIABfIcalR4EHoiurh6A2oE
+IIAPAAD8/89ygABMfgOiz3KgAMQsDaIwGgAECcgEIIAPAQAA8Cy4GLhPIEMHGcgUuGV4BXkqos9y
+gADMFR2CAeAdom4K7/rj2FEhgMX/889woADELKuA5NhaCu/6qXEEJY8f8AcAAP69NL9TJYEULfKB
+51YADgAAlhDgEHFOAA4AEI7PcoAAqF0FuABi+7jVIcIDz3WAAEx+IKXipZgWABCqDC//ANoBpc9x
+gAC4ZhyBAeAcoRqBH2cRzPqhRiCAAhEaHDAB2Ajwz3GAALhmG4EB4BuhANgFAE/7pBABALe5pBhA
+AADZOaC4GEIA4H+6GEQA8cDPcIAATH4BgM9xoADIH5YgQQ8eoRDYDqEB2BUZGIAT8M9xoAD8RB2B
+OYEEIYKPAAAAAhH0BCC+jwAGAAAN9FEjAMAm9M9woAD0BweA/7gA2+nzLvAA2/q4yiOCDwAAAQL5
+uMojgg8AAAIC/LjKI4IPAAABAoDiCfLPc4AAzBVJgwHiSaOKIwgCvg1P/xLwAdnPcIAATAUhoFoK
+7/0ocM9xgABIFgSBiiMIAgHgBKHrAS//aHDgeFEgQMPxwCjyz3CAAEx+AYDPcaAAyB+WIEEPHqEQ
+2A6hAdgVGRiAog3v+kHYUSBAwxLyAdnPcIAATAUhoP4J7/0B2M9xgABIFgSBAeAEoYojCAIv8M9x
+oAD8RB2BOYEEIYKPAAAAAgDbBvQEIL6PAAYAABryANv6uMojgg8AAAEC+bjKI4IPAAACAoDiCfLP
+c4AAzBVJgwHiSaOKIwgC8gxP/wfwA9nPcKAAFAQloDcBL/9ocOHFAhICNiCSQYJA4fS6wCGiAAPh
+z3OgANQHDxMNhgQhgQ8AAPz/sXAaYcj3GcgVIgEwGhEABh1lAiJBAxkTAIYQcT73DxuYgOB/wcXx
+wKoND/uowQDdz3eAAEx+EcwAFxEQz3agAMgfYYdRIECAAsgO8qAWAhD4FgEQInsCItYAdhADAS8m
+iCVbYwXwhBAWAcJzOhiEBR+GEHPJ93B4z3GAANwKZguv/TWJAdnPcKAA1Ac0oDOgA9ktoBEQF4bP
+caAA1AdWJwAiDxkYgBQZWIMCyKQQAABRIACCBfJGDEABA/BHHliTz3CgANQHDRABhkAuACQweQUg
+UAACyCGAABATAUDBuBCCAHIQAQECIZQAuhABAULCQ8FZgM9xoADUB4gZgABW/wnIz3GAAFx+BCCA
+DwEAAPAsuAISAzYEsQ+DrqkAoUATAAECsRCLYBMDAVRow7tleg+pRrEZEgI2z3CAAIRwIYdAIAQH
+VXhHgDpiR6CkFgAQGWH4FgAQAnlEwc9xoADUCwHYEKEih89wAAD8/wK5K+EkeJe4mribuOxxAKEB
+EgE27HAgoCKH7HAgqBkSATbPcIAACHA0eDCI7HAgqOxwoLAZEgE2z3CAAFhw8CBBAOxwIKAZyPAk
+AQDscCCw7HCgsOxwoKDscKCgCRIBNuxwIKACyCCQVBAAARC5JXjscQChAhICNgGCUSAAgQ7yMopQ
+is9wgACwYFZ4AIiGIH8MHHgEuCV4A/CA2OxxAKkCyM9ygABMBTCIMxCAAAS5BXnscCCo7HCgsAIS
+AzbPdqAA1AecEwABJrjAuEAoAQMPg8C4DbgleAWiGRICNs9xgAAIcAAigA+AADBwoKjPcIAAsFxW
+eFR5oLECkLgZRAMVJIIAoKJwGQQAz3CAAIgKHJDIGUQDRcAA2EHAWnAIdwh1K/BMIgCgBvQQzFEg
+AIAT8s9woADQGxGA8bjKICEAQArh+s8g4QMA2ZG5z3CgANAbMaAA2BQeGJACyEAiUiDPdqAA1Aco
+iAHhKKgJEgE2z3CgAEgsPaDPcIAATH4CgFJwmAIOAEwiAKCE8t7+BSUNkEYCAgAPhhB4GRYBlljg
+MHDU9w+GEHgZFgGWWOAwcMb3hBYAELLgN/cPhhB4GRYBlljgMHCmAA0AHh7Ykx0WAJYGEgE2CRoY
+MB0WAJZAJwMSR8AdFgCWALEdFgCWAaFWJwASHh4YkB0WApZALgAkUHoFIhAAANrPcKAA0BuRulGg
+z3CAAFQDEHjPcqAAtEdJGhiAz3CAAAwFYKDPcIAAEAUgoG8gQwBUGhiAz3CgANAbEYDxuAf0ANg2
+Ce/6j7gGEgE2AYFAwApwhiDzD4wgDIAAERMBD/Ia2A7wz3KAALhmHoLPd6AA0A+KIBAhAeAeotHw
+INgCwppwWGAQeHIZBAAAwPa4B/LPcaAASAhAIwAjBvBAIwAhz3GgAEwIG3ECwUwiAKAAIRkAA8AF
+IBAgQCHAMQQggA8AAPz/RsDPcIAATH4jgAbACCBVABTyDCVApN4ADQC1/gUlDZB39AHYFB4YkFUn
+QBQPHhiQUSIAwv/1z3agANQHVB5AFgAYADQCIwAlD6YGwQIhUSVMIgCgAiVAIBumA9gQpgISATYZ
+8iiJqXDIuAy5JXjscQCxA8zscQCxAcAB4EHAB8AGEgE2+ncBGhgwAsgCGlgwBhoYMAGBIJFWJw8i
+NLjAuBR5z3AAAPz/A+EkeB9nGRIBNgbwFSJAMBoQAAYCfxUiQDAaEAAGEHd39wPMz3GfALj/GKHP
+cKAA/EQ9gAQhvo8ABgAAdgXB/0wiAKAV8oolEBAY8M9ygAC4Zj2Cz3egANAPiiASIAHhPaIn8M93
+oADQDxzwCcjPcqAASCyKJQgQHaL6uc9xgAA0ZwbyAIGAvQHgAKEG8AGBgb0B4AGhz3egANAPz3ag
+ANQHGnUH8M93oADQD0ogACBTIH6gBPRk/gV9gOUY8uG9DfICyCmIAeEpqM9xgAA0ZwGBAeABoQnw
+4L0H8s9xgAA0ZwCBAeAAoRp1Asipcci5CIgMuCV4AxIBNxC5JXjscQChCnSEJAKRAcBAIFIAE/KA
+HkAUA8wKcci5ELgleOxxAKEA2AymAdgUHhiQngrv/kAiUiACyJIQAAFRIICCKfJCDcAEENgQHxiQ
+JBcAls9xgACIfCWREHgCuSV4DB8YkBTYEB8YkM9wgACIfEeQJpAY2BC6RXkMH1iQEB8YkM9wgACI
+fEmQKJAQukV5DB9YkADYER8YkEwgAKBo8s9wgABMfgKAUnDH9wjZ7HAgoEAiUiD18c9wgABcfiSQ
+z3CgAGgs8CBAAM9xgABMBSWBJXgOHxiQA9gSpjINT/zpvQTy6nBG/gjwA9gTHhiQANgUHhiQ573K
+IIIPAAAGARX04L3KIIIPAAADAQ/04b3KIIIPAAAEAQn04r2KIEQByiCBDwAABwEqCa/6qXHPcqAA
+LCAwggTAMHAB2cohJgBEIINAD4Lk4AHYyiAmAIDhzCMhgMwgIYDs889wACgIAAgaGDAFwF4OL/wA
+2avwz3CAAHAjEohRIACAF/JRIADDFfLPcIAAcCMPiM9xgADMixC4IImfuIDhAdnAeQ+5JXjPcaAA
+/EQNoUwhAKAN8s9xoADUB4AZQATPcYAAuGYdgQHgHaHPcIAAXH4kkM9woABoLPAgQADPcYAATAUl
+gSV4z3GgANQLDaHPcKAA1AcA2SygiiAEAloIr/qpcdYPb/8FwM9woADUBxkQAIbA4KgADgARzFEg
+QIBQ8s9woADUBwPdIBhYgwHZFBhYgADYz3GAAAwFAKEA2JG4z3agAMgfEx4YkM9wgADcAhB4z3Kg
+ALRHSRoYgAbIz3GAABAFAKFvIEMAVBoYgBMWAJbxuMogIQCcDKH6zyDhA89woADUBw8QAoYGEgE2
+tBmEABMYWIPPcBIgAADKC+/+GRICNgbIsBAAAaAWARBk4DBwyiCFDxIoCACF989wACgIAAgaGDAR
+zAQggA8AAAIIguAK9AYSATaKIAQAMguv/ZgRAQAZEgE2z3KAABhwANg0egCyAsgaCOACGpA9Be/6
+qMDgePHA4cUCyKQQAQCYEAIAUSEAgHIQAQFIcAby0gnv/gDaCHUH8AHhxgnv/gDarGjOD4ABz3Kg
+AMgf+BIBAALIz3OAAKhdEIgFuABj7bgG9AHYE6J4glmCBvAC2BOieoJbggIlQBB4YBBzwCJtAA1x
+AKENcECgABYAQAAWAEACyM9yoAD0B3AQAQFouSeicBABAWi5MHkBBe/6cBhEAPHAz3CAAJiFBoAB
+2c9zoAD0B4HgGYPAeYDgDLkO8mQTBAAKIcAP63IF2M9zAABRCeUBr/lKJQAAAsgckCV4DXEAsQLI
+PZANcCCwAsgvgA1wIKACyEAQAQENcCCwAsgxgA1wIKACyEgQAQENcCCwAhIBNhyRhiD/DITgH/Iz
+gQ1wIKACyFAQAQENcCCwAshUEAEBDXAgsAISATYckYYg8w+MIAyACfQ2gQ1wIKACyFwQAQENcCCw
+AhIBNhyRhiD9DIwgAoIQ9GARAQENcCCwAhIBNqQRAAD3uAbyOYENcCCgAsgA/QISATakEQAAUSCA
+gQfyAYHwuBTym/+bBo/+OoENcCCgAhIBNqQRAACGIPOPBvI7gQ1wIKB7Bo/+dwaP/vHAAdjPcaAA
+9AcLoQPYCKHPcKAA/EQ9gBmAUSBAgjX0BCG+jwAGAAAv9OB44HjgeFEgQMMp8gLIz3GgAMgfsBAA
+AZYgQQ8eoRDYDqEB2BUZGIAGCq/6QdhRIEDDFfLPcIAATAUB2SGgAsikEAEAmrmkGEAAVg5v/QHY
+z3GAAEgWBIEB4AShtgtP/+sFj/7gePHAwgrP+qQRAAChwVEgAIDPcIAAiAoodgPyG5AC8BqQmBYB
+EAQhvo8BAADAdh4EEC306LlAwQ7yIMLPcIAAvEBKYAQhgA8GAAAAMbhYYAPwAdgEIYIPAgAAAddy
+AgAAAcogoQCB4A7yguAJ8oPgANjKIOEBwCihAwbwA9gOuATwANiOuAV5mB5AEJ4WABGUHkAQkh4E
+EIIWABGQFhMRz3WgANQHsh4EEADYgB4EEH4eBBAZFQCWuOAQFpIQTfcRzM9xgAC4ZoYgiAIRGhww
+FYEB4BWhnvAPFRGWARIQNgHZz3CAAAwFIKAA2JG4z3GgANAbEaHPcIAA3AIQeM9yoAC0R0kaGIDP
+cIAAEAXAoG8gQwBUGhiAEYEJEg828bjKICEApAih+s8g4QOkFgAQ9rgi9AkSAjYCIsEDgeEA2Afy
+AieBEIwhw48C9AHYgOAU9BHMz3GAALhmhiCIAhEaHDAUgQHgFKEPHViUCRrYMwEaGDRQ8AEaGDQR
+js9xgAAIRMK4MiEFAAka2DPPcYAAEER0HkQR8CEBAKQWABAleKQeABAAlqBwEHiQHgQQcnDKIcIP
+yiLCB8ogYgHKI4IPAAD4BqQGYvnKJMIEEBaEEAwiAKHKIcIPyiLCB8ogYgHKI4IPAAD5BoAGYvnK
+JYIEDxUAlrQeBBBmCy//yXCkFgAQhiDlj1ANIv7KIIIDDx1YlAkB7/qhwOB48cC2CM/6EMxRIACA
+AN1Y8s9woADQGxGA8bjKICEAkA9h+s8g4QMCyM9ygACoXTCIBbkhYs9ygABMBS25wLmEKQsKACGB
+f4AA8J4morQRAgbPcYAAsFxAoc9xgAAAXUiRGRIBNs92oADUBxEiQICQEAABEfIZFgGWOOAwcMv3
+z3CAAJgEIIDPcAAAmB6aDW/6h7kPFgCWAhIBNrQZBAAIyF4Or/4ZEgI2AhIBNpIRAAH2DW/9lBEB
+AAHeHfAD2M9xoADUByAZGIAB3hQZmIMAFgBACRoYMAAWAEABGhgwAsi0EAABDxkYgMvYBgpv+hkS
+ATYZEgI2z3eAAAhwFCeAECiQgOECEgM2FfSYEwEAVX8spzSnz3GAABBa8CGCAM9xgACEBPQhgQC8
+G0QAyBhEAAXwyBAAAbwbBAAeC+/+oBuAAwISAzagEwAABCC+jwEBAAAY8gDZz3CgAPxEnrkhoM9w
+oADQGxGA77gk8rYKb/0B2M9xgADMFR+BAeAfoRrwkhMAAZQTAQCQEwIBshMDAZoP7/5KJEAAAhIC
+NqASAQAleKAaAADO2EYJb/oBEgE2AhIONqAWABAEIL6PAQEAAGjyz3CgABQEA9kjoAjIBCC+jwAA
+ARAj8qQWABDyuB/yz3GAAEwFAIGA4BnyoKFRIYDF//PPcKAAxCyrgOTY8ghv+qlxUyWBFP69zCEi
+gAfymBYAEHILr/4A2gISATagEQAA8LgK8oogCAAQGhwwoBEBAIcGIAD62PS4IvIJyNCJANozEY8A
+BCCADwEAAPBBKA0Dz3GgADguB4EPIkIDAdxGeAehGcjmDKAHACwAEMd3gACoXQW+EOffZ6CviiAQ
+AAgaGDACyKAQAQAvBiAA+9gDzM9xnwC4/xihxg/v/hnICMgEIL6PAAABEBvy2g/v/gISATaA4AIS
+ATYM8qQRAADxuBHMxSCiBM8gYQARGhwwAYHuuAXyEcyAuBEaHDDM2A4Ib/oIEgE2Wggv/wLIbgkv
+/wLIAhIBNhyRhiD9DIwgAoIP9BCJz3KAALJdBbgQYoHgB/RgEQABhLhgGQQAUSAAwwv0z3CgAPxE
+HYAEIL6PIAYAAPXzUSAAwwDYCfTPcYAAzBUJgQHgCaEA2Ji4gOAM8gPZz3CgABQEI6CKIBAAWwUg
+AAgaGDACyKQQAAAEIL6PAAAAMNjy9LgJ9DYJD//W2G4PL/oIEgE2AsikEAEA7LlW8loPL/rN2CIM
+L/8B2AISATYD2h2xz3CAAJiFBoDPc6AA9AdFo4HgAdjAeAy4hSACDQ1yALICyF2QDXBAsALIT4Dg
+ugDZC/LPcoAATAUGgqKADXCgoAaCRpAG8A1wQKACyEAQAgENcECwAshRgA1wQKACyEgQAgENcECw
+JKMCyBkSAzZ+EAEBgBAAAc9ygACEcHV6GWEHgjhgbg4v/weiCBIBNoMEIADQ2LIOL/rR2AISATYB
+gfi4D/LPcIAAUAgAkB2xz3CAAFQIQIABgFGhEqEH8FYLL/8C2AISATYdscYOD/8CyPYNL/94EAAB
+gOA6BAIAAsgZEgI2gBABAc9wgACEcFV4R4BZYSeg0thODi/6ANkCEgM2AYOYEwEA+LiUG0AAFfLP
+dYAAiHypcLoOL/9ocRDYEBocMBHMo7gRGhwwoghv/6lw4wMAAJ4TAAFAk3QTDQGSGwQAumJQepAb
+hAAqCW//ghMDAQh1z9juDS/6qXH4vQ7yA9nPcKAAFAQjoIogEAAIGhgw/dibAyAAqXECyKQQAQD0
+uVUgwgdz8m4KT/8CEgM2gOCSEwIBlBMBAEjySHDPdoAATH5Ahs4J7/5ils93gAAAXSiXgOHKIIIP
+AACEHrwIQvrPdYAAnAQAhYDgIvIZyAISAjYVIgEwmBIAABoRAQb+D2/+INojlQIgTQACyCCGmBAA
+AOoPb/4g2hB1CHFI9xC9z3AAAHQedghv+qV5Mg1P/wiXgODKIIIPAACEHlwIYvrKISIA6wIAAKQT
+AACnupIbhACQEwIBtLikGwAAkhMAATIJ7/6wEwMBA9nPcKAA9AcloALIGRIDNpgQAQBVIMIHz3CA
+ADhwdXggoAqCUSAAgQj0lg7P/tvYygwv+ggSATYCyKQQAQAodIQkGpAJ8gYPz/0D2c9woAAQFCWg
+FPBRIQCCB/JuCcAA6gnAAAzwcBACAc9woAD0BwDZR6DPcKAAyBwnoAISATbT2HoML/qkEQEAAsgB
+gPm4B/Q2CS//BNgCEgE2HbFq/bH9GnDU2FYML/oKcQISAzYZyIQTAgGCEwEBBCC+rwYIAABZYc9y
+gACEcBV6B4I4YPYBIgAHos9woAAUBAPZJaABg1EgwIAl8qQTAABRIACAz3CAAIgKBPLdkAPw3JDP
+cYAAcCMSiVEgAIAV8g+Jz3GAAMyLELggiZ+4gOEB2cB5D7kleM9xoAD8RA2hA/B2Ew4BEcxTIECA
+DPLV2L4LL/oIEgE2CMgGEgE2GRICNqr9z3WAAIh8qXAuDC//AhIBNhoLL//JcIDgr/QCyJIQAAFR
+IICCuA5CBALIAYBRIMCAXPLX2HYLL/oA2coKr/2A2AgSATYEIYEPAgABANdxAgAAABESAjcJ9P24
+B/JPIsAAERocMAXwo7pQeBEanDACEgI2IYJRIYCBLvKLuIy4ERocMDCKMxKAAAS5JXjPcYAAXH7P
+cqAAOC6kggaxEPAvKkEDTiKDBwDaDyLCAEZ9z3KAAOBv9CLCAFBwCfKA5fH1z3AAAP//BLEG8GSx

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 01:14:31 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 88082369;
 Thu, 28 Aug 2014 01:14:31 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7127033AF;
 Thu, 28 Aug 2014 01:14:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7S1EVn9003011;
 Thu, 28 Aug 2014 01:14:31 GMT (envelope-from truckman@FreeBSD.org)
Received: (from truckman@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7S1EVF5003010;
 Thu, 28 Aug 2014 01:14:31 GMT (envelope-from truckman@FreeBSD.org)
Message-Id: <201408280114.s7S1EVF5003010@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: truckman set sender to
 truckman@FreeBSD.org using -f
From: Don Lewis 
Date: Thu, 28 Aug 2014 01:14:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r270735 - stable/9
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 01:14:31 -0000

Author: truckman
Date: Thu Aug 28 01:14:30 2014
New Revision: 270735
URL: http://svnweb.freebsd.org/changeset/base/270735

Log:
  MFC r270510:
  
  Catch up to gcc 3.3 -> 3.4 upgrade.

Modified:
  stable/9/ObsoleteFiles.inc   (contents, props changed)
Directory Properties:
  stable/9/   (props changed)

Modified: stable/9/ObsoleteFiles.inc
==============================================================================
--- stable/9/ObsoleteFiles.inc	Thu Aug 28 00:05:02 2014	(r270734)
+++ stable/9/ObsoleteFiles.inc	Thu Aug 28 01:14:30 2014	(r270735)
@@ -2456,6 +2456,202 @@ OLD_FILES+=lib/geom/geom_concat.so.1
 OLD_FILES+=lib/geom/geom_label.so.1
 OLD_FILES+=lib/geom/geom_nop.so.1
 OLD_FILES+=lib/geom/geom_stripe.so.1
+# 20040728: GCC 3.4.2
+OLD_DIRS+=usr/include/c++/3.3
+OLD_FILES+=usr/include/c++/3.3/FlexLexer.h
+OLD_FILES+=usr/include/c++/3.3/algorithm
+OLD_FILES+=usr/include/c++/3.3/backward/algo.h
+OLD_FILES+=usr/include/c++/3.3/backward/algobase.h
+OLD_FILES+=usr/include/c++/3.3/backward/alloc.h
+OLD_FILES+=usr/include/c++/3.3/backward/backward_warning.h
+OLD_FILES+=usr/include/c++/3.3/backward/bvector.h
+OLD_FILES+=usr/include/c++/3.3/backward/complex.h
+OLD_FILES+=usr/include/c++/3.3/backward/defalloc.h
+OLD_FILES+=usr/include/c++/3.3/backward/deque.h
+OLD_FILES+=usr/include/c++/3.3/backward/fstream.h
+OLD_FILES+=usr/include/c++/3.3/backward/function.h
+OLD_FILES+=usr/include/c++/3.3/backward/hash_map.h
+OLD_FILES+=usr/include/c++/3.3/backward/hash_set.h
+OLD_FILES+=usr/include/c++/3.3/backward/hashtable.h
+OLD_FILES+=usr/include/c++/3.3/backward/heap.h
+OLD_FILES+=usr/include/c++/3.3/backward/iomanip.h
+OLD_FILES+=usr/include/c++/3.3/backward/iostream.h
+OLD_FILES+=usr/include/c++/3.3/backward/istream.h
+OLD_FILES+=usr/include/c++/3.3/backward/iterator.h
+OLD_FILES+=usr/include/c++/3.3/backward/list.h
+OLD_FILES+=usr/include/c++/3.3/backward/map.h
+OLD_FILES+=usr/include/c++/3.3/backward/multimap.h
+OLD_FILES+=usr/include/c++/3.3/backward/multiset.h
+OLD_FILES+=usr/include/c++/3.3/backward/new.h
+OLD_FILES+=usr/include/c++/3.3/backward/ostream.h
+OLD_FILES+=usr/include/c++/3.3/backward/pair.h
+OLD_FILES+=usr/include/c++/3.3/backward/queue.h
+OLD_FILES+=usr/include/c++/3.3/backward/rope.h
+OLD_FILES+=usr/include/c++/3.3/backward/set.h
+OLD_FILES+=usr/include/c++/3.3/backward/slist.h
+OLD_FILES+=usr/include/c++/3.3/backward/stack.h
+OLD_FILES+=usr/include/c++/3.3/backward/stream.h
+OLD_FILES+=usr/include/c++/3.3/backward/streambuf.h
+OLD_FILES+=usr/include/c++/3.3/backward/strstream
+OLD_FILES+=usr/include/c++/3.3/backward/strstream.h
+OLD_FILES+=usr/include/c++/3.3/backward/tempbuf.h
+OLD_FILES+=usr/include/c++/3.3/backward/tree.h
+OLD_FILES+=usr/include/c++/3.3/backward/vector.h
+OLD_DIRS+=usr/include/c++/3.3/backward
+OLD_FILES+=usr/include/c++/3.3/bits/atomicity.h
+OLD_FILES+=usr/include/c++/3.3/bits/basic_file.h
+OLD_FILES+=usr/include/c++/3.3/bits/basic_ios.h
+OLD_FILES+=usr/include/c++/3.3/bits/basic_ios.tcc
+OLD_FILES+=usr/include/c++/3.3/bits/basic_string.h
+OLD_FILES+=usr/include/c++/3.3/bits/basic_string.tcc
+OLD_FILES+=usr/include/c++/3.3/bits/boost_concept_check.h
+OLD_FILES+=usr/include/c++/3.3/bits/c++config.h
+OLD_FILES+=usr/include/c++/3.3/bits/c++io.h
+OLD_FILES+=usr/include/c++/3.3/bits/c++locale.h
+OLD_FILES+=usr/include/c++/3.3/bits/c++locale_internal.h
+OLD_FILES+=usr/include/c++/3.3/bits/char_traits.h
+OLD_FILES+=usr/include/c++/3.3/bits/cmath.tcc
+OLD_FILES+=usr/include/c++/3.3/bits/codecvt.h
+OLD_FILES+=usr/include/c++/3.3/bits/codecvt_specializations.h
+OLD_FILES+=usr/include/c++/3.3/bits/concept_check.h
+OLD_FILES+=usr/include/c++/3.3/bits/cpp_type_traits.h
+OLD_FILES+=usr/include/c++/3.3/bits/ctype_base.h
+OLD_FILES+=usr/include/c++/3.3/bits/ctype_inline.h
+OLD_FILES+=usr/include/c++/3.3/bits/ctype_noninline.h
+OLD_FILES+=usr/include/c++/3.3/bits/deque.tcc
+OLD_FILES+=usr/include/c++/3.3/bits/fpos.h
+OLD_FILES+=usr/include/c++/3.3/bits/fstream.tcc
+OLD_FILES+=usr/include/c++/3.3/bits/functexcept.h
+OLD_FILES+=usr/include/c++/3.3/bits/generic_shadow.h
+OLD_FILES+=usr/include/c++/3.3/bits/gslice.h
+OLD_FILES+=usr/include/c++/3.3/bits/gslice_array.h
+OLD_FILES+=usr/include/c++/3.3/bits/gthr-default.h
+OLD_FILES+=usr/include/c++/3.3/bits/gthr-posix.h
+OLD_FILES+=usr/include/c++/3.3/bits/gthr-single.h
+OLD_FILES+=usr/include/c++/3.3/bits/gthr.h
+OLD_FILES+=usr/include/c++/3.3/bits/indirect_array.h
+OLD_FILES+=usr/include/c++/3.3/bits/ios_base.h
+OLD_FILES+=usr/include/c++/3.3/bits/istream.tcc
+OLD_FILES+=usr/include/c++/3.3/bits/list.tcc
+OLD_FILES+=usr/include/c++/3.3/bits/locale_classes.h
+OLD_FILES+=usr/include/c++/3.3/bits/locale_facets.h
+OLD_FILES+=usr/include/c++/3.3/bits/locale_facets.tcc
+OLD_FILES+=usr/include/c++/3.3/bits/localefwd.h
+OLD_FILES+=usr/include/c++/3.3/bits/mask_array.h
+OLD_FILES+=usr/include/c++/3.3/bits/messages_members.h
+OLD_FILES+=usr/include/c++/3.3/bits/os_defines.h
+OLD_FILES+=usr/include/c++/3.3/bits/ostream.tcc
+OLD_FILES+=usr/include/c++/3.3/bits/pthread_allocimpl.h
+OLD_FILES+=usr/include/c++/3.3/bits/slice.h
+OLD_FILES+=usr/include/c++/3.3/bits/slice_array.h
+OLD_FILES+=usr/include/c++/3.3/bits/sstream.tcc
+OLD_FILES+=usr/include/c++/3.3/bits/stl_algo.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_algobase.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_alloc.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_bvector.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_construct.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_deque.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_function.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_heap.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_iterator.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_iterator_base_funcs.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_iterator_base_types.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_list.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_map.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_multimap.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_multiset.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_numeric.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_pair.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_pthread_alloc.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_queue.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_raw_storage_iter.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_relops.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_set.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_stack.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_tempbuf.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_threads.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_tree.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_uninitialized.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_vector.h
+OLD_FILES+=usr/include/c++/3.3/bits/stream_iterator.h
+OLD_FILES+=usr/include/c++/3.3/bits/streambuf.tcc
+OLD_FILES+=usr/include/c++/3.3/bits/streambuf_iterator.h
+OLD_FILES+=usr/include/c++/3.3/bits/stringfwd.h
+OLD_FILES+=usr/include/c++/3.3/bits/time_members.h
+OLD_FILES+=usr/include/c++/3.3/bits/type_traits.h
+OLD_FILES+=usr/include/c++/3.3/bits/valarray_array.h
+OLD_FILES+=usr/include/c++/3.3/bits/valarray_array.tcc
+OLD_FILES+=usr/include/c++/3.3/bits/valarray_meta.h
+OLD_FILES+=usr/include/c++/3.3/bits/vector.tcc
+OLD_DIRS+=usr/include/c++/3.3/bits
+OLD_FILES+=usr/include/c++/3.3/bitset
+OLD_FILES+=usr/include/c++/3.3/cassert
+OLD_FILES+=usr/include/c++/3.3/cctype
+OLD_FILES+=usr/include/c++/3.3/cerrno
+OLD_FILES+=usr/include/c++/3.3/cfloat
+OLD_FILES+=usr/include/c++/3.3/ciso646
+OLD_FILES+=usr/include/c++/3.3/climits
+OLD_FILES+=usr/include/c++/3.3/clocale
+OLD_FILES+=usr/include/c++/3.3/cmath
+OLD_FILES+=usr/include/c++/3.3/complex
+OLD_FILES+=usr/include/c++/3.3/csetjmp
+OLD_FILES+=usr/include/c++/3.3/csignal
+OLD_FILES+=usr/include/c++/3.3/cstdarg
+OLD_FILES+=usr/include/c++/3.3/cstddef
+OLD_FILES+=usr/include/c++/3.3/cstdio
+OLD_FILES+=usr/include/c++/3.3/cstdlib
+OLD_FILES+=usr/include/c++/3.3/cstring
+OLD_FILES+=usr/include/c++/3.3/ctime
+OLD_FILES+=usr/include/c++/3.3/cwchar
+OLD_FILES+=usr/include/c++/3.3/cwctype
+OLD_FILES+=usr/include/c++/3.3/cxxabi.h
+OLD_FILES+=usr/include/c++/3.3/deque
+OLD_FILES+=usr/include/c++/3.3/exception
+OLD_FILES+=usr/include/c++/3.3/exception_defines.h
+OLD_FILES+=usr/include/c++/3.3/ext/algorithm
+OLD_FILES+=usr/include/c++/3.3/ext/enc_filebuf.h
+OLD_FILES+=usr/include/c++/3.3/ext/functional
+OLD_FILES+=usr/include/c++/3.3/ext/hash_map
+OLD_FILES+=usr/include/c++/3.3/ext/hash_set
+OLD_FILES+=usr/include/c++/3.3/ext/iterator
+OLD_FILES+=usr/include/c++/3.3/ext/memory
+OLD_FILES+=usr/include/c++/3.3/ext/numeric
+OLD_FILES+=usr/include/c++/3.3/ext/rb_tree
+OLD_FILES+=usr/include/c++/3.3/ext/rope
+OLD_FILES+=usr/include/c++/3.3/ext/ropeimpl.h
+OLD_FILES+=usr/include/c++/3.3/ext/slist
+OLD_FILES+=usr/include/c++/3.3/ext/stdio_filebuf.h
+OLD_FILES+=usr/include/c++/3.3/ext/stl_hash_fun.h
+OLD_FILES+=usr/include/c++/3.3/ext/stl_hashtable.h
+OLD_FILES+=usr/include/c++/3.3/ext/stl_rope.h
+OLD_DIRS+=usr/include/c++/3.3/ext
+OLD_FILES+=usr/include/c++/3.3/fstream
+OLD_FILES+=usr/include/c++/3.3/functional
+OLD_FILES+=usr/include/c++/3.3/iomanip
+OLD_FILES+=usr/include/c++/3.3/ios
+OLD_FILES+=usr/include/c++/3.3/iosfwd
+OLD_FILES+=usr/include/c++/3.3/iostream
+OLD_FILES+=usr/include/c++/3.3/istream
+OLD_FILES+=usr/include/c++/3.3/iterator
+OLD_FILES+=usr/include/c++/3.3/limits
+OLD_FILES+=usr/include/c++/3.3/list
+OLD_FILES+=usr/include/c++/3.3/locale
+OLD_FILES+=usr/include/c++/3.3/map
+OLD_FILES+=usr/include/c++/3.3/memory
+OLD_FILES+=usr/include/c++/3.3/new
+OLD_FILES+=usr/include/c++/3.3/numeric
+OLD_FILES+=usr/include/c++/3.3/ostream
+OLD_FILES+=usr/include/c++/3.3/queue
+OLD_FILES+=usr/include/c++/3.3/set
+OLD_FILES+=usr/include/c++/3.3/sstream
+OLD_FILES+=usr/include/c++/3.3/stack
+OLD_FILES+=usr/include/c++/3.3/stdexcept
+OLD_FILES+=usr/include/c++/3.3/streambuf
+OLD_FILES+=usr/include/c++/3.3/string
+OLD_FILES+=usr/include/c++/3.3/typeinfo
+OLD_FILES+=usr/include/c++/3.3/utility
+OLD_FILES+=usr/include/c++/3.3/valarray
+OLD_FILES+=usr/include/c++/3.3/vector
 # 20040713: fla(4) removed.
 OLD_FILES+=usr/share/man/man4/fla.4.gz
 # 200407XX

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 01:15:00 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 825D04B1;
 Thu, 28 Aug 2014 01:15:00 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6D73833B9;
 Thu, 28 Aug 2014 01:15:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7S1F0C6003139;
 Thu, 28 Aug 2014 01:15:00 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7S1F08w003138;
 Thu, 28 Aug 2014 01:15:00 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201408280115.s7S1F08w003138@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber 
Date: Thu, 28 Aug 2014 01:15:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270736 - stable/10/release/doc/en_US.ISO8859-1/relnotes
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 01:15:00 -0000

Author: gjb
Date: Thu Aug 28 01:14:59 2014
New Revision: 270736
URL: http://svnweb.freebsd.org/changeset/base/270736

Log:
  Correct the note about r270401: s/pam(3)/pam_group(8)
  
  Submitted by:	jilles
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 01:14:30 2014	(r270735)
+++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 01:14:59 2014	(r270736)
@@ -959,7 +959,8 @@
 	-o vers=4.
 
       Support for the account
-	facility has been added to &man.pam.3; library.
+	facility has been added to the &man.pam.group.8;
+	module.
 
       
 	<filename>/etc/rc.d</filename> Scripts

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 01:15:57 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 50F1D60C;
 Thu, 28 Aug 2014 01:15:57 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3A18733C7;
 Thu, 28 Aug 2014 01:15:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7S1FvvN003345;
 Thu, 28 Aug 2014 01:15:57 GMT (envelope-from truckman@FreeBSD.org)
Received: (from truckman@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7S1FvfG003344;
 Thu, 28 Aug 2014 01:15:57 GMT (envelope-from truckman@FreeBSD.org)
Message-Id: <201408280115.s7S1FvfG003344@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: truckman set sender to
 truckman@FreeBSD.org using -f
From: Don Lewis 
Date: Thu, 28 Aug 2014 01:15:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r270737 - stable/8
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 01:15:57 -0000

Author: truckman
Date: Thu Aug 28 01:15:56 2014
New Revision: 270737
URL: http://svnweb.freebsd.org/changeset/base/270737

Log:
  MFC r270510:
  
  Catch up to gcc 3.3 -> 3.4 upgrade.

Modified:
  stable/8/ObsoleteFiles.inc   (contents, props changed)
Directory Properties:
  stable/8/   (props changed)

Modified: stable/8/ObsoleteFiles.inc
==============================================================================
--- stable/8/ObsoleteFiles.inc	Thu Aug 28 01:14:59 2014	(r270736)
+++ stable/8/ObsoleteFiles.inc	Thu Aug 28 01:15:56 2014	(r270737)
@@ -1972,6 +1972,202 @@ OLD_FILES+=lib/geom/geom_concat.so.1
 OLD_FILES+=lib/geom/geom_label.so.1
 OLD_FILES+=lib/geom/geom_nop.so.1
 OLD_FILES+=lib/geom/geom_stripe.so.1
+# 20040728: GCC 3.4.2
+OLD_DIRS+=usr/include/c++/3.3
+OLD_FILES+=usr/include/c++/3.3/FlexLexer.h
+OLD_FILES+=usr/include/c++/3.3/algorithm
+OLD_FILES+=usr/include/c++/3.3/backward/algo.h
+OLD_FILES+=usr/include/c++/3.3/backward/algobase.h
+OLD_FILES+=usr/include/c++/3.3/backward/alloc.h
+OLD_FILES+=usr/include/c++/3.3/backward/backward_warning.h
+OLD_FILES+=usr/include/c++/3.3/backward/bvector.h
+OLD_FILES+=usr/include/c++/3.3/backward/complex.h
+OLD_FILES+=usr/include/c++/3.3/backward/defalloc.h
+OLD_FILES+=usr/include/c++/3.3/backward/deque.h
+OLD_FILES+=usr/include/c++/3.3/backward/fstream.h
+OLD_FILES+=usr/include/c++/3.3/backward/function.h
+OLD_FILES+=usr/include/c++/3.3/backward/hash_map.h
+OLD_FILES+=usr/include/c++/3.3/backward/hash_set.h
+OLD_FILES+=usr/include/c++/3.3/backward/hashtable.h
+OLD_FILES+=usr/include/c++/3.3/backward/heap.h
+OLD_FILES+=usr/include/c++/3.3/backward/iomanip.h
+OLD_FILES+=usr/include/c++/3.3/backward/iostream.h
+OLD_FILES+=usr/include/c++/3.3/backward/istream.h
+OLD_FILES+=usr/include/c++/3.3/backward/iterator.h
+OLD_FILES+=usr/include/c++/3.3/backward/list.h
+OLD_FILES+=usr/include/c++/3.3/backward/map.h
+OLD_FILES+=usr/include/c++/3.3/backward/multimap.h
+OLD_FILES+=usr/include/c++/3.3/backward/multiset.h
+OLD_FILES+=usr/include/c++/3.3/backward/new.h
+OLD_FILES+=usr/include/c++/3.3/backward/ostream.h
+OLD_FILES+=usr/include/c++/3.3/backward/pair.h
+OLD_FILES+=usr/include/c++/3.3/backward/queue.h
+OLD_FILES+=usr/include/c++/3.3/backward/rope.h
+OLD_FILES+=usr/include/c++/3.3/backward/set.h
+OLD_FILES+=usr/include/c++/3.3/backward/slist.h
+OLD_FILES+=usr/include/c++/3.3/backward/stack.h
+OLD_FILES+=usr/include/c++/3.3/backward/stream.h
+OLD_FILES+=usr/include/c++/3.3/backward/streambuf.h
+OLD_FILES+=usr/include/c++/3.3/backward/strstream
+OLD_FILES+=usr/include/c++/3.3/backward/strstream.h
+OLD_FILES+=usr/include/c++/3.3/backward/tempbuf.h
+OLD_FILES+=usr/include/c++/3.3/backward/tree.h
+OLD_FILES+=usr/include/c++/3.3/backward/vector.h
+OLD_DIRS+=usr/include/c++/3.3/backward
+OLD_FILES+=usr/include/c++/3.3/bits/atomicity.h
+OLD_FILES+=usr/include/c++/3.3/bits/basic_file.h
+OLD_FILES+=usr/include/c++/3.3/bits/basic_ios.h
+OLD_FILES+=usr/include/c++/3.3/bits/basic_ios.tcc
+OLD_FILES+=usr/include/c++/3.3/bits/basic_string.h
+OLD_FILES+=usr/include/c++/3.3/bits/basic_string.tcc
+OLD_FILES+=usr/include/c++/3.3/bits/boost_concept_check.h
+OLD_FILES+=usr/include/c++/3.3/bits/c++config.h
+OLD_FILES+=usr/include/c++/3.3/bits/c++io.h
+OLD_FILES+=usr/include/c++/3.3/bits/c++locale.h
+OLD_FILES+=usr/include/c++/3.3/bits/c++locale_internal.h
+OLD_FILES+=usr/include/c++/3.3/bits/char_traits.h
+OLD_FILES+=usr/include/c++/3.3/bits/cmath.tcc
+OLD_FILES+=usr/include/c++/3.3/bits/codecvt.h
+OLD_FILES+=usr/include/c++/3.3/bits/codecvt_specializations.h
+OLD_FILES+=usr/include/c++/3.3/bits/concept_check.h
+OLD_FILES+=usr/include/c++/3.3/bits/cpp_type_traits.h
+OLD_FILES+=usr/include/c++/3.3/bits/ctype_base.h
+OLD_FILES+=usr/include/c++/3.3/bits/ctype_inline.h
+OLD_FILES+=usr/include/c++/3.3/bits/ctype_noninline.h
+OLD_FILES+=usr/include/c++/3.3/bits/deque.tcc
+OLD_FILES+=usr/include/c++/3.3/bits/fpos.h
+OLD_FILES+=usr/include/c++/3.3/bits/fstream.tcc
+OLD_FILES+=usr/include/c++/3.3/bits/functexcept.h
+OLD_FILES+=usr/include/c++/3.3/bits/generic_shadow.h
+OLD_FILES+=usr/include/c++/3.3/bits/gslice.h
+OLD_FILES+=usr/include/c++/3.3/bits/gslice_array.h
+OLD_FILES+=usr/include/c++/3.3/bits/gthr-default.h
+OLD_FILES+=usr/include/c++/3.3/bits/gthr-posix.h
+OLD_FILES+=usr/include/c++/3.3/bits/gthr-single.h
+OLD_FILES+=usr/include/c++/3.3/bits/gthr.h
+OLD_FILES+=usr/include/c++/3.3/bits/indirect_array.h
+OLD_FILES+=usr/include/c++/3.3/bits/ios_base.h
+OLD_FILES+=usr/include/c++/3.3/bits/istream.tcc
+OLD_FILES+=usr/include/c++/3.3/bits/list.tcc
+OLD_FILES+=usr/include/c++/3.3/bits/locale_classes.h
+OLD_FILES+=usr/include/c++/3.3/bits/locale_facets.h
+OLD_FILES+=usr/include/c++/3.3/bits/locale_facets.tcc
+OLD_FILES+=usr/include/c++/3.3/bits/localefwd.h
+OLD_FILES+=usr/include/c++/3.3/bits/mask_array.h
+OLD_FILES+=usr/include/c++/3.3/bits/messages_members.h
+OLD_FILES+=usr/include/c++/3.3/bits/os_defines.h
+OLD_FILES+=usr/include/c++/3.3/bits/ostream.tcc
+OLD_FILES+=usr/include/c++/3.3/bits/pthread_allocimpl.h
+OLD_FILES+=usr/include/c++/3.3/bits/slice.h
+OLD_FILES+=usr/include/c++/3.3/bits/slice_array.h
+OLD_FILES+=usr/include/c++/3.3/bits/sstream.tcc
+OLD_FILES+=usr/include/c++/3.3/bits/stl_algo.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_algobase.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_alloc.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_bvector.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_construct.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_deque.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_function.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_heap.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_iterator.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_iterator_base_funcs.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_iterator_base_types.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_list.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_map.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_multimap.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_multiset.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_numeric.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_pair.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_pthread_alloc.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_queue.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_raw_storage_iter.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_relops.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_set.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_stack.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_tempbuf.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_threads.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_tree.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_uninitialized.h
+OLD_FILES+=usr/include/c++/3.3/bits/stl_vector.h
+OLD_FILES+=usr/include/c++/3.3/bits/stream_iterator.h
+OLD_FILES+=usr/include/c++/3.3/bits/streambuf.tcc
+OLD_FILES+=usr/include/c++/3.3/bits/streambuf_iterator.h
+OLD_FILES+=usr/include/c++/3.3/bits/stringfwd.h
+OLD_FILES+=usr/include/c++/3.3/bits/time_members.h
+OLD_FILES+=usr/include/c++/3.3/bits/type_traits.h
+OLD_FILES+=usr/include/c++/3.3/bits/valarray_array.h
+OLD_FILES+=usr/include/c++/3.3/bits/valarray_array.tcc
+OLD_FILES+=usr/include/c++/3.3/bits/valarray_meta.h
+OLD_FILES+=usr/include/c++/3.3/bits/vector.tcc
+OLD_DIRS+=usr/include/c++/3.3/bits
+OLD_FILES+=usr/include/c++/3.3/bitset
+OLD_FILES+=usr/include/c++/3.3/cassert
+OLD_FILES+=usr/include/c++/3.3/cctype
+OLD_FILES+=usr/include/c++/3.3/cerrno
+OLD_FILES+=usr/include/c++/3.3/cfloat
+OLD_FILES+=usr/include/c++/3.3/ciso646
+OLD_FILES+=usr/include/c++/3.3/climits
+OLD_FILES+=usr/include/c++/3.3/clocale
+OLD_FILES+=usr/include/c++/3.3/cmath
+OLD_FILES+=usr/include/c++/3.3/complex
+OLD_FILES+=usr/include/c++/3.3/csetjmp
+OLD_FILES+=usr/include/c++/3.3/csignal
+OLD_FILES+=usr/include/c++/3.3/cstdarg
+OLD_FILES+=usr/include/c++/3.3/cstddef
+OLD_FILES+=usr/include/c++/3.3/cstdio
+OLD_FILES+=usr/include/c++/3.3/cstdlib
+OLD_FILES+=usr/include/c++/3.3/cstring
+OLD_FILES+=usr/include/c++/3.3/ctime
+OLD_FILES+=usr/include/c++/3.3/cwchar
+OLD_FILES+=usr/include/c++/3.3/cwctype
+OLD_FILES+=usr/include/c++/3.3/cxxabi.h
+OLD_FILES+=usr/include/c++/3.3/deque
+OLD_FILES+=usr/include/c++/3.3/exception
+OLD_FILES+=usr/include/c++/3.3/exception_defines.h
+OLD_FILES+=usr/include/c++/3.3/ext/algorithm
+OLD_FILES+=usr/include/c++/3.3/ext/enc_filebuf.h
+OLD_FILES+=usr/include/c++/3.3/ext/functional
+OLD_FILES+=usr/include/c++/3.3/ext/hash_map
+OLD_FILES+=usr/include/c++/3.3/ext/hash_set
+OLD_FILES+=usr/include/c++/3.3/ext/iterator
+OLD_FILES+=usr/include/c++/3.3/ext/memory
+OLD_FILES+=usr/include/c++/3.3/ext/numeric
+OLD_FILES+=usr/include/c++/3.3/ext/rb_tree
+OLD_FILES+=usr/include/c++/3.3/ext/rope
+OLD_FILES+=usr/include/c++/3.3/ext/ropeimpl.h
+OLD_FILES+=usr/include/c++/3.3/ext/slist
+OLD_FILES+=usr/include/c++/3.3/ext/stdio_filebuf.h
+OLD_FILES+=usr/include/c++/3.3/ext/stl_hash_fun.h
+OLD_FILES+=usr/include/c++/3.3/ext/stl_hashtable.h
+OLD_FILES+=usr/include/c++/3.3/ext/stl_rope.h
+OLD_DIRS+=usr/include/c++/3.3/ext
+OLD_FILES+=usr/include/c++/3.3/fstream
+OLD_FILES+=usr/include/c++/3.3/functional
+OLD_FILES+=usr/include/c++/3.3/iomanip
+OLD_FILES+=usr/include/c++/3.3/ios
+OLD_FILES+=usr/include/c++/3.3/iosfwd
+OLD_FILES+=usr/include/c++/3.3/iostream
+OLD_FILES+=usr/include/c++/3.3/istream
+OLD_FILES+=usr/include/c++/3.3/iterator
+OLD_FILES+=usr/include/c++/3.3/limits
+OLD_FILES+=usr/include/c++/3.3/list
+OLD_FILES+=usr/include/c++/3.3/locale
+OLD_FILES+=usr/include/c++/3.3/map
+OLD_FILES+=usr/include/c++/3.3/memory
+OLD_FILES+=usr/include/c++/3.3/new
+OLD_FILES+=usr/include/c++/3.3/numeric
+OLD_FILES+=usr/include/c++/3.3/ostream
+OLD_FILES+=usr/include/c++/3.3/queue
+OLD_FILES+=usr/include/c++/3.3/set
+OLD_FILES+=usr/include/c++/3.3/sstream
+OLD_FILES+=usr/include/c++/3.3/stack
+OLD_FILES+=usr/include/c++/3.3/stdexcept
+OLD_FILES+=usr/include/c++/3.3/streambuf
+OLD_FILES+=usr/include/c++/3.3/string
+OLD_FILES+=usr/include/c++/3.3/typeinfo
+OLD_FILES+=usr/include/c++/3.3/utility
+OLD_FILES+=usr/include/c++/3.3/valarray
+OLD_FILES+=usr/include/c++/3.3/vector
 # 20040713: fla(4) removed.
 OLD_FILES+=usr/share/man/man4/fla.4.gz
 # 200407XX

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 02:28:24 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 733674AF;
 Thu, 28 Aug 2014 02:28:24 +0000 (UTC)
Received: from shxd.cx (unknown [64.201.244.140])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5A0883965;
 Thu, 28 Aug 2014 02:28:24 +0000 (UTC)
Received: from 50-196-156-133-static.hfc.comcastbusiness.net
 ([50.196.156.133]:50190 helo=THEMADHATTER)
 by shxd.cx with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.77 (FreeBSD))
 (envelope-from )
 id 1XMVXQ-000IoQ-Af; Tue, 26 Aug 2014 22:12:52 -0700
From: 
To: "'Slawa Olhovchenkov'" ,
	
References: <201408260231.s7Q2VbCW087619@svn.freebsd.org>
 <20140827140902.GA41194@zxy.spb.ru>
 <1d0501cfc221$1114f850$333ee8f0$@FreeBSD.org>
 <20140827184832.GJ2075@zxy.spb.ru>
In-Reply-To: <20140827184832.GJ2075@zxy.spb.ru>
Subject: RE: svn commit: r270644 - stable/10/usr.sbin/bsdinstall/scripts
Date: Wed, 27 Aug 2014 19:27:37 -0700
Message-ID: <1e8b01cfc267$a266a650$e733f2f0$@FreeBSD.org>
MIME-Version: 1.0
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: 7bit
X-Mailer: Microsoft Outlook 15.0
Thread-Index: AQEo8EZCNfdT+2JOA5CJW31HcDTrpwF783yrAnwPISUCHU3ilZ0CPVHQ
Content-Language: en-us
Sender: devin@shxd.cx
Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org, svn-src-stable-10@freebsd.org,
 'Andrew Thompson' 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 02:28:24 -0000



> -----Original Message-----
> From: Slawa Olhovchenkov [mailto:slw@zxy.spb.ru]
> Sent: Wednesday, August 27, 2014 11:49 AM
> To: dteske@FreeBSD.org
> Cc: 'Andrew Thompson'; src-committers@freebsd.org; svn-src-
> all@freebsd.org; svn-src-stable@freebsd.org; svn-src-stable-
> 10@freebsd.org
> Subject: Re: svn commit: r270644 - stable/10/usr.sbin/bsdinstall/scripts
> 
> On Wed, Aug 27, 2014 at 11:02:28AM -0700, dteske@FreeBSD.org wrote:
> 
> >
> >
> > > -----Original Message-----
> > > From: owner-src-committers@freebsd.org [mailto:owner-src-
> > > committers@freebsd.org] On Behalf Of Slawa Olhovchenkov
> > > Sent: Wednesday, August 27, 2014 7:09 AM
> > > To: Andrew Thompson
> > > Cc: src-committers@freebsd.org; svn-src-all@freebsd.org; svn-src-
> > > stable@freebsd.org; svn-src-stable-10@freebsd.org
> > > Subject: Re: svn commit: r270644 -
stable/10/usr.sbin/bsdinstall/scripts
> > >
> > > On Tue, Aug 26, 2014 at 02:31:37AM +0000, Andrew Thompson wrote:
> > >
> > > In zfs directory layout you missing some separate datesets:
> > >
> > > usr/home (or, may be, just /home)
> > > usr/obj
> > > usr/ports/packages
> > > usr/ports/distfiles
> > >
> > > Can you do it before 10.1?
> >
> > You must have missed the following in the evolution of that script:
> >
> > http://svnweb.freebsd.org/base?view=revision&revision=257842
> >
> > [snip]
> > + Remove some unnecessary default ZFS datasets from the automatic
> "zfsboot"
> >   script. Such as: /usr/ports/distfiles /usr/ports/packages /usr/obj
/var/db
> >   /var/empty /var/mail and /var/run (these can all be created as-needed
> once
> >   the system is installed).
> > [/snip]
> >
> > The idea is that all of those directories you mentioned are empty
> > by default on a freshly installed system. Compare that to directories
> > which are not empty -- if the user wants the data in a separate
> > dataset, they have salvage existing data in the process.
> 
> /home is not empty on a freshly installed system (I am create account
> for remoty login).
> 

I quote from your above test: "usr/home (or, may be, just /home)"

On a freshly installed 10-STABLE snapshot:
root@zbeastie:~ # ls /home
ls: /home: No such file or directory
root@zbeastie:~ # ls /usr/home
root@zbeastie:~ # df -h /usr/home
Filesystem        Size    Used   Avail Capacity  Mounted on
zroot/usr/home     17G     96K     17G     0%    /usr/home

Now compare that to the following code:
http://svnweb.freebsd.org/base/head/usr.sbin/bsdinstall/scripts/zfsboot?view
=markup

Read: There is a /usr/home already -- what's the issue?


> Other datasets have special atributes and removing datasets is simples
> then creating and to easy to forget create their before use.

Perhaps; but if you're really deploying that many systems (to which it is
a need that each be setup in the same [custom] manner), you really
out to make a custom installer.

Just rip open the installer ISO, create the following file:

FILE: /etc/installerconfig
ZFSBOOT_DATASETS="
	# your custom settings here -- see /usr/libexec/bsdinstall/zfsboot
" # END-QUOTE

Then repack the ISO and use that instead of the generic release media.
-- 
Devin


From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 03:18:28 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 56C006F1;
 Thu, 28 Aug 2014 03:18:28 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 417291217;
 Thu, 28 Aug 2014 03:18:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7S3ISki061410;
 Thu, 28 Aug 2014 03:18:28 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7S3IRKj061407;
 Thu, 28 Aug 2014 03:18:27 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201408280318.s7S3IRKj061407@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: adrian set sender to
 adrian@FreeBSD.org using -f
From: Adrian Chadd 
Date: Thu, 28 Aug 2014 03:18:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270738 - head/sys/dev/iwn
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 03:18:28 -0000

Author: adrian
Date: Thu Aug 28 03:18:27 2014
New Revision: 270738
URL: http://svnweb.freebsd.org/changeset/base/270738

Log:
  Fix antenna configuration, microcode version checks and rate selection
  in preparation for the 5300 3x3 NIC.
  
  During this particular adventure, I did indeed discover that a whole
  swath of things made little to no sense.
  
  Those included, and are fixed here:
  
  * A lot of the antenna configuration bits assume the NIC has two receive
    chains.  That's blatantly untrue for NICs that don't.
  * There was some disconnect between the antenna configuration when
    forming a PLCP rate DWORD (which includes the transmit antenna
    configuration), separate to the link quality antenna configuration.
  
    So now there's helper functions to return which antenna configurations
    to use and those are used wherever an antenna config is required.
  
  * The 5300 does up to three stream TX/RX (so MCS0->23), however
    the link quality table has only 16 slots.  This means all of the
    rate entries are .. well, dual-stream rates.  If this is the case,
    the "last MIMO" parameter can't be 16 or it panics the firmware.
    Set it to 15.
  
  * .. and since yes it has 16 slots, it only would try retransmitting
    from MCS8->MCS23, which can be quite .. terrible.  Hard-code the last
    two retry slots to be the lowest configured rate.
  
  * I noticed some transmit configuration command stuff is different
    based on firmware API version, so I lifted that code from Linux.
  
  * Add / augment some more logging to make it easier to capture this
    stuff.
  
  Now, 3x3 is still terrible because the link quality configuration is
  plainly not good enough.  I'll have to think about that.
  However, the original goal of this - 3x3 operation on the Intel
  5300 NIC - actually worked.
  
  There are also rate control bugs in the way this driver handles
  notifying the net80211 rate control code when AMPDU is enabled.
  It always steps the rate up to the maximum rate possible - and
  this eventually ends in much sadness.  I'll fix that later.
  
  As a side note - 2GHz HT40 now works on all the NICs I have tested.
  
  As a second side note - this exposed some bad 3x3 behaviour in
  the ath(4) rate control code where it starts off at a 3-stream rate
  and doesn't downgrade quickly enough.  This makes the initial
  dhcp exchange take a long time.  I'll fix the ath(4) rate code
  to start at a low fixed 1x1 MCS rate and step up if everything
  works out.
  
  Tested:
  
  * Intel 2200
  * Intel 2230
  * Intel 5300
  * Intel 5100
  * Intel 6205
  * Intel 100
  
  TODO:
  
  * Test the other NICs more thoroughly!
  
  Thank you to Michael Kosarev  for donating the
  Intel 5300 NIC and pestering me about it since last year to try and
  make it all work.

Modified:
  head/sys/dev/iwn/if_iwn.c
  head/sys/dev/iwn/if_iwnreg.h
  head/sys/dev/iwn/if_iwnvar.h

Modified: head/sys/dev/iwn/if_iwn.c
==============================================================================
--- head/sys/dev/iwn/if_iwn.c	Thu Aug 28 01:15:56 2014	(r270737)
+++ head/sys/dev/iwn/if_iwn.c	Thu Aug 28 03:18:27 2014	(r270738)
@@ -393,6 +393,15 @@ iwn_probe(device_t dev)
 }
 
 static int
+iwn_is_3stream_device(struct iwn_softc *sc)
+{
+	/* XXX for now only 5300, until the 5350 can be tested */
+	if (sc->hw_type == IWN_HW_REV_TYPE_5300)
+		return (1);
+	return (0);
+}
+
+static int
 iwn_attach(device_t dev)
 {
 	struct iwn_softc *sc = (struct iwn_softc *)device_get_softc(dev);
@@ -594,21 +603,16 @@ iwn_attach(device_t dev)
 		ic->ic_txstream = sc->ntxchains;
 
 		/*
-		 * The NICs we currently support cap out at 2x2 support
-		 * separate from the chains being used.
-		 *
-		 * This is a total hack to work around that until some
-		 * per-device method is implemented to return the
-		 * actual stream support.
-		 *
-		 * XXX Note: the 5350 is a 3x3 device; so we shouldn't
-		 * cap this!  But, anything that touches rates in the
-		 * driver needs to be audited first before 3x3 is enabled.
+		 * Some of the 3 antenna devices (ie, the 4965) only supports
+		 * 2x2 operation.  So correct the number of streams if
+		 * it's not a 3-stream device.
 		 */
-		if (ic->ic_rxstream > 2)
-			ic->ic_rxstream = 2;
-		if (ic->ic_txstream > 2)
-			ic->ic_txstream = 2;
+		if (! iwn_is_3stream_device(sc)) {
+			if (ic->ic_rxstream > 2)
+				ic->ic_rxstream = 2;
+			if (ic->ic_txstream > 2)
+				ic->ic_txstream = 2;
+		}
 
 		ic->ic_htcaps =
 			  IEEE80211_HTCAP_SMPS_OFF	/* SMPS mode disabled */
@@ -2633,6 +2637,52 @@ rate2plcp(int rate)
 	return 0;
 }
 
+static int
+iwn_get_1stream_tx_antmask(struct iwn_softc *sc)
+{
+
+	return IWN_LSB(sc->txchainmask);
+}
+
+static int
+iwn_get_2stream_tx_antmask(struct iwn_softc *sc)
+{
+	int tx;
+
+	/*
+	 * The '2 stream' setup is a bit .. odd.
+	 *
+	 * For NICs that support only 1 antenna, default to IWN_ANT_AB or
+	 * the firmware panics (eg Intel 5100.)
+	 *
+	 * For NICs that support two antennas, we use ANT_AB.
+	 *
+	 * For NICs that support three antennas, we use the two that
+	 * wasn't the default one.
+	 *
+	 * XXX TODO: if bluetooth (full concurrent) is enabled, restrict
+	 * this to only one antenna.
+	 */
+
+	/* Default - transmit on the other antennas */
+	tx = (sc->txchainmask & ~IWN_LSB(sc->txchainmask));
+
+	/* Now, if it's zero, set it to IWN_ANT_AB, so to not panic firmware */
+	if (tx == 0)
+		tx = IWN_ANT_AB;
+
+	/*
+	 * If the NIC is a two-stream TX NIC, configure the TX mask to
+	 * the default chainmask
+	 */
+	else if (sc->ntxchains == 2)
+		tx = sc->txchainmask;
+
+	return (tx);
+}
+
+
+
 /*
  * Calculate the required PLCP value from the given rate,
  * to the given node.
@@ -2646,14 +2696,9 @@ iwn_rate_to_plcp(struct iwn_softc *sc, s
 {
 #define	RV(v)	((v) & IEEE80211_RATE_VAL)
 	struct ieee80211com *ic = ni->ni_ic;
-	uint8_t txant1, txant2;
 	uint32_t plcp = 0;
 	int ridx;
 
-	/* Use the first valid TX antenna. */
-	txant1 = IWN_LSB(sc->txchainmask);
-	txant2 = IWN_LSB(sc->txchainmask & ~txant1);
-
 	/*
 	 * If it's an MCS rate, let's set the plcp correctly
 	 * and set the relevant flags based on the node config.
@@ -2685,15 +2730,15 @@ iwn_rate_to_plcp(struct iwn_softc *sc, s
 		}
 
 		/*
-		 * If it's a two stream rate, enable TX on both
-		 * antennas.
-		 *
-		 * XXX three stream rates?
+		 * Ensure the selected rate matches the link quality
+		 * table entries being used.
 		 */
-		if (rate > 0x87)
-			plcp |= IWN_RFLAG_ANT(txant1 | txant2);
+		if (rate > 0x8f)
+			plcp |= IWN_RFLAG_ANT(sc->txchainmask);
+		else if (rate > 0x87)
+			plcp |= IWN_RFLAG_ANT(iwn_get_2stream_tx_antmask(sc));
 		else
-			plcp |= IWN_RFLAG_ANT(txant1);
+			plcp |= IWN_RFLAG_ANT(iwn_get_1stream_tx_antmask(sc));
 	} else {
 		/*
 		 * Set the initial PLCP - fine for both
@@ -2715,7 +2760,8 @@ iwn_rate_to_plcp(struct iwn_softc *sc, s
 			plcp |= IWN_RFLAG_CCK;
 
 		/* Set antenna configuration */
-		plcp |= IWN_RFLAG_ANT(txant1);
+		/* XXX TODO: is this the right antenna to use for legacy? */
+		plcp |= IWN_RFLAG_ANT(iwn_get_1stream_tx_antmask(sc));
 	}
 
 	DPRINTF(sc, IWN_DEBUG_TXRATE, "%s: rate=0x%02x, plcp=0x%08x\n",
@@ -3047,8 +3093,9 @@ iwn_rx_compressed_ba(struct iwn_softc *s
 	uint16_t ssn;
 	uint8_t tid;
 	int ackfailcnt = 0, i, lastidx, qid, *res, shift;
+	int tx_ok = 0, tx_err = 0;
 
-	DPRINTF(sc, IWN_DEBUG_TRACE, "->%s begin\n", __func__);
+	DPRINTF(sc, IWN_DEBUG_TRACE | IWN_DEBUG_XMIT, "->%s begin\n", __func__);
 
 	bus_dmamap_sync(sc->rxq.data_dmat, data->map, BUS_DMASYNC_POSTREAD);
 
@@ -3108,17 +3155,19 @@ iwn_rx_compressed_ba(struct iwn_softc *s
 	for (i = 0; bitmap; i++) {
 		if ((bitmap & 1) == 0) {
 			ifp->if_oerrors++;
+			tx_err ++;
 			ieee80211_ratectl_tx_complete(ni->ni_vap, ni,
 			    IEEE80211_RATECTL_TX_FAILURE, &ackfailcnt, NULL);
 		} else {
 			ifp->if_opackets++;
+			tx_ok ++;
 			ieee80211_ratectl_tx_complete(ni->ni_vap, ni,
 			    IEEE80211_RATECTL_TX_SUCCESS, &ackfailcnt, NULL);
 		}
 		bitmap >>= 1;
 	}
 
-	DPRINTF(sc, IWN_DEBUG_TRACE, "->%s: end\n",__func__);
+	DPRINTF(sc, IWN_DEBUG_TRACE | IWN_DEBUG_XMIT, "->%s: end; %d ok; %d err\n",__func__, tx_ok, tx_err);
 
 }
 
@@ -4441,12 +4490,13 @@ iwn_tx_data(struct iwn_softc *sc, struct
 	data->ni = ni;
 
 	DPRINTF(sc, IWN_DEBUG_XMIT,
-	    "%s: qid %d idx %d len %d nsegs %d rate %04x plcp 0x%08x\n",
+	    "%s: qid %d idx %d len %d nsegs %d flags 0x%08x rate 0x%04x plcp 0x%08x\n",
 	    __func__,
 	    ring->qid,
 	    ring->cur,
 	    m->m_pkthdr.len,
 	    nsegs,
+	    flags,
 	    rate,
 	    tx->rate);
 
@@ -4697,7 +4747,7 @@ iwn_raw_xmit(struct ieee80211_node *ni, 
 	struct iwn_softc *sc = ifp->if_softc;
 	int error = 0;
 
-	DPRINTF(sc, IWN_DEBUG_TRACE, "->%s begin\n", __func__);
+	DPRINTF(sc, IWN_DEBUG_XMIT | IWN_DEBUG_TRACE, "->%s begin\n", __func__);
 
 	if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) {
 		ieee80211_free_node(ni);
@@ -4728,7 +4778,7 @@ iwn_raw_xmit(struct ieee80211_node *ni, 
 
 	IWN_UNLOCK(sc);
 
-	DPRINTF(sc, IWN_DEBUG_TRACE, "->%s: end\n",__func__);
+	DPRINTF(sc, IWN_DEBUG_TRACE | IWN_DEBUG_XMIT, "->%s: end\n",__func__);
 
 	return error;
 }
@@ -4752,6 +4802,8 @@ iwn_start_locked(struct ifnet *ifp)
 
 	IWN_LOCK_ASSERT(sc);
 
+	DPRINTF(sc, IWN_DEBUG_XMIT, "%s: called\n", __func__);
+
 	if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0 ||
 	    (ifp->if_drv_flags & IFF_DRV_OACTIVE))
 		return;
@@ -4772,6 +4824,8 @@ iwn_start_locked(struct ifnet *ifp)
 		}
 		sc->sc_tx_timer = 5;
 	}
+
+	DPRINTF(sc, IWN_DEBUG_XMIT, "%s: done\n", __func__);
 }
 
 static void
@@ -4974,49 +5028,15 @@ iwn_set_link_quality(struct iwn_softc *s
 	struct iwn_node *wn = (void *)ni;
 	struct ieee80211_rateset *rs;
 	struct iwn_cmd_link_quality linkq;
-	uint8_t txant;
 	int i, rate, txrate;
 	int is_11n;
 
 	DPRINTF(sc, IWN_DEBUG_TRACE, "->%s begin\n", __func__);
 
-	/* Use the first valid TX antenna. */
-	txant = IWN_LSB(sc->txchainmask);
-
 	memset(&linkq, 0, sizeof linkq);
 	linkq.id = wn->id;
-	linkq.antmsk_1stream = txant;
-
-	/*
-	 * The '2 stream' setup is a bit .. odd.
-	 *
-	 * For NICs that support only 1 antenna, default to IWN_ANT_AB or
-	 * the firmware panics (eg Intel 5100.)
-	 *
-	 * For NICs that support two antennas, we use ANT_AB.
-	 *
-	 * For NICs that support three antennas, we use the two that
-	 * wasn't the default one.
-	 *
-	 * XXX TODO: if bluetooth (full concurrent) is enabled, restrict
-	 * this to only one antenna.
-	 */
-
-	/* So - if there's no secondary antenna, assume IWN_ANT_AB */
-
-	/* Default - transmit on the other antennas */
-	linkq.antmsk_2stream = (sc->txchainmask & ~IWN_LSB(sc->txchainmask));
-
-	/* Now, if it's zero, set it to IWN_ANT_AB, so to not panic firmware */
-	if (linkq.antmsk_2stream == 0)
-		linkq.antmsk_2stream = IWN_ANT_AB;
-
-	/*
-	 * If the NIC is a two-stream TX NIC, configure the TX mask to
-	 * the default chainmask
-	 */
-	else if (sc->ntxchains == 2)
-		linkq.antmsk_2stream = sc->txchainmask;
+	linkq.antmsk_1stream = iwn_get_1stream_tx_antmask(sc);
+	linkq.antmsk_2stream = iwn_get_2stream_tx_antmask(sc);
 
 	linkq.ampdu_max = 32;		/* XXX negotiated? */
 	linkq.ampdu_threshold = 3;
@@ -5053,21 +5073,28 @@ iwn_set_link_quality(struct iwn_softc *s
 	for (i = 0; i < IWN_MAX_TX_RETRIES; i++) {
 		uint32_t plcp;
 
+		/*
+		 * XXX TODO: ensure the last two slots are the two lowest
+		 * rate entries, just for now.
+		 */
+		if (i == 14 || i == 15)
+			txrate = 0;
+
 		if (is_11n)
 			rate = IEEE80211_RATE_MCS | rs->rs_rates[txrate];
 		else
 			rate = RV(rs->rs_rates[txrate]);
 
+		/* Do rate -> PLCP config mapping */
+		plcp = iwn_rate_to_plcp(sc, ni, rate);
+		linkq.retry[i] = plcp;
 		DPRINTF(sc, IWN_DEBUG_XMIT,
-		    "%s: i=%d, txrate=%d, rate=0x%02x\n",
+		    "%s: i=%d, txrate=%d, rate=0x%02x, plcp=0x%08x\n",
 		    __func__,
 		    i,
 		    txrate,
-		    rate);
-
-		/* Do rate -> PLCP config mapping */
-		plcp = iwn_rate_to_plcp(sc, ni, rate);
-		linkq.retry[i] = plcp;
+		    rate,
+		    le32toh(plcp));
 
 		/*
 		 * The mimo field is an index into the table which
@@ -5088,6 +5115,15 @@ iwn_set_link_quality(struct iwn_softc *s
 		if (txrate > 0)
 			txrate--;
 	}
+	/*
+	 * If we reached the end of the list and indeed we hit
+	 * all MIMO rates (eg 5300 doing MCS23-15) then yes,
+	 * set mimo to 15.  Setting it to 16 panics the firmware.
+	 */
+	if (linkq.mimo > 15)
+		linkq.mimo = 15;
+
+	DPRINTF(sc, IWN_DEBUG_XMIT, "%s: mimo = %d\n", __func__, linkq.mimo);
 
 	DPRINTF(sc, IWN_DEBUG_TRACE, "->%s: end\n",__func__);
 
@@ -5125,13 +5161,14 @@ iwn_add_broadcast_node(struct iwn_softc 
 
 	memset(&linkq, 0, sizeof linkq);
 	linkq.id = sc->broadcast_id;
-	linkq.antmsk_1stream = txant;
-	linkq.antmsk_2stream = IWN_ANT_AB;
+	linkq.antmsk_1stream = iwn_get_1stream_tx_antmask(sc);
+	linkq.antmsk_2stream = iwn_get_2stream_tx_antmask(sc);
 	linkq.ampdu_max = 64;
 	linkq.ampdu_threshold = 3;
 	linkq.ampdu_limit = htole16(4000);	/* 4ms */
 
 	/* Use lowest mandatory bit-rate. */
+	/* XXX rate table lookup? */
 	if (IEEE80211_IS_CHAN_5GHZ(ic->ic_curchan))
 		linkq.retry[0] = htole32(0xd);
 	else
@@ -5438,6 +5475,7 @@ iwn5000_set_txpower(struct iwn_softc *sc
     int async)
 {
 	struct iwn5000_cmd_txpower cmd;
+	int cmdid;
 
 	DPRINTF(sc, IWN_DEBUG_TRACE, "->Doing %s\n", __func__);
 
@@ -5449,8 +5487,15 @@ iwn5000_set_txpower(struct iwn_softc *sc
 	cmd.global_limit = 2 * IWN5000_TXPOWER_MAX_DBM;	/* 16 dBm */
 	cmd.flags = IWN5000_TXPOWER_NO_CLOSED;
 	cmd.srv_limit = IWN5000_TXPOWER_AUTO;
-	DPRINTF(sc, IWN_DEBUG_CALIBRATE, "%s: setting TX power\n", __func__);
-	return iwn_cmd(sc, IWN_CMD_TXPOWER_DBM, &cmd, sizeof cmd, async);
+	DPRINTF(sc, IWN_DEBUG_CALIBRATE | IWN_DEBUG_XMIT,
+	    "%s: setting TX power; rev=%d\n",
+	    __func__,
+	    IWN_UCODE_API(sc->ucode_rev));
+	if (IWN_UCODE_API(sc->ucode_rev) == 1)
+		cmdid = IWN_CMD_TXPOWER_DBM_V1;
+	else
+		cmdid = IWN_CMD_TXPOWER_DBM;
+	return iwn_cmd(sc, cmdid, &cmd, sizeof cmd, async);
 }
 
 /*
@@ -5650,7 +5695,7 @@ iwn_collect_noise(struct iwn_softc *sc,
 	for (i = 0; i < 3; i++)
 		if (val - calib->rssi[i] > 15 * 20)
 			sc->chainmask &= ~(1 << i);
-	DPRINTF(sc, IWN_DEBUG_CALIBRATE,
+	DPRINTF(sc, IWN_DEBUG_CALIBRATE | IWN_DEBUG_XMIT,
 	    "%s: RX chains mask: theoretical=0x%x, actual=0x%x\n",
 	    __func__, sc->rxchainmask, sc->chainmask);
 
@@ -5775,7 +5820,7 @@ iwn5000_set_gains(struct iwn_softc *sc)
 				cmd.gain[i - 1] |= 1 << 2;	/* sign bit */
 		}
 	}
-	DPRINTF(sc, IWN_DEBUG_CALIBRATE,
+	DPRINTF(sc, IWN_DEBUG_CALIBRATE | IWN_DEBUG_XMIT,
 	    "setting differential gains Ant B/C: %x/%x (%x)\n",
 	    cmd.gain[0], cmd.gain[1], sc->chainmask);
 	return iwn_cmd(sc, IWN_CMD_PHY_CALIB, &cmd, sizeof cmd, 1);
@@ -6309,9 +6354,10 @@ iwn_config(struct iwn_softc *sc)
 	}
 
 	/* Configure valid TX chains for >=5000 Series. */
-	if (sc->hw_type != IWN_HW_REV_TYPE_4965) {
+	if (sc->hw_type != IWN_HW_REV_TYPE_4965 &&
+	    IWN_UCODE_API(sc->ucode_rev) > 1) {
 		txmask = htole32(sc->txchainmask);
-		DPRINTF(sc, IWN_DEBUG_RESET,
+		DPRINTF(sc, IWN_DEBUG_RESET | IWN_DEBUG_XMIT,
 		    "%s: configuring valid TX chains 0x%x\n", __func__, txmask);
 		error = iwn_cmd(sc, IWN5000_CMD_TX_ANT_CONFIG, &txmask,
 		    sizeof txmask, 0);
@@ -6367,11 +6413,24 @@ iwn_config(struct iwn_softc *sc)
 	sc->rxon->ht_single_mask = 0xff;
 	sc->rxon->ht_dual_mask = 0xff;
 	sc->rxon->ht_triple_mask = 0xff;
+	/*
+	 * In active association mode, ensure that
+	 * all the receive chains are enabled.
+	 *
+	 * Since we're not yet doing SMPS, don't allow the
+	 * number of idle RX chains to be less than the active
+	 * number.
+	 */
 	rxchain =
 	    IWN_RXCHAIN_VALID(sc->rxchainmask) |
-	    IWN_RXCHAIN_MIMO_COUNT(2) |
-	    IWN_RXCHAIN_IDLE_COUNT(2);
+	    IWN_RXCHAIN_MIMO_COUNT(sc->nrxchains) |
+	    IWN_RXCHAIN_IDLE_COUNT(sc->nrxchains);
 	sc->rxon->rxchain = htole16(rxchain);
+	DPRINTF(sc, IWN_DEBUG_RESET | IWN_DEBUG_XMIT,
+	    "%s: rxchainmask=0x%x, nrxchains=%d\n",
+	    __func__,
+	    sc->rxchainmask,
+	    sc->nrxchains);
 	DPRINTF(sc, IWN_DEBUG_RESET, "%s: setting configuration\n", __func__);
 	if (sc->sc_is_scanning)
 		device_printf(sc->sc_dev,
@@ -7806,6 +7865,8 @@ iwn_read_firmware_leg(struct iwn_softc *
 	ptr = (const uint32_t *)fw->data;
 	rev = le32toh(*ptr++);
 
+	sc->ucode_rev = rev;
+
 	/* Check firmware API version. */
 	if (IWN_FW_API(rev) <= 1) {
 		device_printf(sc->sc_dev,
@@ -7871,6 +7932,7 @@ iwn_read_firmware_tlv(struct iwn_softc *
 	}
 	DPRINTF(sc, IWN_DEBUG_RESET, "FW: \"%.64s\", build 0x%x\n", hdr->descr,
 	    le32toh(hdr->build));
+	sc->ucode_rev = le32toh(hdr->rev);
 
 	/*
 	 * Select the closest supported alternative that is less than
@@ -8018,6 +8080,8 @@ iwn_read_firmware(struct iwn_softc *sc)
 		return error;
 	}
 
+	device_printf(sc->sc_dev, "%s: ucode rev=0x%08x\n", __func__, sc->ucode_rev);
+
 	/* Make sure text and data sections fit in hardware memory. */
 	if (fw->main.textsz > sc->fw_text_maxsz ||
 	    fw->main.datasz > sc->fw_data_maxsz ||

Modified: head/sys/dev/iwn/if_iwnreg.h
==============================================================================
--- head/sys/dev/iwn/if_iwnreg.h	Thu Aug 28 01:15:56 2014	(r270737)
+++ head/sys/dev/iwn/if_iwnreg.h	Thu Aug 28 03:18:27 2014	(r270738)
@@ -489,6 +489,7 @@ struct iwn_tx_cmd {
 #define IWN_CMD_TXPOWER_DBM		149
 #define IWN_CMD_TXPOWER			151
 #define IWN5000_CMD_TX_ANT_CONFIG	152
+#define IWN_CMD_TXPOWER_DBM_V1		152
 #define IWN_CMD_BT_COEX			155
 #define IWN_CMD_GET_STATISTICS		156
 #define IWN_CMD_SET_CRITICAL_TEMP	164

Modified: head/sys/dev/iwn/if_iwnvar.h
==============================================================================
--- head/sys/dev/iwn/if_iwnvar.h	Thu Aug 28 01:15:56 2014	(r270737)
+++ head/sys/dev/iwn/if_iwnvar.h	Thu Aug 28 03:18:27 2014	(r270738)
@@ -414,6 +414,9 @@ struct iwn_softc {
 
 	/* For specific params */
 	const struct iwn_base_params *base_params;
+
+#define	IWN_UCODE_API(ver)	(((ver) & 0x0000FF00) >> 8)
+	uint32_t		ucode_rev;
 };
 
 #define IWN_LOCK_INIT(_sc) \

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 03:30:16 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 48D93B9;
 Thu, 28 Aug 2014 03:30:16 +0000 (UTC)
Received: from mail-wi0-x236.google.com (mail-wi0-x236.google.com
 [IPv6:2a00:1450:400c:c05::236])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 3AE0B1367;
 Thu, 28 Aug 2014 03:30:15 +0000 (UTC)
Received: by mail-wi0-f182.google.com with SMTP id z2so161559wiv.3
 for ; Wed, 27 Aug 2014 20:30:13 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=date:from:to:cc:subject:message-id:references:mime-version
 :content-type:content-disposition:in-reply-to:user-agent;
 bh=mTF4C2usgK6J2mQIshMfOYkUJmjaPQ8JICbgySPZi4I=;
 b=UvN6N3sjlvaWIPT97HUxFS1HhffX7yv5Nk3B+g27Lq9Sfh3UGq3dt/nV5/v579NYzI
 d96odqe0qT7tb6T2hKvPDXhuYrzQMiRzSf1R2L3QAOB5wWGLm6s4e7yxwfhOY46CXPNK
 RWvvNOhFpirz10Q2TnlsVRT+oaaXgRVwe4KBCXluC5K6bhKkkeCXoiaIaMKgaM0hNnXd
 E41y/u6eI+6Ob6rxXywqgfFMqS1SvAnvM8cwmQdAQRIgYNcQcYsbTozC5C1RJNrXqvCM
 i9pR68uGzJa8FEqqb6g5NIgl5eO97EYV3KxDzYeZ8cEIILVQLfaLfE1tThiRXPhmyOKy
 EUHQ==
X-Received: by 10.194.219.193 with SMTP id pq1mr1588043wjc.5.1409196613258;
 Wed, 27 Aug 2014 20:30:13 -0700 (PDT)
Received: from dft-labs.eu (n1x0n-1-pt.tunnel.tserv5.lon1.ipv6.he.net.
 [2001:470:1f08:1f7::2])
 by mx.google.com with ESMTPSA id kr8sm6201182wjb.20.2014.08.27.20.30.11
 for 
 (version=TLSv1.2 cipher=RC4-SHA bits=128/128);
 Wed, 27 Aug 2014 20:30:12 -0700 (PDT)
Date: Thu, 28 Aug 2014 05:30:09 +0200
From: Mateusz Guzik 
To: Konstantin Belousov 
Subject: Re: svn commit: r270444 - in head/sys: kern sys
Message-ID: <20140828033009.GA29429@dft-labs.eu>
References: <201408240904.s7O949sI083660@svn.freebsd.org>
 <201408261509.26815.jhb@freebsd.org>
 <20140826193210.GL71691@funkthat.com>
 <201408261723.10854.jhb@freebsd.org>
 <20140826215522.GG2737@kib.kiev.ua>
 <20140827165432.GA28581@dft-labs.eu>
 <20140827185903.GJ2737@kib.kiev.ua>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <20140827185903.GJ2737@kib.kiev.ua>
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: src-committers@freebsd.org, John Baldwin ,
 Mateusz Guzik , svn-src-all@freebsd.org,
 svn-src-head@freebsd.org, John-Mark Gurney 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 03:30:16 -0000

On Wed, Aug 27, 2014 at 09:59:03PM +0300, Konstantin Belousov wrote:
> On Wed, Aug 27, 2014 at 06:54:32PM +0200, Mateusz Guzik wrote:
> > So how about the following:
> 
> You need to update kinfo_proc32 in sys/compat/freebsd32/freebsd32.h
> and freebsd32_kinfo_proc_out() in kern/kern_proc.c.  Otherwise,
> 32bit kinfo_proc is broken, in particular, you can see 32 bit
> ps(1) dumping garbage.

Oops.

Tested with 32-bit ps.

diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c
index 3a0c323..38a9934 100644
--- a/bin/ps/keyword.c
+++ b/bin/ps/keyword.c
@@ -157,6 +157,7 @@ static VAR var[] = {
 	{"tdnam", "TDNAM", NULL, LJUST, tdnam, 0, CHAR, NULL, 0},
 	{"time", "TIME", NULL, USER, cputime, 0, CHAR, NULL, 0},
 	{"tpgid", "TPGID", NULL, 0, kvar, KOFF(ki_tpgid), UINT, PIDFMT, 0},
+	{"tracer", "TRACER", NULL, 0, kvar, KOFF(ki_tracer), UINT, PIDFMT, 0},
 	{"tsid", "TSID", NULL, 0, kvar, KOFF(ki_tsid), UINT, PIDFMT, 0},
 	{"tsiz", "TSIZ", NULL, 0, kvar, KOFF(ki_tsize), PGTOK, "ld", 0},
 	{"tt", "TT ", NULL, 0, tname, 0, CHAR, NULL, 0},
diff --git a/bin/ps/ps.1 b/bin/ps/ps.1
index d8e56fb..294ecf9 100644
--- a/bin/ps/ps.1
+++ b/bin/ps/ps.1
@@ -29,7 +29,7 @@
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
 .\" $FreeBSD$
 .\"
-.Dd August 7, 2014
+.Dd August 27, 2014
 .Dt PS 1
 .Os
 .Sh NAME
@@ -665,6 +665,8 @@ accumulated CPU time, user + system (alias
 .Cm cputime )
 .It Cm tpgid
 control terminal process group ID
+.It Cm tracer
+tracer process ID
 .\".It Cm trss
 .\"text resident set size (in Kbytes)
 .It Cm tsid
diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h
index 94f886e..155612b 100644
--- a/sys/compat/freebsd32/freebsd32.h
+++ b/sys/compat/freebsd32/freebsd32.h
@@ -343,6 +343,7 @@ struct kinfo_proc32 {
 	char	ki_loginclass[LOGINCLASSLEN+1];
 	char	ki_sparestrings[50];
 	int	ki_spareints[KI_NSPARE_INT];
+	int	ki_tracer;
 	int	ki_flag2;
 	int	ki_fibnum;
 	u_int	ki_cr_flags;
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index 6689186..740c4a6 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -791,6 +791,8 @@ fill_kinfo_proc_only(struct proc *p, struct kinfo_proc *kp)
 	struct ucred *cred;
 	struct sigacts *ps;
 
+	/* For proc_realparent. */
+	sx_assert(&proctree_lock, SX_LOCKED);
 	PROC_LOCK_ASSERT(p, MA_OWNED);
 	bzero(kp, sizeof(*kp));
 
@@ -920,7 +922,9 @@ fill_kinfo_proc_only(struct proc *p, struct kinfo_proc *kp)
 	kp->ki_acflag = p->p_acflag;
 	kp->ki_lock = p->p_lock;
 	if (p->p_pptr)
-		kp->ki_ppid = p->p_pptr->p_pid;
+		kp->ki_ppid = proc_realparent(p)->p_pid;
+	if (p->p_flag & P_TRACED)
+		kp->ki_tracer = p->p_pptr->p_pid;
 }
 
 /*
@@ -1166,6 +1170,7 @@ freebsd32_kinfo_proc_out(const struct kinfo_proc *ki, struct kinfo_proc32 *ki32)
 	bcopy(ki->ki_comm, ki32->ki_comm, COMMLEN + 1);
 	bcopy(ki->ki_emul, ki32->ki_emul, KI_EMULNAMELEN + 1);
 	bcopy(ki->ki_loginclass, ki32->ki_loginclass, LOGINCLASSLEN + 1);
+	CP(*ki, *ki32, ki_tracer);
 	CP(*ki, *ki32, ki_flag2);
 	CP(*ki, *ki32, ki_fibnum);
 	CP(*ki, *ki32, ki_cr_flags);
@@ -1287,10 +1292,11 @@ sysctl_kern_proc(SYSCTL_HANDLER_ARGS)
 		error = sysctl_wire_old_buffer(req, 0);
 		if (error)
 			return (error);
+		sx_slock(&proctree_lock);
 		error = pget((pid_t)name[0], PGET_CANSEE, &p);
-		if (error != 0)
-			return (error);
-		error = sysctl_out_proc(p, req, flags, 0);
+		if (error == 0)
+			error = sysctl_out_proc(p, req, flags, 0);
+		sx_sunlock(&proctree_lock);
 		return (error);
 	}
 
@@ -1318,6 +1324,7 @@ sysctl_kern_proc(SYSCTL_HANDLER_ARGS)
 	error = sysctl_wire_old_buffer(req, 0);
 	if (error != 0)
 		return (error);
+	sx_slock(&proctree_lock);
 	sx_slock(&allproc_lock);
 	for (doingzomb=0 ; doingzomb < 2 ; doingzomb++) {
 		if (!doingzomb)
@@ -1422,11 +1429,13 @@ sysctl_kern_proc(SYSCTL_HANDLER_ARGS)
 			error = sysctl_out_proc(p, req, flags, doingzomb);
 			if (error) {
 				sx_sunlock(&allproc_lock);
+				sx_sunlock(&proctree_lock);
 				return (error);
 			}
 		}
 	}
 	sx_sunlock(&allproc_lock);
+	sx_sunlock(&proctree_lock);
 	return (0);
 }
 
diff --git a/sys/sys/user.h b/sys/sys/user.h
index f7b18df..6775ff7 100644
--- a/sys/sys/user.h
+++ b/sys/sys/user.h
@@ -84,7 +84,7 @@
  * it in two places: function fill_kinfo_proc in sys/kern/kern_proc.c and
  * function kvm_proclist in lib/libkvm/kvm_proc.c .
  */
-#define	KI_NSPARE_INT	7
+#define	KI_NSPARE_INT	6
 #define	KI_NSPARE_LONG	12
 #define	KI_NSPARE_PTR	6
 
@@ -187,6 +187,7 @@ struct kinfo_proc {
 	 */
 	char	ki_sparestrings[50];	/* spare string space */
 	int	ki_spareints[KI_NSPARE_INT];	/* spare room for growth */
+	int	ki_tracer;		/* Pid of tracing process */
 	int	ki_flag2;		/* P2_* flags */
 	int	ki_fibnum;		/* Default FIB number */
 	u_int	ki_cr_flags;		/* Credential flags */


-- 
Mateusz Guzik 

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 04:20:25 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 893CE1E1;
 Thu, 28 Aug 2014 04:20:25 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 745691A26;
 Thu, 28 Aug 2014 04:20:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7S4KPRX091126;
 Thu, 28 Aug 2014 04:20:25 GMT (envelope-from bryanv@FreeBSD.org)
Received: (from bryanv@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7S4KPEF091125;
 Thu, 28 Aug 2014 04:20:25 GMT (envelope-from bryanv@FreeBSD.org)
Message-Id: <201408280420.s7S4KPEF091125@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bryanv set sender to
 bryanv@FreeBSD.org using -f
From: Bryan Venteicher 
Date: Thu, 28 Aug 2014 04:20:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270739 - stable/10/sys/dev/vmware/vmxnet3
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 04:20:25 -0000

Author: bryanv
Date: Thu Aug 28 04:20:24 2014
New Revision: 270739
URL: http://svnweb.freebsd.org/changeset/base/270739

Log:
  MFC r267632:
  
    Fix GCC compile warning: Variable(s) can be used uninitialized.
  
  PR:		193076

Modified:
  stable/10/sys/dev/vmware/vmxnet3/if_vmx.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/vmware/vmxnet3/if_vmx.c
==============================================================================
--- stable/10/sys/dev/vmware/vmxnet3/if_vmx.c	Thu Aug 28 03:18:27 2014	(r270738)
+++ stable/10/sys/dev/vmware/vmxnet3/if_vmx.c	Thu Aug 28 04:20:24 2014	(r270739)
@@ -2619,10 +2619,12 @@ vmxnet3_txq_offload_ctx(struct vmxnet3_t
 	struct ether_vlan_header *evh;
 	int offset;
 #if defined(INET)
-	struct ip *ip, iphdr;
+	struct ip *ip = NULL;
+	struct ip iphdr;
 #endif
 #if defined(INET6)
-	struct ip6_hdr *ip6, ip6hdr;
+	struct ip6_hdr *ip6 = NULL;
+	struct ip6_hdr ip6hdr;
 #endif
 
 	evh = mtod(m, struct ether_vlan_header *);

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 04:35:39 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 86AD5788;
 Thu, 28 Aug 2014 04:35:39 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5874F1B6A;
 Thu, 28 Aug 2014 04:35:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7S4ZdnV099601;
 Thu, 28 Aug 2014 04:35:39 GMT (envelope-from hselasky@FreeBSD.org)
Received: (from hselasky@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7S4Zcs8099599;
 Thu, 28 Aug 2014 04:35:39 GMT (envelope-from hselasky@FreeBSD.org)
Message-Id: <201408280435.s7S4Zcs8099599@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: hselasky set sender to
 hselasky@FreeBSD.org using -f
From: Hans Petter Selasky 
Date: Thu, 28 Aug 2014 04:35:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270740 - head/share/man/man9
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 04:35:39 -0000

Author: hselasky
Date: Thu Aug 28 04:35:38 2014
New Revision: 270740
URL: http://svnweb.freebsd.org/changeset/base/270740

Log:
  Add description of "sysctl_remove_name()" function.

Modified:
  head/share/man/man9/Makefile
  head/share/man/man9/sysctl_add_oid.9

Modified: head/share/man/man9/Makefile
==============================================================================
--- head/share/man/man9/Makefile	Thu Aug 28 04:20:24 2014	(r270739)
+++ head/share/man/man9/Makefile	Thu Aug 28 04:35:38 2014	(r270740)
@@ -1379,7 +1379,8 @@ MLINKS+=sysctl.9 SYSCTL_DECL.9 \
 	sysctl.9 SYSCTL_ULONG.9 \
 	sysctl.9 SYSCTL_UQUAD.9
 MLINKS+=sysctl_add_oid.9 sysctl_move_oid.9 \
-	sysctl_add_oid.9 sysctl_remove_oid.9
+	sysctl_add_oid.9 sysctl_remove_oid.9 \
+	sysctl_add_oid.9 sysctl_remove_name.9
 MLINKS+=sysctl_ctx_init.9 sysctl_ctx_entry_add.9 \
 	sysctl_ctx_init.9 sysctl_ctx_entry_del.9 \
 	sysctl_ctx_init.9 sysctl_ctx_entry_find.9 \

Modified: head/share/man/man9/sysctl_add_oid.9
==============================================================================
--- head/share/man/man9/sysctl_add_oid.9	Thu Aug 28 04:20:24 2014	(r270739)
+++ head/share/man/man9/sysctl_add_oid.9	Thu Aug 28 04:35:38 2014	(r270740)
@@ -27,13 +27,14 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 31, 2014
+.Dd August 28, 2014
 .Dt SYSCTL_ADD_OID 9
 .Os
 .Sh NAME
 .Nm sysctl_add_oid ,
 .Nm sysctl_move_oid ,
-.Nm sysctl_remove_oid
+.Nm sysctl_remove_oid ,
+.Nm sysctl_remove_name
 .Nd runtime sysctl tree manipulation
 .Sh SYNOPSIS
 .In sys/types.h
@@ -62,6 +63,13 @@
 .Fa "int del"
 .Fa "int recurse"
 .Fc
+.Ft int
+.Fo sysctl_remove_name
+.Fa "struct sysctl_oid *oidp"
+.Fa "const char *name"
+.Fa "int del"
+.Fa "int recurse"
+.Fc
 .Sh DESCRIPTION
 These functions provide the interface for creating and deleting sysctl
 OIDs at runtime for example during the lifetime of a module.
@@ -149,7 +157,25 @@ Be aware, though, that this may result i
 if other code sections continue to use removed subtrees.
 .El
 .Pp
-Again, in most cases the programmer should use contexts,
+The
+.Fn sysctl_remove_name
+function looks up the child node matching the
+.Fa name
+argument and then invokes the
+.Fn sysctl_remove_oid
+function on that node, passing along the
+.Fa del
+and
+.Fa recurse
+arguments.
+If a node having the specified name does not exist an error code of
+.Er ENOENT
+is returned.
+Else the error code from
+.Fn sysctl_remove_oid
+is returned.
+.Pp
+In most cases the programmer should use contexts,
 as described in
 .Xr sysctl_ctx_init 9 ,
 to keep track of created OIDs,

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 06:16:37 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 3AB95DDA;
 Thu, 28 Aug 2014 06:16:37 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 255FD1432;
 Thu, 28 Aug 2014 06:16:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7S6GbOw045802;
 Thu, 28 Aug 2014 06:16:37 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7S6Gbo1045801;
 Thu, 28 Aug 2014 06:16:37 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201408280616.s7S6Gbo1045801@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber 
Date: Thu, 28 Aug 2014 06:16:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270741 - stable/10/release/doc/en_US.ISO8859-1/relnotes
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 06:16:37 -0000

Author: gjb
Date: Thu Aug 28 06:16:36 2014
New Revision: 270741
URL: http://svnweb.freebsd.org/changeset/base/270741

Log:
  Document r269946, USDT DTrace probe improvements.
  
  Submitted by:	rpaulo
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 04:35:38 2014	(r270740)
+++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 06:16:36 2014	(r270741)
@@ -945,6 +945,15 @@
 	parameters.  This change allows &man.carp.4; interfaces to
 	be used within the &man.jail.8;.
 
+      Support for generating and compiling
+	USDT DTrace
+	probes has been improved.  DTrace
+	USDT files are now handled similar to
+	&man.lex.1; and &man.yacc.1; files, meaning support for
+	handling D files as part of the
+	build process is built into the SRCS
+	&man.make.1; environment variable.
+
       The &man.iscsictl.8; utility has been
 	updated to include a new flag, -M, which
 	allows modifying the iSCSI session

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 07:34:12 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 80737A16;
 Thu, 28 Aug 2014 07:34:12 +0000 (UTC)
Received: from zxy.spb.ru (zxy.spb.ru [195.70.199.98])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 371FF1C8C;
 Thu, 28 Aug 2014 07:34:12 +0000 (UTC)
Received: from slw by zxy.spb.ru with local (Exim 4.82 (FreeBSD))
 (envelope-from )
 id 1XMuDg-000IL4-Ci; Thu, 28 Aug 2014 11:34:08 +0400
Date: Thu, 28 Aug 2014 11:34:08 +0400
From: Slawa Olhovchenkov 
To: dteske@FreeBSD.org
Subject: Re: svn commit: r270644 - stable/10/usr.sbin/bsdinstall/scripts
Message-ID: <20140828073408.GK2075@zxy.spb.ru>
References: <201408260231.s7Q2VbCW087619@svn.freebsd.org>
 <20140827140902.GA41194@zxy.spb.ru>
 <1d0501cfc221$1114f850$333ee8f0$@FreeBSD.org>
 <20140827184832.GJ2075@zxy.spb.ru>
 <1e8b01cfc267$a266a650$e733f2f0$@FreeBSD.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1e8b01cfc267$a266a650$e733f2f0$@FreeBSD.org>
User-Agent: Mutt/1.5.23 (2014-03-12)
X-SA-Exim-Connect-IP: 
X-SA-Exim-Mail-From: slw@zxy.spb.ru
X-SA-Exim-Scanned: No (on zxy.spb.ru); SAEximRunCond expanded to false
Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org, svn-src-stable-10@freebsd.org,
 'Andrew Thompson' 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 07:34:12 -0000

On Wed, Aug 27, 2014 at 07:27:37PM -0700, dteske@FreeBSD.org wrote:

> Now compare that to the following code:
> http://svnweb.freebsd.org/base/head/usr.sbin/bsdinstall/scripts/zfsboot?view
> =markup
> 
> Read: There is a /usr/home already -- what's the issue?

May be best mount to /home and do symlink from /usr/home?
This is proposal. I think for ZFS install this is natural.

> > Other datasets have special atributes and removing datasets is simples
> > then creating and to easy to forget create their before use.
> 
> Perhaps; but if you're really deploying that many systems (to which it is
> a need that each be setup in the same [custom] manner), you really
> out to make a custom installer.

In some cases I do remote setup where install image supplayed for me.

> Just rip open the installer ISO, create the following file:
> 
> FILE: /etc/installerconfig
> ZFSBOOT_DATASETS="
> 	# your custom settings here -- see /usr/libexec/bsdinstall/zfsboot
> " # END-QUOTE

I see this but don't correlate with actual ZFS layout:

/usr in real not copressed, /usr/ports is compressed.
I don't see compression options for /usr/ports in ZFSBOOT_DATASETS, how it work?!

> Then repack the ISO and use that instead of the generic release media.

And do it for each new release?
What about "advanced options" with checkboxes for optional dataset?

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 07:44:59 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id BF200DBF;
 Thu, 28 Aug 2014 07:44:59 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AA9411D6F;
 Thu, 28 Aug 2014 07:44:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7S7ixY6088563;
 Thu, 28 Aug 2014 07:44:59 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7S7ixh5088562;
 Thu, 28 Aug 2014 07:44:59 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201408280744.s7S7ixh5088562@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: adrian set sender to
 adrian@FreeBSD.org using -f
From: Adrian Chadd 
Date: Thu, 28 Aug 2014 07:44:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270742 - head/sys/dev/iwn
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 07:44:59 -0000

Author: adrian
Date: Thu Aug 28 07:44:59 2014
New Revision: 270742
URL: http://svnweb.freebsd.org/changeset/base/270742

Log:
  Inform the rate control code if a single frame AMPDU transmission succeeds
  but has some retries.
  
  Without this, single frame transmission in AMPDU will always look like
  it succeeded fine, and thus AMRR will think it's totally fine to just
  keep upping the rate upwards.
  
  Now, this is still not quite right!  For multi-frame aggregates the
  completion happens in two parts - the TX done and the BA received.
  The driver is currently double accounting those a little - there's no
  way to say to the rate control code "I completed X frames, Y worked fine,
  there were Z retries." And it's a bit odd with iwn, as the firmware
  retransmits frames for us so we don't get to see how many retransmits
  happened; only that it took longer than normal.  I may have to extend
  the rate control API to properly track that.
  
  So this may keep the rate lower than it should be, but that's better
  than keeping it higher than it should be.
  
  Tested:
  
  * 5100, STA mode

Modified:
  head/sys/dev/iwn/if_iwn.c

Modified: head/sys/dev/iwn/if_iwn.c
==============================================================================
--- head/sys/dev/iwn/if_iwn.c	Thu Aug 28 06:16:36 2014	(r270741)
+++ head/sys/dev/iwn/if_iwn.c	Thu Aug 28 07:44:59 2014	(r270742)
@@ -213,7 +213,7 @@ static void	iwn5000_tx_done(struct iwn_s
 		    struct iwn_rx_data *);
 static void	iwn_tx_done(struct iwn_softc *, struct iwn_rx_desc *, int,
 		    uint8_t);
-static void	iwn_ampdu_tx_done(struct iwn_softc *, int, int, int, void *);
+static void	iwn_ampdu_tx_done(struct iwn_softc *, int, int, int, int, void *);
 static void	iwn_cmd_done(struct iwn_softc *, struct iwn_rx_desc *);
 static void	iwn_notif_intr(struct iwn_softc *);
 static void	iwn_wakeup_intr(struct iwn_softc *);
@@ -3150,6 +3150,11 @@ iwn_rx_compressed_ba(struct iwn_softc *s
 	if (wn->agg[tid].nframes > (64 - shift))
 		return;
 
+	/*
+	 * XXX does this correctly process an almost empty bitmap?
+	 * (since it bails out when it sees an empty bitmap, but there
+	 * may be failed bits there..)
+	 */
 	ni = tap->txa_ni;
 	bitmap = (le64toh(ba->bitmap) >> shift) & wn->agg[tid].bitmap;
 	for (i = 0; bitmap; i++) {
@@ -3426,7 +3431,7 @@ iwn4965_tx_done(struct iwn_softc *sc, st
 	bus_dmamap_sync(ring->data_dmat, data->map, BUS_DMASYNC_POSTREAD);
 	if (qid >= sc->firstaggqueue) {
 		iwn_ampdu_tx_done(sc, qid, desc->idx, stat->nframes,
-		    &stat->status);
+		    stat->ackfailcnt, &stat->status);
 	} else {
 		iwn_tx_done(sc, desc, stat->ackfailcnt,
 		    le32toh(stat->status) & 0xff);
@@ -3458,7 +3463,7 @@ iwn5000_tx_done(struct iwn_softc *sc, st
 	bus_dmamap_sync(ring->data_dmat, data->map, BUS_DMASYNC_POSTREAD);
 	if (qid >= sc->firstaggqueue) {
 		iwn_ampdu_tx_done(sc, qid, desc->idx, stat->nframes,
-		    &stat->status);
+		    stat->ackfailcnt, &stat->status);
 	} else {
 		iwn_tx_done(sc, desc, stat->ackfailcnt,
 		    le16toh(stat->status) & 0xff);
@@ -3573,7 +3578,7 @@ iwn_cmd_done(struct iwn_softc *sc, struc
 
 static void
 iwn_ampdu_tx_done(struct iwn_softc *sc, int qid, int idx, int nframes,
-    void *stat)
+    int ackfailcnt, void *stat)
 {
 	struct iwn_ops *ops = &sc->ops;
 	struct ifnet *ifp = sc->sc_ifp;
@@ -3591,6 +3596,15 @@ iwn_ampdu_tx_done(struct iwn_softc *sc, 
 	int bit, i, lastidx, *res, seqno, shift, start;
 
 	DPRINTF(sc, IWN_DEBUG_TRACE, "->%s begin\n", __func__);
+	DPRINTF(sc, IWN_DEBUG_XMIT, "%s: nframes=%d, status=0x%08x\n",
+	    __func__,
+	    nframes,
+	    *status);
+
+	tap = sc->qid2tap[qid];
+	tid = tap->txa_tid;
+	wn = (void *)tap->txa_ni;
+	ni = tap->txa_ni;
 
 	if (nframes == 1) {
 		if ((*status & 0xff) != 1 && (*status & 0xff) != 2) {
@@ -3602,15 +3616,24 @@ iwn_ampdu_tx_done(struct iwn_softc *sc, 
 			 * notification is pushed up to the rate control
 			 * layer.
 			 */
-			tap = sc->qid2tap[qid];
-			tid = tap->txa_tid;
-			wn = (void *)tap->txa_ni;
-			ni = tap->txa_ni;
 			ieee80211_ratectl_tx_complete(ni->ni_vap, ni,
 			    IEEE80211_RATECTL_TX_FAILURE, &nframes, NULL);
 		}
 	}
 
+	/*
+	 * We succeeded with some frames, so let's update how many
+	 * retries were needed for this frame.
+	 *
+	 * XXX we can't yet pass tx_complete tx_cnt and success_cnt,
+	 * le sigh.
+	 */
+	ieee80211_ratectl_tx_complete(ni->ni_vap,
+	    ni,
+	    IEEE80211_RATECTL_TX_SUCCESS,
+	    &ackfailcnt,
+	    NULL);
+
 	bitmap = 0;
 	start = idx;
 	for (i = 0; i < nframes; i++) {

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 07:57:01 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 10188169;
 Thu, 28 Aug 2014 07:57:01 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E3ABA1E50;
 Thu, 28 Aug 2014 07:57:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7S7v0Wl093299;
 Thu, 28 Aug 2014 07:57:00 GMT (envelope-from mav@FreeBSD.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7S7v0Ke093298;
 Thu, 28 Aug 2014 07:57:00 GMT (envelope-from mav@FreeBSD.org)
Message-Id: <201408280757.s7S7v0Ke093298@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org
 using -f
From: Alexander Motin 
Date: Thu, 28 Aug 2014 07:57:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270743 - stable/10/release/doc/en_US.ISO8859-1/relnotes
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 07:57:01 -0000

Author: mav
Date: Thu Aug 28 07:57:00 2014
New Revision: 270743
URL: http://svnweb.freebsd.org/changeset/base/270743

Log:
  Move some points between sections.

Modified:
  stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 07:44:59 2014	(r270742)
+++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 07:57:00 2014	(r270743)
@@ -130,30 +130,11 @@
     
       Kernel Changes
 
-      The
-	vfs.zfs.zio.use_uma &man.sysctl.8; has been
-	re-enabled.  On multi-CPU machines with enough RAM, this can
-	easily double &man.zfs.8; performance or reduce CPU usage in
-	half.  It was originally disabled due to memory and
-	KVA exhaustion problem reports, which
-	should be resolved due to several change in the VM
-	subsystem.
-
-      The
-	&man.geom.4; RAID driver has been
-	updated to support unmapped I/O.
-
       A new &man.sysctl.8;,
 	kern.panic_reboot_wait_time, has been
 	added, which allows controlling how long the system will wait
 	after &man.panic.9; before rebooting.
 
-      The &man.virtio_blk.4; driver has been
-	updated to support unmapped I/O.
-
-      The &man.virtio_scsi.4; driver has been
-	updated to support unmapped I/O.
-
       The &man.vt.4; driver has been merged
 	from &os;-CURRENT.  To enable &man.vt.4;, enter
 	set kern.vty=vt at the &man.loader.8;
@@ -233,6 +214,11 @@
 	updated to include support for the &intel; Lynx Point
 	KT AMT serial port.
 
+      The radeonkms(4)
+	driver has been updated to include 32-bit &man.ioctl.2;
+	support, allowing 32-bit applications to run on a 64-bit
+	system.
+
       A bug that would prevent
 	a &man.jail.8; from setting the correct IPv4 source address
 	with some operations that required
@@ -243,20 +229,10 @@
 	updated to support core events from the Atom™
 	Silvermont architecture.
 
-      The &man.mfi.4; driver has been
-	updated to include support for unmapped I/O.
-
-      The &man.hpt27xx.4; driver has been
-	updated with various vendor-supplied bug fixes.
-
       The &man.oce.4; driver has been updated
 	with vendor-supplied fixes for big endian support, and 20GB/s
 	and 25GB/s link speeds.
 
-      Support for unmapped I/O has been added
-	to the &man.xen.4; blkfront driver.
-
       The &os; virtual memory subsystem
 	has been updated to implement fast path for
 	the page fault handler.
@@ -544,6 +520,26 @@
       
 	Disks and Storage
 
+	The
+	  &man.geom.4; RAID driver has been
+	  updated to support unmapped I/O.
+
+	The &man.virtio_blk.4; driver has been
+	  updated to support unmapped I/O.
+
+	The &man.virtio_scsi.4; driver has been
+	  updated to support unmapped I/O.
+
+	The &man.mfi.4; driver has been
+	  updated to include support for unmapped I/O.
+
+	The &man.hpt27xx.4; driver has been
+	  updated with various vendor-supplied bug fixes.
+
+	Support for unmapped I/O has been added
+	  to the &man.xen.4; blkfront driver.
+
 	The
 	  &man.geom.8; label class is now aware of
 	  resized partitions.  This corrects an issue where
@@ -568,11 +564,6 @@
 	  disklabel64 partitioning scheme has been
 	  added to &man.gpart.8;.
 
-	The radeonkms(4)
-	  driver has been updated to include 32-bit &man.ioctl.2;
-	  support, allowing 32-bit applications to run on a 64-bit
-	  system.
-
 	The maximum number of
 	  SCSI ports in the &man.ctl.4; driver has
 	  been increased from 32 to 128.
@@ -590,6 +581,15 @@
       
 	File Systems
 
+	The
+	  vfs.zfs.zio.use_uma &man.sysctl.8; has been
+	  re-enabled.  On multi-CPU machines with enough RAM, this can
+	  easily double &man.zfs.8; performance or reduce CPU usage in
+	  half.  It was originally disabled due to memory and
+	  KVA exhaustion problem reports, which
+	  should be resolved due to several change in the VM
+	  subsystem.
+
 	A new flag, -R,
 	  has been added to the &man.fsck.ffs.8; utility.  When used,

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 08:21:46 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 58B60755;
 Thu, 28 Aug 2014 08:21:46 +0000 (UTC)
Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id EAB831186;
 Thu, 28 Aug 2014 08:21:45 +0000 (UTC)
Received: from tom.home (kib@localhost [127.0.0.1])
 by kib.kiev.ua (8.14.9/8.14.9) with ESMTP id s7S8LdDN031144
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
 Thu, 28 Aug 2014 11:21:39 +0300 (EEST)
 (envelope-from kostikbel@gmail.com)
DKIM-Filter: OpenDKIM Filter v2.9.2 kib.kiev.ua s7S8LdDN031144
Received: (from kostik@localhost)
 by tom.home (8.14.9/8.14.9/Submit) id s7S8LdX0031143;
 Thu, 28 Aug 2014 11:21:39 +0300 (EEST)
 (envelope-from kostikbel@gmail.com)
X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com
 using -f
Date: Thu, 28 Aug 2014 11:21:39 +0300
From: Konstantin Belousov 
To: Mateusz Guzik 
Subject: Re: svn commit: r270444 - in head/sys: kern sys
Message-ID: <20140828082139.GK2737@kib.kiev.ua>
References: <201408240904.s7O949sI083660@svn.freebsd.org>
 <201408261509.26815.jhb@freebsd.org>
 <20140826193210.GL71691@funkthat.com>
 <201408261723.10854.jhb@freebsd.org>
 <20140826215522.GG2737@kib.kiev.ua>
 <20140827165432.GA28581@dft-labs.eu>
 <20140827185903.GJ2737@kib.kiev.ua>
 <20140828033009.GA29429@dft-labs.eu>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature"; boundary="3zkUw7Z/8N7C7PXP"
Content-Disposition: inline
In-Reply-To: <20140828033009.GA29429@dft-labs.eu>
User-Agent: Mutt/1.5.23 (2014-03-12)
X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00,
 DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no
 autolearn_force=no version=3.4.0
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on tom.home
Cc: src-committers@freebsd.org, John Baldwin ,
 Mateusz Guzik , svn-src-all@freebsd.org,
 svn-src-head@freebsd.org, John-Mark Gurney 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 08:21:46 -0000


--3zkUw7Z/8N7C7PXP
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, Aug 28, 2014 at 05:30:09AM +0200, Mateusz Guzik wrote:
> @@ -791,6 +791,8 @@ fill_kinfo_proc_only(struct proc *p, struct kinfo_pro=
c *kp)
>  	struct ucred *cred;
>  	struct sigacts *ps;
> =20
> +	/* For proc_realparent. */
> +	sx_assert(&proctree_lock, SX_LOCKED);
>  	PROC_LOCK_ASSERT(p, MA_OWNED);
>  	bzero(kp, sizeof(*kp));
> =20
> @@ -920,7 +922,9 @@ fill_kinfo_proc_only(struct proc *p, struct kinfo_pro=
c *kp)
>  	kp->ki_acflag =3D p->p_acflag;
>  	kp->ki_lock =3D p->p_lock;
>  	if (p->p_pptr)
> -		kp->ki_ppid =3D p->p_pptr->p_pid;
> +		kp->ki_ppid =3D proc_realparent(p)->p_pid;
Is the check for p_pptr !=3D NULL still needed for the call to
proc_realparent() ? If yes, I think it indicates a bug in
proc_realparent(), which should incorporate the check, instead of
enforcing it on the callers. It seems to be there for the kernel process
(pid 0).

If the test can be removed, and proc_realparent() called unconditionally,
I suggest to remove assert about proctree_lock at the start of
fill_kinfo_proc_only(), since the check is done in proc_realparent().

Whatever decision is made there, it can be implemented after your
change is landed.  The patch looks fine for me.

--3zkUw7Z/8N7C7PXP
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBAgAGBQJT/uaSAAoJEJDCuSvBvK1BF+EP/02xcc43PmiKXHi2e3Y19Rj5
ExP+++pBMFCVh9EGZlKuEEOFatneiPhnpR1fDUY6C7zSMkZe/+fOIMP6pYifNnUw
cLWF3Vfw+1B8x1Z7L6QksqJYE7QWhutzMl2Kbh0h0Ez5x9aw6yK5oW7/NkNLHjD4
qF8MxDqasiYixF3GEtAtIEUm5PyWc75CjeU2ozdRgmUqFRrYOeJUYAcZUFToi3N/
ls+wHsMjX8J8iwVqgPkesDlfn8nqF3+Wma4P4OEUQQnu/2cYfaTg1l5JEKwuEKvY
dOFYFfqRODnlXEKvVyVbQRH2nxvyTAovIMnW6lr+DXJX6QIlda9cE9BN6NtoBgSK
RMgDnnPjxfL33TC53tZvtht4BSg5692WC1bgZ7Gkpv+9MnQ2LKIV1ppmIg2QcFIP
tjYvX5ThtM++e4yAAtopMSTobDy1uYdFokOnHny5Lwy7hBSNP2XKfoEU3VdLbj0w
CYwj3jB7KAc8N5oPSIL7mPJNdnknTmO8UdxqEROJ7vyShCZTNz+Ssa+3zRpnMUY7
V5EARl/mVSbirHtb8rWeGEsl/D8GhNE14HqGVmCS9DpffV9vAFxYBQyDCxIBWmIL
353mV9yniaaEF2J/2ZZZXmvifYt80VSJLvhQFV7CnwZwxauQ3sNvbbTuXisI1jjC
94Zl4U7Jv3jBUGKKrGhx
=nzs4
-----END PGP SIGNATURE-----

--3zkUw7Z/8N7C7PXP--

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 08:25:16 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 8A3028EA;
 Thu, 28 Aug 2014 08:25:16 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 69E0F11BE;
 Thu, 28 Aug 2014 08:25:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7S8PGau006885;
 Thu, 28 Aug 2014 08:25:16 GMT (envelope-from mav@FreeBSD.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7S8PGX7006884;
 Thu, 28 Aug 2014 08:25:16 GMT (envelope-from mav@FreeBSD.org)
Message-Id: <201408280825.s7S8PGX7006884@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org
 using -f
From: Alexander Motin 
Date: Thu, 28 Aug 2014 08:25:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270744 - stable/10/release/doc/en_US.ISO8859-1/relnotes
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 08:25:16 -0000

Author: mav
Date: Thu Aug 28 08:25:15 2014
New Revision: 270744
URL: http://svnweb.freebsd.org/changeset/base/270744

Log:
  Move more storage stuff to storage section.

Modified:
  stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 07:57:00 2014	(r270743)
+++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 08:25:15 2014	(r270744)
@@ -141,12 +141,6 @@
 	prompt during boot, or add kern.vty=vt to
 	&man.loader.conf.5; and reboot the system.
 
-      Support for MegaRAID Fury cards has been
-	added to the &man.mfi.4; driver.
-
-      The &man.aacraid.4; driver has been
-	updated to version 3.2.5.
-
       Support for &man.hwpmc.4; has been added
 	for &powerpc; 970 class processors.
 
@@ -165,51 +159,14 @@
       Support for &amd; Family 16h sensor
 	devices has been added to &man.amdtemp.4;.
 
-      Support for LUN-based CD changers has
-	been removed from the &man.cd.4; driver.
-
-      Support for 9th generation HP host bus
-	adapter cards has been added to &man.ciss.4;.
-
-      The
-	&man.mpr.4; device has been added,
-	providing support for LSI Fusion-MPT 3 12Gb SCSI/SATA
-	controllers.
-
-      The GEOM_VINUM option
-	is now able to be built both directly into the kernel or as
-	a &man.kldload.8; loadable module.
-
       The &man.uslcom.4; driver has been
 	updated to support 26 new devices.
 
-      The
-	&man.mrsas.4; driver has been added,
-	providing support for LSI MegaRAID SAS controllers.  The
-	&man.mfi.4; driver will attach to the controller, by default.
-	To enable &man.mrsas.4; add
-	hw.mfi.mrsas_enable=1 to
-	/boot/loader.conf, which turns off
-	&man.mfi.4; device probing.
-
-      
-	At this time, the &man.mfiutil.8; utility and
-	  the &os; version of
-	  MegaCLI and
-	  StorCli do not work with
-	  &man.mrsas.4;.
-      
-
       A kernel bug that inhibited proper
 	functionality of the dev.cpu.0.freq
 	&man.sysctl.8; on &intel; processors with Turbo
 	Boost™ enabled has been fixed.
 
-      The &man.geom.uncompress.4; module is
-	built by default which, similar to &man.geom.uzip.4;,
-	provides support for compressed, read-only disk
-	images.
-
       The &man.uart.4; driver has been
 	updated to include support for the &intel; Lynx Point
 	KT AMT serial port.
@@ -530,6 +487,34 @@
 	The &man.virtio_scsi.4; driver has been
 	  updated to support unmapped I/O.
 
+	Support for LUN-based CD changers has
+	  been removed from the &man.cd.4; driver.
+
+	Support for 9th generation HP host bus
+	  adapter cards has been added to &man.ciss.4;.
+
+	The
+	  &man.mpr.4; device has been added,
+	  providing support for LSI Fusion-MPT 3 12Gb SCSI/SATA
+	  controllers.
+
+	The
+	  &man.mrsas.4; driver has been added,
+	  providing support for LSI MegaRAID SAS controllers.  The
+	  &man.mfi.4; driver will attach to the controller, by default.
+	  To enable &man.mrsas.4; add
+	  hw.mfi.mrsas_enable=1 to
+	  /boot/loader.conf, which turns off
+	  &man.mfi.4; device probing.
+
+	
+	  At this time, the &man.mfiutil.8; utility and
+	    the &os; version of
+	    MegaCLI and
+	    StorCli do not work with
+	    &man.mrsas.4;.
+	
+
 	The &man.mfi.4; driver has been
 	  updated to include support for unmapped I/O.
 
@@ -553,6 +538,16 @@
 	  it easier to resize the size of a mirror when all of its
 	  components have been replaced.
 
+	Support for MegaRAID Fury cards has been
+	  added to the &man.mfi.4; driver.
+
+	The &man.aacraid.4; driver has been
+	  updated to version 3.2.5.
+
+	The GEOM_VINUM option
+	  is now able to be built both directly into the kernel or as
+	  a &man.kldload.8; loadable module.
+
 	The &man.geom.8;
 	  GEOM_PART class has been updated to
 	  support automatic partition resizing.  Changes to the
@@ -560,6 +555,11 @@
 	  gpart commit is run, and prior to saving,
 	  can be reverted with gpart undo.
 
+	The &man.geom.uncompress.4; module is
+	  built by default which, similar to &man.geom.uzip.4;,
+	  provides support for compressed, read-only disk
+	  images.
+
 	Support for the
 	  disklabel64 partitioning scheme has been
 	  added to &man.gpart.8;.

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 08:30:43 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 4C8B9A56;
 Thu, 28 Aug 2014 08:30:43 +0000 (UTC)
Received: from mail-qa0-x236.google.com (mail-qa0-x236.google.com
 [IPv6:2607:f8b0:400d:c00::236])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id CAB2B11FA;
 Thu, 28 Aug 2014 08:30:42 +0000 (UTC)
Received: by mail-qa0-f54.google.com with SMTP id x12so410400qac.27
 for ; Thu, 28 Aug 2014 01:30:42 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:date:message-id:subject
 :from:to:cc:content-type;
 bh=Kz9CRIsgIU4CG7vzTl1mnD1gelMlMCRxI4nyYgGudXk=;
 b=Wb5agCvMmWaEuAOPKdeVq2loXhMWCFdyPNgloJmrPdHTpHXjDjfmlQHNT1wwW0rizi
 PpVC2dTjEN2iAZ2+AZbSlAkL7D4c7D+bo3SGJLv6xaL7PZEGfotswiDartRMu0pWOZn1
 WYcANcLAoL4D7wdOwTGwnNFsO1+tVEHSTs3m56GKk4w4YzrVlshVStLo+ywemUmxzLb8
 q8/YOSm9LCxKgvjWSUxErGju++fA4L4dC0bBXpdbLY2PfdOuyqdGn5VDQtWmay58IXnG
 1Kc7oghAlcrdi2jCxDYOLbnT4aCo6GAcTwrilLBZ7jpYwIKrGJHKSRMv9SBNYD4M7zx8
 rc/g==
MIME-Version: 1.0
X-Received: by 10.224.86.5 with SMTP id q5mr4265508qal.36.1409214641912; Thu,
 28 Aug 2014 01:30:41 -0700 (PDT)
Sender: adrian.chadd@gmail.com
Received: by 10.224.39.139 with HTTP; Thu, 28 Aug 2014 01:30:41 -0700 (PDT)
In-Reply-To: <201407261810.s6QIAIIj049439@svn.freebsd.org>
References: <201407261810.s6QIAIIj049439@svn.freebsd.org>
Date: Thu, 28 Aug 2014 01:30:41 -0700
X-Google-Sender-Auth: EcSngS3kVmRoOKZXuovRjkSE6gI
Message-ID: 
Subject: Re: svn commit: r269134 - head/sys/vm
From: Adrian Chadd 
To: Alan Cox 
Content-Type: text/plain; charset=UTF-8
Cc: "svn-src-head@freebsd.org" ,
 "svn-src-all@freebsd.org" ,
 "src-committers@freebsd.org" 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 08:30:43 -0000

Hi Alan!

I just reverted back to the commit before this one and it fixed my MIPS32 boot.

Would you have some time to help me help you figure out why things broke? :)

Thanks!



-a


On 26 July 2014 11:10, Alan Cox  wrote:
> Author: alc
> Date: Sat Jul 26 18:10:18 2014
> New Revision: 269134
> URL: http://svnweb.freebsd.org/changeset/base/269134
>
> Log:
>   When unwiring a region of an address space, do not assume that the
>   underlying physical pages are mapped by the pmap.  If, for example, the
>   application has performed an mprotect(..., PROT_NONE) on any part of the
>   wired region, then those pages will no longer be mapped by the pmap.
>   So, using the pmap to lookup the wired pages in order to unwire them
>   doesn't always work, and when it doesn't work wired pages are leaked.
>
>   To avoid the leak, introduce and use a new function vm_object_unwire()
>   that locates the wired pages by traversing the object and its backing
>   objects.
>
>   At the same time, switch from using pmap_change_wiring() to the recently
>   introduced function pmap_unwire() for unwiring the region's mappings.
>   pmap_unwire() is faster, because it operates a range of virtual addresses
>   rather than a single virtual page at a time.  Moreover, by operating on
>   a range, it is superpage friendly.  It doesn't waste time performing
>   unnecessary demotions.
>
>   Reported by:  markj
>   Reviewed by:  kib
>   Tested by:    pho, jmg (arm)
>   Sponsored by: EMC / Isilon Storage Division
>
> Modified:
>   head/sys/vm/vm_extern.h
>   head/sys/vm/vm_fault.c
>   head/sys/vm/vm_map.c
>   head/sys/vm/vm_object.c
>   head/sys/vm/vm_object.h
>
> Modified: head/sys/vm/vm_extern.h
> ==============================================================================
> --- head/sys/vm/vm_extern.h     Sat Jul 26 17:59:25 2014        (r269133)
> +++ head/sys/vm/vm_extern.h     Sat Jul 26 18:10:18 2014        (r269134)
> @@ -81,7 +81,6 @@ int vm_fault_hold(vm_map_t map, vm_offse
>      int fault_flags, vm_page_t *m_hold);
>  int vm_fault_quick_hold_pages(vm_map_t map, vm_offset_t addr, vm_size_t len,
>      vm_prot_t prot, vm_page_t *ma, int max_count);
> -void vm_fault_unwire(vm_map_t, vm_offset_t, vm_offset_t, boolean_t);
>  int vm_fault_wire(vm_map_t, vm_offset_t, vm_offset_t, boolean_t);
>  int vm_forkproc(struct thread *, struct proc *, struct thread *, struct vmspace *, int);
>  void vm_waitproc(struct proc *);
>
> Modified: head/sys/vm/vm_fault.c
> ==============================================================================
> --- head/sys/vm/vm_fault.c      Sat Jul 26 17:59:25 2014        (r269133)
> +++ head/sys/vm/vm_fault.c      Sat Jul 26 18:10:18 2014        (r269134)
> @@ -106,6 +106,7 @@ __FBSDID("$FreeBSD$");
>  #define PFFOR 4
>
>  static int vm_fault_additional_pages(vm_page_t, int, int, vm_page_t *, int *);
> +static void vm_fault_unwire(vm_map_t, vm_offset_t, vm_offset_t, boolean_t);
>
>  #define        VM_FAULT_READ_BEHIND    8
>  #define        VM_FAULT_READ_MAX       (1 + VM_FAULT_READ_AHEAD_MAX)
> @@ -1186,7 +1187,7 @@ vm_fault_wire(vm_map_t map, vm_offset_t
>   *
>   *     Unwire a range of virtual addresses in a map.
>   */
> -void
> +static void
>  vm_fault_unwire(vm_map_t map, vm_offset_t start, vm_offset_t end,
>      boolean_t fictitious)
>  {
>
> Modified: head/sys/vm/vm_map.c
> ==============================================================================
> --- head/sys/vm/vm_map.c        Sat Jul 26 17:59:25 2014        (r269133)
> +++ head/sys/vm/vm_map.c        Sat Jul 26 18:10:18 2014        (r269134)
> @@ -132,6 +132,7 @@ static void _vm_map_init(vm_map_t map, p
>      vm_offset_t max);
>  static void vm_map_entry_deallocate(vm_map_entry_t entry, boolean_t system_map);
>  static void vm_map_entry_dispose(vm_map_t map, vm_map_entry_t entry);
> +static void vm_map_entry_unwire(vm_map_t map, vm_map_entry_t entry);
>  #ifdef INVARIANTS
>  static void vm_map_zdtor(void *mem, int size, void *arg);
>  static void vmspace_zdtor(void *mem, int size, void *arg);
> @@ -2393,16 +2394,10 @@ done:
>                     (entry->eflags & MAP_ENTRY_USER_WIRED))) {
>                         if (user_unwire)
>                                 entry->eflags &= ~MAP_ENTRY_USER_WIRED;
> -                       entry->wired_count--;
> -                       if (entry->wired_count == 0) {
> -                               /*
> -                                * Retain the map lock.
> -                                */
> -                               vm_fault_unwire(map, entry->start, entry->end,
> -                                   entry->object.vm_object != NULL &&
> -                                   (entry->object.vm_object->flags &
> -                                   OBJ_FICTITIOUS) != 0);
> -                       }
> +                       if (entry->wired_count == 1)
> +                               vm_map_entry_unwire(map, entry);
> +                       else
> +                               entry->wired_count--;
>                 }
>                 KASSERT((entry->eflags & MAP_ENTRY_IN_TRANSITION) != 0,
>                     ("vm_map_unwire: in-transition flag missing %p", entry));
> @@ -2635,19 +2630,12 @@ done:
>                          * unnecessary.
>                          */
>                         entry->wired_count = 0;
> -               } else {
> -                       if (!user_wire ||
> -                           (entry->eflags & MAP_ENTRY_USER_WIRED) == 0)
> +               } else if (!user_wire ||
> +                   (entry->eflags & MAP_ENTRY_USER_WIRED) == 0) {
> +                       if (entry->wired_count == 1)
> +                               vm_map_entry_unwire(map, entry);
> +                       else
>                                 entry->wired_count--;
> -                       if (entry->wired_count == 0) {
> -                               /*
> -                                * Retain the map lock.
> -                                */
> -                               vm_fault_unwire(map, entry->start, entry->end,
> -                                   entry->object.vm_object != NULL &&
> -                                   (entry->object.vm_object->flags &
> -                                   OBJ_FICTITIOUS) != 0);
> -                       }
>                 }
>         next_entry_done:
>                 KASSERT((entry->eflags & MAP_ENTRY_IN_TRANSITION) != 0,
> @@ -2783,9 +2771,13 @@ vm_map_sync(
>  static void
>  vm_map_entry_unwire(vm_map_t map, vm_map_entry_t entry)
>  {
> -       vm_fault_unwire(map, entry->start, entry->end,
> -           entry->object.vm_object != NULL &&
> -           (entry->object.vm_object->flags & OBJ_FICTITIOUS) != 0);
> +
> +       VM_MAP_ASSERT_LOCKED(map);
> +       KASSERT(entry->wired_count > 0,
> +           ("vm_map_entry_unwire: entry %p isn't wired", entry));
> +       pmap_unwire(map->pmap, entry->start, entry->end);
> +       vm_object_unwire(entry->object.vm_object, entry->offset, entry->end -
> +           entry->start, PQ_ACTIVE);
>         entry->wired_count = 0;
>  }
>
>
> Modified: head/sys/vm/vm_object.c
> ==============================================================================
> --- head/sys/vm/vm_object.c     Sat Jul 26 17:59:25 2014        (r269133)
> +++ head/sys/vm/vm_object.c     Sat Jul 26 18:10:18 2014        (r269134)
> @@ -2202,6 +2202,78 @@ vm_object_set_writeable_dirty(vm_object_
>         vm_object_set_flag(object, OBJ_MIGHTBEDIRTY);
>  }
>
> +/*
> + *     vm_object_unwire:
> + *
> + *     For each page offset within the specified range of the given object,
> + *     find the highest-level page in the shadow chain and unwire it.  A page
> + *     must exist at every page offset, and the highest-level page must be
> + *     wired.
> + */
> +void
> +vm_object_unwire(vm_object_t object, vm_ooffset_t offset, vm_size_t length,
> +    uint8_t queue)
> +{
> +       vm_object_t tobject;
> +       vm_page_t m, tm;
> +       vm_pindex_t end_pindex, pindex, tpindex;
> +       int depth, locked_depth;
> +
> +       KASSERT((offset & PAGE_MASK) == 0,
> +           ("vm_object_unwire: offset is not page aligned"));
> +       KASSERT((length & PAGE_MASK) == 0,
> +           ("vm_object_unwire: length is not a multiple of PAGE_SIZE"));
> +       /* The wired count of a fictitious page never changes. */
> +       if ((object->flags & OBJ_FICTITIOUS) != 0)
> +               return;
> +       pindex = OFF_TO_IDX(offset);
> +       end_pindex = pindex + atop(length);
> +       locked_depth = 1;
> +       VM_OBJECT_RLOCK(object);
> +       m = vm_page_find_least(object, pindex);
> +       while (pindex < end_pindex) {
> +               if (m == NULL || pindex < m->pindex) {
> +                       /*
> +                        * The first object in the shadow chain doesn't
> +                        * contain a page at the current index.  Therefore,
> +                        * the page must exist in a backing object.
> +                        */
> +                       tobject = object;
> +                       tpindex = pindex;
> +                       depth = 0;
> +                       do {
> +                               tpindex +=
> +                                   OFF_TO_IDX(tobject->backing_object_offset);
> +                               tobject = tobject->backing_object;
> +                               KASSERT(tobject != NULL,
> +                                   ("vm_object_unwire: missing page"));
> +                               if ((tobject->flags & OBJ_FICTITIOUS) != 0)
> +                                       goto next_page;
> +                               depth++;
> +                               if (depth == locked_depth) {
> +                                       locked_depth++;
> +                                       VM_OBJECT_RLOCK(tobject);
> +                               }
> +                       } while ((tm = vm_page_lookup(tobject, tpindex)) ==
> +                           NULL);
> +               } else {
> +                       tm = m;
> +                       m = TAILQ_NEXT(m, listq);
> +               }
> +               vm_page_lock(tm);
> +               vm_page_unwire(tm, queue);
> +               vm_page_unlock(tm);
> +next_page:
> +               pindex++;
> +       }
> +       /* Release the accumulated object locks. */
> +       for (depth = 0; depth < locked_depth; depth++) {
> +               tobject = object->backing_object;
> +               VM_OBJECT_RUNLOCK(object);
> +               object = tobject;
> +       }
> +}
> +
>  #include "opt_ddb.h"
>  #ifdef DDB
>  #include 
>
> Modified: head/sys/vm/vm_object.h
> ==============================================================================
> --- head/sys/vm/vm_object.h     Sat Jul 26 17:59:25 2014        (r269133)
> +++ head/sys/vm/vm_object.h     Sat Jul 26 18:10:18 2014        (r269134)
> @@ -291,6 +291,8 @@ void vm_object_shadow (vm_object_t *, vm
>  void vm_object_split(vm_map_entry_t);
>  boolean_t vm_object_sync(vm_object_t, vm_ooffset_t, vm_size_t, boolean_t,
>      boolean_t);
> +void vm_object_unwire(vm_object_t object, vm_ooffset_t offset,
> +    vm_size_t length, uint8_t queue);
>  #endif                         /* _KERNEL */
>
>  #endif                         /* _VM_OBJECT_ */
>

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 08:41:13 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 3A96ED4F;
 Thu, 28 Aug 2014 08:41:13 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1A6811375;
 Thu, 28 Aug 2014 08:41:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7S8fCP3012992;
 Thu, 28 Aug 2014 08:41:12 GMT (envelope-from mjg@FreeBSD.org)
Received: (from mjg@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7S8fC6X012986;
 Thu, 28 Aug 2014 08:41:12 GMT (envelope-from mjg@FreeBSD.org)
Message-Id: <201408280841.s7S8fC6X012986@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: mjg set sender to mjg@FreeBSD.org
 using -f
From: Mateusz Guzik 
Date: Thu, 28 Aug 2014 08:41:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270745 - in head: bin/ps sys/compat/freebsd32 sys/kern
 sys/sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 08:41:13 -0000

Author: mjg
Date: Thu Aug 28 08:41:11 2014
New Revision: 270745
URL: http://svnweb.freebsd.org/changeset/base/270745

Log:
  Return real parent pid in kinfo (used by e.g. ps)
  
  Add a separate field which exports tracer pid and add a new keyword
  ("tracer") for ps to display it.
  
  This is a follow up to r270444.
  
  Reviewed by:	kib
  MFC after:	1 week
  Relnotes:	yes

Modified:
  head/bin/ps/keyword.c
  head/bin/ps/ps.1
  head/sys/compat/freebsd32/freebsd32.h
  head/sys/kern/kern_proc.c
  head/sys/sys/user.h

Modified: head/bin/ps/keyword.c
==============================================================================
--- head/bin/ps/keyword.c	Thu Aug 28 08:25:15 2014	(r270744)
+++ head/bin/ps/keyword.c	Thu Aug 28 08:41:11 2014	(r270745)
@@ -157,6 +157,7 @@ static VAR var[] = {
 	{"tdnam", "TDNAM", NULL, LJUST, tdnam, 0, CHAR, NULL, 0},
 	{"time", "TIME", NULL, USER, cputime, 0, CHAR, NULL, 0},
 	{"tpgid", "TPGID", NULL, 0, kvar, KOFF(ki_tpgid), UINT, PIDFMT, 0},
+	{"tracer", "TRACER", NULL, 0, kvar, KOFF(ki_tracer), UINT, PIDFMT, 0},
 	{"tsid", "TSID", NULL, 0, kvar, KOFF(ki_tsid), UINT, PIDFMT, 0},
 	{"tsiz", "TSIZ", NULL, 0, kvar, KOFF(ki_tsize), PGTOK, "ld", 0},
 	{"tt", "TT ", NULL, 0, tname, 0, CHAR, NULL, 0},

Modified: head/bin/ps/ps.1
==============================================================================
--- head/bin/ps/ps.1	Thu Aug 28 08:25:15 2014	(r270744)
+++ head/bin/ps/ps.1	Thu Aug 28 08:41:11 2014	(r270745)
@@ -29,7 +29,7 @@
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
 .\" $FreeBSD$
 .\"
-.Dd August 7, 2014
+.Dd August 27, 2014
 .Dt PS 1
 .Os
 .Sh NAME
@@ -665,6 +665,8 @@ accumulated CPU time, user + system (ali
 .Cm cputime )
 .It Cm tpgid
 control terminal process group ID
+.It Cm tracer
+tracer process ID
 .\".It Cm trss
 .\"text resident set size (in Kbytes)
 .It Cm tsid

Modified: head/sys/compat/freebsd32/freebsd32.h
==============================================================================
--- head/sys/compat/freebsd32/freebsd32.h	Thu Aug 28 08:25:15 2014	(r270744)
+++ head/sys/compat/freebsd32/freebsd32.h	Thu Aug 28 08:41:11 2014	(r270745)
@@ -343,6 +343,7 @@ struct kinfo_proc32 {
 	char	ki_loginclass[LOGINCLASSLEN+1];
 	char	ki_sparestrings[50];
 	int	ki_spareints[KI_NSPARE_INT];
+	int	ki_tracer;
 	int	ki_flag2;
 	int	ki_fibnum;
 	u_int	ki_cr_flags;

Modified: head/sys/kern/kern_proc.c
==============================================================================
--- head/sys/kern/kern_proc.c	Thu Aug 28 08:25:15 2014	(r270744)
+++ head/sys/kern/kern_proc.c	Thu Aug 28 08:41:11 2014	(r270745)
@@ -791,6 +791,8 @@ fill_kinfo_proc_only(struct proc *p, str
 	struct ucred *cred;
 	struct sigacts *ps;
 
+	/* For proc_realparent. */
+	sx_assert(&proctree_lock, SX_LOCKED);
 	PROC_LOCK_ASSERT(p, MA_OWNED);
 	bzero(kp, sizeof(*kp));
 
@@ -920,7 +922,9 @@ fill_kinfo_proc_only(struct proc *p, str
 	kp->ki_acflag = p->p_acflag;
 	kp->ki_lock = p->p_lock;
 	if (p->p_pptr)
-		kp->ki_ppid = p->p_pptr->p_pid;
+		kp->ki_ppid = proc_realparent(p)->p_pid;
+	if (p->p_flag & P_TRACED)
+		kp->ki_tracer = p->p_pptr->p_pid;
 }
 
 /*
@@ -1166,6 +1170,7 @@ freebsd32_kinfo_proc_out(const struct ki
 	bcopy(ki->ki_comm, ki32->ki_comm, COMMLEN + 1);
 	bcopy(ki->ki_emul, ki32->ki_emul, KI_EMULNAMELEN + 1);
 	bcopy(ki->ki_loginclass, ki32->ki_loginclass, LOGINCLASSLEN + 1);
+	CP(*ki, *ki32, ki_tracer);
 	CP(*ki, *ki32, ki_flag2);
 	CP(*ki, *ki32, ki_fibnum);
 	CP(*ki, *ki32, ki_cr_flags);
@@ -1287,10 +1292,11 @@ sysctl_kern_proc(SYSCTL_HANDLER_ARGS)
 		error = sysctl_wire_old_buffer(req, 0);
 		if (error)
 			return (error);
+		sx_slock(&proctree_lock);
 		error = pget((pid_t)name[0], PGET_CANSEE, &p);
-		if (error != 0)
-			return (error);
-		error = sysctl_out_proc(p, req, flags, 0);
+		if (error == 0)
+			error = sysctl_out_proc(p, req, flags, 0);
+		sx_sunlock(&proctree_lock);
 		return (error);
 	}
 
@@ -1318,6 +1324,7 @@ sysctl_kern_proc(SYSCTL_HANDLER_ARGS)
 	error = sysctl_wire_old_buffer(req, 0);
 	if (error != 0)
 		return (error);
+	sx_slock(&proctree_lock);
 	sx_slock(&allproc_lock);
 	for (doingzomb=0 ; doingzomb < 2 ; doingzomb++) {
 		if (!doingzomb)
@@ -1422,11 +1429,13 @@ sysctl_kern_proc(SYSCTL_HANDLER_ARGS)
 			error = sysctl_out_proc(p, req, flags, doingzomb);
 			if (error) {
 				sx_sunlock(&allproc_lock);
+				sx_sunlock(&proctree_lock);
 				return (error);
 			}
 		}
 	}
 	sx_sunlock(&allproc_lock);
+	sx_sunlock(&proctree_lock);
 	return (0);
 }
 

Modified: head/sys/sys/user.h
==============================================================================
--- head/sys/sys/user.h	Thu Aug 28 08:25:15 2014	(r270744)
+++ head/sys/sys/user.h	Thu Aug 28 08:41:11 2014	(r270745)
@@ -84,7 +84,7 @@
  * it in two places: function fill_kinfo_proc in sys/kern/kern_proc.c and
  * function kvm_proclist in lib/libkvm/kvm_proc.c .
  */
-#define	KI_NSPARE_INT	7
+#define	KI_NSPARE_INT	6
 #define	KI_NSPARE_LONG	12
 #define	KI_NSPARE_PTR	6
 
@@ -187,6 +187,7 @@ struct kinfo_proc {
 	 */
 	char	ki_sparestrings[50];	/* spare string space */
 	int	ki_spareints[KI_NSPARE_INT];	/* spare room for growth */
+	int	ki_tracer;		/* Pid of tracing process */
 	int	ki_flag2;		/* P2_* flags */
 	int	ki_fibnum;		/* Default FIB number */
 	u_int	ki_cr_flags;		/* Credential flags */

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 08:47:16 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 933421C0;
 Thu, 28 Aug 2014 08:47:16 +0000 (UTC)
Received: from mail-we0-x22a.google.com (mail-we0-x22a.google.com
 [IPv6:2a00:1450:400c:c03::22a])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 85C1113A2;
 Thu, 28 Aug 2014 08:47:15 +0000 (UTC)
Received: by mail-we0-f170.google.com with SMTP id p10so425504wes.29
 for ; Thu, 28 Aug 2014 01:47:13 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=date:from:to:cc:subject:message-id:references:mime-version
 :content-type:content-disposition:in-reply-to:user-agent;
 bh=pNFmtlZ6tuMqMwUXeu485hvKN0KHvGNcJ5PdoPiKjU8=;
 b=fCp/fuBd3w7QVXqyWq4MsGzqNFi6WzQeHmi2dcnRfz8qgmdivY+DoIWS/3Qe0jr9wo
 IGGYnNbU2aY3AxlcN2nlI8HsdMCrpR35MTZnsm616edn0gWpN07Sai3pY3L5vB7RCOFQ
 coS0RW6p3rwFP1jkKHlpGOXsPvMXJDaneFRPgDSpal62PTcrO8rjsdLafBZIGFSjmimr
 kmmGbMCxpepgz2UgprIzf1rey0ByY9Sy9Rqnv57CmcUXYDEOCrWNzIXpCINeu96E4SK+
 euht2R54k4lVgzCkCW8C8KOnht7DbsMGbbTwF9NH/iWyLI1PcBStktA6VXsxjoKBwv5F
 YYzw==
X-Received: by 10.195.11.234 with SMTP id el10mr3197877wjd.95.1409215633651;
 Thu, 28 Aug 2014 01:47:13 -0700 (PDT)
Received: from dft-labs.eu (n1x0n-1-pt.tunnel.tserv5.lon1.ipv6.he.net.
 [2001:470:1f08:1f7::2])
 by mx.google.com with ESMTPSA id cj2sm33136078wid.23.2014.08.28.01.47.12
 for 
 (version=TLSv1.2 cipher=RC4-SHA bits=128/128);
 Thu, 28 Aug 2014 01:47:12 -0700 (PDT)
Date: Thu, 28 Aug 2014 10:47:10 +0200
From: Mateusz Guzik 
To: Konstantin Belousov 
Subject: Re: svn commit: r270444 - in head/sys: kern sys
Message-ID: <20140828084709.GB29429@dft-labs.eu>
References: <201408240904.s7O949sI083660@svn.freebsd.org>
 <201408261509.26815.jhb@freebsd.org>
 <20140826193210.GL71691@funkthat.com>
 <201408261723.10854.jhb@freebsd.org>
 <20140826215522.GG2737@kib.kiev.ua>
 <20140827165432.GA28581@dft-labs.eu>
 <20140827185903.GJ2737@kib.kiev.ua>
 <20140828033009.GA29429@dft-labs.eu>
 <20140828082139.GK2737@kib.kiev.ua>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <20140828082139.GK2737@kib.kiev.ua>
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: src-committers@freebsd.org, John Baldwin ,
 Mateusz Guzik , svn-src-all@freebsd.org,
 svn-src-head@freebsd.org, John-Mark Gurney 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 08:47:16 -0000

On Thu, Aug 28, 2014 at 11:21:39AM +0300, Konstantin Belousov wrote:
> On Thu, Aug 28, 2014 at 05:30:09AM +0200, Mateusz Guzik wrote:
> > @@ -791,6 +791,8 @@ fill_kinfo_proc_only(struct proc *p, struct kinfo_proc *kp)
> >  	struct ucred *cred;
> >  	struct sigacts *ps;
> >  
> > +	/* For proc_realparent. */
> > +	sx_assert(&proctree_lock, SX_LOCKED);
> >  	PROC_LOCK_ASSERT(p, MA_OWNED);
> >  	bzero(kp, sizeof(*kp));
> >  
> > @@ -920,7 +922,9 @@ fill_kinfo_proc_only(struct proc *p, struct kinfo_proc *kp)
> >  	kp->ki_acflag = p->p_acflag;
> >  	kp->ki_lock = p->p_lock;
> >  	if (p->p_pptr)
> > -		kp->ki_ppid = p->p_pptr->p_pid;
> > +		kp->ki_ppid = proc_realparent(p)->p_pid;
> Is the check for p_pptr != NULL still needed for the call to
> proc_realparent() ? If yes, I think it indicates a bug in
> proc_realparent(), which should incorporate the check, instead of
> enforcing it on the callers. It seems to be there for the kernel process
> (pid 0).

As it is proc_realparent cannot fail, so after this change callers like
this one would have to have some checks anyway. On the other hand other
consumers don't need to worry about this edge case, so it would only add
an unnecessary branch.

I have no strong opinion either way, for now I decided to just commit
the patch in its current form.

> 
> If the test can be removed, and proc_realparent() called unconditionally,
> I suggest to remove assert about proctree_lock at the start of
> fill_kinfo_proc_only(), since the check is done in proc_realparent().
> 
> Whatever decision is made there, it can be implemented after your
> change is landed.  The patch looks fine for me.

Thanks, committed as r270745.

-- 
Mateusz Guzik 

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 08:48:11 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 487F5312;
 Thu, 28 Aug 2014 08:48:11 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 199B513AA;
 Thu, 28 Aug 2014 08:48:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7S8mANf016804;
 Thu, 28 Aug 2014 08:48:10 GMT (envelope-from mav@FreeBSD.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7S8mAV1016803;
 Thu, 28 Aug 2014 08:48:10 GMT (envelope-from mav@FreeBSD.org)
Message-Id: <201408280848.s7S8mAV1016803@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org
 using -f
From: Alexander Motin 
Date: Thu, 28 Aug 2014 08:48:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270746 - stable/10/release/doc/en_US.ISO8859-1/relnotes
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 08:48:11 -0000

Author: mav
Date: Thu Aug 28 08:48:10 2014
New Revision: 270746
URL: http://svnweb.freebsd.org/changeset/base/270746

Log:
  Document GEOM direct dispatch support and some other GEOM changes.

Modified:
  stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 08:41:11 2014	(r270745)
+++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 08:48:10 2014	(r270746)
@@ -478,9 +478,21 @@
 	Disks and Storage
 
 	The
+	  &man.geom.4; got I/O direct dispatch support.
+	  When safety requirements are met, it allows to avoid passing
+	  I/O requests to GEOM g_up/g_down thread, executing them directly
+	  in the caller context. That allows to avoid CPU bottlenecks in
+	  g_up/g_down threads, plus avoid several context switches per I/O.
+	  
+
+	The
 	  &man.geom.4; RAID driver has been
 	  updated to support unmapped I/O.
 
+	The &man.geom.8;
+	  GEOM_MULTIPATH class got automatic live
+	  resize support.
+
 	The &man.virtio_blk.4; driver has been
 	  updated to support unmapped I/O.
 
@@ -515,6 +527,13 @@
 	    &man.mrsas.4;.
 	
 
+	Fixed accounting of BIO_FLUSH operation
+	  in &man.geom.8; GEOM_DISK class
+
+	The &man.gstat.8;
+	  utility now has a -o option, to
+	  display "other" operatins (e.g. BIO_FLUSH).
+
 	The &man.mfi.4; driver has been
 	  updated to include support for unmapped I/O.
 

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 09:00:54 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 64F9C78A;
 Thu, 28 Aug 2014 09:00:54 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5015E14F5;
 Thu, 28 Aug 2014 09:00:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7S90ssh023689;
 Thu, 28 Aug 2014 09:00:54 GMT (envelope-from mav@FreeBSD.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7S90sR5023688;
 Thu, 28 Aug 2014 09:00:54 GMT (envelope-from mav@FreeBSD.org)
Message-Id: <201408280900.s7S90sR5023688@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org
 using -f
From: Alexander Motin 
Date: Thu, 28 Aug 2014 09:00:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270747 - stable/10/release/doc/en_US.ISO8859-1/relnotes
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 09:00:54 -0000

Author: mav
Date: Thu Aug 28 09:00:53 2014
New Revision: 270747
URL: http://svnweb.freebsd.org/changeset/base/270747

Log:
  Document CAM locking improvements.

Modified:
  stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 08:48:10 2014	(r270746)
+++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 09:00:53 2014	(r270747)
@@ -489,6 +489,14 @@
 	  &man.geom.4; RAID driver has been
 	  updated to support unmapped I/O.
 
+	The
+	  &man.cam.4; got finer-grained locking, direct dispatch and
+	  multi-queue support.
+	  Combined with &man.geom.4; direct dispatch that allows to
+	  reduce lock congestion and improve SMP scalability of the
+	  SCSI/ATA stack.
+	  
+
 	The &man.geom.8;
 	  GEOM_MULTIPATH class got automatic live
 	  resize support.

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 09:40:45 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 882DDF6C;
 Thu, 28 Aug 2014 09:40:45 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5972819FC;
 Thu, 28 Aug 2014 09:40:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7S9ejEp040322;
 Thu, 28 Aug 2014 09:40:45 GMT (envelope-from mav@FreeBSD.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7S9ejiq040321;
 Thu, 28 Aug 2014 09:40:45 GMT (envelope-from mav@FreeBSD.org)
Message-Id: <201408280940.s7S9ejiq040321@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org
 using -f
From: Alexander Motin 
Date: Thu, 28 Aug 2014 09:40:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270748 - stable/10/release/doc/en_US.ISO8859-1/relnotes
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 09:40:45 -0000

Author: mav
Date: Thu Aug 28 09:40:44 2014
New Revision: 270748
URL: http://svnweb.freebsd.org/changeset/base/270748

Log:
  Document some CTL improvements.

Modified:
  stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 09:00:53 2014	(r270747)
+++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 09:40:44 2014	(r270748)
@@ -591,10 +591,6 @@
 	  disklabel64 partitioning scheme has been
 	  added to &man.gpart.8;.
 
-	The maximum number of
-	  SCSI ports in the &man.ctl.4; driver has
-	  been increased from 32 to 128.
-
 	A new &man.sysctl.8; and
 	  &man.loader.8; tunable,
 	  kern.geom.part.mbr.enforce_chs has been
@@ -603,6 +599,36 @@
 	  GEOM_PART_MBR will automatically
 	  recalculate the user-specified offset and size for alignment
 	  with the disk geometry.
+
+	CAM Target Layer (CTL)
+	 got many impromenets:
+	
+	  
+	    Support for UNMAP, WRITE SAME, COMPARE AND WRITE, XCOPY
+		and some other SCSI commands was added to support VMWare VAAI
+		and Microsoft ODX storage acceleration.
+	  
+	  
+	    READ/WRITE size limitations were removed
+		by supporting multiple data moves per command.
+	  
+	  
+	    Finer-grained per-LUN locking and
+		multiple worker threads for better SMP scapability.
+	  
+	  
+	    Memory consumption reduced by several
+		times by disabling some never used functionality.
+	  
+	  
+	    The maximum number of
+		SCSI ports increased from 32 to 128
+	  
+	  
+	    Improved ZVOL integration for better
+		performance.
+	  
+	
       
 
       

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 11:50:52 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 9EEDE92B;
 Thu, 28 Aug 2014 11:50:52 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8A7EE1949;
 Thu, 28 Aug 2014 11:50:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7SBoq1O000376;
 Thu, 28 Aug 2014 11:50:52 GMT (envelope-from ed@FreeBSD.org)
Received: (from ed@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7SBoqh9000375;
 Thu, 28 Aug 2014 11:50:52 GMT (envelope-from ed@FreeBSD.org)
Message-Id: <201408281150.s7SBoqh9000375@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ed set sender to ed@FreeBSD.org
 using -f
From: Ed Schouten 
Date: Thu, 28 Aug 2014 11:50:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270749 - head/contrib/openbsm/bin/auditdistd
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 11:50:52 -0000

Author: ed
Date: Thu Aug 28 11:50:52 2014
New Revision: 270749
URL: http://svnweb.freebsd.org/changeset/base/270749

Log:
  Unlock the right lock.
  
  The adist_remote_lock is not held in this place, whereas the
  adist_recv_list_lock lock is and is picked up during the next iteration.
  
  I found this by annotating our libpthread with Clang's -Wthread-safety
  attributes. I will send out a patch for this in the nearby future,
  because it's awesome.
  
  MFC after:	2 weeks

Modified:
  head/contrib/openbsm/bin/auditdistd/sender.c

Modified: head/contrib/openbsm/bin/auditdistd/sender.c
==============================================================================
--- head/contrib/openbsm/bin/auditdistd/sender.c	Thu Aug 28 09:40:44 2014	(r270748)
+++ head/contrib/openbsm/bin/auditdistd/sender.c	Thu Aug 28 11:50:52 2014	(r270749)
@@ -643,7 +643,7 @@ recv_thread(void *arg __unused)
 			 * we can use that.
 			 */
 			if (TAILQ_EMPTY(&adist_recv_list)) {
-				rw_unlock(&adist_remote_lock);
+				mtx_unlock(&adist_recv_list_lock);
 				continue;
 			}
 			mtx_unlock(&adist_recv_list_lock);

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 12:40:31 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id EAD68AF4;
 Thu, 28 Aug 2014 12:40:31 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D60271E58;
 Thu, 28 Aug 2014 12:40:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7SCeV6j023377;
 Thu, 28 Aug 2014 12:40:31 GMT (envelope-from dumbbell@FreeBSD.org)
Received: (from dumbbell@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7SCeVgG023376;
 Thu, 28 Aug 2014 12:40:31 GMT (envelope-from dumbbell@FreeBSD.org)
Message-Id: <201408281240.s7SCeVgG023376@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: dumbbell set sender to
 dumbbell@FreeBSD.org using -f
From: Jean-Sebastien Pedron 
Date: Thu, 28 Aug 2014 12:40:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270750 - head/sys/dev/drm2/radeon
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 12:40:32 -0000

Author: dumbbell
Date: Thu Aug 28 12:40:31 2014
New Revision: 270750
URL: http://svnweb.freebsd.org/changeset/base/270750

Log:
  drm/radeon: Fix a memory leak when radeonkms is unloaded
  
  MFC after:	1 week

Modified:
  head/sys/dev/drm2/radeon/radeon_fb.c

Modified: head/sys/dev/drm2/radeon/radeon_fb.c
==============================================================================
--- head/sys/dev/drm2/radeon/radeon_fb.c	Thu Aug 28 11:50:52 2014	(r270749)
+++ head/sys/dev/drm2/radeon/radeon_fb.c	Thu Aug 28 12:40:31 2014	(r270750)
@@ -291,6 +291,7 @@ static int radeon_fbdev_destroy(struct d
 
 	if (rfbdev->helper.fbdev) {
 		info = rfbdev->helper.fbdev;
+		free(info->fb_priv, DRM_MEM_KMS);
 		free(info, DRM_MEM_KMS);
 	}
 

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 14:57:10 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 7794319C;
 Thu, 28 Aug 2014 14:57:10 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 62447106F;
 Thu, 28 Aug 2014 14:57:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7SEvAPE086669;
 Thu, 28 Aug 2014 14:57:10 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7SEvAmw086668;
 Thu, 28 Aug 2014 14:57:10 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201408281457.s7SEvAmw086668@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber 
Date: Thu, 28 Aug 2014 14:57:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270751 - stable/10/release/doc/en_US.ISO8859-1/relnotes
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 14:57:10 -0000

Author: gjb
Date: Thu Aug 28 14:57:09 2014
New Revision: 270751
URL: http://svnweb.freebsd.org/changeset/base/270751

Log:
  Note r268700 was sponsored by Spectra Logic.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 12:40:31 2014	(r270750)
+++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 14:57:09 2014	(r270751)
@@ -918,10 +918,12 @@
       The &man.mkimg.1; utility has been
 	merged from &os;-CURRENT.
 
-      The &man.camcontrol.8; has been updated
-	to include a new persist command, which
-	allows issuing SCSI PERSISTENT RESERVE IN
-	and SCSI PERSISTENT RESERVE OUT.
+      The &man.camcontrol.8; has been
+	updated to include a new persist command,
+	which allows issuing SCSI PERSISTENT RESERVE
+	  IN and SCSI PERSISTENT RESERVE
+	  OUT.
 
       The &man.gstat.8; utility has been
 	updated to include a new flag, -p, which

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 15:00:04 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 9AFDB65F;
 Thu, 28 Aug 2014 15:00:04 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 85A2110C1;
 Thu, 28 Aug 2014 15:00:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7SF04GD087481;
 Thu, 28 Aug 2014 15:00:04 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7SF04bT087480;
 Thu, 28 Aug 2014 15:00:04 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201408281500.s7SF04bT087480@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber 
Date: Thu, 28 Aug 2014 15:00:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270752 - stable/10/release/doc/en_US.ISO8859-1/relnotes
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 15:00:04 -0000

Author: gjb
Date: Thu Aug 28 15:00:04 2014
New Revision: 270752
URL: http://svnweb.freebsd.org/changeset/base/270752

Log:
  Document r270242, sequential packet support in devd(8)
  
  Submitted by:	asomers
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 14:57:09 2014	(r270751)
+++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 15:00:04 2014	(r270752)
@@ -1022,6 +1022,11 @@
 	specify NFS version 4, the syntax to use is
 	-o vers=4.
 
+      The &man.devd.8; client socket type
+	has been changed to SOCK_SEQPACKET,
+	providing sequential packet support.
+
       Support for the account
 	facility has been added to the &man.pam.group.8;
 	module.

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 15:05:43 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 5476FF6D;
 Thu, 28 Aug 2014 15:05:43 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3F2B31271;
 Thu, 28 Aug 2014 15:05:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7SF5hgf091857;
 Thu, 28 Aug 2014 15:05:43 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7SF5hYn091856;
 Thu, 28 Aug 2014 15:05:43 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201408281505.s7SF5hYn091856@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber 
Date: Thu, 28 Aug 2014 15:05:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270753 - stable/10/release/doc/en_US.ISO8859-1/relnotes
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 15:05:43 -0000

Author: gjb
Date: Thu Aug 28 15:05:42 2014
New Revision: 270753
URL: http://svnweb.freebsd.org/changeset/base/270753

Log:
  Note r269398 adds RFC5661 support.
  
  Submitted by:	rmacklem
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 15:00:04 2014	(r270752)
+++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 15:05:42 2014	(r270753)
@@ -978,8 +978,9 @@
 	
       
 
-      The &man.nfsd.8; server update to 4.1
-	has merged from &os;-CURRENT.
+      The &man.nfsd.8; server update to 4.1,
+	adding support for RFC5661, has merged from
+	&os;-CURRENT.
 
       The serial terminals
 	ttyu0 and ttyu1 have

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 16:26:14 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 4A7E0B60;
 Thu, 28 Aug 2014 16:26:14 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 35D5D1D91;
 Thu, 28 Aug 2014 16:26:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7SGQEw8030861;
 Thu, 28 Aug 2014 16:26:14 GMT (envelope-from rodrigc@FreeBSD.org)
Received: (from rodrigc@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7SGQEl9030860;
 Thu, 28 Aug 2014 16:26:14 GMT (envelope-from rodrigc@FreeBSD.org)
Message-Id: <201408281626.s7SGQEl9030860@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: rodrigc set sender to
 rodrigc@FreeBSD.org using -f
From: Craig Rodrigues 
Date: Thu, 28 Aug 2014 16:26:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270754 - head/share/examples/bhyve
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 16:26:14 -0000

Author: rodrigc
Date: Thu Aug 28 16:26:13 2014
New Revision: 270754
URL: http://svnweb.freebsd.org/changeset/base/270754

Log:
  Use "file -s", so that we can run vmrun.sh against special devices such
  as /dev/md memory file systems
  
  Reviewed by: neel

Modified:
  head/share/examples/bhyve/vmrun.sh

Modified: head/share/examples/bhyve/vmrun.sh
==============================================================================
--- head/share/examples/bhyve/vmrun.sh	Thu Aug 28 15:05:42 2014	(r270753)
+++ head/share/examples/bhyve/vmrun.sh	Thu Aug 28 16:26:13 2014	(r270754)
@@ -177,10 +177,10 @@ ${BHYVECTL} --vm=${vmname} --destroy > /
 
 while [ 1 ]; do
 
-	file ${virtio_diskdev} | grep "boot sector" > /dev/null
+	file -s ${virtio_diskdev} | grep "boot sector" > /dev/null
 	rc=$?
 	if [ $rc -ne 0 ]; then
-		file ${virtio_diskdev} | grep ": Unix Fast File sys" > /dev/null
+		file -s ${virtio_diskdev} | grep ": Unix Fast File sys" > /dev/null
 		rc=$?
 	fi
 	if [ $rc -ne 0 ]; then

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 16:29:58 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id D144EE55;
 Thu, 28 Aug 2014 16:29:58 +0000 (UTC)
Received: from pp1.rice.edu (proofpoint1.mail.rice.edu [128.42.201.100])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 951131DC2;
 Thu, 28 Aug 2014 16:29:57 +0000 (UTC)
Received: from pps.filterd (pp1.rice.edu [127.0.0.1])
 by pp1.rice.edu (8.14.5/8.14.5) with SMTP id s7SGRBSs028612;
 Thu, 28 Aug 2014 11:29:56 -0500
Received: from mh2.mail.rice.edu (mh2.mail.rice.edu [128.42.201.21])
 by pp1.rice.edu with ESMTP id 1p121bs2yk-1;
 Thu, 28 Aug 2014 11:29:56 -0500
X-Virus-Scanned: by amavis-2.7.0 at mh2.mail.rice.edu, auth channel
Received: from [10.87.78.95] (unknown [10.87.78.95])
 (using TLSv1 with cipher RC4-MD5 (128/128 bits))
 (No client certificate requested) (Authenticated sender: alc)
 by mh2.mail.rice.edu (Postfix) with ESMTPSA id D83E8500150;
 Thu, 28 Aug 2014 11:29:54 -0500 (CDT)
Subject: Re: svn commit: r269134 - head/sys/vm
Mime-Version: 1.0 (Apple Message framework v1085)
Content-Type: text/plain; charset=us-ascii
From: Alan Cox 
In-Reply-To: 
Date: Thu, 28 Aug 2014 11:30:53 -0500
Content-Transfer-Encoding: quoted-printable
Message-Id: <72B80282-6FA1-4481-8333-37EF3A58FB74@rice.edu>
References: <201407261810.s6QIAIIj049439@svn.freebsd.org>
 
To: Adrian Chadd 
X-Mailer: Apple Mail (2.1085)
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0
 kscore.is_bulkscore=0
 kscore.compositescore=0 circleOfTrustscore=0
 compositescore=0.765433954564634 urlsuspect_oldscore=0.765433954564634
 suspectscore=0 recipient_domain_to_sender_totalscore=0 phishscore=0
 bulkscore=0 kscore.is_spamscore=1 recipient_to_sender_totalscore=0
 recipient_domain_to_sender_domain_totalscore=0 rbsscore=0.765433954564634
 spamscore=0 recipient_to_sender_domain_totalscore=0 urlsuspectscore=0.9
 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=7.0.1-1402240000 definitions=main-1408280180
Cc: Alan Cox ,
 "svn-src-head@freebsd.org" ,
 "svn-src-all@freebsd.org" ,
 "src-committers@freebsd.org" 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 16:29:59 -0000


On Aug 28, 2014, at 3:30 AM, Adrian Chadd wrote:

> Hi Alan!
>=20
> I just reverted back to the commit before this one and it fixed my =
MIPS32 boot.
>=20
> Would you have some time to help me help you figure out why things =
broke? :)
>=20


Have you tried booting a kernel based on r269134?  At the time, I tested =
a 64-bit MIPS kernel on gxemul, and it ran ok.  Also, Hiren reports that =
a 32-bit kernel from about two weeks after r269134 works for him.


>=20
>=20
>=20
>=20
> -a
>=20
>=20
> On 26 July 2014 11:10, Alan Cox  wrote:
>> Author: alc
>> Date: Sat Jul 26 18:10:18 2014
>> New Revision: 269134
>> URL: http://svnweb.freebsd.org/changeset/base/269134
>>=20
>> Log:
>>  When unwiring a region of an address space, do not assume that the
>>  underlying physical pages are mapped by the pmap.  If, for example, =
the
>>  application has performed an mprotect(..., PROT_NONE) on any part of =
the
>>  wired region, then those pages will no longer be mapped by the pmap.
>>  So, using the pmap to lookup the wired pages in order to unwire them
>>  doesn't always work, and when it doesn't work wired pages are =
leaked.
>>=20
>>  To avoid the leak, introduce and use a new function =
vm_object_unwire()
>>  that locates the wired pages by traversing the object and its =
backing
>>  objects.
>>=20
>>  At the same time, switch from using pmap_change_wiring() to the =
recently
>>  introduced function pmap_unwire() for unwiring the region's =
mappings.
>>  pmap_unwire() is faster, because it operates a range of virtual =
addresses
>>  rather than a single virtual page at a time.  Moreover, by operating =
on
>>  a range, it is superpage friendly.  It doesn't waste time performing
>>  unnecessary demotions.
>>=20
>>  Reported by:  markj
>>  Reviewed by:  kib
>>  Tested by:    pho, jmg (arm)
>>  Sponsored by: EMC / Isilon Storage Division
>>=20
>> Modified:
>>  head/sys/vm/vm_extern.h
>>  head/sys/vm/vm_fault.c
>>  head/sys/vm/vm_map.c
>>  head/sys/vm/vm_object.c
>>  head/sys/vm/vm_object.h
>>=20
>> Modified: head/sys/vm/vm_extern.h
>> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
>> --- head/sys/vm/vm_extern.h     Sat Jul 26 17:59:25 2014        =
(r269133)
>> +++ head/sys/vm/vm_extern.h     Sat Jul 26 18:10:18 2014        =
(r269134)
>> @@ -81,7 +81,6 @@ int vm_fault_hold(vm_map_t map, vm_offse
>>     int fault_flags, vm_page_t *m_hold);
>> int vm_fault_quick_hold_pages(vm_map_t map, vm_offset_t addr, =
vm_size_t len,
>>     vm_prot_t prot, vm_page_t *ma, int max_count);
>> -void vm_fault_unwire(vm_map_t, vm_offset_t, vm_offset_t, boolean_t);
>> int vm_fault_wire(vm_map_t, vm_offset_t, vm_offset_t, boolean_t);
>> int vm_forkproc(struct thread *, struct proc *, struct thread *, =
struct vmspace *, int);
>> void vm_waitproc(struct proc *);
>>=20
>> Modified: head/sys/vm/vm_fault.c
>> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
>> --- head/sys/vm/vm_fault.c      Sat Jul 26 17:59:25 2014        =
(r269133)
>> +++ head/sys/vm/vm_fault.c      Sat Jul 26 18:10:18 2014        =
(r269134)
>> @@ -106,6 +106,7 @@ __FBSDID("$FreeBSD$");
>> #define PFFOR 4
>>=20
>> static int vm_fault_additional_pages(vm_page_t, int, int, vm_page_t =
*, int *);
>> +static void vm_fault_unwire(vm_map_t, vm_offset_t, vm_offset_t, =
boolean_t);
>>=20
>> #define        VM_FAULT_READ_BEHIND    8
>> #define        VM_FAULT_READ_MAX       (1 + VM_FAULT_READ_AHEAD_MAX)
>> @@ -1186,7 +1187,7 @@ vm_fault_wire(vm_map_t map, vm_offset_t
>>  *
>>  *     Unwire a range of virtual addresses in a map.
>>  */
>> -void
>> +static void
>> vm_fault_unwire(vm_map_t map, vm_offset_t start, vm_offset_t end,
>>     boolean_t fictitious)
>> {
>>=20
>> Modified: head/sys/vm/vm_map.c
>> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
>> --- head/sys/vm/vm_map.c        Sat Jul 26 17:59:25 2014        =
(r269133)
>> +++ head/sys/vm/vm_map.c        Sat Jul 26 18:10:18 2014        =
(r269134)
>> @@ -132,6 +132,7 @@ static void _vm_map_init(vm_map_t map, p
>>     vm_offset_t max);
>> static void vm_map_entry_deallocate(vm_map_entry_t entry, boolean_t =
system_map);
>> static void vm_map_entry_dispose(vm_map_t map, vm_map_entry_t entry);
>> +static void vm_map_entry_unwire(vm_map_t map, vm_map_entry_t entry);
>> #ifdef INVARIANTS
>> static void vm_map_zdtor(void *mem, int size, void *arg);
>> static void vmspace_zdtor(void *mem, int size, void *arg);
>> @@ -2393,16 +2394,10 @@ done:
>>                    (entry->eflags & MAP_ENTRY_USER_WIRED))) {
>>                        if (user_unwire)
>>                                entry->eflags &=3D =
~MAP_ENTRY_USER_WIRED;
>> -                       entry->wired_count--;
>> -                       if (entry->wired_count =3D=3D 0) {
>> -                               /*
>> -                                * Retain the map lock.
>> -                                */
>> -                               vm_fault_unwire(map, entry->start, =
entry->end,
>> -                                   entry->object.vm_object !=3D NULL =
&&
>> -                                   (entry->object.vm_object->flags &
>> -                                   OBJ_FICTITIOUS) !=3D 0);
>> -                       }
>> +                       if (entry->wired_count =3D=3D 1)
>> +                               vm_map_entry_unwire(map, entry);
>> +                       else
>> +                               entry->wired_count--;
>>                }
>>                KASSERT((entry->eflags & MAP_ENTRY_IN_TRANSITION) !=3D =
0,
>>                    ("vm_map_unwire: in-transition flag missing %p", =
entry));
>> @@ -2635,19 +2630,12 @@ done:
>>                         * unnecessary.
>>                         */
>>                        entry->wired_count =3D 0;
>> -               } else {
>> -                       if (!user_wire ||
>> -                           (entry->eflags & MAP_ENTRY_USER_WIRED) =3D=3D=
 0)
>> +               } else if (!user_wire ||
>> +                   (entry->eflags & MAP_ENTRY_USER_WIRED) =3D=3D 0) =
{
>> +                       if (entry->wired_count =3D=3D 1)
>> +                               vm_map_entry_unwire(map, entry);
>> +                       else
>>                                entry->wired_count--;
>> -                       if (entry->wired_count =3D=3D 0) {
>> -                               /*
>> -                                * Retain the map lock.
>> -                                */
>> -                               vm_fault_unwire(map, entry->start, =
entry->end,
>> -                                   entry->object.vm_object !=3D NULL =
&&
>> -                                   (entry->object.vm_object->flags &
>> -                                   OBJ_FICTITIOUS) !=3D 0);
>> -                       }
>>                }
>>        next_entry_done:
>>                KASSERT((entry->eflags & MAP_ENTRY_IN_TRANSITION) !=3D =
0,
>> @@ -2783,9 +2771,13 @@ vm_map_sync(
>> static void
>> vm_map_entry_unwire(vm_map_t map, vm_map_entry_t entry)
>> {
>> -       vm_fault_unwire(map, entry->start, entry->end,
>> -           entry->object.vm_object !=3D NULL &&
>> -           (entry->object.vm_object->flags & OBJ_FICTITIOUS) !=3D =
0);
>> +
>> +       VM_MAP_ASSERT_LOCKED(map);
>> +       KASSERT(entry->wired_count > 0,
>> +           ("vm_map_entry_unwire: entry %p isn't wired", entry));
>> +       pmap_unwire(map->pmap, entry->start, entry->end);
>> +       vm_object_unwire(entry->object.vm_object, entry->offset, =
entry->end -
>> +           entry->start, PQ_ACTIVE);
>>        entry->wired_count =3D 0;
>> }
>>=20
>>=20
>> Modified: head/sys/vm/vm_object.c
>> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
>> --- head/sys/vm/vm_object.c     Sat Jul 26 17:59:25 2014        =
(r269133)
>> +++ head/sys/vm/vm_object.c     Sat Jul 26 18:10:18 2014        =
(r269134)
>> @@ -2202,6 +2202,78 @@ vm_object_set_writeable_dirty(vm_object_
>>        vm_object_set_flag(object, OBJ_MIGHTBEDIRTY);
>> }
>>=20
>> +/*
>> + *     vm_object_unwire:
>> + *
>> + *     For each page offset within the specified range of the given =
object,
>> + *     find the highest-level page in the shadow chain and unwire =
it.  A page
>> + *     must exist at every page offset, and the highest-level page =
must be
>> + *     wired.
>> + */
>> +void
>> +vm_object_unwire(vm_object_t object, vm_ooffset_t offset, vm_size_t =
length,
>> +    uint8_t queue)
>> +{
>> +       vm_object_t tobject;
>> +       vm_page_t m, tm;
>> +       vm_pindex_t end_pindex, pindex, tpindex;
>> +       int depth, locked_depth;
>> +
>> +       KASSERT((offset & PAGE_MASK) =3D=3D 0,
>> +           ("vm_object_unwire: offset is not page aligned"));
>> +       KASSERT((length & PAGE_MASK) =3D=3D 0,
>> +           ("vm_object_unwire: length is not a multiple of =
PAGE_SIZE"));
>> +       /* The wired count of a fictitious page never changes. */
>> +       if ((object->flags & OBJ_FICTITIOUS) !=3D 0)
>> +               return;
>> +       pindex =3D OFF_TO_IDX(offset);
>> +       end_pindex =3D pindex + atop(length);
>> +       locked_depth =3D 1;
>> +       VM_OBJECT_RLOCK(object);
>> +       m =3D vm_page_find_least(object, pindex);
>> +       while (pindex < end_pindex) {
>> +               if (m =3D=3D NULL || pindex < m->pindex) {
>> +                       /*
>> +                        * The first object in the shadow chain =
doesn't
>> +                        * contain a page at the current index.  =
Therefore,
>> +                        * the page must exist in a backing object.
>> +                        */
>> +                       tobject =3D object;
>> +                       tpindex =3D pindex;
>> +                       depth =3D 0;
>> +                       do {
>> +                               tpindex +=3D
>> +                                   =
OFF_TO_IDX(tobject->backing_object_offset);
>> +                               tobject =3D tobject->backing_object;
>> +                               KASSERT(tobject !=3D NULL,
>> +                                   ("vm_object_unwire: missing =
page"));
>> +                               if ((tobject->flags & OBJ_FICTITIOUS) =
!=3D 0)
>> +                                       goto next_page;
>> +                               depth++;
>> +                               if (depth =3D=3D locked_depth) {
>> +                                       locked_depth++;
>> +                                       VM_OBJECT_RLOCK(tobject);
>> +                               }
>> +                       } while ((tm =3D vm_page_lookup(tobject, =
tpindex)) =3D=3D
>> +                           NULL);
>> +               } else {
>> +                       tm =3D m;
>> +                       m =3D TAILQ_NEXT(m, listq);
>> +               }
>> +               vm_page_lock(tm);
>> +               vm_page_unwire(tm, queue);
>> +               vm_page_unlock(tm);
>> +next_page:
>> +               pindex++;
>> +       }
>> +       /* Release the accumulated object locks. */
>> +       for (depth =3D 0; depth < locked_depth; depth++) {
>> +               tobject =3D object->backing_object;
>> +               VM_OBJECT_RUNLOCK(object);
>> +               object =3D tobject;
>> +       }
>> +}
>> +
>> #include "opt_ddb.h"
>> #ifdef DDB
>> #include 
>>=20
>> Modified: head/sys/vm/vm_object.h
>> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
>> --- head/sys/vm/vm_object.h     Sat Jul 26 17:59:25 2014        =
(r269133)
>> +++ head/sys/vm/vm_object.h     Sat Jul 26 18:10:18 2014        =
(r269134)
>> @@ -291,6 +291,8 @@ void vm_object_shadow (vm_object_t *, vm
>> void vm_object_split(vm_map_entry_t);
>> boolean_t vm_object_sync(vm_object_t, vm_ooffset_t, vm_size_t, =
boolean_t,
>>     boolean_t);
>> +void vm_object_unwire(vm_object_t object, vm_ooffset_t offset,
>> +    vm_size_t length, uint8_t queue);
>> #endif                         /* _KERNEL */
>>=20
>> #endif                         /* _VM_OBJECT_ */
>>=20
>=20


From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 16:52:53 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id B7E7C54D;
 Thu, 28 Aug 2014 16:52:53 +0000 (UTC)
Received: from mail-qg0-x235.google.com (mail-qg0-x235.google.com
 [IPv6:2607:f8b0:400d:c04::235])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 3394F10AF;
 Thu, 28 Aug 2014 16:52:53 +0000 (UTC)
Received: by mail-qg0-f53.google.com with SMTP id z107so1043115qgd.12
 for ; Thu, 28 Aug 2014 09:52:52 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:date:message-id:subject
 :from:to:cc:content-type;
 bh=S9RWw1nkznXa+q+d+0Fh6z/S+8JOgQ/xnQ8lufMrscQ=;
 b=mi+l7TkX8/XuGiFr5tJlJEtoqlINTq20ZN7sWI/KWA61k2WnfeEQRtH8j2gHXsV5u9
 yS7IzmELAnyInZR4HijjpArwxiVmtwutSTFm/XoO5yT/5QGA/cvu4eDkKgaIv91c1/L1
 KNqcbpCHKV9xFrYeFHZUFin/bBB1B+eGm2/jPqy/fw6nYMMNd2CrVGaVclq/swaVG9Sr
 7rgDhqn/CuLqIQCvjUAgoz1F1WuBA2E1HIb2PStfAwTVI+CXaJG9aRejzCKL034uw38e
 8cVZYzPFzey+OetnHvIhQkgAZWYYplsnAFUxOiqmkrxP7zA5JoUXyqJiDOQRoM5P9Nk4
 y5vA==
MIME-Version: 1.0
X-Received: by 10.140.85.74 with SMTP id m68mr8064085qgd.50.1409244772258;
 Thu, 28 Aug 2014 09:52:52 -0700 (PDT)
Sender: hiren.panchasara@gmail.com
Received: by 10.96.170.230 with HTTP; Thu, 28 Aug 2014 09:52:52 -0700 (PDT)
In-Reply-To: <72B80282-6FA1-4481-8333-37EF3A58FB74@rice.edu>
References: <201407261810.s6QIAIIj049439@svn.freebsd.org>
 
 <72B80282-6FA1-4481-8333-37EF3A58FB74@rice.edu>
Date: Thu, 28 Aug 2014 09:52:52 -0700
X-Google-Sender-Auth: Cq3Z2_sPJUl7cCcsHP-Vy456U_Q
Message-ID: 
Subject: Re: svn commit: r269134 - head/sys/vm
From: hiren panchasara 
To: Alan Cox 
Content-Type: text/plain; charset=UTF-8
Cc: Alan Cox ,
 "svn-src-head@freebsd.org" ,
 Adrian Chadd ,
 "src-committers@freebsd.org" ,
 "svn-src-all@freebsd.org" 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 16:52:53 -0000

On Thu, Aug 28, 2014 at 9:30 AM, Alan Cox  wrote:
>
> On Aug 28, 2014, at 3:30 AM, Adrian Chadd wrote:
>
>> Hi Alan!
>>
>> I just reverted back to the commit before this one and it fixed my MIPS32 boot.
>>
>> Would you have some time to help me help you figure out why things broke? :)
>>
>
>
> Have you tried booting a kernel based on r269134?  At the time, I tested a 64-bit MIPS kernel on gxemul, and it ran ok.  Also, Hiren reports that a 32-bit kernel from about two weeks after r269134 works for him.
>

To be precise, I am on r269799 which works for me.

cheers,
Hiren

>
>>
>>
>>
>>
>> -a
>>
>>
>> On 26 July 2014 11:10, Alan Cox  wrote:
>>> Author: alc
>>> Date: Sat Jul 26 18:10:18 2014
>>> New Revision: 269134
>>> URL: http://svnweb.freebsd.org/changeset/base/269134
>>>
>>> Log:
>>>  When unwiring a region of an address space, do not assume that the
>>>  underlying physical pages are mapped by the pmap.  If, for example, the
>>>  application has performed an mprotect(..., PROT_NONE) on any part of the
>>>  wired region, then those pages will no longer be mapped by the pmap.
>>>  So, using the pmap to lookup the wired pages in order to unwire them
>>>  doesn't always work, and when it doesn't work wired pages are leaked.
>>>
>>>  To avoid the leak, introduce and use a new function vm_object_unwire()
>>>  that locates the wired pages by traversing the object and its backing
>>>  objects.
>>>
>>>  At the same time, switch from using pmap_change_wiring() to the recently
>>>  introduced function pmap_unwire() for unwiring the region's mappings.
>>>  pmap_unwire() is faster, because it operates a range of virtual addresses
>>>  rather than a single virtual page at a time.  Moreover, by operating on
>>>  a range, it is superpage friendly.  It doesn't waste time performing
>>>  unnecessary demotions.
>>>
>>>  Reported by:  markj
>>>  Reviewed by:  kib
>>>  Tested by:    pho, jmg (arm)
>>>  Sponsored by: EMC / Isilon Storage Division
>>>
>>> Modified:
>>>  head/sys/vm/vm_extern.h
>>>  head/sys/vm/vm_fault.c
>>>  head/sys/vm/vm_map.c
>>>  head/sys/vm/vm_object.c
>>>  head/sys/vm/vm_object.h
>>>
>>> Modified: head/sys/vm/vm_extern.h
>>> ==============================================================================
>>> --- head/sys/vm/vm_extern.h     Sat Jul 26 17:59:25 2014        (r269133)
>>> +++ head/sys/vm/vm_extern.h     Sat Jul 26 18:10:18 2014        (r269134)
>>> @@ -81,7 +81,6 @@ int vm_fault_hold(vm_map_t map, vm_offse
>>>     int fault_flags, vm_page_t *m_hold);
>>> int vm_fault_quick_hold_pages(vm_map_t map, vm_offset_t addr, vm_size_t len,
>>>     vm_prot_t prot, vm_page_t *ma, int max_count);
>>> -void vm_fault_unwire(vm_map_t, vm_offset_t, vm_offset_t, boolean_t);
>>> int vm_fault_wire(vm_map_t, vm_offset_t, vm_offset_t, boolean_t);
>>> int vm_forkproc(struct thread *, struct proc *, struct thread *, struct vmspace *, int);
>>> void vm_waitproc(struct proc *);
>>>
>>> Modified: head/sys/vm/vm_fault.c
>>> ==============================================================================
>>> --- head/sys/vm/vm_fault.c      Sat Jul 26 17:59:25 2014        (r269133)
>>> +++ head/sys/vm/vm_fault.c      Sat Jul 26 18:10:18 2014        (r269134)
>>> @@ -106,6 +106,7 @@ __FBSDID("$FreeBSD$");
>>> #define PFFOR 4
>>>
>>> static int vm_fault_additional_pages(vm_page_t, int, int, vm_page_t *, int *);
>>> +static void vm_fault_unwire(vm_map_t, vm_offset_t, vm_offset_t, boolean_t);
>>>
>>> #define        VM_FAULT_READ_BEHIND    8
>>> #define        VM_FAULT_READ_MAX       (1 + VM_FAULT_READ_AHEAD_MAX)
>>> @@ -1186,7 +1187,7 @@ vm_fault_wire(vm_map_t map, vm_offset_t
>>>  *
>>>  *     Unwire a range of virtual addresses in a map.
>>>  */
>>> -void
>>> +static void
>>> vm_fault_unwire(vm_map_t map, vm_offset_t start, vm_offset_t end,
>>>     boolean_t fictitious)
>>> {
>>>
>>> Modified: head/sys/vm/vm_map.c
>>> ==============================================================================
>>> --- head/sys/vm/vm_map.c        Sat Jul 26 17:59:25 2014        (r269133)
>>> +++ head/sys/vm/vm_map.c        Sat Jul 26 18:10:18 2014        (r269134)
>>> @@ -132,6 +132,7 @@ static void _vm_map_init(vm_map_t map, p
>>>     vm_offset_t max);
>>> static void vm_map_entry_deallocate(vm_map_entry_t entry, boolean_t system_map);
>>> static void vm_map_entry_dispose(vm_map_t map, vm_map_entry_t entry);
>>> +static void vm_map_entry_unwire(vm_map_t map, vm_map_entry_t entry);
>>> #ifdef INVARIANTS
>>> static void vm_map_zdtor(void *mem, int size, void *arg);
>>> static void vmspace_zdtor(void *mem, int size, void *arg);
>>> @@ -2393,16 +2394,10 @@ done:
>>>                    (entry->eflags & MAP_ENTRY_USER_WIRED))) {
>>>                        if (user_unwire)
>>>                                entry->eflags &= ~MAP_ENTRY_USER_WIRED;
>>> -                       entry->wired_count--;
>>> -                       if (entry->wired_count == 0) {
>>> -                               /*
>>> -                                * Retain the map lock.
>>> -                                */
>>> -                               vm_fault_unwire(map, entry->start, entry->end,
>>> -                                   entry->object.vm_object != NULL &&
>>> -                                   (entry->object.vm_object->flags &
>>> -                                   OBJ_FICTITIOUS) != 0);
>>> -                       }
>>> +                       if (entry->wired_count == 1)
>>> +                               vm_map_entry_unwire(map, entry);
>>> +                       else
>>> +                               entry->wired_count--;
>>>                }
>>>                KASSERT((entry->eflags & MAP_ENTRY_IN_TRANSITION) != 0,
>>>                    ("vm_map_unwire: in-transition flag missing %p", entry));
>>> @@ -2635,19 +2630,12 @@ done:
>>>                         * unnecessary.
>>>                         */
>>>                        entry->wired_count = 0;
>>> -               } else {
>>> -                       if (!user_wire ||
>>> -                           (entry->eflags & MAP_ENTRY_USER_WIRED) == 0)
>>> +               } else if (!user_wire ||
>>> +                   (entry->eflags & MAP_ENTRY_USER_WIRED) == 0) {
>>> +                       if (entry->wired_count == 1)
>>> +                               vm_map_entry_unwire(map, entry);
>>> +                       else
>>>                                entry->wired_count--;
>>> -                       if (entry->wired_count == 0) {
>>> -                               /*
>>> -                                * Retain the map lock.
>>> -                                */
>>> -                               vm_fault_unwire(map, entry->start, entry->end,
>>> -                                   entry->object.vm_object != NULL &&
>>> -                                   (entry->object.vm_object->flags &
>>> -                                   OBJ_FICTITIOUS) != 0);
>>> -                       }
>>>                }
>>>        next_entry_done:
>>>                KASSERT((entry->eflags & MAP_ENTRY_IN_TRANSITION) != 0,
>>> @@ -2783,9 +2771,13 @@ vm_map_sync(
>>> static void
>>> vm_map_entry_unwire(vm_map_t map, vm_map_entry_t entry)
>>> {
>>> -       vm_fault_unwire(map, entry->start, entry->end,
>>> -           entry->object.vm_object != NULL &&
>>> -           (entry->object.vm_object->flags & OBJ_FICTITIOUS) != 0);
>>> +
>>> +       VM_MAP_ASSERT_LOCKED(map);
>>> +       KASSERT(entry->wired_count > 0,
>>> +           ("vm_map_entry_unwire: entry %p isn't wired", entry));
>>> +       pmap_unwire(map->pmap, entry->start, entry->end);
>>> +       vm_object_unwire(entry->object.vm_object, entry->offset, entry->end -
>>> +           entry->start, PQ_ACTIVE);
>>>        entry->wired_count = 0;
>>> }
>>>
>>>
>>> Modified: head/sys/vm/vm_object.c
>>> ==============================================================================
>>> --- head/sys/vm/vm_object.c     Sat Jul 26 17:59:25 2014        (r269133)
>>> +++ head/sys/vm/vm_object.c     Sat Jul 26 18:10:18 2014        (r269134)
>>> @@ -2202,6 +2202,78 @@ vm_object_set_writeable_dirty(vm_object_
>>>        vm_object_set_flag(object, OBJ_MIGHTBEDIRTY);
>>> }
>>>
>>> +/*
>>> + *     vm_object_unwire:
>>> + *
>>> + *     For each page offset within the specified range of the given object,
>>> + *     find the highest-level page in the shadow chain and unwire it.  A page
>>> + *     must exist at every page offset, and the highest-level page must be
>>> + *     wired.
>>> + */
>>> +void
>>> +vm_object_unwire(vm_object_t object, vm_ooffset_t offset, vm_size_t length,
>>> +    uint8_t queue)
>>> +{
>>> +       vm_object_t tobject;
>>> +       vm_page_t m, tm;
>>> +       vm_pindex_t end_pindex, pindex, tpindex;
>>> +       int depth, locked_depth;
>>> +
>>> +       KASSERT((offset & PAGE_MASK) == 0,
>>> +           ("vm_object_unwire: offset is not page aligned"));
>>> +       KASSERT((length & PAGE_MASK) == 0,
>>> +           ("vm_object_unwire: length is not a multiple of PAGE_SIZE"));
>>> +       /* The wired count of a fictitious page never changes. */
>>> +       if ((object->flags & OBJ_FICTITIOUS) != 0)
>>> +               return;
>>> +       pindex = OFF_TO_IDX(offset);
>>> +       end_pindex = pindex + atop(length);
>>> +       locked_depth = 1;
>>> +       VM_OBJECT_RLOCK(object);
>>> +       m = vm_page_find_least(object, pindex);
>>> +       while (pindex < end_pindex) {
>>> +               if (m == NULL || pindex < m->pindex) {
>>> +                       /*
>>> +                        * The first object in the shadow chain doesn't
>>> +                        * contain a page at the current index.  Therefore,
>>> +                        * the page must exist in a backing object.
>>> +                        */
>>> +                       tobject = object;
>>> +                       tpindex = pindex;
>>> +                       depth = 0;
>>> +                       do {
>>> +                               tpindex +=
>>> +                                   OFF_TO_IDX(tobject->backing_object_offset);
>>> +                               tobject = tobject->backing_object;
>>> +                               KASSERT(tobject != NULL,
>>> +                                   ("vm_object_unwire: missing page"));
>>> +                               if ((tobject->flags & OBJ_FICTITIOUS) != 0)
>>> +                                       goto next_page;
>>> +                               depth++;
>>> +                               if (depth == locked_depth) {
>>> +                                       locked_depth++;
>>> +                                       VM_OBJECT_RLOCK(tobject);
>>> +                               }
>>> +                       } while ((tm = vm_page_lookup(tobject, tpindex)) ==
>>> +                           NULL);
>>> +               } else {
>>> +                       tm = m;
>>> +                       m = TAILQ_NEXT(m, listq);
>>> +               }
>>> +               vm_page_lock(tm);
>>> +               vm_page_unwire(tm, queue);
>>> +               vm_page_unlock(tm);
>>> +next_page:
>>> +               pindex++;
>>> +       }
>>> +       /* Release the accumulated object locks. */
>>> +       for (depth = 0; depth < locked_depth; depth++) {
>>> +               tobject = object->backing_object;
>>> +               VM_OBJECT_RUNLOCK(object);
>>> +               object = tobject;
>>> +       }
>>> +}
>>> +
>>> #include "opt_ddb.h"
>>> #ifdef DDB
>>> #include 
>>>
>>> Modified: head/sys/vm/vm_object.h
>>> ==============================================================================
>>> --- head/sys/vm/vm_object.h     Sat Jul 26 17:59:25 2014        (r269133)
>>> +++ head/sys/vm/vm_object.h     Sat Jul 26 18:10:18 2014        (r269134)
>>> @@ -291,6 +291,8 @@ void vm_object_shadow (vm_object_t *, vm
>>> void vm_object_split(vm_map_entry_t);
>>> boolean_t vm_object_sync(vm_object_t, vm_ooffset_t, vm_size_t, boolean_t,
>>>     boolean_t);
>>> +void vm_object_unwire(vm_object_t object, vm_ooffset_t offset,
>>> +    vm_size_t length, uint8_t queue);
>>> #endif                         /* _KERNEL */
>>>
>>> #endif                         /* _VM_OBJECT_ */
>>>
>>
>
>

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 17:17:34 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id E0546374;
 Thu, 28 Aug 2014 17:17:34 +0000 (UTC)
Received: from mail-qc0-x22b.google.com (mail-qc0-x22b.google.com
 [IPv6:2607:f8b0:400d:c01::22b])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 5A96213A8;
 Thu, 28 Aug 2014 17:17:34 +0000 (UTC)
Received: by mail-qc0-f171.google.com with SMTP id x3so1117284qcv.2
 for ; Thu, 28 Aug 2014 10:17:33 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:date:message-id:subject
 :from:to:cc:content-type;
 bh=NolcD+3aY8yldmLdHKs0V3dCZxZxj3UEPLDUNeWFUls=;
 b=s+6izmjoMdbdsXlIPYaMK+S4q/Pz19eS/2hxatuoQrnU8cd3cit6iBYJC5F/92DsTM
 QrQNkZZuIBnkdMIcJGNkW+pY7seTKCBnh7GSO9gbNBXpyI9EQuK1Srh3RTWmnMH4IK69
 ljRWjOYIMQom1odwVZ7lOZq+Fqa/3krnz0jeworyjLsddrk7hOdB5jON0hg9RJF1n+Tf
 7Hw/9/3IyMF6iXl2os7Db+GfHbOzbtm4xKXLwo4Dn3RF5DeZdI5SbQexRGq6jNI3DXQF
 6UewiRJ3cX3dSdqDPCukvKANzEjboUQkzcqCQXADTjZ+YUHWqIba6pI0HgVo9N8qAfvu
 gQOQ==
MIME-Version: 1.0
X-Received: by 10.140.19.201 with SMTP id 67mr8267003qgh.28.1409246253436;
 Thu, 28 Aug 2014 10:17:33 -0700 (PDT)
Sender: adrian.chadd@gmail.com
Received: by 10.224.39.139 with HTTP; Thu, 28 Aug 2014 10:17:33 -0700 (PDT)
In-Reply-To: 
References: <201407261810.s6QIAIIj049439@svn.freebsd.org>
 
 <72B80282-6FA1-4481-8333-37EF3A58FB74@rice.edu>
 
Date: Thu, 28 Aug 2014 10:17:33 -0700
X-Google-Sender-Auth: XheI_rrvDSRD3puepTIjdGHUGJM
Message-ID: 
Subject: Re: svn commit: r269134 - head/sys/vm
From: Adrian Chadd 
To: hiren panchasara 
Content-Type: text/plain; charset=UTF-8
Cc: Alan Cox ,
 "svn-src-head@freebsd.org" ,
 "svn-src-all@freebsd.org" ,
 "src-committers@freebsd.org" ,
 Alan Cox 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 17:17:35 -0000

On 28 August 2014 09:52, hiren panchasara  wrote:
> On Thu, Aug 28, 2014 at 9:30 AM, Alan Cox  wrote:
>>
>> On Aug 28, 2014, at 3:30 AM, Adrian Chadd wrote:
>>
>>> Hi Alan!
>>>
>>> I just reverted back to the commit before this one and it fixed my MIPS32 boot.
>>>
>>> Would you have some time to help me help you figure out why things broke? :)
>>>
>>
>>
>> Have you tried booting a kernel based on r269134?  At the time, I tested a 64-bit MIPS kernel on gxemul, and it ran ok.  Also, Hiren reports that a 32-bit kernel from about two weeks after r269134 works for him.
>>
>
> To be precise, I am on r269799 which works for me.

Ok. I'll jump forward to r269799 and then inch forward until I find
where it broke.

Thanks!


-a

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 17:40:20 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 16525CAB;
 Thu, 28 Aug 2014 17:40:20 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 027761835;
 Thu, 28 Aug 2014 17:40:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7SHeJwi071419;
 Thu, 28 Aug 2014 17:40:19 GMT (envelope-from jfv@FreeBSD.org)
Received: (from jfv@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7SHeJPN071417;
 Thu, 28 Aug 2014 17:40:19 GMT (envelope-from jfv@FreeBSD.org)
Message-Id: <201408281740.s7SHeJPN071417@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jfv set sender to jfv@FreeBSD.org
 using -f
From: Jack F Vogel 
Date: Thu, 28 Aug 2014 17:40:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270755 - in head/sys: conf modules
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 17:40:20 -0000

Author: jfv
Date: Thu Aug 28 17:40:19 2014
New Revision: 270755
URL: http://svnweb.freebsd.org/changeset/base/270755

Log:
  Add XL710 device entries to NOTES, and directories to the module
  Makefile so they will be built.
  
  MFC after: 1 day

Modified:
  head/sys/conf/NOTES
  head/sys/modules/Makefile

Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES	Thu Aug 28 16:26:13 2014	(r270754)
+++ head/sys/conf/NOTES	Thu Aug 28 17:40:19 2014	(r270755)
@@ -2094,6 +2094,8 @@ device		em		# Intel Pro/1000 Gigabit Eth
 device		igb		# Intel Pro/1000 PCIE Gigabit Ethernet
 device		ixgb		# Intel Pro/10Gbe PCI-X Ethernet
 device		ixgbe		# Intel Pro/10Gbe PCIE Ethernet
+device		ixl		# Intel XL710 40Gbe PCIE Ethernet
+device		ixlv		# Intel XL710 40Gbe VF PCIE Ethernet
 device		le		# AMD Am7900 LANCE and Am79C9xx PCnet
 device		mxge		# Myricom Myri-10G 10GbE NIC
 device		nxge		# Neterion Xframe 10GbE Server/Storage Adapter

Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile	Thu Aug 28 16:26:13 2014	(r270754)
+++ head/sys/modules/Makefile	Thu Aug 28 17:40:19 2014	(r270755)
@@ -180,6 +180,8 @@ SUBDIR=	\
 	${_iwnfw} \
 	${_ixgb} \
 	${_ixgbe} \
+	${_ixl} \
+	${_ixlv} \
 	jme \
 	joy \
 	kbdmux \
@@ -622,6 +624,8 @@ _iwnfw=		iwnfw
 .endif
 _ixgb=		ixgb
 _ixgbe=		ixgbe
+_ixl=		ixl
+_ixlv=		ixlv
 _mly=		mly
 _nfe=		nfe
 _nvd=		nvd
@@ -729,6 +733,8 @@ _iwnfw=		iwnfw
 .endif
 _ixgb=		ixgb
 _ixgbe=		ixgbe
+_ixl=		ixl
+_ixlv=		ixlv
 _linprocfs=	linprocfs
 _linsysfs=	linsysfs
 _linux=		linux

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 17:41:17 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 730BBEEF;
 Thu, 28 Aug 2014 17:41:17 +0000 (UTC)
Received: from felyko.com (felyko.com [65.49.80.26])
 by mx1.freebsd.org (Postfix) with ESMTP id 5A2C61853;
 Thu, 28 Aug 2014 17:41:17 +0000 (UTC)
Received: from [IPv6:2601:9:8280:5fd:bcc3:14a5:6d15:c505] (unknown
 [IPv6:2601:9:8280:5fd:bcc3:14a5:6d15:c505])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by felyko.com (Postfix) with ESMTPSA id 2CFE634A9E5;
 Thu, 28 Aug 2014 10:41:16 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=felyko.com; s=mail;
 t=1409247676; bh=kHLSdSfsdLSqsBo4Q+dqe/YfCNeTQKuvsURk68eV4cQ=;
 h=Subject:From:In-Reply-To:Date:Cc:References:To;
 b=ZiChh4pM5//2ZgLiIkiCjLVLaIGlIsRiogvQnI655BE/cCtU5ZKk4iWiDhZ/lYqGi
 d4gK6Ax8pOcrQvZmxDOasXJQhME8NcnIbXZ66/a/uLC+nuJNE8LJhZttVGPcldgamp
 I9sXPEt+y7F6libdKRSW/3Z6e4Xz5P3lP5U0QI3E=
Content-Type: text/plain; charset=us-ascii
Mime-Version: 1.0 (Mac OS X Mail 8.0 \(1973.6\))
Subject: Re: svn commit: r270755 - in head/sys: conf modules
From: Rui Paulo 
In-Reply-To: <201408281740.s7SHeJPN071417@svn.freebsd.org>
Date: Thu, 28 Aug 2014 10:41:15 -0700
Content-Transfer-Encoding: 7bit
Message-Id: <5B782898-FFC0-488B-BFFB-02DF985CB2F6@felyko.com>
References: <201408281740.s7SHeJPN071417@svn.freebsd.org>
To: Jack F Vogel 
X-Mailer: Apple Mail (2.1973.6)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 17:41:17 -0000

On Aug 28, 2014, at 10:40, Jack F Vogel  wrote:
> 
> Author: jfv
> Date: Thu Aug 28 17:40:19 2014
> New Revision: 270755
> URL: http://svnweb.freebsd.org/changeset/base/270755
> 
> Log:
>  Add XL710 device entries to NOTES, and directories to the module
>  Makefile so they will be built.
> 
>  MFC after: 1 day

The minimum MFC timer is 3 days.

--
Rui Paulo




From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 18:11:06 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 515E092A;
 Thu, 28 Aug 2014 18:11:06 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 21ECA1B06;
 Thu, 28 Aug 2014 18:11:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7SIB6gk089432;
 Thu, 28 Aug 2014 18:11:06 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7SIB5oh089427;
 Thu, 28 Aug 2014 18:11:05 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201408281811.s7SIB5oh089427@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: pfg set sender to pfg@FreeBSD.org
 using -f
From: "Pedro F. Giffuni" 
Date: Thu, 28 Aug 2014 18:11:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270756 - in stable/10: bin/ed libexec/rtld-elf
 usr.bin/mail
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 18:11:06 -0000

Author: pfg
Date: Thu Aug 28 18:11:05 2014
New Revision: 270756
URL: http://svnweb.freebsd.org/changeset/base/270756

Log:
  MFC	r270256:
  Always check the limits of array index variables before using them.
  
  Obtained from:	DragonFlyBSD

Modified:
  stable/10/bin/ed/cbc.c
  stable/10/libexec/rtld-elf/libmap.c
  stable/10/usr.bin/mail/edit.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/bin/ed/cbc.c
==============================================================================
--- stable/10/bin/ed/cbc.c	Thu Aug 28 17:40:19 2014	(r270755)
+++ stable/10/bin/ed/cbc.c	Thu Aug 28 18:11:05 2014	(r270756)
@@ -237,7 +237,7 @@ expand_des_key(char *obuf, char *kbuf)
 		/*
 		 * now translate it, bombing on any illegal hex digit
 		 */
-		for (i = 0; kbuf[i] && i < 16; i++)
+		for (i = 0; i < 16 && kbuf[i]; i++)
 			if ((nbuf[i] = hex_to_binary((int) kbuf[i], 16)) == -1)
 				des_error("bad hex digit in key");
 		while (i < 16)

Modified: stable/10/libexec/rtld-elf/libmap.c
==============================================================================
--- stable/10/libexec/rtld-elf/libmap.c	Thu Aug 28 17:40:19 2014	(r270755)
+++ stable/10/libexec/rtld-elf/libmap.c	Thu Aug 28 18:11:05 2014	(r270756)
@@ -216,14 +216,14 @@ lmc_parse(char *lm_p, size_t lm_len)
 	p = NULL;
 	while (cnt < lm_len) {
 		i = 0;
-		while (lm_p[cnt] != '\n' && cnt < lm_len &&
+		while (cnt < lm_len && lm_p[cnt] != '\n' &&
 		    i < sizeof(line) - 1) {
 			line[i] = lm_p[cnt];
 			cnt++;
 			i++;
 		}
 		line[i] = '\0';
-		while (lm_p[cnt] != '\n' && cnt < lm_len)
+		while (cnt < lm_len && lm_p[cnt] != '\n')
 			cnt++;
 		/* skip over nl */
 		cnt++;

Modified: stable/10/usr.bin/mail/edit.c
==============================================================================
--- stable/10/usr.bin/mail/edit.c	Thu Aug 28 17:40:19 2014	(r270755)
+++ stable/10/usr.bin/mail/edit.c	Thu Aug 28 18:11:05 2014	(r270756)
@@ -81,7 +81,7 @@ edit1(int *msgvec, int type)
 	/*
 	 * Deal with each message to be edited . . .
 	 */
-	for (i = 0; msgvec[i] && i < msgCount; i++) {
+	for (i = 0; i < msgCount && msgvec[i]; i++) {
 		sig_t sigint;
 
 		if (i > 0) {

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 18:23:10 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 0A2A3C69;
 Thu, 28 Aug 2014 18:23:10 +0000 (UTC)
Received: from mail-lb0-x235.google.com (mail-lb0-x235.google.com
 [IPv6:2a00:1450:4010:c04::235])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id C49C81CA5;
 Thu, 28 Aug 2014 18:23:08 +0000 (UTC)
Received: by mail-lb0-f181.google.com with SMTP id n15so1342501lbi.40
 for ; Thu, 28 Aug 2014 11:23:06 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=sender:message-id:date:from:user-agent:mime-version:to:subject
 :references:in-reply-to:content-type:content-transfer-encoding;
 bh=qBRHJnnuXZ+i0xKIlKAZ93XOJzUJ/OG3YDKXbbZFGFU=;
 b=a4w7wl52BJwPTfjOsck8L2mehCsigGYqPc5fPRY7ZyesOToFjI09nPU/hgYFzmzb+Q
 rtpQhtrcmMY3bnnxEiHITxR4ktfjAEoptVUUYdKjh3c4nNblsXpHRfHD2ABx2kp0E6Gd
 5RNJDk786+Xe72S2JFTDDio4ZyIUTcaEkmAhUYPJ8lDJWtMKZCiblS6ztnfuOPaAbmvI
 kc862ovTnVeJjK/gp8XQ7neNwo4uJ5Jp5Bp4qqhNTgsizBPGVxAcUdPNCZ/tJ4CiE/xz
 GjJh24UjPRJr77TId0mkOWWw8Z22Ikqk9+rlAeLFtdIoZckdgfEhMBJzzpFEjQ61bebj
 mkhg==
X-Received: by 10.152.29.129 with SMTP id k1mr6184871lah.81.1409250186596;
 Thu, 28 Aug 2014 11:23:06 -0700 (PDT)
Received: from mavbook.mavhome.dp.ua ([134.249.139.101])
 by mx.google.com with ESMTPSA id zt1sm7086334lbc.31.2014.08.28.11.23.04
 for 
 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);
 Thu, 28 Aug 2014 11:23:05 -0700 (PDT)
Sender: Alexander Motin 
Message-ID: <53FF7386.3050804@FreeBSD.org>
Date: Thu, 28 Aug 2014 21:23:02 +0300
From: Alexander Motin 
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
 rv:24.0) Gecko/20100101 Thunderbird/24.6.0
MIME-Version: 1.0
To: =?UTF-8?B?Um9nZXIgUGF1IE1vbm7DqQ==?= , 
 src-committers@freebsd.org, svn-src-all@freebsd.org, 
 svn-src-head@freebsd.org
Subject: Re: svn commit: r269814 - head/sys/dev/xen/blkfront
References: <53e8e31e.2179.30c1c657@svn.freebsd.org>
In-Reply-To: <53e8e31e.2179.30c1c657@svn.freebsd.org>
X-Enigmail-Version: 1.6
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 18:23:10 -0000

Hi, Roger.

It looks to me like this commit does not work as it should. I got
problem when I just tried `newfs /dev/ada0 ; mount /dev/ada0 /mnt`.
Somehow newfs does not produce valid filesystem. Problem is reliably
repeatable and reverting this commit fixes it.

I found at least one possible cause there: If original data buffer is
unmapped, misaligned and not physically contiguous, then present x86
bus_dmamap_load_bio() implementation will process each physically
contiguous segment separately. Due to the misalignment first and last
physical segments may have size not multiple to 512 bytes. Since each
segment processed separately, they are not joined together, and
xbd_queue_cb() is getting segments not multiple to 512 bytes. Attempt to
convert them to exact number of sectors in the driver cause data corruption.

This is a bug of the busdma code, and until it is fixed I don't see
solution other then temporary reverting this commit.

On 11.08.2014 18:37, Roger Pau Monné   wrote:
> Author: royger
> Date: Mon Aug 11 15:37:02 2014
> New Revision: 269814
> URL: http://svnweb.freebsd.org/changeset/base/269814
> 
> Log:
>   blkfront: add support for unmapped IO
>   
>   Using unmapped IO is really beneficial when running inside of a VM,
>   since it avoids IPIs to other vCPUs in order to invalidate the
>   mappings.
>   
>   This patch adds unmapped IO support to blkfront. The following tests
>   results have been obtained when running on a Xen host without HAP:
>   
>   PVHVM
>        3165.84 real      6354.17 user      4483.32 sys
>   PVHVM with unmapped IO
>        2099.46 real      4624.52 user      2967.38 sys
>   
>   This is because when running using shadow page tables TLB flushes and
>   range invalidations are much more expensive, so using unmapped IO
>   provides a very important performance boost.
>   
>   Sponsored by:	Citrix Systems R&D
>   Tested by:	robak
>   MFC after:	1 week
>   PR:		191173
>   
>   dev/xen/blkfront/blkfront.c:
>    - Add and announce support for unmapped IO.
> 
> Modified:
>   head/sys/dev/xen/blkfront/blkfront.c
> 
> Modified: head/sys/dev/xen/blkfront/blkfront.c
> ==============================================================================
> --- head/sys/dev/xen/blkfront/blkfront.c	Mon Aug 11 15:06:07 2014	(r269813)
> +++ head/sys/dev/xen/blkfront/blkfront.c	Mon Aug 11 15:37:02 2014	(r269814)
> @@ -272,8 +272,12 @@ xbd_queue_request(struct xbd_softc *sc, 
>  {
>  	int error;
>  
> -	error = bus_dmamap_load(sc->xbd_io_dmat, cm->cm_map, cm->cm_data,
> -	    cm->cm_datalen, xbd_queue_cb, cm, 0);
> +	if (cm->cm_bp != NULL)
> +		error = bus_dmamap_load_bio(sc->xbd_io_dmat, cm->cm_map,
> +		    cm->cm_bp, xbd_queue_cb, cm, 0);
> +	else
> +		error = bus_dmamap_load(sc->xbd_io_dmat, cm->cm_map,
> +		    cm->cm_data, cm->cm_datalen, xbd_queue_cb, cm, 0);
>  	if (error == EINPROGRESS) {
>  		/*
>  		 * Maintain queuing order by freezing the queue.  The next
> @@ -333,8 +337,6 @@ xbd_bio_command(struct xbd_softc *sc)
>  	}
>  
>  	cm->cm_bp = bp;
> -	cm->cm_data = bp->bio_data;
> -	cm->cm_datalen = bp->bio_bcount;
>  	cm->cm_sector_number = (blkif_sector_t)bp->bio_pblkno;
>  
>  	switch (bp->bio_cmd) {
> @@ -993,7 +995,7 @@ xbd_instance_create(struct xbd_softc *sc
>  
>  	sc->xbd_disk->d_mediasize = sectors * sector_size;
>  	sc->xbd_disk->d_maxsize = sc->xbd_max_request_size;
> -	sc->xbd_disk->d_flags = 0;
> +	sc->xbd_disk->d_flags = DISKFLAG_UNMAPPED_BIO;
>  	if ((sc->xbd_flags & (XBDF_FLUSH|XBDF_BARRIER)) != 0) {
>  		sc->xbd_disk->d_flags |= DISKFLAG_CANFLUSHCACHE;
>  		device_printf(sc->xbd_dev,
> 


-- 
Alexander Motin

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 18:33:43 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id DB31C28A;
 Thu, 28 Aug 2014 18:33:42 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BB99B1DE0;
 Thu, 28 Aug 2014 18:33:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7SIXgQD002920;
 Thu, 28 Aug 2014 18:33:42 GMT (envelope-from tijl@FreeBSD.org)
Received: (from tijl@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7SIXg6C002919;
 Thu, 28 Aug 2014 18:33:42 GMT (envelope-from tijl@FreeBSD.org)
Message-Id: <201408281833.s7SIXg6C002919@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org
 using -f
From: Tijl Coosemans 
Date: Thu, 28 Aug 2014 18:33:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270757 - head/contrib/binutils/ld/emultempl
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 18:33:43 -0000

Author: tijl
Date: Thu Aug 28 18:33:42 2014
New Revision: 270757
URL: http://svnweb.freebsd.org/changeset/base/270757

Log:
  In r253839 the default behaviour of ld(1) was changed such that all
  libraries that need to be linked into an executable or library have to be
  listed on the command line explicitly.  This commit fixes a bug in ld(1)
  where it would scan dependencies of the libraries on the command line and
  link them if needed if they were also found in ld.so.cache.
  
  The important bit of the patch is the initialisation of needed.by such that
  libraries found by scanning dependencies are marked as such and not used in
  the link.
  
  The patch is a backport of binutils git commit
  d5c8b1f8561426b41aa5330ed60f578178fe6be2
  
  The author gave permission to use it under GPLv2 terms.
  
  PR:		192062
  Exp-run by:	antoine
  MFC after:	1 week

Modified:
  head/contrib/binutils/ld/emultempl/elf32.em

Modified: head/contrib/binutils/ld/emultempl/elf32.em
==============================================================================
--- head/contrib/binutils/ld/emultempl/elf32.em	Thu Aug 28 18:11:05 2014	(r270756)
+++ head/contrib/binutils/ld/emultempl/elf32.em	Thu Aug 28 18:33:42 2014	(r270757)
@@ -541,7 +541,8 @@ EOF
 #endif
 
 static bfd_boolean
-gld${EMULATION_NAME}_check_ld_elf_hints (const char *name, int force)
+gld${EMULATION_NAME}_check_ld_elf_hints (const struct bfd_link_needed_list *l,
+					 int force)
 {
   static bfd_boolean initialized;
   static char *ld_elf_hints;
@@ -584,10 +585,9 @@ gld${EMULATION_NAME}_check_ld_elf_hints 
   if (ld_elf_hints == NULL)
     return FALSE;
 
-  needed.by = NULL;
-  needed.name = name;
-  return gld${EMULATION_NAME}_search_needed (ld_elf_hints, & needed,
-					     force);
+  needed.by = l->by;
+  needed.name = l->name;
+  return gld${EMULATION_NAME}_search_needed (ld_elf_hints, &needed, force);
 }
 EOF
     # FreeBSD
@@ -759,7 +759,8 @@ gld${EMULATION_NAME}_parse_ld_so_conf
 }
 
 static bfd_boolean
-gld${EMULATION_NAME}_check_ld_so_conf (const char *name, int force)
+gld${EMULATION_NAME}_check_ld_so_conf (const struct bfd_link_needed_list *l,
+				       int force)
 {
   static bfd_boolean initialized;
   static char *ld_so_conf;
@@ -794,8 +795,8 @@ gld${EMULATION_NAME}_check_ld_so_conf (c
     return FALSE;
 
 
-  needed.by = NULL;
-  needed.name = name;
+  needed.by = l->by;
+  needed.name = l->name;
   return gld${EMULATION_NAME}_search_needed (ld_so_conf, &needed, force);
 }
 
@@ -1037,7 +1038,7 @@ if [ "x${USE_LIBPATH}" = xyes ] ; then
   case ${target} in
     *-*-freebsd* | *-*-dragonfly*)
       cat >>e${EMULATION_NAME}.c <name, force))
+	  if (gld${EMULATION_NAME}_check_ld_elf_hints (l, force))
 	    break;
 EOF
     # FreeBSD
@@ -1046,7 +1047,7 @@ EOF
     *-*-linux-* | *-*-k*bsd*-*)
     # Linux
       cat >>e${EMULATION_NAME}.c <name, force))
+	  if (gld${EMULATION_NAME}_check_ld_so_conf (l, force))
 	    break;
 
 EOF

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 18:45:17 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 2DCC56F3;
 Thu, 28 Aug 2014 18:45:17 +0000 (UTC)
Received: from h2.funkthat.com (gate2.funkthat.com [208.87.223.18])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client CN "funkthat.com", Issuer "funkthat.com" (not verified))
 by mx1.freebsd.org (Postfix) with ESMTPS id CFB311EFD;
 Thu, 28 Aug 2014 18:45:16 +0000 (UTC)
Received: from h2.funkthat.com (localhost [127.0.0.1])
 by h2.funkthat.com (8.14.3/8.14.3) with ESMTP id s7SIjFur064640
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
 Thu, 28 Aug 2014 11:45:15 -0700 (PDT)
 (envelope-from jmg@h2.funkthat.com)
Received: (from jmg@localhost)
 by h2.funkthat.com (8.14.3/8.14.3/Submit) id s7SIjFcZ064639;
 Thu, 28 Aug 2014 11:45:15 -0700 (PDT) (envelope-from jmg)
Date: Thu, 28 Aug 2014 11:45:15 -0700
From: John-Mark Gurney 
To: Alexander Motin 
Subject: Re: svn commit: r269814 - head/sys/dev/xen/blkfront
Message-ID: <20140828184515.GV71691@funkthat.com>
References: <53e8e31e.2179.30c1c657@svn.freebsd.org>
 <53FF7386.3050804@FreeBSD.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <53FF7386.3050804@FreeBSD.org>
User-Agent: Mutt/1.4.2.3i
X-Operating-System: FreeBSD 7.2-RELEASE i386
X-PGP-Fingerprint: 54BA 873B 6515 3F10 9E88  9322 9CB1 8F74 6D3F A396
X-Files: The truth is out there
X-URL: http://resnet.uoregon.edu/~gurney_j/
X-Resume: http://resnet.uoregon.edu/~gurney_j/resume.html
X-TipJar: bitcoin:13Qmb6AeTgQecazTWph4XasEsP7nGRbAPE
X-to-the-FBI-CIA-and-NSA: HI! HOW YA DOIN? can i haz chizburger?
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.2.2
 (h2.funkthat.com [127.0.0.1]); Thu, 28 Aug 2014 11:45:15 -0700 (PDT)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 Roger Pau =?iso-8859-1?Q?Monn=E9?= ,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 18:45:17 -0000

Alexander Motin wrote this message on Thu, Aug 28, 2014 at 21:23 +0300:
> Hi, Roger.
> 
> It looks to me like this commit does not work as it should. I got
> problem when I just tried `newfs /dev/ada0 ; mount /dev/ada0 /mnt`.
> Somehow newfs does not produce valid filesystem. Problem is reliably
> repeatable and reverting this commit fixes it.
> 
> I found at least one possible cause there: If original data buffer is
> unmapped, misaligned and not physically contiguous, then present x86
> bus_dmamap_load_bio() implementation will process each physically
> contiguous segment separately. Due to the misalignment first and last
> physical segments may have size not multiple to 512 bytes. Since each
> segment processed separately, they are not joined together, and
> xbd_queue_cb() is getting segments not multiple to 512 bytes. Attempt to
> convert them to exact number of sectors in the driver cause data corruption.

Are you sure this isn't a problem w/ the tag not properly specifying
the correct alignement?  Also, I don't think there is a way for busdma
to say that you MUST have a segment be a multiple of 512, though you
could use a 512 boundary, but that would force all segments to only be
512 bytes...

> This is a bug of the busdma code, and until it is fixed I don't see
> solution other then temporary reverting this commit.
> 
> On 11.08.2014 18:37, Roger Pau Monné   wrote:
> > Author: royger
> > Date: Mon Aug 11 15:37:02 2014
> > New Revision: 269814
> > URL: http://svnweb.freebsd.org/changeset/base/269814
> > 
> > Log:
> >   blkfront: add support for unmapped IO
> >   
> >   Using unmapped IO is really beneficial when running inside of a VM,
> >   since it avoids IPIs to other vCPUs in order to invalidate the
> >   mappings.
> >   
> >   This patch adds unmapped IO support to blkfront. The following tests
> >   results have been obtained when running on a Xen host without HAP:
> >   
> >   PVHVM
> >        3165.84 real      6354.17 user      4483.32 sys
> >   PVHVM with unmapped IO
> >        2099.46 real      4624.52 user      2967.38 sys
> >   
> >   This is because when running using shadow page tables TLB flushes and
> >   range invalidations are much more expensive, so using unmapped IO
> >   provides a very important performance boost.
> >   
> >   Sponsored by:	Citrix Systems R&D
> >   Tested by:	robak
> >   MFC after:	1 week
> >   PR:		191173
> >   
> >   dev/xen/blkfront/blkfront.c:
> >    - Add and announce support for unmapped IO.
> > 
> > Modified:
> >   head/sys/dev/xen/blkfront/blkfront.c
> > 
> > Modified: head/sys/dev/xen/blkfront/blkfront.c
> > ==============================================================================
> > --- head/sys/dev/xen/blkfront/blkfront.c	Mon Aug 11 15:06:07 2014	(r269813)
> > +++ head/sys/dev/xen/blkfront/blkfront.c	Mon Aug 11 15:37:02 2014	(r269814)
> > @@ -272,8 +272,12 @@ xbd_queue_request(struct xbd_softc *sc, 
> >  {
> >  	int error;
> >  
> > -	error = bus_dmamap_load(sc->xbd_io_dmat, cm->cm_map, cm->cm_data,
> > -	    cm->cm_datalen, xbd_queue_cb, cm, 0);
> > +	if (cm->cm_bp != NULL)
> > +		error = bus_dmamap_load_bio(sc->xbd_io_dmat, cm->cm_map,
> > +		    cm->cm_bp, xbd_queue_cb, cm, 0);
> > +	else
> > +		error = bus_dmamap_load(sc->xbd_io_dmat, cm->cm_map,
> > +		    cm->cm_data, cm->cm_datalen, xbd_queue_cb, cm, 0);
> >  	if (error == EINPROGRESS) {
> >  		/*
> >  		 * Maintain queuing order by freezing the queue.  The next
> > @@ -333,8 +337,6 @@ xbd_bio_command(struct xbd_softc *sc)
> >  	}
> >  
> >  	cm->cm_bp = bp;
> > -	cm->cm_data = bp->bio_data;
> > -	cm->cm_datalen = bp->bio_bcount;
> >  	cm->cm_sector_number = (blkif_sector_t)bp->bio_pblkno;
> >  
> >  	switch (bp->bio_cmd) {
> > @@ -993,7 +995,7 @@ xbd_instance_create(struct xbd_softc *sc
> >  
> >  	sc->xbd_disk->d_mediasize = sectors * sector_size;
> >  	sc->xbd_disk->d_maxsize = sc->xbd_max_request_size;
> > -	sc->xbd_disk->d_flags = 0;
> > +	sc->xbd_disk->d_flags = DISKFLAG_UNMAPPED_BIO;
> >  	if ((sc->xbd_flags & (XBDF_FLUSH|XBDF_BARRIER)) != 0) {
> >  		sc->xbd_disk->d_flags |= DISKFLAG_CANFLUSHCACHE;
> >  		device_printf(sc->xbd_dev,

-- 
  John-Mark Gurney				Voice: +1 415 225 5579

     "All that I will do, has been done, All that I have, has not."

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 18:58:19 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 41FDCC25;
 Thu, 28 Aug 2014 18:58:19 +0000 (UTC)
Received: from mail-la0-x230.google.com (mail-la0-x230.google.com
 [IPv6:2a00:1450:4010:c03::230])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 27B7610A4;
 Thu, 28 Aug 2014 18:58:17 +0000 (UTC)
Received: by mail-la0-f48.google.com with SMTP id gl10so1487698lab.7
 for ; Thu, 28 Aug 2014 11:58:16 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject
 :references:in-reply-to:content-type:content-transfer-encoding;
 bh=QJLFY4UWBHKYk+UMn53YMVTetgxUC+Wi2N1ytpGo+FQ=;
 b=QxLN42WTj5q3nQo77wo8lDs8zHSDM6fg+A0hlDp9c5foc1QqRWoE6uSaEQwVQxxrdD
 QnTHZEoRisCqmznlLuKkabrXZ4cpxeY/BtIqPRODkjffvQpNmYv6x4gdtPriQCt0RnH9
 jXOgxVzejtlY8Utl/afmo6Gcg9q34S/qlYNNXR4bVE8pJnoWE+eNh/ttYXQgBvx6Fx8G
 1Z71VdNHeRUAA0VSKoXB7TuVq//JFVp60z+TaSzDLJTYAPR1tDUtgHupl3H++qLRKvrw
 SUaYk441dMzI+2Z01lVmq7aFTANmtmvfjK5KYGyHARfNTiaWJYJSWbhZOtMI0yPFy7BQ
 vQqg==
X-Received: by 10.152.179.229 with SMTP id dj5mr4893968lac.97.1409252295967;
 Thu, 28 Aug 2014 11:58:15 -0700 (PDT)
Received: from mavbook.mavhome.dp.ua ([134.249.139.101])
 by mx.google.com with ESMTPSA id h9sm2889224lae.40.2014.08.28.11.58.13
 for 
 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);
 Thu, 28 Aug 2014 11:58:15 -0700 (PDT)
Sender: Alexander Motin 
Message-ID: <53FF7BC4.6050801@FreeBSD.org>
Date: Thu, 28 Aug 2014 21:58:12 +0300
From: Alexander Motin 
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
 rv:24.0) Gecko/20100101 Thunderbird/24.6.0
MIME-Version: 1.0
To: John-Mark Gurney 
Subject: Re: svn commit: r269814 - head/sys/dev/xen/blkfront
References: <53e8e31e.2179.30c1c657@svn.freebsd.org>
 <53FF7386.3050804@FreeBSD.org> <20140828184515.GV71691@funkthat.com>
In-Reply-To: <20140828184515.GV71691@funkthat.com>
X-Enigmail-Version: 1.6
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 =?ISO-8859-1?Q?Roger_Pau_Monn=E9?= ,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 18:58:19 -0000

On 28.08.2014 21:45, John-Mark Gurney wrote:
> Alexander Motin wrote this message on Thu, Aug 28, 2014 at 21:23 +0300:
>> Hi, Roger.
>>
>> It looks to me like this commit does not work as it should. I got
>> problem when I just tried `newfs /dev/ada0 ; mount /dev/ada0 /mnt`.
>> Somehow newfs does not produce valid filesystem. Problem is reliably
>> repeatable and reverting this commit fixes it.
>>
>> I found at least one possible cause there: If original data buffer is
>> unmapped, misaligned and not physically contiguous, then present x86
>> bus_dmamap_load_bio() implementation will process each physically
>> contiguous segment separately. Due to the misalignment first and last
>> physical segments may have size not multiple to 512 bytes. Since each
>> segment processed separately, they are not joined together, and
>> xbd_queue_cb() is getting segments not multiple to 512 bytes. Attempt to
>> convert them to exact number of sectors in the driver cause data corruption.
> 
> Are you sure this isn't a problem w/ the tag not properly specifying
> the correct alignement? 

I don't know how to specify it stronger then this:
        error = bus_dma_tag_create(
            bus_get_dma_tag(sc->xbd_dev),       /* parent */
            512, PAGE_SIZE,                     /* algnmnt, boundary */
            BUS_SPACE_MAXADDR,                  /* lowaddr */
            BUS_SPACE_MAXADDR,                  /* highaddr */
            NULL, NULL,                         /* filter, filterarg */
            sc->xbd_max_request_size,
            sc->xbd_max_request_segments,
            PAGE_SIZE,                          /* maxsegsize */
            BUS_DMA_ALLOCNOW,                   /* flags */
            busdma_lock_mutex,                  /* lockfunc */
            &sc->xbd_io_lock,                   /* lockarg */
            &sc->xbd_io_dmat);

> Also, I don't think there is a way for busdma
> to say that you MUST have a segment be a multiple of 512, though you
> could use a 512 boundary, but that would force all segments to only be
> 512 bytes...

As I understand, that is mandatory requirement for this "hardware".
Alike 4K alignment requirement also exist at least for SDHCI, and IIRC
UHCI/OHCI hardware. Even AHCI requires both segment addresses and
lengths to be even.

I may be wrong, but I think it is quite likely that hardware that
requires segment address alignment quite likely will have the same
requirements for segments length.

>> This is a bug of the busdma code, and until it is fixed I don't see
>> solution other then temporary reverting this commit.
>>
>> On 11.08.2014 18:37, Roger Pau Monné   wrote:
>>> Author: royger
>>> Date: Mon Aug 11 15:37:02 2014
>>> New Revision: 269814
>>> URL: http://svnweb.freebsd.org/changeset/base/269814
>>>
>>> Log:
>>>   blkfront: add support for unmapped IO
>>>   
>>>   Using unmapped IO is really beneficial when running inside of a VM,
>>>   since it avoids IPIs to other vCPUs in order to invalidate the
>>>   mappings.
>>>   
>>>   This patch adds unmapped IO support to blkfront. The following tests
>>>   results have been obtained when running on a Xen host without HAP:
>>>   
>>>   PVHVM
>>>        3165.84 real      6354.17 user      4483.32 sys
>>>   PVHVM with unmapped IO
>>>        2099.46 real      4624.52 user      2967.38 sys
>>>   
>>>   This is because when running using shadow page tables TLB flushes and
>>>   range invalidations are much more expensive, so using unmapped IO
>>>   provides a very important performance boost.
>>>   
>>>   Sponsored by:	Citrix Systems R&D
>>>   Tested by:	robak
>>>   MFC after:	1 week
>>>   PR:		191173
>>>   
>>>   dev/xen/blkfront/blkfront.c:
>>>    - Add and announce support for unmapped IO.
>>>
>>> Modified:
>>>   head/sys/dev/xen/blkfront/blkfront.c
>>>
>>> Modified: head/sys/dev/xen/blkfront/blkfront.c
>>> ==============================================================================
>>> --- head/sys/dev/xen/blkfront/blkfront.c	Mon Aug 11 15:06:07 2014	(r269813)
>>> +++ head/sys/dev/xen/blkfront/blkfront.c	Mon Aug 11 15:37:02 2014	(r269814)
>>> @@ -272,8 +272,12 @@ xbd_queue_request(struct xbd_softc *sc, 
>>>  {
>>>  	int error;
>>>  
>>> -	error = bus_dmamap_load(sc->xbd_io_dmat, cm->cm_map, cm->cm_data,
>>> -	    cm->cm_datalen, xbd_queue_cb, cm, 0);
>>> +	if (cm->cm_bp != NULL)
>>> +		error = bus_dmamap_load_bio(sc->xbd_io_dmat, cm->cm_map,
>>> +		    cm->cm_bp, xbd_queue_cb, cm, 0);
>>> +	else
>>> +		error = bus_dmamap_load(sc->xbd_io_dmat, cm->cm_map,
>>> +		    cm->cm_data, cm->cm_datalen, xbd_queue_cb, cm, 0);
>>>  	if (error == EINPROGRESS) {
>>>  		/*
>>>  		 * Maintain queuing order by freezing the queue.  The next
>>> @@ -333,8 +337,6 @@ xbd_bio_command(struct xbd_softc *sc)
>>>  	}
>>>  
>>>  	cm->cm_bp = bp;
>>> -	cm->cm_data = bp->bio_data;
>>> -	cm->cm_datalen = bp->bio_bcount;
>>>  	cm->cm_sector_number = (blkif_sector_t)bp->bio_pblkno;
>>>  
>>>  	switch (bp->bio_cmd) {
>>> @@ -993,7 +995,7 @@ xbd_instance_create(struct xbd_softc *sc
>>>  
>>>  	sc->xbd_disk->d_mediasize = sectors * sector_size;
>>>  	sc->xbd_disk->d_maxsize = sc->xbd_max_request_size;
>>> -	sc->xbd_disk->d_flags = 0;
>>> +	sc->xbd_disk->d_flags = DISKFLAG_UNMAPPED_BIO;
>>>  	if ((sc->xbd_flags & (XBDF_FLUSH|XBDF_BARRIER)) != 0) {
>>>  		sc->xbd_disk->d_flags |= DISKFLAG_CANFLUSHCACHE;
>>>  		device_printf(sc->xbd_dev,
> 


-- 
Alexander Motin

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 18:59:40 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id DD77EDAC;
 Thu, 28 Aug 2014 18:59:40 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AF2BF10C4;
 Thu, 28 Aug 2014 18:59:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7SIxeDf015917;
 Thu, 28 Aug 2014 18:59:40 GMT (envelope-from smh@FreeBSD.org)
Received: (from smh@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7SIxekg015911;
 Thu, 28 Aug 2014 18:59:40 GMT (envelope-from smh@FreeBSD.org)
Message-Id: <201408281859.s7SIxekg015911@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: smh set sender to smh@FreeBSD.org
 using -f
From: Steven Hartland 
Date: Thu, 28 Aug 2014 18:59:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270758 - head/sys/dev/ixl
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 18:59:41 -0000

Author: smh
Date: Thu Aug 28 18:59:39 2014
New Revision: 270758
URL: http://svnweb.freebsd.org/changeset/base/270758

Log:
  Fix build breakage caused by ixl driver
  
  Fix missing includes and invalid vars in ixl / ixlv driver added by r270346
  which caused build failures for GENERIC kernel after it was made default
  by r270755.
  
  X-MFC-With: r270346 / r270755
  Sponsored by:	Multiplay

Modified:
  head/sys/dev/ixl/i40e_osdep.h
  head/sys/dev/ixl/if_ixlv.c
  head/sys/dev/ixl/ixl.h

Modified: head/sys/dev/ixl/i40e_osdep.h
==============================================================================
--- head/sys/dev/ixl/i40e_osdep.h	Thu Aug 28 18:33:42 2014	(r270757)
+++ head/sys/dev/ixl/i40e_osdep.h	Thu Aug 28 18:59:39 2014	(r270758)
@@ -191,7 +191,7 @@ rd32_osdep(struct i40e_osdep *osdep, uin
 
 	KASSERT(reg < osdep->mem_bus_space_size,
 	    ("ixl: register offset %#jx too large (max is %#jx",
-	    (uintmax_t)a, (uintmax_t)osdep->mem_bus_space_size));
+	    (uintmax_t)reg, (uintmax_t)osdep->mem_bus_space_size));
 
 	return (bus_space_read_4(osdep->mem_bus_space_tag,
 	    osdep->mem_bus_space_handle, reg));
@@ -203,7 +203,7 @@ wr32_osdep(struct i40e_osdep *osdep, uin
 
 	KASSERT(reg < osdep->mem_bus_space_size,
 	    ("ixl: register offset %#jx too large (max is %#jx",
-	    (uintmax_t)a, (uintmax_t)osdep->mem_bus_space_size));
+	    (uintmax_t)reg, (uintmax_t)osdep->mem_bus_space_size));
 
 	bus_space_write_4(osdep->mem_bus_space_tag,
 	    osdep->mem_bus_space_handle, reg, value);

Modified: head/sys/dev/ixl/if_ixlv.c
==============================================================================
--- head/sys/dev/ixl/if_ixlv.c	Thu Aug 28 18:33:42 2014	(r270757)
+++ head/sys/dev/ixl/if_ixlv.c	Thu Aug 28 18:59:39 2014	(r270758)
@@ -2311,7 +2311,7 @@ ixlv_update_link_status(struct ixlv_sc *
 static void
 ixlv_stop(struct ixlv_sc *sc)
 {
-	mtx_assert(&sc->sc_mtx, MA_OWNED);
+	mtx_assert(&sc->mtx, MA_OWNED);
 
 	INIT_DBG_IF(&sc->vsi->ifp, "begin");
 

Modified: head/sys/dev/ixl/ixl.h
==============================================================================
--- head/sys/dev/ixl/ixl.h	Thu Aug 28 18:33:42 2014	(r270757)
+++ head/sys/dev/ixl/ixl.h	Thu Aug 28 18:59:39 2014	(r270758)
@@ -47,8 +47,10 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
+#include 
 #include 
 #include 
 #include 

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 19:50:09 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id EA79AD6E;
 Thu, 28 Aug 2014 19:50:09 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D464E1857;
 Thu, 28 Aug 2014 19:50:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7SJo9LE047226;
 Thu, 28 Aug 2014 19:50:09 GMT (envelope-from smh@FreeBSD.org)
Received: (from smh@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7SJo90I047213;
 Thu, 28 Aug 2014 19:50:09 GMT (envelope-from smh@FreeBSD.org)
Message-Id: <201408281950.s7SJo90I047213@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: smh set sender to smh@FreeBSD.org
 using -f
From: Steven Hartland 
Date: Thu, 28 Aug 2014 19:50:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270759 - in head/sys: cddl/compat/opensolaris/kern
 cddl/compat/opensolaris/sys cddl/contrib/opensolaris/uts/common/fs/zfs vm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 19:50:10 -0000

Author: smh
Date: Thu Aug 28 19:50:08 2014
New Revision: 270759
URL: http://svnweb.freebsd.org/changeset/base/270759

Log:
  Refactor ZFS ARC reclaim logic to be more VM cooperative
  
  Prior to this change we triggered ARC reclaim when kmem usage passed 3/4
  of the total available, as indicated by vmem_size(kmem_arena, VMEM_ALLOC).
  
  This could lead large amounts of unused RAM e.g. on a 192GB machine with
  ARC the only major RAM consumer, 40GB of RAM would remain unused.
  
  The old method has also been seen to result in extreme RAM usage under
  certain loads, causing poor performance and stalls.
  
  We now trigger ARC reclaim when the number of free pages drops below the
  value defined by the new sysctl vfs.zfs.arc_free_target, which defaults
  to the value of vm.v_free_target.
  
  Credit to Karl Denninger for the original patch on which this update was
  based.
  
  PR:		191510 and 187594
  Tested by:	dteske
  MFC after:	1 week
  Relnotes:	yes
  Sponsored by:	Multiplay

Modified:
  head/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c
  head/sys/cddl/compat/opensolaris/sys/kmem.h
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  head/sys/vm/vm_pageout.c

Modified: head/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c
==============================================================================
--- head/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c	Thu Aug 28 18:59:39 2014	(r270758)
+++ head/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c	Thu Aug 28 19:50:08 2014	(r270759)
@@ -126,18 +126,47 @@ kmem_size_init(void *unused __unused)
 }
 SYSINIT(kmem_size_init, SI_SUB_KMEM, SI_ORDER_ANY, kmem_size_init, NULL);
 
-uint64_t
-kmem_size(void)
+/*
+ * The return values from kmem_free_* are only valid once the pagedaemon
+ * has been initialised, before then they return 0.
+ * 
+ * To ensure the returns are valid the caller can use a SYSINIT with
+ * subsystem set to SI_SUB_KTHREAD_PAGE and an order of at least
+ * SI_ORDER_SECOND.
+ */
+u_int
+kmem_free_target(void)
 {
 
-	return (kmem_size_val);
+	return (vm_cnt.v_free_target);
+}
+
+u_int
+kmem_free_min(void)
+{
+
+	return (vm_cnt.v_free_min);
+}
+
+u_int
+kmem_free_count(void)
+{
+
+	return (vm_cnt.v_free_count);
+}
+
+u_int
+kmem_page_count(void)
+{
+
+	return (vm_cnt.v_page_count);
 }
 
 uint64_t
-kmem_used(void)
+kmem_size(void)
 {
 
-	return (vmem_size(kmem_arena, VMEM_ALLOC));
+	return (kmem_size_val);
 }
 
 static int

Modified: head/sys/cddl/compat/opensolaris/sys/kmem.h
==============================================================================
--- head/sys/cddl/compat/opensolaris/sys/kmem.h	Thu Aug 28 18:59:39 2014	(r270758)
+++ head/sys/cddl/compat/opensolaris/sys/kmem.h	Thu Aug 28 19:50:08 2014	(r270759)
@@ -66,7 +66,16 @@ typedef struct kmem_cache {
 void *zfs_kmem_alloc(size_t size, int kmflags);
 void zfs_kmem_free(void *buf, size_t size);
 uint64_t kmem_size(void);
-uint64_t kmem_used(void);
+u_int kmem_page_count(void);
+
+/*
+ * The return values from kmem_free_* are only valid once the pagedaemon
+ * has been initialised, before then they return 0.
+ */
+u_int kmem_free_count(void);
+u_int kmem_free_target(void);
+u_int kmem_free_min(void);
+
 kmem_cache_t *kmem_cache_create(char *name, size_t bufsize, size_t align,
     int (*constructor)(void *, void *, int), void (*destructor)(void *, void *),
     void (*reclaim)(void *) __unused, void *private, vmem_t *vmp, int cflags);

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Thu Aug 28 18:59:39 2014	(r270758)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Thu Aug 28 19:50:08 2014	(r270759)
@@ -193,9 +193,6 @@ extern int zfs_prefetch_disable;
  */
 static boolean_t arc_warm;
 
-/*
- * These tunables are for performance analysis.
- */
 uint64_t zfs_arc_max;
 uint64_t zfs_arc_min;
 uint64_t zfs_arc_meta_limit = 0;
@@ -204,6 +201,20 @@ int zfs_arc_shrink_shift = 0;
 int zfs_arc_p_min_shift = 0;
 int zfs_disable_dup_eviction = 0;
 uint64_t zfs_arc_average_blocksize = 8 * 1024; /* 8KB */
+u_int zfs_arc_free_target = (1 << 19); /* default before pagedaemon init only */
+
+static int sysctl_vfs_zfs_arc_free_target(SYSCTL_HANDLER_ARGS);
+
+#ifdef _KERNEL
+static void
+arc_free_target_init(void *unused __unused)
+{
+
+	zfs_arc_free_target = kmem_free_target();
+}
+SYSINIT(arc_free_target_init, SI_SUB_KTHREAD_PAGE, SI_ORDER_ANY,
+    arc_free_target_init, NULL);
+#endif
 
 TUNABLE_QUAD("vfs.zfs.arc_meta_limit", &zfs_arc_meta_limit);
 SYSCTL_DECL(_vfs_zfs);
@@ -214,6 +225,35 @@ SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, arc_min
 SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, arc_average_blocksize, CTLFLAG_RDTUN,
     &zfs_arc_average_blocksize, 0,
     "ARC average blocksize");
+/*
+ * We don't have a tunable for arc_free_target due to the dependency on
+ * pagedaemon initialisation.
+ */
+SYSCTL_PROC(_vfs_zfs, OID_AUTO, arc_free_target,
+    CTLTYPE_UINT | CTLFLAG_MPSAFE | CTLFLAG_RW, 0, sizeof(u_int),
+    sysctl_vfs_zfs_arc_free_target, "IU",
+    "Desired number of free pages below which ARC triggers reclaim");
+
+static int
+sysctl_vfs_zfs_arc_free_target(SYSCTL_HANDLER_ARGS)
+{
+	u_int val;
+	int err;
+
+	val = zfs_arc_free_target;
+	err = sysctl_handle_int(oidp, &val, 0, req);
+	if (err != 0 || req->newptr == NULL)
+		return (err);
+
+	if (val < kmem_free_min())
+		return (EINVAL);
+	if (val > kmem_page_count())
+		return (EINVAL);
+
+	zfs_arc_free_target = val;
+
+	return (0);
+}
 
 /*
  * Note that buffers can be in one of 6 states:
@@ -2418,9 +2458,12 @@ arc_flush(spa_t *spa)
 void
 arc_shrink(void)
 {
+
 	if (arc_c > arc_c_min) {
 		uint64_t to_free;
 
+		DTRACE_PROBE2(arc__shrink, uint64_t, arc_c, uint64_t,
+			arc_c_min);
 #ifdef _KERNEL
 		to_free = arc_c >> arc_shrink_shift;
 #else
@@ -2440,8 +2483,11 @@ arc_shrink(void)
 		ASSERT((int64_t)arc_p >= 0);
 	}
 
-	if (arc_size > arc_c)
+	if (arc_size > arc_c) {
+		DTRACE_PROBE2(arc__shrink_adjust, uint64_t, arc_size,
+			uint64_t, arc_c);
 		arc_adjust();
+	}
 }
 
 static int needfree = 0;
@@ -2452,15 +2498,25 @@ arc_reclaim_needed(void)
 
 #ifdef _KERNEL
 
-	if (needfree)
+	if (needfree) {
+		DTRACE_PROBE(arc__reclaim_needfree);
 		return (1);
+	}
+
+	if (kmem_free_count() < zfs_arc_free_target) {
+		DTRACE_PROBE2(arc__reclaim_freetarget, uint64_t,
+		    kmem_free_count(), uint64_t, zfs_arc_free_target);
+		return (1);
+	}
 
 	/*
 	 * Cooperate with pagedaemon when it's time for it to scan
 	 * and reclaim some pages.
 	 */
-	if (vm_paging_needed())
+	if (vm_paging_needed()) {
+		DTRACE_PROBE(arc__reclaim_paging);
 		return (1);
+	}
 
 #ifdef sun
 	/*
@@ -2504,15 +2560,14 @@ arc_reclaim_needed(void)
 	    (btop(vmem_size(heap_arena, VMEM_FREE | VMEM_ALLOC)) >> 2))
 		return (1);
 #endif
-#else	/* !sun */
-	if (kmem_used() > (kmem_size() * 3) / 4)
-		return (1);
 #endif	/* sun */
 
 #else
 	if (spa_get_random(100) == 0)
 		return (1);
 #endif
+	DTRACE_PROBE(arc__reclaim_no);
+
 	return (0);
 }
 

Modified: head/sys/vm/vm_pageout.c
==============================================================================
--- head/sys/vm/vm_pageout.c	Thu Aug 28 18:59:39 2014	(r270758)
+++ head/sys/vm/vm_pageout.c	Thu Aug 28 19:50:08 2014	(r270759)
@@ -115,10 +115,14 @@ __FBSDID("$FreeBSD$");
 
 /* the kernel process "vm_pageout"*/
 static void vm_pageout(void);
+static void vm_pageout_init(void);
 static int vm_pageout_clean(vm_page_t);
 static void vm_pageout_scan(struct vm_domain *vmd, int pass);
 static void vm_pageout_mightbe_oom(struct vm_domain *vmd, int pass);
 
+SYSINIT(pagedaemon_init, SI_SUB_KTHREAD_PAGE, SI_ORDER_FIRST, vm_pageout_init,
+    NULL);
+
 struct proc *pageproc;
 
 static struct kproc_desc page_kp = {
@@ -126,7 +130,7 @@ static struct kproc_desc page_kp = {
 	vm_pageout,
 	&pageproc
 };
-SYSINIT(pagedaemon, SI_SUB_KTHREAD_PAGE, SI_ORDER_FIRST, kproc_start,
+SYSINIT(pagedaemon, SI_SUB_KTHREAD_PAGE, SI_ORDER_SECOND, kproc_start,
     &page_kp);
 
 #if !defined(NO_SWAPPING)
@@ -1640,15 +1644,11 @@ vm_pageout_worker(void *arg)
 }
 
 /*
- *	vm_pageout is the high level pageout daemon.
+ *	vm_pageout_init initialises basic pageout daemon settings.
  */
 static void
-vm_pageout(void)
+vm_pageout_init(void)
 {
-#if MAXMEMDOM > 1
-	int error, i;
-#endif
-
 	/*
 	 * Initialize some paging parameters.
 	 */
@@ -1694,6 +1694,17 @@ vm_pageout(void)
 	/* XXX does not really belong here */
 	if (vm_page_max_wired == 0)
 		vm_page_max_wired = vm_cnt.v_free_count / 3;
+}
+
+/*
+ *     vm_pageout is the high level pageout daemon.
+ */
+static void
+vm_pageout(void)
+{
+#if MAXMEMDOM > 1
+	int error, i;
+#endif
 
 	swap_pager_swap_init();
 #if MAXMEMDOM > 1

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 19:59:05 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id A7B593C1;
 Thu, 28 Aug 2014 19:59:05 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 928661971;
 Thu, 28 Aug 2014 19:59:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7SJx5wJ053144;
 Thu, 28 Aug 2014 19:59:05 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7SJx5u8053142;
 Thu, 28 Aug 2014 19:59:05 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201408281959.s7SJx5u8053142@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper 
Date: Thu, 28 Aug 2014 19:59:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270760 - in stable/10: lib/libc share/mk
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 19:59:05 -0000

Author: ngie
Date: Thu Aug 28 19:59:04 2014
New Revision: 270760
URL: http://svnweb.freebsd.org/changeset/base/270760

Log:
  MFC r270519:
  
  Fix "make checkdpadd" for lib/libc when MK_SSP != no
  
   Add LIBSSP_NONSHARED to bsd.libnames.mk and append LIBSSP_NONSHARED to DPADD in
   lib/libc when MK_SSP != no
  
   Approved by: rpaulo (mentor)
   Phabric: D675 (as part of a larger diff)
   PR: 192728

Modified:
  stable/10/lib/libc/Makefile
  stable/10/share/mk/bsd.libnames.mk
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libc/Makefile
==============================================================================
--- stable/10/lib/libc/Makefile	Thu Aug 28 19:50:08 2014	(r270759)
+++ stable/10/lib/libc/Makefile	Thu Aug 28 19:59:04 2014	(r270760)
@@ -47,6 +47,7 @@ LDFLAGS+= -nodefaultlibs
 LDADD+= -lgcc
 
 .if ${MK_SSP} != "no"
+DPADD+= ${LIBSSP_NONSHARED}
 LDADD+= -lssp_nonshared
 .endif
 

Modified: stable/10/share/mk/bsd.libnames.mk
==============================================================================
--- stable/10/share/mk/bsd.libnames.mk	Thu Aug 28 19:50:08 2014	(r270759)
+++ stable/10/share/mk/bsd.libnames.mk	Thu Aug 28 19:59:04 2014	(r270760)
@@ -142,6 +142,7 @@ LIBSDP?=	${DESTDIR}${LIBDIR}/libsdp.a
 LIBSMB?=	${DESTDIR}${LIBDIR}/libsmb.a
 LIBSSH?=	${DESTDIR}${LIBPRIVATEDIR}/libssh.a
 LIBSSL?=	${DESTDIR}${LIBDIR}/libssl.a
+LIBSSP_NONSHARED?=	${DESTDIR}${LIBDIR}/libssp_nonshared.a
 LIBSTAND?=	${DESTDIR}${LIBDIR}/libstand.a
 LIBSTDCPLUSPLUS?= ${DESTDIR}${LIBDIR}/libstdc++.a
 LIBTACPLUS?=	${DESTDIR}${LIBDIR}/libtacplus.a

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 20:25:18 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 5DF46BA0;
 Thu, 28 Aug 2014 20:25:18 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 46B371C5E;
 Thu, 28 Aug 2014 20:25:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7SKPIxr071226;
 Thu, 28 Aug 2014 20:25:18 GMT (envelope-from mav@FreeBSD.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7SKPIoJ071225;
 Thu, 28 Aug 2014 20:25:18 GMT (envelope-from mav@FreeBSD.org)
Message-Id: <201408282025.s7SKPIoJ071225@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org
 using -f
From: Alexander Motin 
Date: Thu, 28 Aug 2014 20:25:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270761 - stable/10/release/doc/en_US.ISO8859-1/relnotes
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 20:25:18 -0000

Author: mav
Date: Thu Aug 28 20:25:17 2014
New Revision: 270761
URL: http://svnweb.freebsd.org/changeset/base/270761

Log:
  Mention NFS and kernel iSCSI optimizations.

Modified:
  stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 19:59:04 2014	(r270760)
+++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 20:25:17 2014	(r270761)
@@ -472,6 +472,13 @@
 	A bug in &man.sctp.4; that would allow
 	  two listening sockets bound to the same port has been
 	  fixed.
+
+	Kernel RPC code, which is a
+	  base of NFS server took multiple optimizations, that significantly
+	  improved its performance and SMP scapability.
+
+	New kernel-based iSCSI target and initiator code took many
+	  fixes and performance optimizations.
       
 
       

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 20:38:04 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id D50CBFC8;
 Thu, 28 Aug 2014 20:38:04 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BFBC31D81;
 Thu, 28 Aug 2014 20:38:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7SKc4uX077687;
 Thu, 28 Aug 2014 20:38:04 GMT (envelope-from mav@FreeBSD.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7SKc4jO077686;
 Thu, 28 Aug 2014 20:38:04 GMT (envelope-from mav@FreeBSD.org)
Message-Id: <201408282038.s7SKc4jO077686@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org
 using -f
From: Alexander Motin 
Date: Thu, 28 Aug 2014 20:38:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270762 - stable/10/release/doc/en_US.ISO8859-1/relnotes
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 20:38:05 -0000

Author: mav
Date: Thu Aug 28 20:38:04 2014
New Revision: 270762
URL: http://svnweb.freebsd.org/changeset/base/270762

Log:
  Document volmode ZVOL property addition.

Modified:
  stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 20:25:17 2014	(r270761)
+++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 20:38:04 2014	(r270762)
@@ -525,6 +525,12 @@
 	  providing support for LSI Fusion-MPT 3 12Gb SCSI/SATA
 	  controllers.
 
+	A new ZVOL property volmode
+	  and  &man.sysctl.8; vfs.zfs.vol.mode has been
+	  added to allow switching ZVOL between three different ways of
+	  exposing it to a user: geom,
+	  dev and none.
+
 	The
 	  &man.mrsas.4; driver has been added,
 	  providing support for LSI MegaRAID SAS controllers.  The

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 20:41:54 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 098292E9;
 Thu, 28 Aug 2014 20:41:54 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E82571E47;
 Thu, 28 Aug 2014 20:41:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7SKfr13081521;
 Thu, 28 Aug 2014 20:41:53 GMT (envelope-from mav@FreeBSD.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7SKfrnT081520;
 Thu, 28 Aug 2014 20:41:53 GMT (envelope-from mav@FreeBSD.org)
Message-Id: <201408282041.s7SKfrnT081520@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org
 using -f
From: Alexander Motin 
Date: Thu, 28 Aug 2014 20:41:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270763 - stable/10/release/doc/en_US.ISO8859-1/relnotes
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 20:41:54 -0000

Author: mav
Date: Thu Aug 28 20:41:53 2014
New Revision: 270763
URL: http://svnweb.freebsd.org/changeset/base/270763

Log:
  Document ZVOLs got BIO_DELETE support.

Modified:
  stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 20:38:04 2014	(r270762)
+++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 20:41:53 2014	(r270763)
@@ -517,6 +517,8 @@
 	Support for LUN-based CD changers has
 	  been removed from the &man.cd.4; driver.
 
+	ZVOLs got BIO_DELETE support.
+
 	Support for 9th generation HP host bus
 	  adapter cards has been added to &man.ciss.4;.
 

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 20:58:33 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 14DED64B;
 Thu, 28 Aug 2014 20:58:33 +0000 (UTC)
Received: from woozle.rinet.ru (woozle.rinet.ru [195.54.192.68])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 84FD21F8E;
 Thu, 28 Aug 2014 20:58:31 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
 by woozle.rinet.ru (8.14.5/8.14.5) with ESMTP id s7SKwKog019349;
 Fri, 29 Aug 2014 00:58:20 +0400 (MSK) (envelope-from marck@rinet.ru)
Date: Fri, 29 Aug 2014 00:58:20 +0400 (MSK)
From: Dmitry Morozovsky 
To: Steven Hartland 
Subject: Re: svn commit: r270759 - in head/sys: cddl/compat/opensolaris/kern
 cddl/compat/opensolaris/sys cddl/contrib/opensolaris/uts/common/fs/zfs vm
In-Reply-To: <201408281950.s7SJo90I047213@svn.freebsd.org>
Message-ID: 
References: <201408281950.s7SJo90I047213@svn.freebsd.org>
User-Agent: Alpine 2.00 (BSF 1167 2008-08-23)
X-NCC-RegID: ru.rinet
X-OpenPGP-Key-ID: 6B691B03
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3
 (woozle.rinet.ru [0.0.0.0]); Fri, 29 Aug 2014 00:58:20 +0400 (MSK)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 20:58:33 -0000

Steve,

On Thu, 28 Aug 2014, Steven Hartland wrote:

> Author: smh
> Date: Thu Aug 28 19:50:08 2014
> New Revision: 270759
> URL: http://svnweb.freebsd.org/changeset/base/270759
> 
> Log:
>   Refactor ZFS ARC reclaim logic to be more VM cooperative

[snip]

>   Credit to Karl Denninger for the original patch on which this update was
>   based.
>   Tested by:	dteske
>   MFC after:	1 week
>   Relnotes:	yes
>   Sponsored by:	Multiplay

Thank you, and also Karl and Devin for this work!

Is this change applicable to stable/9? I suppose, pretty large base of users 
could benefit from this.

-- 
Sincerely,
D.Marck                                     [DM5020, MCK-RIPE, DM3-RIPN]
[ FreeBSD committer:                                 marck@FreeBSD.org ]
------------------------------------------------------------------------
*** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- marck@rinet.ru ***
------------------------------------------------------------------------

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 21:02:11 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 70D66824;
 Thu, 28 Aug 2014 21:02:11 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 50A331079;
 Thu, 28 Aug 2014 21:02:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7SL2Bw0091013;
 Thu, 28 Aug 2014 21:02:11 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7SL2BBa091012;
 Thu, 28 Aug 2014 21:02:11 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201408282102.s7SL2BBa091012@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber 
Date: Thu, 28 Aug 2014 21:02:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270764 - stable/10/release/doc/en_US.ISO8859-1/relnotes
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 21:02:11 -0000

Author: gjb
Date: Thu Aug 28 21:02:10 2014
New Revision: 270764
URL: http://svnweb.freebsd.org/changeset/base/270764

Log:
  Add FreeBSD/ARM notes.
  
  These do not have corresponding revision numbers, since
  the updates took place over a large span of revisions,
  not one revision in particular.
  
  Submitted/prepared by:	ian
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 20:41:53 2014	(r270763)
+++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 21:02:10 2014	(r270764)
@@ -285,9 +285,83 @@
 	The &man.gpioiic.4; and
 	  &man.gpioled.4; have been merged from &os;-CURRENT.
 
-	The ZEDBOARD kernel
-	  configuration file has been updated to include
-	  SMP support.
+	Support for hardware floating point was added to the
+	  kernel, and enabled by default in the configuration files
+	  for all platforms that contain the required hardware.
+
+	C++ exception handling now
+	  works with GCC.
+
+	Support for SMP was added to the
+	  kernel, and enabled by default in the configuration files
+	  for all platforms that contain multi-core CPUs.
+
+	Support was added for:
+
+	
+	  
+	    CHROMEBOOK (Samsung Exynos 5250)
+	  
+
+	  
+	    COLIBRI (Freescale Vybrid)
+	  
+
+	  
+	    COSMIC (Freescale Vybrid)
+	  
+
+	  
+	    IMX53-QSB (Freescale i.MX53)
+	  
+
+	  
+	    QUARTZ (Freescale Vybrid)
+	  
+
+	  
+	    RADXA (Rockchip rk30xx)
+	  
+
+	  
+	    WANDBOARD (Freescale i.MX6)
+	  
+	
+
+	An I2C driver was added for
+	  the RaspberryPi.
+
+	Drivers have been added to support TI
+	  platforms, such as BEAGLEBONE and PANDABOARD:
+
+	
+	  
+	    PRUSS (Programmable Realtime Unit Subsystem)
+	  
+
+	  
+	    MBOX (Mailbox hardware)
+	  
+
+	  
+	    SDHCI (new faster driver for
+	      MMC/SD
+	      storage)
+	  
+
+	  
+	    PPS (Pulse Per Second input on a
+	      GPIO/timer pin)
+	  
+
+	  
+	    PWM (Pulse Width Modulation output)
+	  
+
+	  
+	    ADC (Analog to Digital converter)
+	  
+	
       
 
       

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 21:07:55 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 439F8B63;
 Thu, 28 Aug 2014 21:07:55 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2EAB9111B;
 Thu, 28 Aug 2014 21:07:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7SL7tF0091793;
 Thu, 28 Aug 2014 21:07:55 GMT (envelope-from mav@FreeBSD.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7SL7tjF091792;
 Thu, 28 Aug 2014 21:07:55 GMT (envelope-from mav@FreeBSD.org)
Message-Id: <201408282107.s7SL7tjF091792@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org
 using -f
From: Alexander Motin 
Date: Thu, 28 Aug 2014 21:07:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270765 - stable/10/release/doc/en_US.ISO8859-1/relnotes
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 21:07:55 -0000

Author: mav
Date: Thu Aug 28 21:07:54 2014
New Revision: 270765
URL: http://svnweb.freebsd.org/changeset/base/270765

Log:
  Fix typo.
  
  Submitted by:	Hugo Lombard 

Modified:
  stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 21:02:10 2014	(r270764)
+++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 21:07:54 2014	(r270765)
@@ -689,8 +689,8 @@
 	  recalculate the user-specified offset and size for alignment
 	  with the disk geometry.
 
-	CAM Target Layer (CTL)
-	 got many impromenets:
+	Many improvements to the
+	  CAM Target Layer (CTL):
 	
 	  
 	    Support for UNMAP, WRITE SAME, COMPARE AND WRITE, XCOPY

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 21:11:46 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 7608DD15;
 Thu, 28 Aug 2014 21:11:46 +0000 (UTC)
Received: from smtp1.multiplay.co.uk (smtp1.multiplay.co.uk [85.236.96.35])
 by mx1.freebsd.org (Postfix) with ESMTP id 38A04121D;
 Thu, 28 Aug 2014 21:11:46 +0000 (UTC)
Received: by smtp1.multiplay.co.uk (Postfix, from userid 65534)
 id CFDE820E7088A; Thu, 28 Aug 2014 21:11:43 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
 smtp1.multiplay.co.uk
X-Spam-Level: 
X-Spam-Status: No, score=0.8 required=8.0 tests=AWL,BAYES_00,DOS_OE_TO_MX,
 FSL_HELO_NON_FQDN_1,RDNS_DYNAMIC,STOX_REPLY_TYPE autolearn=no version=3.3.1
Received: from r2d2 (82-69-141-170.dsl.in-addr.zen.co.uk [82.69.141.170])
 by smtp1.multiplay.co.uk (Postfix) with ESMTP id 3E7B520E70885;
 Thu, 28 Aug 2014 21:11:42 +0000 (UTC)
Message-ID: <899BF203A6C64F3D8C8902F371D9DA79@multiplay.co.uk>
From: "Steven Hartland" 
To: "Dmitry Morozovsky" 
References: <201408281950.s7SJo90I047213@svn.freebsd.org>
 
Subject: Re: svn commit: r270759 - in head/sys: cddl/compat/opensolaris/kern
 cddl/compat/opensolaris/sys cddl/contrib/opensolaris/uts/common/fs/zfs vm
Date: Thu, 28 Aug 2014 22:11:39 +0100
MIME-Version: 1.0
Content-Type: text/plain; format=flowed; charset="iso-8859-1";
 reply-type=original
Content-Transfer-Encoding: 7bit
X-Priority: 3
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook Express 6.00.2900.5931
X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.6157
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 21:11:46 -0000

----- Original Message ----- 
From: "Dmitry Morozovsky" 


> Steve,
>
> On Thu, 28 Aug 2014, Steven Hartland wrote:
>
>> Author: smh
>> Date: Thu Aug 28 19:50:08 2014
>> New Revision: 270759
>> URL: http://svnweb.freebsd.org/changeset/base/270759
>>
>> Log:
>>   Refactor ZFS ARC reclaim logic to be more VM cooperative
>
> [snip]
>
>>   Credit to Karl Denninger for the original patch on which this 
>> update was
>>   based.
>>   Tested by: dteske
>>   MFC after: 1 week
>>   Relnotes: yes
>>   Sponsored by: Multiplay
>
> Thank you, and also Karl and Devin for this work!
>
> Is this change applicable to stable/9? I suppose, pretty large base of 
> users
> could benefit from this.

Its very likely applicable to stable/9 although I've never used 9 
myself,
we jumped from 9 direct to 10.

My target for this is to make the cutoff for 10.1 freeze.

I'll MFC to 9 and possibly 8 as well at that time if relavent.

    Regards
    Steve 


From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 21:14:32 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id A0812E64;
 Thu, 28 Aug 2014 21:14:32 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 807061230;
 Thu, 28 Aug 2014 21:14:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7SLEWWr096078;
 Thu, 28 Aug 2014 21:14:32 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7SLEWeE096077;
 Thu, 28 Aug 2014 21:14:32 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201408282114.s7SLEWeE096077@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber 
Date: Thu, 28 Aug 2014 21:14:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270766 - stable/10/release/doc/en_US.ISO8859-1/relnotes
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 21:14:32 -0000

Author: gjb
Date: Thu Aug 28 21:14:32 2014
New Revision: 270766
URL: http://svnweb.freebsd.org/changeset/base/270766

Log:
  Use  and  in a few places where needed.
  Minor rewording to r264732 entry.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 21:07:54 2014	(r270765)
+++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 21:14:32 2014	(r270766)
@@ -549,7 +549,7 @@
 
 	Kernel RPC code, which is a
 	  base of NFS server took multiple optimizations, that significantly
-	  improved its performance and SMP scapability.
+	  improved its performance and SMP scapability.
 
 	New kernel-based iSCSI target and initiator code took many
 	  fixes and performance optimizations.
@@ -561,9 +561,9 @@
 	The
 	  &man.geom.4; got I/O direct dispatch support.
 	  When safety requirements are met, it allows to avoid passing
-	  I/O requests to GEOM g_up/g_down thread, executing them directly
+	  I/O requests to GEOM g_up/g_down thread, executing them directly
 	  in the caller context. That allows to avoid CPU bottlenecks in
-	  g_up/g_down threads, plus avoid several context switches per I/O.
+	  g_up/g_down threads, plus avoid several context switches per I/O.
 	  
 
 	The
@@ -574,7 +574,7 @@
 	  &man.cam.4; got finer-grained locking, direct dispatch and
 	  multi-queue support.
 	  Combined with &man.geom.4; direct dispatch that allows to
-	  reduce lock congestion and improve SMP scalability of the
+	  reduce lock congestion and improve SMP scalability of the
 	  SCSI/ATA stack.
 	  
 
@@ -591,7 +591,7 @@
 	Support for LUN-based CD changers has
 	  been removed from the &man.cd.4; driver.
 
-	ZVOLs got BIO_DELETE support.
+	Support for BIO_DELETE has been added to &man.zfs.8; zvol volumes.
 
 	Support for 9th generation HP host bus
 	  adapter cards has been added to &man.ciss.4;.
@@ -601,9 +601,9 @@
 	  providing support for LSI Fusion-MPT 3 12Gb SCSI/SATA
 	  controllers.
 
-	A new ZVOL property volmode
+	A new zvol property volmode
 	  and  &man.sysctl.8; vfs.zfs.vol.mode has been
-	  added to allow switching ZVOL between three different ways of
+	  added to allow switching zvol between three different ways of
 	  exposing it to a user: geom,
 	  dev and none.
 
@@ -624,12 +624,12 @@
 	    &man.mrsas.4;.
 	
 
-	Fixed accounting of BIO_FLUSH operation
+	Fixed accounting of BIO_FLUSH operation
 	  in &man.geom.8; GEOM_DISK class
 
 	The &man.gstat.8;
 	  utility now has a -o option, to
-	  display "other" operatins (e.g. BIO_FLUSH).
+	  display "other" operatins (e.g. BIO_FLUSH).
 
 	The &man.mfi.4; driver has been
 	  updated to include support for unmapped I/O.
@@ -693,17 +693,17 @@
 	  CAM Target Layer (CTL):
 	
 	  
-	    Support for UNMAP, WRITE SAME, COMPARE AND WRITE, XCOPY
+	    Support for UNMAP, WRITE SAME, COMPARE AND WRITE, XCOPY
 		and some other SCSI commands was added to support VMWare VAAI
 		and Microsoft ODX storage acceleration.
 	  
 	  
-	    READ/WRITE size limitations were removed
+	    READ/WRITE size limitations were removed
 		by supporting multiple data moves per command.
 	  
 	  
 	    Finer-grained per-LUN locking and
-		multiple worker threads for better SMP scapability.
+		multiple worker threads for better SMP scapability.
 	  
 	  
 	    Memory consumption reduced by several
@@ -714,7 +714,7 @@
 		SCSI ports increased from 32 to 128
 	  
 	  
-	    Improved ZVOL integration for better
+	    Improved zvol integration for better
 		performance.
 	  
 	
@@ -1244,7 +1244,7 @@
       (and snapshots of the various security branches) are supported
       using the &man.freebsd-update.8; utility.  The binary upgrade
       procedure will update unmodified userland utilities, as well as
-      unmodified GENERIC or SMP kernels distributed as a part of an
+      unmodified GENERIC or SMP kernels distributed as a part of an
       official &os; release.  The &man.freebsd-update.8; utility
       requires that the host being upgraded have Internet
       connectivity.

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 21:15:16 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id B60CFFA0;
 Thu, 28 Aug 2014 21:15:16 +0000 (UTC)
Received: from thyme.infocus-llc.com (thyme.infocus-llc.com [199.15.120.10])
 (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 86B1C123D;
 Thu, 28 Aug 2014 21:15:16 +0000 (UTC)
Received: from draco.over-yonder.net (c-75-65-60-66.hsd1.ms.comcast.net
 [75.65.60.66])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by thyme.infocus-llc.com (Postfix) with ESMTPSA id 200DA37B567;
 Thu, 28 Aug 2014 16:15:09 -0500 (CDT)
Received: by draco.over-yonder.net (Postfix, from userid 100)
 id 3hkcCc4HfZz9r; Thu, 28 Aug 2014 16:15:08 -0500 (CDT)
Date: Thu, 28 Aug 2014 16:15:08 -0500
From: "Matthew D. Fuller" 
To: Steven Hartland 
Subject: Re: svn commit: r270759 - in head/sys: cddl/compat/opensolaris/kern
 cddl/compat/opensolaris/sys cddl/contrib/opensolaris/uts/common/fs/zfs vm
Message-ID: <20140828211508.GK46031@over-yonder.net>
References: <201408281950.s7SJo90I047213@svn.freebsd.org>
 
 <899BF203A6C64F3D8C8902F371D9DA79@multiplay.co.uk>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <899BF203A6C64F3D8C8902F371D9DA79@multiplay.co.uk>
X-Editor: vi
X-OS: FreeBSD 
User-Agent: Mutt/1.5.23-fullermd.4 (2014-03-12)
X-Virus-Scanned: clamav-milter 0.98.4 at thyme.infocus-llc.com
X-Virus-Status: Clean
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org, Dmitry Morozovsky 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 21:15:16 -0000

On Thu, Aug 28, 2014 at 10:11:39PM +0100 I heard the voice of
Steven Hartland, and lo! it spake thus:
> 
> Its very likely applicable to stable/9 although I've never used 9
> myself, we jumped from 9 direct to 10.

This is actually hitting two different issues from the two bugs:

- 191510 is about "ARC isn't greedy enough" on huge-memory machines,
  and from the osreldate that bug was filed on 9.2, so presumably is
  applicable.

- 187594 is about "ARC is too greedy" (probably mostly on not-so-huge
  machines) and starves/drives the rest of the system into swap.  That
  I believe came about as a result of some unrelated change in the
  10.x stream that upset the previous balance between ARC and the rest
  of the VM, so isn't a problem on 9.x.



-- 
Matthew Fuller     (MF4839)   |  fullermd@over-yonder.net
Systems/Network Administrator |  http://www.over-yonder.net/~fullermd/
           On the Internet, nobody can hear you scream.

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 21:16:31 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 8967B182;
 Thu, 28 Aug 2014 21:16:31 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 74953124F;
 Thu, 28 Aug 2014 21:16:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7SLGVGN096428;
 Thu, 28 Aug 2014 21:16:31 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7SLGVxO096427;
 Thu, 28 Aug 2014 21:16:31 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201408282116.s7SLGVxO096427@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber 
Date: Thu, 28 Aug 2014 21:16:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270767 - stable/10/release/doc/en_US.ISO8859-1/relnotes
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 21:16:31 -0000

Author: gjb
Date: Thu Aug 28 21:16:30 2014
New Revision: 270767
URL: http://svnweb.freebsd.org/changeset/base/270767

Log:
  We do not differentiate the SMP from GENERIC kernel anymore,
  so remove mention of it.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 21:14:32 2014	(r270766)
+++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 21:16:30 2014	(r270767)
@@ -1244,7 +1244,7 @@
       (and snapshots of the various security branches) are supported
       using the &man.freebsd-update.8; utility.  The binary upgrade
       procedure will update unmodified userland utilities, as well as
-      unmodified GENERIC or SMP kernels distributed as a part of an
+      unmodified GENERIC kernel distributed as a part of an
       official &os; release.  The &man.freebsd-update.8; utility
       requires that the host being upgraded have Internet
       connectivity.

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 21:16:40 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id E9C2B2AE;
 Thu, 28 Aug 2014 21:16:40 +0000 (UTC)
Received: from woozle.rinet.ru (woozle.rinet.ru [195.54.192.68])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 664941252;
 Thu, 28 Aug 2014 21:16:39 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
 by woozle.rinet.ru (8.14.5/8.14.5) with ESMTP id s7SLGbsp019846;
 Fri, 29 Aug 2014 01:16:37 +0400 (MSK) (envelope-from marck@rinet.ru)
Date: Fri, 29 Aug 2014 01:16:37 +0400 (MSK)
From: Dmitry Morozovsky 
To: Steven Hartland 
Subject: Re: svn commit: r270759 - in head/sys: cddl/compat/opensolaris/kern
 cddl/compat/opensolaris/sys cddl/contrib/opensolaris/uts/common/fs/zfs vm
In-Reply-To: <899BF203A6C64F3D8C8902F371D9DA79@multiplay.co.uk>
Message-ID: 
References: <201408281950.s7SJo90I047213@svn.freebsd.org>
 
 <899BF203A6C64F3D8C8902F371D9DA79@multiplay.co.uk>
User-Agent: Alpine 2.00 (BSF 1167 2008-08-23)
X-NCC-RegID: ru.rinet
X-OpenPGP-Key-ID: 6B691B03
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3
 (woozle.rinet.ru [0.0.0.0]); Fri, 29 Aug 2014 01:16:37 +0400 (MSK)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 21:16:41 -0000

On Thu, 28 Aug 2014, Steven Hartland wrote:

> > Thank you, and also Karl and Devin for this work!
> > 
> > Is this change applicable to stable/9? I suppose, pretty large base of users
> > could benefit from this.
> 
> Its very likely applicable to stable/9 although I've never used 9 myself,
> we jumped from 9 direct to 10.
> 
> My target for this is to make the cutoff for 10.1 freeze.
> 
> I'll MFC to 9 and possibly 8 as well at that time if relavent.

No rush for other stable branches, surely; also, we're at the EoL (EoS at 
least) for stable/8 -- but if the changeset is not too harsh I see no reason 
not to merge it down there.

As I @work have some loaded machines with ZFS base on at least 9 (while not 
really memory-loaded, not more than 32G -- but sometimes rather heavy loaded 
with userbase apps), I would be glad to test changesets if it's feasible.

Thanks again!

-- 
Sincerely,
D.Marck                                     [DM5020, MCK-RIPE, DM3-RIPN]
[ FreeBSD committer:                                 marck@FreeBSD.org ]
------------------------------------------------------------------------
*** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- marck@rinet.ru ***
------------------------------------------------------------------------

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 21:18:59 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id E968945C;
 Thu, 28 Aug 2014 21:18:59 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BA378126A;
 Thu, 28 Aug 2014 21:18:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7SLIxhc096784;
 Thu, 28 Aug 2014 21:18:59 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7SLIx8o096783;
 Thu, 28 Aug 2014 21:18:59 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201408282118.s7SLIx8o096783@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber 
Date: Thu, 28 Aug 2014 21:18:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270768 - stable/10/release/doc/en_US.ISO8859-1/relnotes
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 21:19:00 -0000

Author: gjb
Date: Thu Aug 28 21:18:59 2014
New Revision: 270768
URL: http://svnweb.freebsd.org/changeset/base/270768

Log:
  Minor rewording to a few sections.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 21:16:30 2014	(r270767)
+++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 21:18:59 2014	(r270768)
@@ -559,7 +559,7 @@
 	Disks and Storage
 
 	The
-	  &man.geom.4; got I/O direct dispatch support.
+	  &man.geom.4; subsystem has been updated to support I/O direct dispatch.
 	  When safety requirements are met, it allows to avoid passing
 	  I/O requests to GEOM g_up/g_down thread, executing them directly
 	  in the caller context. That allows to avoid CPU bottlenecks in
@@ -571,16 +571,16 @@
 	  updated to support unmapped I/O.
 
 	The
-	  &man.cam.4; got finer-grained locking, direct dispatch and
-	  multi-queue support.
+	  &man.cam.4; subsystem has been updated to support
+	  finer-grained locking, direct dispatch and multi-queue.
 	  Combined with &man.geom.4; direct dispatch that allows to
 	  reduce lock congestion and improve SMP scalability of the
 	  SCSI/ATA stack.
 	  
 
 	The &man.geom.8;
-	  GEOM_MULTIPATH class got automatic live
-	  resize support.
+	  GEOM_MULTIPATH class has been updated to
+	  support automatic live partition resizing.
 
 	The &man.virtio_blk.4; driver has been
 	  updated to support unmapped I/O.

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 21:25:30 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id CB8936E0;
 Thu, 28 Aug 2014 21:25:30 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B5C441331;
 Thu, 28 Aug 2014 21:25:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7SLPU9t001793;
 Thu, 28 Aug 2014 21:25:30 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7SLPUHQ001792;
 Thu, 28 Aug 2014 21:25:30 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201408282125.s7SLPUHQ001792@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber 
Date: Thu, 28 Aug 2014 21:25:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270769 - stable/10/release/doc/en_US.ISO8859-1/relnotes
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 21:25:31 -0000

Author: gjb
Date: Thu Aug 28 21:25:30 2014
New Revision: 270769
URL: http://svnweb.freebsd.org/changeset/base/270769

Log:
  FDP style nits.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 21:18:59 2014	(r270768)
+++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 21:25:30 2014	(r270769)
@@ -547,24 +547,27 @@
 	  two listening sockets bound to the same port has been
 	  fixed.
 
-	Kernel RPC code, which is a
-	  base of NFS server took multiple optimizations, that significantly
-	  improved its performance and SMP scapability.
+	Kernel RPC code, which
+	  is a base of NFS server took multiple optimizations, that
+	  significantly improved its performance and
+	  SMP scapability.
 
-	New kernel-based iSCSI target and initiator code took many
-	  fixes and performance optimizations.
+	New kernel-based iSCSI target and initiator code took
+	  many fixes and performance optimizations.
       
 
       
 	Disks and Storage
 
 	The
-	  &man.geom.4; subsystem has been updated to support I/O direct dispatch.
-	  When safety requirements are met, it allows to avoid passing
-	  I/O requests to GEOM g_up/g_down thread, executing them directly
-	  in the caller context. That allows to avoid CPU bottlenecks in
-	  g_up/g_down threads, plus avoid several context switches per I/O.
-	  
+	  &man.geom.4; subsystem has been updated to support I/O
+	  direct dispatch.  When safety requirements are met, it
+	  allows to avoid passing I/O requests to GEOM
+	  g_up/g_down thread,
+	  executing them directly in the caller context.  That allows
+	  to avoid CPU bottlenecks in
+	  g_up/g_down threads,
+	  plus avoid several context switches per I/O.
 
 	The
 	  &man.geom.4; RAID driver has been
@@ -574,9 +577,8 @@
 	  &man.cam.4; subsystem has been updated to support
 	  finer-grained locking, direct dispatch and multi-queue.
 	  Combined with &man.geom.4; direct dispatch that allows to
-	  reduce lock congestion and improve SMP scalability of the
-	  SCSI/ATA stack.
-	  
+	  reduce lock congestion and improve SMP
+	  scalability of the SCSI/ATA stack.
 
 	The &man.geom.8;
 	  GEOM_MULTIPATH class has been updated to
@@ -585,13 +587,15 @@
 	The &man.virtio_blk.4; driver has been
 	  updated to support unmapped I/O.
 
-	The &man.virtio_scsi.4; driver has been
-	  updated to support unmapped I/O.
+	The &man.virtio_scsi.4; driver has
+	  been updated to support unmapped I/O.
 
 	Support for LUN-based CD changers has
 	  been removed from the &man.cd.4; driver.
 
-	Support for BIO_DELETE has been added to &man.zfs.8; zvol volumes.
+	Support for
+	  BIO_DELETE has been added to &man.zfs.8;
+	  zvol volumes.
 
 	Support for 9th generation HP host bus
 	  adapter cards has been added to &man.ciss.4;.
@@ -601,35 +605,35 @@
 	  providing support for LSI Fusion-MPT 3 12Gb SCSI/SATA
 	  controllers.
 
-	A new zvol property volmode
-	  and  &man.sysctl.8; vfs.zfs.vol.mode has been
-	  added to allow switching zvol between three different ways of
-	  exposing it to a user: geom,
+	A new zvol property
+	  volmode and  &man.sysctl.8;
+	  vfs.zfs.vol.mode has been added to allow
+	  switching zvol between three different
+	  ways of exposing it to a user: geom,
 	  dev and none.
 
 	The
-	  &man.mrsas.4; driver has been added,
-	  providing support for LSI MegaRAID SAS controllers.  The
-	  &man.mfi.4; driver will attach to the controller, by default.
-	  To enable &man.mrsas.4; add
-	  hw.mfi.mrsas_enable=1 to
-	  /boot/loader.conf, which turns off
+	  &man.mrsas.4; driver has been added, providing support for
+	  LSI MegaRAID SAS controllers.  The &man.mfi.4; driver will
+	  attach to the controller, by default.  To enable
+	  &man.mrsas.4; add hw.mfi.mrsas_enable=1
+	  to /boot/loader.conf, which turns off
 	  &man.mfi.4; device probing.
 
 	
-	  At this time, the &man.mfiutil.8; utility and
-	    the &os; version of
-	    MegaCLI and
+	  At this time, the &man.mfiutil.8; utility and the &os;
+	    version of MegaCLI and
 	    StorCli do not work with
 	    &man.mrsas.4;.
 	
 
-	Fixed accounting of BIO_FLUSH operation
-	  in &man.geom.8; GEOM_DISK class
-
-	The &man.gstat.8;
-	  utility now has a -o option, to
-	  display "other" operatins (e.g. BIO_FLUSH).
+	Fixed accounting of
+	  BIO_FLUSH operation in &man.geom.8;
+	  GEOM_DISK class
+
+	The &man.gstat.8; utility now has
+	  a -o option, to display "other" operatins
+	  (e.g. BIO_FLUSH).
 
 	The &man.mfi.4; driver has been
 	  updated to include support for unmapped I/O.
@@ -638,8 +642,9 @@
 	  updated with various vendor-supplied bug fixes.
 
 	Support for unmapped I/O has been added
-	  to the &man.xen.4; blkfront driver.
+	  sponsor="&citrix.rd;">Support for unmapped I/O has been
+	  added to the &man.xen.4; blkfront
+	  driver.
 
 	The
 	  &man.geom.8; label class is now aware of
@@ -654,15 +659,15 @@
 	  it easier to resize the size of a mirror when all of its
 	  components have been replaced.
 
-	Support for MegaRAID Fury cards has been
-	  added to the &man.mfi.4; driver.
+	Support for MegaRAID Fury cards has
+	  been added to the &man.mfi.4; driver.
 
 	The &man.aacraid.4; driver has been
 	  updated to version 3.2.5.
 
-	The GEOM_VINUM option
-	  is now able to be built both directly into the kernel or as
-	  a &man.kldload.8; loadable module.
+	The GEOM_VINUM
+	  option is now able to be built both directly into the kernel
+	  or as a &man.kldload.8; loadable module.
 
 	The &man.geom.8;
 	  GEOM_PART class has been updated to
@@ -689,33 +694,40 @@
 	  recalculate the user-specified offset and size for alignment
 	  with the disk geometry.
 
-	Many improvements to the
-	  CAM Target Layer (CTL):
+	Many improvements to
+	  the CAM Target Layer (CTL):
 	
 	  
-	    Support for UNMAP, WRITE SAME, COMPARE AND WRITE, XCOPY
-		and some other SCSI commands was added to support VMWare VAAI
-		and Microsoft ODX storage acceleration.
+	    Support for UNMAP, WRITE
+		SAME, COMPARE AND WRITE,
+	      XCOPY and some other SCSI commands
+	      was added to support VMWare VAAI and Microsoft ODX
+	      storage acceleration.
 	  
 	  
-	    READ/WRITE size limitations were removed
-		by supporting multiple data moves per command.
+	    The
+	      READ/WRITE size
+	      limitations were removed by supporting multiple
+	      data moves per command.
 	  
 	  
 	    Finer-grained per-LUN locking and
-		multiple worker threads for better SMP scapability.
+	      multiple worker threads for better
+	      SMP scapability.
 	  
 	  
-	    Memory consumption reduced by several
-		times by disabling some never used functionality.
+	    Memory consumption reduced by
+	      several times by disabling some never used
+	      functionality.
 	  
 	  
 	    The maximum number of
-		SCSI ports increased from 32 to 128
+	      SCSI ports increased from 32 to
+	      128
 	  
 	  
-	    Improved zvol integration for better
-		performance.
+	    Improved zvol
+	      integration for better performance.
 	  
 	
       
@@ -724,10 +736,10 @@
 	File Systems
 
 	The
-	  vfs.zfs.zio.use_uma &man.sysctl.8; has been
-	  re-enabled.  On multi-CPU machines with enough RAM, this can
-	  easily double &man.zfs.8; performance or reduce CPU usage in
-	  half.  It was originally disabled due to memory and
+	  vfs.zfs.zio.use_uma &man.sysctl.8; has
+	  been re-enabled.  On multi-CPU machines with enough RAM,
+	  this can easily double &man.zfs.8; performance or reduce CPU
+	  usage in half.  It was originally disabled due to memory and
 	  KVA exhaustion problem reports, which
 	  should be resolved due to several change in the VM
 	  subsystem.
@@ -1244,9 +1256,9 @@
       (and snapshots of the various security branches) are supported
       using the &man.freebsd-update.8; utility.  The binary upgrade
       procedure will update unmodified userland utilities, as well as
-      unmodified GENERIC kernel distributed as a part of an
-      official &os; release.  The &man.freebsd-update.8; utility
-      requires that the host being upgraded have Internet
+      unmodified GENERIC kernel distributed as
+      a part of an official &os; release.  The &man.freebsd-update.8;
+      utility requires that the host being upgraded have Internet
       connectivity.
 
     Source-based upgrades (those based on recompiling the &os;

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 21:27:37 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id E803582D;
 Thu, 28 Aug 2014 21:27:37 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D30271343;
 Thu, 28 Aug 2014 21:27:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7SLRb4d002092;
 Thu, 28 Aug 2014 21:27:37 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7SLRbbG002091;
 Thu, 28 Aug 2014 21:27:37 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201408282127.s7SLRbbG002091@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber 
Date: Thu, 28 Aug 2014 21:27:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270770 - stable/10/release/doc/en_US.ISO8859-1/relnotes
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 21:27:38 -0000

Author: gjb
Date: Thu Aug 28 21:27:37 2014
New Revision: 270770
URL: http://svnweb.freebsd.org/changeset/base/270770

Log:
  Minor wording changes.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 21:25:30 2014	(r270769)
+++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 21:27:37 2014	(r270770)
@@ -631,9 +631,10 @@
 	  BIO_FLUSH operation in &man.geom.8;
 	  GEOM_DISK class
 
-	The &man.gstat.8; utility now has
-	  a -o option, to display "other" operatins
-	  (e.g. BIO_FLUSH).
+	The &man.gstat.8; utility now has an
+	  -o option, to display
+	  other operations, such as
+	  BIO_FLUSH.
 
 	The &man.mfi.4; driver has been
 	  updated to include support for unmapped I/O.

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 21:30:39 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id EF72BA73;
 Thu, 28 Aug 2014 21:30:39 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D99361423;
 Thu, 28 Aug 2014 21:30:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7SLUdxC002678;
 Thu, 28 Aug 2014 21:30:39 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7SLUdOq002677;
 Thu, 28 Aug 2014 21:30:39 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201408282130.s7SLUdOq002677@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh 
Date: Thu, 28 Aug 2014 21:30:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270771 - head/bin/dd
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 21:30:40 -0000

Author: imp
Date: Thu Aug 28 21:30:39 2014
New Revision: 270771
URL: http://svnweb.freebsd.org/changeset/base/270771

Log:
  Add canonical population of a disk / thumb drive from an image
  example.

Modified:
  head/bin/dd/dd.1

Modified: head/bin/dd/dd.1
==============================================================================
--- head/bin/dd/dd.1	Thu Aug 28 21:27:37 2014	(r270770)
+++ head/bin/dd/dd.1	Thu Aug 28 21:30:39 2014	(r270771)
@@ -408,6 +408,11 @@ To create an image of a Mode-1 CD-ROM, w
 for data CD-ROM disks, use a block size of 2048 bytes:
 .Pp
 .Dl "dd if=/dev/acd0 of=filename.iso bs=2048"
+.Pp
+Write a filesystem image to a memory stick, padding the end with zeros,
+if necessary, to a 1MiB boundary:
+.Pp
+.Dl "dd if=memstick.img of=/dev/da0 bs=1m conv=noerror,sync"
 .Sh SEE ALSO
 .Xr cp 1 ,
 .Xr mt 1 ,

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 21:45:08 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 5D0ABDA4;
 Thu, 28 Aug 2014 21:45:08 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 458C11572;
 Thu, 28 Aug 2014 21:45:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7SLj8vO011428;
 Thu, 28 Aug 2014 21:45:08 GMT (envelope-from jfv@FreeBSD.org)
Received: (from jfv@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7SLj8f2011427;
 Thu, 28 Aug 2014 21:45:08 GMT (envelope-from jfv@FreeBSD.org)
Message-Id: <201408282145.s7SLj8f2011427@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jfv set sender to jfv@FreeBSD.org
 using -f
From: Jack F Vogel 
Date: Thu, 28 Aug 2014 21:45:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270772 - head/sys/dev/ixl
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 21:45:08 -0000

Author: jfv
Date: Thu Aug 28 21:45:07 2014
New Revision: 270772
URL: http://svnweb.freebsd.org/changeset/base/270772

Log:
  Some corrections, reformating, and additional info about the VF
  driver in the README.
  
  MFC after: 1 day

Modified:
  head/sys/dev/ixl/README

Modified: head/sys/dev/ixl/README
==============================================================================
--- head/sys/dev/ixl/README	Thu Aug 28 21:30:39 2014	(r270771)
+++ head/sys/dev/ixl/README	Thu Aug 28 21:45:07 2014	(r270772)
@@ -1,9 +1,10 @@
-ixl FreeBSD* Base Driver for the Intel® XL710 Ethernet Controller Family
+	ixl FreeBSD* Base Driver and ixlv VF Driver for the
+	     Intel XL710 Ethernet Controller Family
 
 /*$FreeBSD$*/
 ================================================================
 
-July 21, 2014
+August 26, 2014
 
 
 Contents
@@ -11,6 +12,7 @@ Contents
 
 - Overview
 - Supported Adapters
+- The VF Driver
 - Building and Installation
 - Additional Configurations
 - Known Limitations
@@ -19,15 +21,21 @@ Contents
 Overview
 ========
 
-This file describes the IXL FreeBSD* Base driver for the XL710 Ethernet Family of Adapters. The Driver has been developed for use with FreeBSD 10.0 or later,  but should be compatible with any supported release.
-
-For questions related to hardware requirements, refer to the documentation      supplied with your Intel XL710 adapter. All hardware requirements listed apply  for use with FreeBSD.
+This file describes the IXL FreeBSD* Base driver and the IXLV VF Driver
+for the XL710 Ethernet Family of Adapters. The Driver has been developed
+for use with FreeBSD 10.0 or later, but should be compatible with any
+supported release.
+
+For questions related to hardware requirements, refer to the documentation
+supplied with your Intel XL710 adapter. All hardware requirements listed
+apply for use with FreeBSD.
 
 
 Supported Adapters
 ==================
 
-The driver in this release is compatible with XL710 and X710-based Intel        Ethernet Network Connections.
+The drivers in this release are compatible with XL710 and X710-based
+Intel Ethernet Network Connections.
 
 
 SFP+ Devices with Pluggable Optics
@@ -49,18 +57,45 @@ QSFP+ Modules
   Intel     TRIPLE RATE 1G/10G/40G QSFP+ LR (bailed)    E40GQSFPLR
     QSFP+ 1G speed is not supported on XL710 based devices.
 
-X710/XL710 Based SFP+ adapters support all passive and active limiting direct   attach cables that comply with SFF-8431 v4.1 and SFF-8472 v10.4 specifications.
+X710/XL710 Based SFP+ adapters support all passive and active limiting direct
+attach cables that comply with SFF-8431 v4.1 and SFF-8472 v10.4 specifications.
               
+The VF Driver
+==================
+The VF driver is normally used in a virtualized environment where a host
+driver manages SRIOV, and provides a VF device to the guest. With this
+first release the only host environment tested was using Linux QEMU/KVM.
+Support is planned for Xen and VMWare hosts at a later time.
+
+In the FreeBSD guest the IXLV driver would be loaded and will function
+using the VF device assigned to it.
+
+The VF driver provides most of the same functionality as the CORE driver,
+but is actually a slave to the Host, access to many controls are actually
+accomplished by a request to the Host via what is called the "Admin queue".
+These are startup and initialization events however, once in operation
+the device is self-contained and should achieve near native performance.
+
+Some notable limitations of the VF environment: for security reasons 
+the driver is never permitted to be promiscuous, therefore a tcpdump
+will not behave the same with the interface. Second, media info is not
+available from the PF, so it will always appear as auto.
 
-Building and Installation
+Tarball Building and Installation
 =========================
 
-NOTE: You must have kernel sources installed to compile the driver module.
+NOTE: You must have kernel sources installed to compile the driver tarball.
+
+These instructions assume a standalone driver tarball, building the driver
+already in the kernel source is simply a matter of adding the device entry
+to the kernel config file, or building in the ixl or ixlv module directory.
 
 In the instructions below, x.x.x is the driver version
-as indicated in thename of the driver tar. 
+as indicated in the name of the driver tarball. The example is
+for ixl, the same procedure applies for ixlv.
 
-1. Move the base driver tar file to the directory of your choice. For example,  use /home/username/ixl or /usr/local/src/ixl.
+1. Move the base driver tar file to the directory of your choice.
+   For example, use /home/username/ixl or /usr/local/src/ixl.
 
 2. Untar/unzip the archive:
      tar xfz ixl-x.x.x.tar.gz
@@ -76,7 +111,9 @@ as indicated in thename of the driver ta
 5. To assign an IP address to the interface, enter the following:
      ifconfig ixl 
 
-6. Verify that the interface works. Enter the following, where  is  the IP address for another machine on the same subnet as the interface that is  being tested:
+6. Verify that the interface works. Enter the following, where 
+   is the IP address for another machine on the same subnet as the interface
+   that is  being tested:
 
      ping 
 
@@ -105,7 +142,7 @@ as indicated in thename of the driver ta
 Configuration and Tuning
 =========================
 
-The driver supports Transmit/Receive Checksum Offload for IPv4 and IPv6,
+Both drivers supports Transmit/Receive Checksum Offload for IPv4 and IPv6,
 TSO forIPv4 and IPv6, LRO, and Jumbo Frames on all 40 Gigabit adapters. 
 
   Jumbo Frames
@@ -240,7 +277,7 @@ TSO forIPv4 and IPv6, LRO, and Jumbo Fra
          ifconfig ixl lro 
 
 
-Flow Control
+Flow Control  (IXL only)
 ------------
 Flow control is disabled by default. To change flow control settings use sysctl.
 
@@ -263,19 +300,25 @@ To disable flow control:
 
 NOTE: You must have a flow control capable link partner.
 
+NOTE: The VF driver does not have access to flow control, it must be
+	managed from the host side.
 
    
   Important system configuration changes:
   =======================================
  
-  
 -Change the file /etc/sysctl.conf, and add the line:  
  
          hw.intr_storm_threshold: 0 (the default is 1000)
 
 -Best throughput results are seen with a large MTU; use 9706 if possible. 
 
--The default number of descriptors per ring is 1024, increasing this may        improve performance depending on the use case.
+-The default number of descriptors per ring is 1024, increasing this may
+improve performance depending on the use case.
+
+-The VF driver uses a relatively large buf ring, this was found to eliminate
+ UDP transmit errors, it is a tuneable, and if no UDP traffic is used it can
+ be reduced. It is memory used per queue.
 
 
 Known Limitations
@@ -283,7 +326,11 @@ Known Limitations
 
 Network Memory Buffer allocation
 --------------------------------
-  FreeBSD may have a low number of network memory buffers (mbufs) by default. Ifyour mbuf value is too low, it may cause the driver to fail to initialize and/orcause the system to become unresponsive. You can check to see if the system is  mbuf-starved by running 'netstat -m'. Increase the number of mbufs by editing   the lines below in /etc/sysctl.conf:
+  FreeBSD may have a low number of network memory buffers (mbufs) by default.
+If your mbuf value is too low, it may cause the driver to fail to initialize
+and/or cause the system to become unresponsive. You can check to see if the
+system is mbuf-starved by running 'netstat -m'. Increase the number of mbufs
+by editing the lines below in /etc/sysctl.conf:
 
          kern.ipc.nmbclusters
          kern.ipc.nmbjumbop    
@@ -291,9 +338,11 @@ Network Memory Buffer allocation
          kern.ipc.nmbjumbo16
          kern.ipc.nmbufs
 
-The amount of memory that you allocate is system specific, and may require some trial and error.
+The amount of memory that you allocate is system specific, and may
+require some trial and error.
 
-Also, increasing the follwing in /etc/sysctl.conf could help increase network   performance:
+Also, increasing the follwing in /etc/sysctl.conf could help increase
+network performance:
          
          kern.ipc.maxsockbuf
          net.inet.tcp.sendspace
@@ -304,7 +353,10 @@ Also, increasing the follwing in /etc/sy
 
 UDP Stress Test Dropped Packet Issue
 ------------------------------------
-  Under small packet UDP stress test with the ixl driver, the FreeBSD system   will drop UDP packets due to the fullness of socket buffers. You may want to    change the driver's Flow Control variables to the minimum value for controlling packet reception.
+Under small packet UDP stress test with the ixl driver, the FreeBSD system
+may drop UDP packets due to the fullness of socket buffers. You may want to
+change the driver's Flow Control variables to the minimum value for
+controlling packet reception.
 
 
 Disable LRO when routing/bridging
@@ -314,11 +366,20 @@ LRO must be turned off when forwarding t
 
 Lower than expected performance
 -------------------------------
-  Some PCIe x8 slots are actually configured as x4 slots. These slots have      insufficient bandwidth for full line rate with dual port and quad port devices. In addition, if you put a PCIe Generation 3-capable adapter into a PCIe         Generation 2 slot, you cannot get full bandwidth. The driver detects this       situation and writes the following message in the system log:
-
-  "PCI-Express bandwidth available for this card is not sufficient for optimal  performance. For optimal performance a x8 PCI-Express slot is required."
+Some PCIe x8 slots are actually configured as x4 slots. These slots have
+insufficient bandwidth for full line rate with dual port and quad port
+devices.
+
+In addition, if you put a PCIe Generation 3-capable adapter into a PCIe
+Generation 2 slot, you cannot get full bandwidth. The driver detects this
+situation and writes the following message in the system log:
+
+  "PCI-Express bandwidth available for this card is not sufficient for
+   optimal  performance. For optimal performance a x8 PCI-Express slot
+   is required."
 
-If this error occurs, moving your adapter to a true PCIe Generation 3 x8 slot   will resolve the issue.
+If this error occurs, moving your adapter to a true PCIe Generation 3 x8
+slot will resolve the issue.
 
 
 Support
@@ -328,14 +389,21 @@ For general information and support, go 
 
         http://support.intel.com
 
-If an issue is identified with the released source code on the supported kernel with a supported adapter, email the specific information related to the issue tofreebsdnic@mailbox.intel.com.
+If an issue is identified with the released source code on the supported kernel
+with a supported adapter, email the specific information related to the issue
+to freebsdnic@mailbox.intel.com.
 
 
 License
 =======
 
-This software program is released under the terms of a license agreement betweenyou ('Licensee') and Intel. Do not use or load this software or any associated  materials (collectively, the 'Software') until you have carefully read the full terms and conditions of the LICENSE located in this software package. By loadingor using the Software, you agree to the terms of this Agreement. If you do not 
-agree with the terms of this Agreement, do not install or use the Software.
+This software program is released under the terms of a license agreement
+between you ('Licensee') and Intel. Do not use or load this software or any
+associated  materials (collectively, the 'Software') until you have carefully
+read the full terms and conditions of the LICENSE located in this software
+package. By loadingor using the Software, you agree to the terms of this
+Agreement. If you do not agree with the terms of this Agreement, do not
+install or use the Software.
 
 * Other names and brands may be claimed as the property of others.
 

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 22:08:37 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 5B442419;
 Thu, 28 Aug 2014 22:08:37 +0000 (UTC)
Received: from mx1.sbone.de (mx1.sbone.de [IPv6:2a01:4f8:130:3ffc::401:25])
 (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
 (Client CN "mx1.sbone.de", Issuer "SBone.DE" (not verified))
 by mx1.freebsd.org (Postfix) with ESMTPS id 125AD18B6;
 Thu, 28 Aug 2014 22:08:37 +0000 (UTC)
Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:31::2013:587])
 (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.sbone.de (Postfix) with ESMTPS id 2D25B25D3B7D;
 Thu, 28 Aug 2014 22:08:34 +0000 (UTC)
Received: from content-filter.sbone.de (content-filter.sbone.de
 [IPv6:fde9:577b:c1a9:31::2013:2742])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mail.sbone.de (Postfix) with ESMTPS id 543FFC77071;
 Thu, 28 Aug 2014 22:08:33 +0000 (UTC)
X-Virus-Scanned: amavisd-new at sbone.de
Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:31::2013:587])
 by content-filter.sbone.de (content-filter.sbone.de
 [fde9:577b:c1a9:31::2013:2742]) (amavisd-new, port 10024)
 with ESMTP id Cbtk8W_wQFzo; Thu, 28 Aug 2014 22:08:31 +0000 (UTC)
Received: from [IPv6:fde9:577b:c1a9:4410:80bc:9d4b:d41a:2ca6] (unknown
 [IPv6:fde9:577b:c1a9:4410:80bc:9d4b:d41a:2ca6])
 (using TLSv1 with cipher AES128-SHA (128/128 bits))
 (No client certificate requested)
 by mail.sbone.de (Postfix) with ESMTPSA id 41E4AC77073;
 Thu, 28 Aug 2014 22:08:29 +0000 (UTC)
Content-Type: text/plain; charset=windows-1252
Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\))
Subject: Re: svn commit: r270755 - in head/sys: conf modules
From: "Bjoern A. Zeeb" 
In-Reply-To: <5B782898-FFC0-488B-BFFB-02DF985CB2F6@felyko.com>
Date: Thu, 28 Aug 2014 22:08:10 +0000
Content-Transfer-Encoding: quoted-printable
Message-Id: <376B9E49-8AEC-4B55-83EE-1320392FE259@FreeBSD.org>
References: <201408281740.s7SHeJPN071417@svn.freebsd.org>
 <5B782898-FFC0-488B-BFFB-02DF985CB2F6@felyko.com>
To: Jack F Vogel 
X-Mailer: Apple Mail (2.1878.6)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 22:08:37 -0000


On 28 Aug 2014, at 17:41 , Rui Paulo  wrote:

> On Aug 28, 2014, at 10:40, Jack F Vogel  wrote:
>>=20
>> Author: jfv
>> Date: Thu Aug 28 17:40:19 2014
>> New Revision: 270755
>> URL: http://svnweb.freebsd.org/changeset/base/270755
>>=20
>> Log:
>> Add XL710 device entries to NOTES, and directories to the module
>> Makefile so they will be built.
>>=20
>> MFC after: 1 day
>=20
> The minimum MFC timer is 3 days.


And it=92s needed given sparc64 LINT fails with:

/scratch/tmp/bz/head.svn/sys/dev/ixl/if_ixl.c:280:38: error: =
dev/netmap/if_ixl_netmap.h: No such file or directory

and pc98 LINT fails with:

/scratch/tmp/bz/head.svn/sys/dev/ixl/if_ixl.c:280:10: fatal error: =
'dev/netmap/if_ixl_netmap.h' file not found
#include 
         ^
1 error generated.
/scratch/tmp/bz/head.svn/sys/dev/ixl/ixl_txrx.c:809:5: warning: =
'NETMAP_API' is not defined, evaluates to 0 [-Wundef]
#if NETMAP_API < 4
    ^
/scratch/tmp/bz/head.svn/sys/dev/ixl/ixl_txrx.c:1420:5: warning: =
'NETMAP_API' is not defined, evaluates to 0 [-Wundef]
#if NETMAP_API < 4
    ^
2 warnings generated.


and I am waiting for more to come still .. . . .   I guess putting it in =
sys/conf/NOTES wasn=92t the right decision.

=97=20
Bjoern A. Zeeb             "Come on. Learn, goddamn it.", WarGames, 1983


From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 22:22:04 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id DBE706BE;
 Thu, 28 Aug 2014 22:22:04 +0000 (UTC)
Received: from mx1.sbone.de (bird.sbone.de [46.4.1.90])
 (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
 (Client CN "mx1.sbone.de", Issuer "SBone.DE" (not verified))
 by mx1.freebsd.org (Postfix) with ESMTPS id 8CB671A40;
 Thu, 28 Aug 2014 22:22:04 +0000 (UTC)
Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:31::2013:587])
 (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.sbone.de (Postfix) with ESMTPS id CC2C325D37C3;
 Thu, 28 Aug 2014 22:21:55 +0000 (UTC)
Received: from content-filter.sbone.de (content-filter.sbone.de
 [IPv6:fde9:577b:c1a9:31::2013:2742])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mail.sbone.de (Postfix) with ESMTPS id C3187C77072;
 Thu, 28 Aug 2014 22:21:54 +0000 (UTC)
X-Virus-Scanned: amavisd-new at sbone.de
Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:31::2013:587])
 by content-filter.sbone.de (content-filter.sbone.de
 [fde9:577b:c1a9:31::2013:2742]) (amavisd-new, port 10024)
 with ESMTP id tUQ3t95Pn3OQ; Thu, 28 Aug 2014 22:21:53 +0000 (UTC)
Received: from [IPv6:fde9:577b:c1a9:4410:80bc:9d4b:d41a:2ca6] (unknown
 [IPv6:fde9:577b:c1a9:4410:80bc:9d4b:d41a:2ca6])
 (using TLSv1 with cipher AES128-SHA (128/128 bits))
 (No client certificate requested)
 by mail.sbone.de (Postfix) with ESMTPSA id 00960C77071;
 Thu, 28 Aug 2014 22:21:51 +0000 (UTC)
Content-Type: text/plain; charset=windows-1252
Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\))
Subject: Re: svn commit: r270755 - in head/sys: conf modules
From: "Bjoern A. Zeeb" 
In-Reply-To: <376B9E49-8AEC-4B55-83EE-1320392FE259@FreeBSD.org>
Date: Thu, 28 Aug 2014 22:21:44 +0000
Content-Transfer-Encoding: quoted-printable
Message-Id: <5BB90745-BC78-429F-8130-EDAFFD64AD54@FreeBSD.org>
References: <201408281740.s7SHeJPN071417@svn.freebsd.org>
 <5B782898-FFC0-488B-BFFB-02DF985CB2F6@felyko.com>
 <376B9E49-8AEC-4B55-83EE-1320392FE259@FreeBSD.org>
To: Jack F Vogel 
X-Mailer: Apple Mail (2.1878.6)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 22:22:05 -0000


On 28 Aug 2014, at 22:08 , Bjoern A. Zeeb  wrote:

>=20
> On 28 Aug 2014, at 17:41 , Rui Paulo  wrote:
>=20
>> On Aug 28, 2014, at 10:40, Jack F Vogel  wrote:
>>>=20
>>> Author: jfv
>>> Date: Thu Aug 28 17:40:19 2014
>>> New Revision: 270755
>>> URL: http://svnweb.freebsd.org/changeset/base/270755
>>>=20
>>> Log:
>>> Add XL710 device entries to NOTES, and directories to the module
>>> Makefile so they will be built.
>>>=20
>>> MFC after: 1 day
>>=20
>> The minimum MFC timer is 3 days.
>=20
>=20
> And it=92s needed given sparc64 LINT fails with:
>=20
> /scratch/tmp/bz/head.svn/sys/dev/ixl/if_ixl.c:280:38: error: =
dev/netmap/if_ixl_netmap.h: No such file or directory
>=20
> and pc98 LINT fails with:
>=20
> /scratch/tmp/bz/head.svn/sys/dev/ixl/if_ixl.c:280:10: fatal error: =
'dev/netmap/if_ixl_netmap.h' file not found
> #include 
>         ^
> 1 error generated.
> /scratch/tmp/bz/head.svn/sys/dev/ixl/ixl_txrx.c:809:5: warning: =
'NETMAP_API' is not defined, evaluates to 0 [-Wundef]
> #if NETMAP_API < 4
>    ^
> /scratch/tmp/bz/head.svn/sys/dev/ixl/ixl_txrx.c:1420:5: warning: =
'NETMAP_API' is not defined, evaluates to 0 [-Wundef]
> #if NETMAP_API < 4
>    ^
> 2 warnings generated.
>=20
>=20
> and I am waiting for more to come still .. . . .   I guess putting it =
in sys/conf/NOTES wasn=92t the right decision.

well maybe that=92s not even the problem.

most i386 LINT kernels are failing now and the NOINET and NOIP ones have =
a long list of warnings/errors, while LINT, VIMAGE, and NOINET6 are =
failing equally to pc98.   I=92ll refrain from posting more errors.  =
Please fix and do a universe test build.

=97=20
Bjoern A. Zeeb             "Come on. Learn, goddamn it.", WarGames, 1983


From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 22:30:28 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 6404094B;
 Thu, 28 Aug 2014 22:30:28 +0000 (UTC)
Received: from pp1.rice.edu (proofpoint1.mail.rice.edu [128.42.201.100])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 25E5D1AA2;
 Thu, 28 Aug 2014 22:30:27 +0000 (UTC)
Received: from pps.filterd (pp1.rice.edu [127.0.0.1])
 by pp1.rice.edu (8.14.5/8.14.5) with SMTP id s7SMR4Yc022435;
 Thu, 28 Aug 2014 17:30:18 -0500
Received: from mh11.mail.rice.edu (mh11.mail.rice.edu [128.42.199.30])
 by pp1.rice.edu with ESMTP id 1p121bsbhc-1;
 Thu, 28 Aug 2014 17:30:18 -0500
X-Virus-Scanned: by amavis-2.7.0 at mh11.mail.rice.edu, auth channel
Received: from 108-254-203-201.lightspeed.hstntx.sbcglobal.net
 (108-254-203-201.lightspeed.hstntx.sbcglobal.net [108.254.203.201])
 (using TLSv1 with cipher RC4-MD5 (128/128 bits))
 (No client certificate requested) (Authenticated sender: alc)
 by mh11.mail.rice.edu (Postfix) with ESMTPSA id A52B84C0096;
 Thu, 28 Aug 2014 17:30:17 -0500 (CDT)
Message-ID: <53FFAD79.7070106@rice.edu>
Date: Thu, 28 Aug 2014 17:30:17 -0500
From: Alan Cox 
User-Agent: Mozilla/5.0 (X11; FreeBSD i386;
 rv:24.0) Gecko/20100101 Thunderbird/24.2.0
MIME-Version: 1.0
To: "Matthew D. Fuller" ,
 Steven Hartland 
Subject: Re: svn commit: r270759 - in head/sys: cddl/compat/opensolaris/kern
 cddl/compat/opensolaris/sys cddl/contrib/opensolaris/uts/common/fs/zfs vm
References: <201408281950.s7SJo90I047213@svn.freebsd.org>
 
 <899BF203A6C64F3D8C8902F371D9DA79@multiplay.co.uk>
 <20140828211508.GK46031@over-yonder.net>
In-Reply-To: <20140828211508.GK46031@over-yonder.net>
X-Enigmail-Version: 1.6
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0
 kscore.is_bulkscore=5.65364421944992e-12
 kscore.compositescore=2.08269938622996e-06 circleOfTrustscore=0
 compositescore=0.601496849000349 urlsuspect_oldscore=0.00149684900034924
 suspectscore=3 recipient_domain_to_sender_totalscore=0 phishscore=0
 bulkscore=0 kscore.is_spamscore=0 recipient_to_sender_totalscore=0
 recipient_domain_to_sender_domain_totalscore=0 rbsscore=0.601496849000349
 spamscore=0 recipient_to_sender_domain_totalscore=0 urlsuspectscore=0.9
 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=7.0.1-1402240000 definitions=main-1408280258
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org, Dmitry Morozovsky 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 22:30:28 -0000

On 08/28/2014 16:15, Matthew D. Fuller wrote:
> On Thu, Aug 28, 2014 at 10:11:39PM +0100 I heard the voice of
> Steven Hartland, and lo! it spake thus:
>> Its very likely applicable to stable/9 although I've never used 9
>> myself, we jumped from 9 direct to 10.
> This is actually hitting two different issues from the two bugs:
>
> - 191510 is about "ARC isn't greedy enough" on huge-memory machines,
>   and from the osreldate that bug was filed on 9.2, so presumably is
>   applicable.
>
> - 187594 is about "ARC is too greedy" (probably mostly on not-so-huge
>   machines) and starves/drives the rest of the system into swap.  That
>   I believe came about as a result of some unrelated change in the
>   10.x stream that upset the previous balance between ARC and the rest
>   of the VM, so isn't a problem on 9.x.

10.0 had a bug in the page daemon that was fixed in 10-STABLE about
three months ago (r265945).  The ARC was not the only thing affected by
this bug.


From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 22:52:21 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 68D0CD8;
 Thu, 28 Aug 2014 22:52:21 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4A4D51D4E;
 Thu, 28 Aug 2014 22:52:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7SMqLSe043908;
 Thu, 28 Aug 2014 22:52:21 GMT (envelope-from jfv@FreeBSD.org)
Received: (from jfv@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7SMqKjG043905;
 Thu, 28 Aug 2014 22:52:20 GMT (envelope-from jfv@FreeBSD.org)
Message-Id: <201408282252.s7SMqKjG043905@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jfv set sender to jfv@FreeBSD.org
 using -f
From: Jack F Vogel 
Date: Thu, 28 Aug 2014 22:52:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270773 - head/sys/dev/ixl
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 22:52:21 -0000

Author: jfv
Date: Thu Aug 28 22:52:20 2014
New Revision: 270773
URL: http://svnweb.freebsd.org/changeset/base/270773

Log:
  Remove the DEV_NETMAP code from the ixl drivers, it was a placeholder
  and not yet ready to be defined, and its causing build errors.
  
  MFC after:	3 days

Modified:
  head/sys/dev/ixl/if_ixl.c
  head/sys/dev/ixl/ixl.h
  head/sys/dev/ixl/ixl_txrx.c

Modified: head/sys/dev/ixl/if_ixl.c
==============================================================================
--- head/sys/dev/ixl/if_ixl.c	Thu Aug 28 21:45:07 2014	(r270772)
+++ head/sys/dev/ixl/if_ixl.c	Thu Aug 28 22:52:20 2014	(r270773)
@@ -276,10 +276,6 @@ int ixl_atr_rate = 20;
 TUNABLE_INT("hw.ixl.atr_rate", &ixl_atr_rate);
 #endif
 
-#ifdef DEV_NETMAP
-#include 
-#endif /* DEV_NETMAP */
-
 static char *ixl_fc_string[6] = {
 	"None",
 	"Rx",
@@ -652,10 +648,6 @@ ixl_attach(device_t dev)
 	vsi->vlan_detach = EVENTHANDLER_REGISTER(vlan_unconfig,
 	    ixl_unregister_vlan, vsi, EVENTHANDLER_PRI_FIRST);
 
-#ifdef DEV_NETMAP
-	ixl_netmap_attach(pf);
-#endif /* DEV_NETMAP */
-
 	INIT_DEBUGOUT("ixl_attach: end");
 	return (0);
 
@@ -733,10 +725,6 @@ ixl_detach(device_t dev)
 	ether_ifdetach(vsi->ifp);
 	callout_drain(&pf->timer);
 
-#ifdef DEV_NETMAP
-	netmap_detach(vsi->ifp);
-#endif /* DEV_NETMAP */
-
 	ixl_free_pci_resources(pf);
 	bus_generic_detach(dev);
 	if_free(vsi->ifp);
@@ -2552,12 +2540,6 @@ ixl_initialize_vsi(struct ixl_vsi *vsi)
 		rctx.tphdata_ena = 0;
 		rctx.tphhead_ena = 0;
 		rctx.lrxqthresh = 2;
-#ifdef DEV_NETMAP
-		/* "CRC strip in netmap is conditional" */
-		if (vsi->ifp->if_capenable & IFCAP_NETMAP && !ixl_crcstrip)
-			rctx.crcstrip = 0;
-		else
-#endif /* DEV_NETMAP */
 		rctx.crcstrip = 1;
 		rctx.l2tsel = 1;
 		rctx.showiv = 1;
@@ -2581,21 +2563,6 @@ ixl_initialize_vsi(struct ixl_vsi *vsi)
 			break;
 		}
 		wr32(vsi->hw, I40E_QRX_TAIL(que->me), 0);
-#ifdef DEV_NETMAP
-		/* TODO appropriately comment
-		 * Code based on netmap code in ixgbe_init_locked()
-		 * Messes with what the software sets as queue
-		 * descriptor tail in hardware.
-		 */
-		if (vsi->ifp->if_capenable & IFCAP_NETMAP)
-		{
-			struct netmap_adapter *na = NA(vsi->ifp);
-			struct netmap_kring *kring = &na->rx_rings[que->me];
-			int t = na->num_rx_desc - 1 - kring->nr_hwavail;
-
-			wr32(vsi->hw, I40E_QRX_TAIL(que->me), t);
-		} else
-#endif /* DEV_NETMAP */
 		wr32(vsi->hw, I40E_QRX_TAIL(que->me), que->num_desc - 1);
 	}
 	return (err);

Modified: head/sys/dev/ixl/ixl.h
==============================================================================
--- head/sys/dev/ixl/ixl.h	Thu Aug 28 21:45:07 2014	(r270772)
+++ head/sys/dev/ixl/ixl.h	Thu Aug 28 22:52:20 2014	(r270773)
@@ -295,9 +295,6 @@ struct ixl_rx_buf {
 	struct mbuf	*fmp;
 	bus_dmamap_t	hmap;
 	bus_dmamap_t	pmap;
-#ifdef DEV_NETMAP
-	u64		addr;
-#endif
 };
 
 /*

Modified: head/sys/dev/ixl/ixl_txrx.c
==============================================================================
--- head/sys/dev/ixl/ixl_txrx.c	Thu Aug 28 21:45:07 2014	(r270772)
+++ head/sys/dev/ixl/ixl_txrx.c	Thu Aug 28 22:52:20 2014	(r270773)
@@ -454,17 +454,9 @@ ixl_init_tx_ring(struct ixl_queue *que)
 {
 	struct tx_ring *txr = &que->txr;
 	struct ixl_tx_buf *buf;
-#ifdef DEV_NETMAP
-	struct ixl_vsi *vsi = que->vsi;
-	struct netmap_adapter *na = NA(vsi->ifp);
-	struct netmap_slot *slot;
-#endif /* DEV_NETMAP */
 
 	/* Clear the old ring contents */
 	IXL_TX_LOCK(txr);
-#ifdef DEV_NETMAP
-	slot = netmap_reset(na, NR_TX, que->me, 0);
-#endif
 	bzero((void *)txr->base,
 	      (sizeof(struct i40e_tx_desc)) * que->num_desc);
 
@@ -488,13 +480,6 @@ ixl_init_tx_ring(struct ixl_queue *que)
 			m_freem(buf->m_head);
 			buf->m_head = NULL;
 		}
-#ifdef DEV_NETMAP
-		if (slot)
-		{
-			int si = netmap_idx_n2k(&na->tx_rings[que->me], i);
-			netmap_load_map(txr->tag, buf->map, NMB(slot + si));
-		}
-#endif
 		/* Clear the EOP index */
 		buf->eop_index = -1;
         }
@@ -573,9 +558,13 @@ ixl_tx_setup_offload(struct ixl_queue *q
     struct mbuf *mp, u32 *cmd, u32 *off)
 {
 	struct ether_vlan_header	*eh;
+#ifdef INET
 	struct ip			*ip = NULL;
+#endif
 	struct tcphdr			*th = NULL;
+#ifdef INET6
 	struct ip6_hdr			*ip6;
+#endif
 	int				elen, ip_hlen = 0, tcp_hlen;
 	u16				etype;
 	u8				ipproto = 0;
@@ -681,8 +670,12 @@ ixl_tso_setup(struct ixl_queue *que, str
 	u16				etype;
 	int				idx, elen, ip_hlen, tcp_hlen;
 	struct ether_vlan_header	*eh;
+#ifdef INET
 	struct ip			*ip;
+#endif
+#ifdef INET6
 	struct ip6_hdr			*ip6;
+#endif
 	struct tcphdr			*th;
 	u64				type_cmd_tso_mss;
 
@@ -794,36 +787,6 @@ ixl_txeof(struct ixl_queue *que)
 
 	mtx_assert(&txr->mtx, MA_OWNED);
 
-#ifdef DEV_NETMAP
-	if (ifp->if_capenable & IFCAP_NETMAP) {
-		struct netmap_adapter *na = NA(ifp);
-		struct netmap_kring *kring = &na->tx_rings[que->me];
-		tx_desc = txr->base;
-		bus_dmamap_sync(txr->dma.tag, txr->dma.map,
-		     BUS_DMASYNC_POSTREAD);
-		if (!netmap_mitigate ||
-		    (kring->nr_kflags < kring->nkr_num_slots &&
-		    tx_desc[kring->nr_kflags].cmd_type_offset_bsz &
-		        htole32(I40E_TX_DESC_DTYPE_DESC_DONE)))
-		{
-#if NETMAP_API < 4
-			struct ixl_pf *pf = vsi->pf;
-			kring->nr_kflags = kring->nkr_num_slots;
-			selwakeuppri(&na->tx_rings[que->me].si, PI_NET);
-			IXL_TX_UNLOCK(txr);
-			IXL_PF_LOCK(pf);
-			selwakeuppri(&na->tx_si, PI_NET);
-			IXL_PF_UNLOCK(pf);
-			IXL_TX_LOCK(txr);
-#else /* NETMAP_API >= 4 */
-			netmap_tx_irq(ifp, txr->que->me);
-#endif /* NETMAP_API */
-		}
-		// XXX guessing there is no more work to be done
-		return FALSE;
-	}
-#endif /* DEV_NETMAP */
-
 	/* These are not the descriptors you seek, move along :) */
 	if (txr->avail == que->num_desc) {
 		que->busy = 0;
@@ -1011,12 +974,8 @@ no_split:
 		buf->m_pack = mp;
 		bus_dmamap_sync(rxr->ptag, buf->pmap,
 		    BUS_DMASYNC_PREREAD);
-#ifdef DEV_NETMAP
-		rxr->base[i].read.pkt_addr = buf->addr;
-#else /* !DEV_NETMAP */
 		rxr->base[i].read.pkt_addr =
 		   htole64(pseg[0].ds_addr);
-#endif /* DEV_NETMAP */
 		/* Used only when doing header split */
 		rxr->base[i].read.hdr_addr = 0;
 
@@ -1127,15 +1086,8 @@ ixl_init_rx_ring(struct ixl_queue *que)
 	struct ixl_rx_buf	*buf;
 	bus_dma_segment_t	pseg[1], hseg[1];
 	int			rsize, nsegs, error = 0;
-#ifdef DEV_NETMAP
-	struct netmap_adapter *na = NA(ifp);
-	struct netmap_slot *slot;
-#endif /* DEV_NETMAP */
 
 	IXL_RX_LOCK(rxr);
-#ifdef DEV_NETMAP
-	slot = netmap_reset(na, NR_RX, que->me, 0);
-#endif
 	/* Clear the ring contents */
 	rsize = roundup2(que->num_desc *
 	    sizeof(union i40e_rx_desc), DBA_ALIGN);
@@ -1169,21 +1121,6 @@ ixl_init_rx_ring(struct ixl_queue *que)
 		struct mbuf	*mh, *mp;
 
 		buf = &rxr->buffers[j];
-#ifdef DEV_NETMAP
-		if (slot)
-		{
-			int sj = netmap_idx_n2k(&na->rx_rings[que->me], j);
-			u64 paddr;
-			void *addr;
-
-			addr = PNMB(slot + sj, &paddr);
-			netmap_load_map(rxr->ptag, buf->pmap, addr);
-			/* Update descriptor and cached value */
-			rxr->base[j].read.pkt_addr = htole64(paddr);
-			buf->addr = htole64(paddr);
-			continue;
-		}
-#endif /* DEV_NETMAP */
 		/*
 		** Don't allocate mbufs if not
 		** doing header split, its wasteful
@@ -1416,29 +1353,6 @@ ixl_rxeof(struct ixl_queue *que, int cou
 
 	IXL_RX_LOCK(rxr);
 
-#ifdef DEV_NETMAP
-#if NETMAP_API < 4
-	if (ifp->if_capenable & IFCAP_NETMAP)
-	{
-		struct netmap_adapter *na = NA(ifp);
-
-		na->rx_rings[que->me].nr_kflags |= NKR_PENDINTR;
-		selwakeuppri(&na->rx_rings[que->me].si, PI_NET);
-		IXL_RX_UNLOCK(rxr);
-		IXL_PF_LOCK(vsi->pf);
-		selwakeuppri(&na->rx_si, PI_NET);
-		IXL_PF_UNLOCK(vsi->pf);
-		return (FALSE);
-	}
-#else /* NETMAP_API >= 4 */
-	if (netmap_rx_irq(ifp, que->me, &processed))
-	{
-		IXL_RX_UNLOCK(rxr);
-		return (FALSE);
-	}
-#endif /* NETMAP_API */
-#endif /* DEV_NETMAP */
-
 	for (i = rxr->next_check; count != 0;) {
 		struct mbuf	*sendmp, *mh, *mp;
 		u32		rsc, status, error;

From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 23:22:48 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 0F41E8C6;
 Thu, 28 Aug 2014 23:22:48 +0000 (UTC)
Received: from smtp2.wemm.org (smtp2.wemm.org [IPv6:2001:470:67:39d::78])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "smtp2.wemm.org",
 Issuer "StartCom Class 1 Primary Intermediate Server CA" (not verified))
 by mx1.freebsd.org (Postfix) with ESMTPS id DA4E71FFD;
 Thu, 28 Aug 2014 23:22:47 +0000 (UTC)
Received: from overcee.wemm.org (canning.wemm.org [192.203.228.65])
 by smtp2.wemm.org (Postfix) with ESMTP id 4855CDA8;
 Thu, 28 Aug 2014 16:22:41 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wemm.org;
 s=m20140428; t=1409268161;
 bh=goRUCaZyvRXGy4Wo7zjyLKzoRtaW4LDT4P3O7iydC5w=;
 h=From:To:Cc:Subject:Date:In-Reply-To:References;
 b=OPaKuf74hIn4BwgVmiC8zZTKbbfYSbF3UudiPocbIDlZi97qgOnbmdaHiG64l4yNE
 8LHV2T1l1PNm0U6Fi3vammMrqn9QCY0pmuKUaG/vfZj8ZX7yXxLAHvv4mmHC9Tlmv/
 2VzAuN5ueiBgRhYubMoKPxAs3Vy78eeKnvBhtCdo=
From: Peter Wemm 
To: Alan Cox 
Subject: Re: svn commit: r270759 - in head/sys: cddl/compat/opensolaris/kern
 cddl/compat/opensolaris/sys cddl/contrib/opensolaris/uts/common/fs/zfs vm
Date: Thu, 28 Aug 2014 16:22:31 -0700
Message-ID: <1617817.cOUOX4x8n2@overcee.wemm.org>
User-Agent: KMail/4.12.5 (FreeBSD/11.0-CURRENT; KDE/4.12.5; amd64; ; )
In-Reply-To: <53FFAD79.7070106@rice.edu>
References: <201408281950.s7SJo90I047213@svn.freebsd.org>
 <20140828211508.GK46031@over-yonder.net> <53FFAD79.7070106@rice.edu>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="nextPart1965031.UcmHp7AfKf";
 micalg="pgp-sha1"; protocol="application/pgp-signature"
Cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
 Dmitry Morozovsky ,
 "Matthew D. Fuller" , svn-src-head@freebsd.org,
 Steven Hartland 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 23:22:48 -0000


--nextPart1965031.UcmHp7AfKf
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset="us-ascii"

On Thursday 28 August 2014 17:30:17 Alan Cox wrote:
> On 08/28/2014 16:15, Matthew D. Fuller wrote:
> > On Thu, Aug 28, 2014 at 10:11:39PM +0100 I heard the voice of
> >=20
> > Steven Hartland, and lo! it spake thus:
> >> Its very likely applicable to stable/9 although I've never used 9
> >> myself, we jumped from 9 direct to 10.
> >=20
> > This is actually hitting two different issues from the two bugs:
> >=20
> > - 191510 is about "ARC isn't greedy enough" on huge-memory machines=
,
> >=20
> >   and from the osreldate that bug was filed on 9.2, so presumably i=
s
> >   applicable.
> >=20
> > - 187594 is about "ARC is too greedy" (probably mostly on not-so-hu=
ge
> >=20
> >   machines) and starves/drives the rest of the system into swap.  T=
hat
> >   I believe came about as a result of some unrelated change in the
> >   10.x stream that upset the previous balance between ARC and the r=
est
> >   of the VM, so isn't a problem on 9.x.
>=20
> 10.0 had a bug in the page daemon that was fixed in 10-STABLE about
> three months ago (r265945).  The ARC was not the only thing affected =
by
> this bug.

I'm concerned about potential unintended consequences of this change.

Before, arc reclaim was driven by vm_paging_needed(), which was:
vm_paging_needed(void)
{
    return (vm_cnt.v_free_count + vm_cnt.v_cache_count <
        vm_pageout_wakeup_thresh);
}
Now it's ignoring the v_cache_count and looking exclusively at v_free_c=
ount. =20
"cache" pages are free pages that just happen to have known contents.  =
If I=20
read this change right, zfs arc will now discard checksummed cache page=
s to=20
make room for non-checksummed pages:

+       if (kmem_free_count() < zfs_arc_free_target) {
+               return (1);
+       }
...
+kmem_free_count(void)
+{
+       return (vm_cnt.v_free_count);
+}

This seems like a pretty substantial behavior change.  I'm concerned th=
at it=20
doesn't appear to count all the forms of "free" pages.

I haven't seen the problems with the over-aggressive ARC since the page=
 daemon=20
bug was fixed.  It's been working fine under pretty abusive loads in th=
e freebsd=20
cluster after that fix.

(I should know better than to fire a reply off before full fact checkin=
g, but=20
this commit worries me..)

=2D-=20
Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com; KI=
6FJV
UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246
--nextPart1965031.UcmHp7AfKf
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part.
Content-Transfer-Encoding: 7Bit

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQEcBAABAgAGBQJT/7nAAAoJEDXWlwnsgJ4E1H0IALdKdhcW0/8GeJPI9pOzNXsz
ReoaRK+C0B84IFS0HVzieelli+m4D264Dpb8qPOAUWzc60rpodp/weKSLbz0WD8L
wuq3ONf7NjBg3zc3w2b9aj3UvyhNnyp4RZY/uWBNJHdwBNpiVP6BPnnp2y6hs3/l
5tVwfFZEnKNgBTDkfXdz/3dpc8+ORwRWcZfq7v4W33220p/oDWuteUaj3bNPa1SS
CG5Q6FBcjAuvSyRR7voKiJl+M/OpkT7kUBcfX9jNQ69WwVS+qxJbo6gV8N+654vU
2p8+yUXgkxlIOR6Se33W+zX6c0SfSwWq4vo39HlN9gtSnh+OKMZAi9kMqxIq9QY=
=0rPk
-----END PGP SIGNATURE-----

--nextPart1965031.UcmHp7AfKf--


From owner-svn-src-all@FreeBSD.ORG  Thu Aug 28 23:32:56 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id E0A5EDF1;
 Thu, 28 Aug 2014 23:32:56 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id CCE46119D;
 Thu, 28 Aug 2014 23:32:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7SNWutA063095;
 Thu, 28 Aug 2014 23:32:56 GMT (envelope-from alonso@FreeBSD.org)
Received: (from alonso@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7SNWuqr063094;
 Thu, 28 Aug 2014 23:32:56 GMT (envelope-from alonso@FreeBSD.org)
Message-Id: <201408282332.s7SNWuqr063094@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: alonso set sender to
 alonso@FreeBSD.org using -f
From: Alonso Schaich 
Date: Thu, 28 Aug 2014 23:32:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270774 - head/share/misc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Thu, 28 Aug 2014 23:32:57 -0000

Author: alonso (ports committer)
Date: Thu Aug 28 23:32:56 2014
New Revision: 270774
URL: http://svnweb.freebsd.org/changeset/base/270774

Log:
  Add Alonso Schaich to ports developers. Mentors: makc@, rakuco@
  
  Approved by:	rakuco (mentor)

Modified:
  head/share/misc/committers-ports.dot

Modified: head/share/misc/committers-ports.dot
==============================================================================
--- head/share/misc/committers-ports.dot	Thu Aug 28 22:52:20 2014	(r270773)
+++ head/share/misc/committers-ports.dot	Thu Aug 28 23:32:56 2014	(r270774)
@@ -49,6 +49,7 @@ ale [label="Alex Dupre\nale@FreeBSD.org\
 alepulver [label="Alejandro Pulver\nalepulver@FreeBSD.org\n2006/04/01"]
 alexbl [label="Alexander Botero-Lowry\nalexbl@FreeBSD.org\n2006/09/11"]
 alexey [label="Alexey Degtyarev\nalexey@FreeBSD.org\n2013/11/09"]
+alonso [label="Alonso Schaich\nalonso@FreeBSD.org\n2014/08/14"]
 amdmi3 [label="Dmitry Marakasov\namdmi3@FreeBSD.org\n2008/06/19"]
 anray [label="Andrey Slusar\nanray@FreeBSD.org\n2005/12/11"]
 antoine [label="Antoine Brodin\nantoine@FreeBSD.org\n2013/04/03"]
@@ -420,6 +421,7 @@ marcus -> jmallett
 
 marino -> robak
 
+makc -> alonso
 makc -> bf
 makc -> jhale
 makc -> rakuco
@@ -493,6 +495,8 @@ philip -> koitsu
 
 rafan -> chinsan
 
+rakuco -> alonso
+
 rene -> bar
 rene -> crees
 rene -> jgh

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 00:20:58 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 7286D664;
 Fri, 29 Aug 2014 00:20:58 +0000 (UTC)
Received: from mail-qg0-x232.google.com (mail-qg0-x232.google.com
 [IPv6:2607:f8b0:400d:c04::232])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id E1FF81730;
 Fri, 29 Aug 2014 00:20:57 +0000 (UTC)
Received: by mail-qg0-f50.google.com with SMTP id q108so1606500qgd.9
 for ; Thu, 28 Aug 2014 17:20:57 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:date:message-id:subject
 :from:to:cc:content-type;
 bh=dkr7ezCIQX2T0i4MFsXiMs1RPFIDp0/PDRhvnEj68KQ=;
 b=GTBt7rrklGR+V9jjCM+hhHOtbEHSxDyugRMThmOkt7m63x1D9uFS+UPA2JjpXixxGG
 pCixJAo3CQGSlrkgtpNRoT1Nn4CCAWvbvHy2JVSqTqDNUUXimeWzsJx5iXZFZHgK/wdF
 t+c0c5laJ7uSmblWyby6JWGyvAuMo7PG2MA13Nhxy8FxCC0lOZFVWOsvQqD4FB4Eb9zF
 WunZDw9zOj8oIBv5oQBdGHE1OaT1BiRO+eRB4P+AhS4MCTzSRAt/5mlL7qS03Nj7kCbo
 b6PpdtQvj7NN4slQb3zyEljsCqb9coPFAOFH99D4XAUs9k/8fR9rXDFm7Ow0LBv/qE6Z
 TBow==
MIME-Version: 1.0
X-Received: by 10.224.36.4 with SMTP id r4mr12384921qad.69.1409271657000; Thu,
 28 Aug 2014 17:20:57 -0700 (PDT)
Sender: adrian.chadd@gmail.com
Received: by 10.224.39.139 with HTTP; Thu, 28 Aug 2014 17:20:56 -0700 (PDT)
In-Reply-To: 
References: <201407261810.s6QIAIIj049439@svn.freebsd.org>
 
 <72B80282-6FA1-4481-8333-37EF3A58FB74@rice.edu>
 
 
Date: Thu, 28 Aug 2014 17:20:56 -0700
X-Google-Sender-Auth: tXRwnxuvUgi9bPR69dvEu738e3Y
Message-ID: 
Subject: Re: svn commit: r269134 - head/sys/vm
From: Adrian Chadd 
To: hiren panchasara 
Content-Type: text/plain; charset=UTF-8
Cc: Alan Cox ,
 "svn-src-head@freebsd.org" ,
 "svn-src-all@freebsd.org" ,
 "src-committers@freebsd.org" ,
 Alan Cox 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 00:20:58 -0000

Just tried it, it didn't work:

RedBoot> load kernel.RSPRO

Using default protocol (TFTP)

Entry point: 0x80050100, address range: 0x80050000-0x805b11cc

RedBoot>

RedBoot> go

CPU platform: Atheros AR7161 rev 2

CPU Frequency=720 MHz

CPU DDR Frequency=360 MHz

CPU AHB Frequency=180 MHz

platform frequency: 720 MHz

CPU reference clock: 40 MHz

CPU MDIO clock: 40 MHz

arguments:

  a0 = 80050100

  a1 = 8ffffff0

  a2 = 00000001

  a3 = 00000007

Cmd line:

Environment:

envp is invalid

Cache info:

  picache_stride    = 4096

  picache_loopcount = 16

  pdcache_stride    = 4096

  pdcache_loopcount = 8

cpu0: MIPS Technologies processor v116.147

  MMU: Standard TLB, 16 entries

  L1 i-cache: 4 ways of 512 sets, 32 bytes per line

  L1 d-cache: 4 ways of 256 sets, 32 bytes per line

  Config1=0x9ee3519e

  Config3=0x20

KDB: debugger backends: ddb

KDB: current backend: ddb

Copyright (c) 1992-2014 The FreeBSD Project.

Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994

        The Regents of the University of California. All rights reserved.

FreeBSD is a registered trademark of The FreeBSD Foundation.

FreeBSD 11.0-CURRENT #3 r269799: Fri Aug 29 00:17:22 UTC 2014

    adrian@adrian-hackbox:/usr/home/adrian/work/freebsd/embedded/head/obj/mips/mips.mips/usr/home/adrian/work/freebsd/embedded/head/src/sys/RSPRO
mips

gcc version 4.2.1 20070831 patched [FreeBSD]

WARNING: WITNESS option enabled, expect reduced performance.

MEMGUARD DEBUGGING ALLOCATOR INITIALIZED:

        MEMGUARD map base: 0xc0800000

        MEMGUARD map size: 45696 KBytes

real memory  = 33554432 (32768K bytes)

avail memory = 22806528 (21MB)

random device not loaded; using insecure entropy

random:  initialized

nexus0: 

clock0:  on nexus0

Timecounter "MIPS32" frequency 360000000 Hz quality 800

Event timer "MIPS32" frequency 360000000 Hz quality 800

argemdio0:  at mem 0x19000000-0x19000fff on nexus0

mdio0:  on argemdio0

mdioproxy0:  on mdio0

arswitch0:  on mdio0

arswitch0: ar8316_hw_setup: MAC port == RGMII, port 4 = dedicated PHY

arswitch0: ar8316_hw_setup: port 4 RGMII workaround

miibus0:  on arswitch0

ukphy0:  PHY 0 on miibus0

ukphy0:  none, 10baseT, 10baseT-FDX, 100baseTX, 100baseTX-FDX,
1000baseT-FDX, 1000baseT-FDX-master, auto

miibus1:  on arswitch0

ukphy1:  PHY 1 on miibus1

ukphy1:  none, 10baseT, 10baseT-FDX, 100baseTX, 100baseTX-FDX,
1000baseT-FDX, 1000baseT-FDX-master, auto

miibus2:  on arswitch0

ukphy2:  PHY 2 on miibus2

ukphy2:  none, 10baseT, 10baseT-FDX, 100baseTX, 100baseTX-FDX,
1000baseT-FDX, 1000baseT-FDX-master, auto

miibus3:  on arswitch0

ukphy3:  PHY 3 on miibus3

ukphy3:  none, 10baseT, 10baseT-FDX, 100baseTX, 100baseTX-FDX,
1000baseT-FDX, 1000baseT-FDX-master, auto

etherswitch0:  on arswitch0

mdio1:  on arswitch0

mdioproxy1:  on mdio1

apb0 at irq 4 on nexus0

uart0: <16550 or compatible> at mem 0x18020003-0x1802001a irq 3 on apb0

uart0: console (115200,n,8,1)

gpio0:  at mem 0x18040000-0x18040fff irq 2 on apb0

gpio0: [GIANT-LOCKED]

gpio0: function_set: 0x0

gpio0: function_clear: 0x0

gpio0: gpio pinmask=0xff

gpioc0:  on gpio0

gpiobus0:  on gpio0

gpioled0:  at pin(s) 2 on gpiobus0

ehci0:  at mem
0x1b000000-0x1bffffff irq 1 on nexus0

usbus0: set host controller mode

usbus0: EHCI version 1.0

usbus0: set host controller mode

usbus0 on ehci0

pcib0 at irq 0 on nexus0

pcib0: ar71xx_pci_attach: missing hint 'baseslot', default to
AR71XX_PCI_BASE_SLOT

pci0:  on pcib0

ath0:  irq 0 at device 17.0 on pci0

[ath] enabling AN_TOP2_FIXUP

ath0: [HT] enabling HT modes

ath0: [HT] 1 stream STBC receive enabled

ath0: [HT] 1 stream STBC transmit enabled

ath0: [HT] 2 RX streams; 2 TX streams

ath0: AR9220 mac 128.2 RF5133 phy 13.0

ath0: 2GHz radio: 0x0000; 5GHz radio: 0x00c0

ath1:  irq 1 at device 18.0 on pci0

[ath] enabling AN_TOP2_FIXUP

ath1: [HT] enabling HT modes

ath1: [HT] 1 stream STBC receive enabled

ath1: [HT] 1 stream STBC transmit enabled

ath1: [HT] 2 RX streams; 2 TX streams

ath1: AR9220 mac 128.2 RF5133 phy 13.0

ath1: 2GHz radio: 0x0000; 5GHz radio: 0x00c0

arge0:  at mem
0x19000000-0x19000fff irq 2 on nexus0

arge0: arge_attach: overriding MII mode to 'RGMII'

miiproxy0:  on arge0

miiproxy0: attached to target mdio1

arge0: finishing attachment, phymask 0010, proxy set

miibus4:  on miiproxy0

ukphy4:  PHY 4 on miibus4

ukphy4:  none, 10baseT, 10baseT-FDX, 100baseTX, 100baseTX-FDX,
1000baseT-FDX, 1000baseT-FDX-master, auto

arge0: Ethernet address: 62:73:64:c5:94:0b

arge1:  at mem
0x1a000000-0x1a000fff irq 3 on nexus0

arge1: arge_attach: overriding MII mode to 'RGMII'

arge1: finishing attachment, phymask 0000, proxy null

arge1: Ethernet address: 62:73:64:94:c2:8e

spi0:  at mem 0x1f000000-0x1f00000f on nexus0

spibus0:  on spi0

mx25l0:  at cs 0 on spibus0

mx25l0: mx25ll128, sector 65536 bytes, 256 sectors

ar71xx_wdog0:  on nexus0

Timecounters tick every 1.000 msec

arswitch0port1: link state changed to DOWN

arswitch0port2: link state changed to DOWN

arswitch0port3: link state changed to DOWN

arswitch0port4: link state changed to DOWN

usbus0: 480Mbps High Speed USB v2.0

ugen0.1:  at usbus0

uhub0:  on usbus0

g_dev_taste: make_dev_p() failed (gp->name=redboot/RedBoot config, error=22)

g_dev_taste: make_dev_p() failed (gp->name=redboot/FIS directory, error=22)

redboot/rootfs.uzip: 1102 x 16384 blocks

random: unblocking device.

WARNING: WITNESS option enabled, expect reduced performance.

Root mount waiting for: usbus0

uhub0: 2 ports with 2 removable, self powered

Root mount waiting for: usbus0

Root mount waiting for: usbus0

Root mount waiting for: usbus0

ugen0.2:  at usbus0

umass0:  on usbus0

umass0:  SCSI over Bulk-Only; quirks = 0x4100

umass0:0:0: Attached to scbus0

Trying to mount root from ufs:redboot/rootfs.uzip []...

warning: no time-of-day clock registered, system time will not be set accurately

da0 at umass-sim0 bus 0 scbus0 target 0 lun 0

da0:  Removable Direct Access SCSI-0 device

da0: Serial Number 000000009451

da0: 40.000MB/s transfers

da0: 3902MB (7991296 512 byte sectors: 255H 63S/T 497C)

da0: quirks=0x3

Aug 28 08:07:57 init: login_getclass: unknown class 'daemon'

BAD_PAGE_FAULT: pid 27 tid 100045 (mount), uid 0: pc 0x40514dd0 got a
read fault (type 0x2) at 0x4040011c

Trapframe Register Dump:

        zero: 0 at: 0x7fffffff  v0: 0   v1: 0x404000fc

        a0: 0x54        a1: 0x40400000  a2: 0   a3: 0x1

        t0: 0   t1: 0x40c0300c  t2: 0x40800168  t3: 0x2f

        t4: 0x40c00030  t5: 0   t6: 0x748       t7: 0x402c70

        t8: 0x13        t9: 0x40514d58  s0: 0x3 s1: 0x40418798

        s2: 0   s3: 0x404ec4    s4: 0x40418798  s5: 0x40418798

        s6: 0   s7: 0   k0: 0   k1: 0

        gp: 0x405ec910  sp: 0x7ffee348  s8: 0   ra: 0x4051534c

        sr: 0xfc13      mullo: 0x6719   mulhi: 0xc      badvaddr: 0x4040011c

        cause: 0x8      pc: 0x40514dd0

Page table info for pc address 0x40514dd0: pde = 0x813c4000, pte = 0xa0057b9a

Dumping 4 words starting at pc address 0x40514dd0:

8c700020 32030ff0 00032102 240300ff

Page table info for bad address 0x4040011c: pde = 0x813c4000, pte = 0

pid 27 (mount), uid 0: exited on signal 11

BAD_PAGE_FAULT: pid 32 tid 100045 (mount), uid 0: pc 0x40514dd0 got a
read fault (type 0x2) at 0x4040011c

Trapframe Register Dump:

        zero: 0 at: 0x7fffffff  v0: 0   v1: 0x404000fc

        a0: 0x54        a1: 0x40400000  a2: 0   a3: 0x1

        t0: 0   t1: 0x40c0300c  t2: 0x40800168  t3: 0x2f

        t4: 0x40c00030  t5: 0   t6: 0x748       t7: 0x402c70

        t8: 0x13        t9: 0x40514d58  s0: 0x3 s1: 0x40418798

        s2: 0   s3: 0x404ec4    s4: 0x40418798  s5: 0x40418798

        s6: 0   s7: 0   k0: 0   k1: 0

        gp: 0x405ec910  sp: 0x7ffee348  s8: 0   ra: 0x4051534c

        sr: 0xfc13      mullo: 0x6719   mulhi: 0xc      badvaddr: 0x4040011c

        cause: 0x8      pc: 0x40514dd0

Page table info for pc address 0x40514dd0: pde = 0x813c7000, pte = 0xa0057b9a

Dumping 4 words starting at pc address 0x40514dd0:

8c700020 32030ff0 00032102 240300ff

Page table info for bad address 0x4040011c: pde = 0x813c7000, pte = 0

pid 32 (mount), uid 0: exited on signal 11

cp: /etc/rc.d: Read-only file system

ln: /etc//termcap: Read-only file system

exec: /etc/rc2: not found

Enter full pathname of shell or RETURN for /bin/sh:

Note that this board has more RAM than Hiren's. I don't know what that
may change.




-a

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 00:25:18 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 883327F6;
 Fri, 29 Aug 2014 00:25:18 +0000 (UTC)
Received: from mail-qa0-x22b.google.com (mail-qa0-x22b.google.com
 [IPv6:2607:f8b0:400d:c00::22b])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 02E9A17EA;
 Fri, 29 Aug 2014 00:25:17 +0000 (UTC)
Received: by mail-qa0-f43.google.com with SMTP id cm18so1473522qab.2
 for ; Thu, 28 Aug 2014 17:25:17 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:date:message-id:subject
 :from:to:cc:content-type;
 bh=sapc5pok147XJNhnF2IGBQtnkZxOphkXpCsawyP0vs0=;
 b=i562s6eCP3hzJUIi0jJOZVZmWvUCe/mdet5n1F2XyQf0izFX8yFwyp3UmVmPj0XSoo
 aVaVA0Z+XYDOeykhAqsQYHfXXje6/S5wF5fFNea++qaJuKcpoqFiYbPghJUYe8SbH/Ch
 y8BhtNbReZHwACS2ZxSCkt0SAG4A/RTntbMT2oTTkU34735TqPRBeCq4lYahExdXpWbl
 2ZP0FiPcgQYwJg40wvhrwLwhMqAXxFGGf/aocfN4YRxwZzBtWXRBns8C4w+tK1oOoKMf
 wcUfEcQuTteonueiJJOIHYSGwMNEh4mPb0M2ZP0SOF7EeW1NUFy6PMnOmfnUevHMvJHY
 RZyQ==
MIME-Version: 1.0
X-Received: by 10.140.19.201 with SMTP id 67mr11785014qgh.28.1409271917158;
 Thu, 28 Aug 2014 17:25:17 -0700 (PDT)
Sender: adrian.chadd@gmail.com
Received: by 10.224.39.139 with HTTP; Thu, 28 Aug 2014 17:25:17 -0700 (PDT)
In-Reply-To: 
References: <201407261810.s6QIAIIj049439@svn.freebsd.org>
 
 <72B80282-6FA1-4481-8333-37EF3A58FB74@rice.edu>
 
 
 
Date: Thu, 28 Aug 2014 17:25:17 -0700
X-Google-Sender-Auth: iMCDVJpfyMT1eJwJhn1DSM1kVlA
Message-ID: 
Subject: Re: svn commit: r269134 - head/sys/vm
From: Adrian Chadd 
To: hiren panchasara 
Content-Type: text/plain; charset=UTF-8
Cc: Alan Cox ,
 "svn-src-head@freebsd.org" ,
 "svn-src-all@freebsd.org" ,
 "src-committers@freebsd.org" ,
 Alan Cox 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 00:25:18 -0000

Hm, ok, r269134 worked but r269799 didn't.

I'll keep digging, thanks!


-a

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 00:33:32 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 0FA709C7;
 Fri, 29 Aug 2014 00:33:32 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E35EE18BD;
 Fri, 29 Aug 2014 00:33:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7T0XVxl091766;
 Fri, 29 Aug 2014 00:33:31 GMT (envelope-from jfv@FreeBSD.org)
Received: (from jfv@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7T0XV1l091765;
 Fri, 29 Aug 2014 00:33:31 GMT (envelope-from jfv@FreeBSD.org)
Message-Id: <201408290033.s7T0XV1l091765@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jfv set sender to jfv@FreeBSD.org
 using -f
From: Jack F Vogel 
Date: Fri, 29 Aug 2014 00:33:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270775 - head/sys/dev/ixl
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 00:33:32 -0000

Author: jfv
Date: Fri Aug 29 00:33:31 2014
New Revision: 270775
URL: http://svnweb.freebsd.org/changeset/base/270775

Log:
  Fix the NOINET and NOINET6 builds.
  
  MFC after:3 days

Modified:
  head/sys/dev/ixl/ixl_txrx.c

Modified: head/sys/dev/ixl/ixl_txrx.c
==============================================================================
--- head/sys/dev/ixl/ixl_txrx.c	Thu Aug 28 23:32:56 2014	(r270774)
+++ head/sys/dev/ixl/ixl_txrx.c	Fri Aug 29 00:33:31 2014	(r270775)
@@ -596,6 +596,7 @@ ixl_tx_setup_offload(struct ixl_queue *q
 
 	switch (etype) {
 		case ETHERTYPE_IP:
+#ifdef INET
 			ip = (struct ip *)(mp->m_data + elen);
 			ip_hlen = ip->ip_hl << 2;
 			ipproto = ip->ip_p;
@@ -605,14 +606,17 @@ ixl_tx_setup_offload(struct ixl_queue *q
 				*cmd |= I40E_TX_DESC_CMD_IIPT_IPV4_CSUM;
 			else
 				*cmd |= I40E_TX_DESC_CMD_IIPT_IPV4;
+#endif
 			break;
 		case ETHERTYPE_IPV6:
+#ifdef INET6
 			ip6 = (struct ip6_hdr *)(mp->m_data + elen);
 			ip_hlen = sizeof(struct ip6_hdr);
 			ipproto = ip6->ip6_nxt;
 			th = (struct tcphdr *)((caddr_t)ip6 + ip_hlen);
 			*cmd |= I40E_TX_DESC_CMD_IIPT_IPV6;
 			/* Falls thru */
+#endif
 		default:
 			break;
 	}

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 01:20:32 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 86D49FF7;
 Fri, 29 Aug 2014 01:20:32 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5810D1CE1;
 Fri, 29 Aug 2014 01:20:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7T1KWJP012525;
 Fri, 29 Aug 2014 01:20:32 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7T1KVTi012522;
 Fri, 29 Aug 2014 01:20:31 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201408290120.s7T1KVTi012522@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber 
Date: Fri, 29 Aug 2014 01:20:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270776 - in stable/10: gnu/usr.bin/grep usr.bin/host
 usr.bin/svn/svn
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 01:20:32 -0000

Author: gjb
Date: Fri Aug 29 01:20:31 2014
New Revision: 270776
URL: http://svnweb.freebsd.org/changeset/base/270776

Log:
  MFC r270668, r270669, r270672:
  
  r270668:
    Add gnugrep.1 to CLEANFILES.
  
  r270669:
    Add host.1 to CLEANFILES.
  
  r270672:
    Add svnlite.1 to CLEANFILES.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/gnu/usr.bin/grep/Makefile
  stable/10/usr.bin/host/Makefile
  stable/10/usr.bin/svn/svn/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/gnu/usr.bin/grep/Makefile
==============================================================================
--- stable/10/gnu/usr.bin/grep/Makefile	Fri Aug 29 00:33:31 2014	(r270775)
+++ stable/10/gnu/usr.bin/grep/Makefile	Fri Aug 29 01:20:31 2014	(r270776)
@@ -12,6 +12,7 @@ PROG=	gnugrep
 SRCS=	closeout.c dfa.c error.c exclude.c grep.c grepmat.c hard-locale.c \
 	isdir.c kwset.c obstack.c quotearg.c savedir.c search.c xmalloc.c \
 	xstrtoumax.c
+CLEANFILES+=	gnugrep.1
 
 CFLAGS+=-I${.CURDIR} -I${DESTDIR}/usr/include/gnu -DHAVE_CONFIG_H
 

Modified: stable/10/usr.bin/host/Makefile
==============================================================================
--- stable/10/usr.bin/host/Makefile	Fri Aug 29 00:33:31 2014	(r270775)
+++ stable/10/usr.bin/host/Makefile	Fri Aug 29 01:20:31 2014	(r270776)
@@ -8,6 +8,7 @@ LDNSHOSTDIR=	${.CURDIR}/../../contrib/ld
 PROG=		host
 SRCS=		ldns-host.c
 MAN=		host.1
+CLEANFILES+=	host.1
 
 host.1: ldns-host.1
 	sed -e 's/ldns-//gI' <${.ALLSRC} >${.TARGET} || \

Modified: stable/10/usr.bin/svn/svn/Makefile
==============================================================================
--- stable/10/usr.bin/svn/svn/Makefile	Fri Aug 29 00:33:31 2014	(r270775)
+++ stable/10/usr.bin/svn/svn/Makefile	Fri Aug 29 01:20:31 2014	(r270776)
@@ -51,6 +51,7 @@ DPADD=	${LIBSVN_CLIENT} ${LIBSVN_WC} ${L
 	${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \
 	${LIBCRYPTO} ${LIBSSL} ${LIBPTHREAD}
 
+CLEANFILES+=	svnlite.1
 .if(defined(ORGANIZATION) && !empty(ORGANIZATION))
 DPSRCS+=	freebsd-organization.h
 CLEANFILES+=	freebsd-organization.h

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 01:21:09 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 609FF1AF;
 Fri, 29 Aug 2014 01:21:09 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4C8A41CE8;
 Fri, 29 Aug 2014 01:21:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7T1L95F013120;
 Fri, 29 Aug 2014 01:21:09 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7T1L9oG013118;
 Fri, 29 Aug 2014 01:21:09 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201408290121.s7T1L9oG013118@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber 
Date: Fri, 29 Aug 2014 01:21:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r270777 - stable/9/gnu/usr.bin/grep
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 01:21:09 -0000

Author: gjb
Date: Fri Aug 29 01:21:08 2014
New Revision: 270777
URL: http://svnweb.freebsd.org/changeset/base/270777

Log:
  MFC r270668:
    Add gnugrep.1 to CLEANFILES.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/9/gnu/usr.bin/grep/Makefile
Directory Properties:
  stable/9/gnu/usr.bin/   (props changed)

Modified: stable/9/gnu/usr.bin/grep/Makefile
==============================================================================
--- stable/9/gnu/usr.bin/grep/Makefile	Fri Aug 29 01:20:31 2014	(r270776)
+++ stable/9/gnu/usr.bin/grep/Makefile	Fri Aug 29 01:21:08 2014	(r270777)
@@ -12,6 +12,7 @@ PROG=	gnugrep
 SRCS=	closeout.c dfa.c error.c exclude.c grep.c grepmat.c hard-locale.c \
 	isdir.c kwset.c obstack.c quotearg.c savedir.c search.c xmalloc.c \
 	xstrtoumax.c
+CLEANFILES+=	gnugrep.1
 
 CFLAGS+=-I${.CURDIR} -I${DESTDIR}/usr/include/gnu -DHAVE_CONFIG_H
 

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 01:40:50 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 85601576;
 Fri, 29 Aug 2014 01:40:50 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 70CED1E93;
 Fri, 29 Aug 2014 01:40:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7T1eoWd024674;
 Fri, 29 Aug 2014 01:40:50 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7T1eo2e024673;
 Fri, 29 Aug 2014 01:40:50 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201408290140.s7T1eo2e024673@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber 
Date: Fri, 29 Aug 2014 01:40:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270778 - stable/10/sys/dev/usb
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 01:40:50 -0000

Author: gjb
Date: Fri Aug 29 01:40:49 2014
New Revision: 270778
URL: http://svnweb.freebsd.org/changeset/base/270778

Log:
  MFC r269608:
    Add device ID for the Chicony USB 2.0 HD UVC Webcam
    found on the Asus X550LA.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/sys/dev/usb/usbdevs
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/usb/usbdevs
==============================================================================
--- stable/10/sys/dev/usb/usbdevs	Fri Aug 29 01:21:08 2014	(r270777)
+++ stable/10/sys/dev/usb/usbdevs	Fri Aug 29 01:40:49 2014	(r270778)
@@ -1380,6 +1380,7 @@ product CHIC CYPRESS		0x0003	Cypress USB
 product CHICONY KB8933		0x0001	KB-8933 keyboard
 product CHICONY KU0325		0x0116	KU-0325 keyboard
 product CHICONY CNF7129		0xb071	Notebook Web Camera
+product CHICONY HDUVCCAM	0xb40a	HD UVC WebCam
 product	CHICONY RTL8188CUS_1	0xaff7	RTL8188CUS
 product	CHICONY RTL8188CUS_2	0xaff8	RTL8188CUS
 product	CHICONY RTL8188CUS_3	0xaff9	RTL8188CUS

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 02:21:03 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id D07419B7;
 Fri, 29 Aug 2014 02:21:03 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A2A051278;
 Fri, 29 Aug 2014 02:21:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7T2L33a040884;
 Fri, 29 Aug 2014 02:21:03 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7T2L2MO040748;
 Fri, 29 Aug 2014 02:21:02 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201408290221.s7T2L2MO040748@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper 
Date: Fri, 29 Aug 2014 02:21:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270779 - in stable/10: bin/date/tests tools/build/mk
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 02:21:03 -0000

Author: ngie
Date: Fri Aug 29 02:21:02 2014
New Revision: 270779
URL: http://svnweb.freebsd.org/changeset/base/270779

Log:
  MFC r269903:
  
   Port date/bin/tests to ATF
  
   Phabric: D545
   Approved by: jmmv (mentor)
   Submitted by: keramida (earlier version)
   Sponsored by: Google, Inc
   Sponsored by: EMC / Isilon Storage Division

Added:
  stable/10/bin/date/tests/format_string_test.sh
     - copied unchanged from r269903, head/bin/date/tests/format_string_test.sh
Deleted:
  stable/10/bin/date/tests/legacy_test.sh
Modified:
  stable/10/bin/date/tests/Makefile
  stable/10/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/bin/date/tests/Makefile
==============================================================================
--- stable/10/bin/date/tests/Makefile	Fri Aug 29 01:40:49 2014	(r270778)
+++ stable/10/bin/date/tests/Makefile	Fri Aug 29 02:21:02 2014	(r270779)
@@ -4,6 +4,6 @@
 
 TESTSDIR=	${TESTSBASE}/bin/date
 
-TAP_TESTS_SH=	legacy_test
+ATF_TESTS_SH=	format_string_test
 
 .include 

Copied: stable/10/bin/date/tests/format_string_test.sh (from r269903, head/bin/date/tests/format_string_test.sh)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/10/bin/date/tests/format_string_test.sh	Fri Aug 29 02:21:02 2014	(r270779, copy of r269903, head/bin/date/tests/format_string_test.sh)
@@ -0,0 +1,92 @@
+#
+# Regression tests for date(1)
+#
+# Submitted by Edwin Groothuis 
+#
+# $FreeBSD$
+#
+
+#
+# These two date/times have been chosen carefully -- they
+# create both the single digit and double/multidigit version of
+# the values.
+#
+# To create a new one, make sure you are using the UTC timezone!
+#
+
+TEST1=3222243		# 1970-02-07 07:04:03
+TEST2=1005600000	# 2001-11-12 21:11:12
+
+check()
+{
+	local format_string exp_output_1 exp_output_2
+
+	format_string=${1}
+	exp_output_1=${2}
+	exp_output_2=${3}
+
+	atf_check -o "inline:${exp_output_1}\n" \
+	    date -r ${TEST1} +%${format_string}
+	atf_check -o "inline:${exp_output_2}\n" \
+	    date -r ${TEST2} +%${format_string}
+}
+
+format_string_test()
+{
+	local desc exp_output_1 exp_output_2 flag
+
+	desc=${1}
+	flag=${2}
+	exp_output_1=${3}
+	exp_output_2=${4}
+
+	atf_test_case ${desc}_test
+	eval "
+${desc}_test_body() {
+	check ${flag} '${exp_output_1}' '${exp_output_2}';
+}"
+	atf_add_test_case ${desc}_test
+}
+
+atf_init_test_cases()
+{
+	format_string_test A A Saturday Monday
+	format_string_test a a Sat Mon
+	format_string_test B B February November
+	format_string_test b b Feb Nov
+	format_string_test C C 19 20
+	format_string_test c c "Sat Feb  7 07:04:03 1970" "Mon Nov 12 21:20:00 2001"
+	format_string_test D D 02/07/70 11/12/01
+	format_string_test d d 07 12
+	format_string_test e e " 7" 12
+	format_string_test F F "1970-02-07" "2001-11-12"
+	format_string_test G G 1970 2001
+	format_string_test g g 70 01
+	format_string_test H H 07 21
+	format_string_test h h Feb Nov
+	format_string_test I I 07 09
+	format_string_test j j 038 316
+	format_string_test k k " 7" 21
+	format_string_test l l " 7" " 9"
+	format_string_test M M 04 20
+	format_string_test m m 02 11
+	format_string_test p p AM PM
+	format_string_test R R 07:04 21:20
+	format_string_test r r "07:04:03 AM" "09:20:00 PM"
+	format_string_test S S 03 00
+	format_string_test s s ${TEST1} ${TEST2}
+	format_string_test U U 05 45
+	format_string_test u u 6 1
+	format_string_test V V 06 46
+	format_string_test v v " 7-Feb-1970" "12-Nov-2001"
+	format_string_test W W 05 46
+	format_string_test w w 6 1
+	format_string_test X X "07:04:03" "21:20:00"
+	format_string_test x x "02/07/70" "11/12/01"
+	format_string_test Y Y 1970 2001
+	format_string_test y y 70 01
+	format_string_test Z Z UTC UTC
+	format_string_test z z +0000 +0000
+	format_string_test percent % % %
+	format_string_test plus + "Sat Feb  7 07:04:03 UTC 1970" "Mon Nov 12 21:20:00 UTC 2001"
+}

Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Fri Aug 29 01:40:49 2014	(r270778)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Fri Aug 29 02:21:02 2014	(r270779)
@@ -4071,6 +4071,7 @@ OLD_FILES+=usr/share/man/man8/telnetd.8.
 
 .if ${MK_TESTS} == yes
 OLD_LIBS+=usr/lib/libatf-c++.so.1
+OLD_FILES+=usr/tests/bin/date/legacy_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/test_helpers_test
 OLD_FILES+=usr/tests/lib/atf/test-programs/fork_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/application_test

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 03:33:28 2014
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 1033)
 id DCAC628E; Fri, 29 Aug 2014 03:33:28 +0000 (UTC)
Date: Fri, 29 Aug 2014 03:33:28 +0000
From: Alexey Dokuchaev 
To: Steven Hartland 
Subject: Re: svn commit: r270759 - in head/sys: cddl/compat/opensolaris/kern
 cddl/compat/opensolaris/sys cddl/contrib/opensolaris/uts/common/fs/zfs vm
Message-ID: <20140829033328.GB53500@FreeBSD.org>
References: <201408281950.s7SJo90I047213@svn.freebsd.org>
 
 <899BF203A6C64F3D8C8902F371D9DA79@multiplay.co.uk>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <899BF203A6C64F3D8C8902F371D9DA79@multiplay.co.uk>
User-Agent: Mutt/1.5.23 (2014-03-12)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org, Dmitry Morozovsky 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 03:33:29 -0000

On Thu, Aug 28, 2014 at 10:11:39PM +0100, Steven Hartland wrote:
> I'll MFC to 9 and possibly 8 as well at that time if relavent.

Although I don't use ZFS on stable/8, your care about our best stable
branch :) is much appreciated.

./danfe

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 05:37:24 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id F1D95E46;
 Fri, 29 Aug 2014 05:37:23 +0000 (UTC)
Received: from mail108.syd.optusnet.com.au (mail108.syd.optusnet.com.au
 [211.29.132.59])
 by mx1.freebsd.org (Postfix) with ESMTP id B2641152E;
 Fri, 29 Aug 2014 05:37:22 +0000 (UTC)
Received: from c122-106-147-133.carlnfd1.nsw.optusnet.com.au
 (c122-106-147-133.carlnfd1.nsw.optusnet.com.au [122.106.147.133])
 by mail108.syd.optusnet.com.au (Postfix) with ESMTPS id A74611A4633;
 Fri, 29 Aug 2014 15:37:13 +1000 (EST)
Date: Fri, 29 Aug 2014 15:37:12 +1000 (EST)
From: Bruce Evans 
X-X-Sender: bde@besplex.bde.org
To: Warner Losh 
Subject: Re: svn commit: r270771 - head/bin/dd
In-Reply-To: <201408282130.s7SLUdOq002677@svn.freebsd.org>
Message-ID: <20140829135805.E965@besplex.bde.org>
References: <201408282130.s7SLUdOq002677@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Optus-CM-Score: 0
X-Optus-CM-Analysis: v=2.1 cv=fvDlOjIf c=1 sm=1 tr=0
 a=7NqvjVvQucbO2RlWB8PEog==:117 a=PO7r1zJSAAAA:8 a=vP0a1Juy-6gA:10
 a=-Ipgo79MMzMA:10 a=kj9zAlcOel0A:10 a=JzwRw_2MAAAA:8 a=6I5d2MoRAAAA:8
 a=J-Hf8eGe7SijfmcwNEYA:9 a=xPD8LiEXptS-V670:21 a=qIH4V4QtYJJjNaO9:21
 a=CjuIK1q_8ugA:10
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 05:37:24 -0000

On Thu, 28 Aug 2014, Warner Losh wrote:

> Author: imp
> Date: Thu Aug 28 21:30:39 2014
> New Revision: 270771
> URL: http://svnweb.freebsd.org/changeset/base/270771
>
> Log:
>  Add canonical population of a disk / thumb drive from an image
>  example.
>
> Modified:
>  head/bin/dd/dd.1
>
> Modified: head/bin/dd/dd.1
> ==============================================================================
> --- head/bin/dd/dd.1	Thu Aug 28 21:27:37 2014	(r270770)
> +++ head/bin/dd/dd.1	Thu Aug 28 21:30:39 2014	(r270771)
> @@ -408,6 +408,11 @@ To create an image of a Mode-1 CD-ROM, w
> for data CD-ROM disks, use a block size of 2048 bytes:
> .Pp
> .Dl "dd if=/dev/acd0 of=filename.iso bs=2048"
> +.Pp
> +Write a filesystem image to a memory stick, padding the end with zeros,
> +if necessary, to a 1MiB boundary:
> +.Pp
> +.Dl "dd if=memstick.img of=/dev/da0 bs=1m conv=noerror,sync"
> .Sh SEE ALSO
> .Xr cp 1 ,
> .Xr mt 1 ,

dd.1 doesn't use the MiB uglyness anywhere else.  It even defines 1M
correctly:

      Where sizes are specified, a decimal, octal, or hexadecimal number of
      bytes is expected.  If the number ends with a ``b'', ``k'', ``m'', ``g'',
      or ``w'', the number is multiplied by 512, 1024 (1K), 1048576 (1M),
      1073741824 (1G) or the number of bytes in an integer, respectively.  Two
      or more numbers may be separated by an ``x'' to indicate a product.

dd also has the correct amount of support (none) for power of 10 sizes in
args.

However, it is not useful to use 1M in the description of ``m''.  It
basically describes ``m'' by saying that it is ``M''.  1048576 is
sufficient and not mistakable for 1000000.  The technical term 1M is
not used anywhere in the man page.  Similarly for 1K and 1G.

However2, dd also accepts upper case aliases for ``m'', etc.  These are
relatively recent bugs in FreeBSD.  They are too recent for news of them
to have reached the man page.  There aren't enough letters to use 2
aliases every power of 2 size, especially starting some years after the
MiB uglyness.

humanize_number(3) still have much the same bugs, except it supports
power of 10 sizes.  expand_number(3) is a little better.
humanize_number() doesn't humanize numbers.  It converts integers into
a string representation in a special dehumanized (scientific) format.
expand_number() doesn't expand numbers.  It parses string
representations of integers into object representations of integers.
This is rarely an expansion.  Normal English usage is that "12345"
is a decimal expansion of a number, not that the number is an expansion
of "12345".  The string representation is usually also larger in size.

expand_number() documents its wastage of 2 aliases for every power of
2 size and its null support for power of 10 sizes.  It doesn't
explicitly document its null support for suffixes like "MiB".  It still
describes the suffixes as prefixes.  They may be prefixes in some
technical SI sense, but they are always suffixes for the parser.
(Indeed, they are prefixes in the technical sense of being prefixes
for units.  expand_number() only "expands" raw numbers, so the units
are null.)  It doesn't document its support for hex and octal numbers.
dd does document this, if not the complete syntax.  expand_number()
has some extensions like support for 3 suffixes above g, but doesn't
support multpliers like dd.  Otherwise, it parses string representations
of numbers much like dd.

humanize_number() doesn't waste letters for suffixes.  It only prints
upper case suffixes, except k means 1000 and K means 1024 (it has no
support for floating point numbers so it doesn't need lower case
suffixes like m for milli).  It has an option to print power of 2
suffixes in the uglified Mi format.  It has an option to print a suffix
like "B", so that megabytes become "MB" or "MiB" or even

     "MB is the correct spelling of 104876 bytes; MiB is ugly, but not
     as ugly as mebiB; fortunately, this function cannot print mebi,
     since it only prints upper suffixes except for k."

This explains some of the confusing uses of "prefix".  First the digits
representing the number are put in the string.  Then an SI suffix is
appended if necessary.  Then a suffix like "B" is appended if requested.
So the SI suffixes may be in the middle.  expand_number() doesn't
support suffixes like "B".  Oops.  The suffix is documented as always
being printed, with a space between it and the rest, so "MB" is
impossible.  There is an HN_NOSPACE flag for suppressing the space
before the SI suffixes, but I don't see one for the final suffix.
Most callers are like df and space-constrained, so they use HN_NOSPACE
and don't print a "B" suffix.  I think they sometimes get the space
before the empty suffix at the end, and either use this as a separator
or do extra work to remove it.  There is also an HN_B flag which gives
a suffix in the SI position if the SI suffix is null.  Most disk
utilities use this, but only small files end up with a "B" suffix
from this.  When they do, the space before it is controlled by HN_NOSPACE.
Parsing "1 M B" and "1 M" would be harder than parsing "1MB" and "1M".
expand_number() supports the "B" suffix with no space before it, as will
occur for small numbers printed using HN_B | HN_NOSPACE, but news of this
has not reached its man page.  It has a large incompatibily with dd
here -- "b" and "B" mean 512 in dd.

Bruce

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 06:23:02 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 10AC071B;
 Fri, 29 Aug 2014 06:23:02 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id F041C1AA6;
 Fri, 29 Aug 2014 06:23:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7T6N1uo052551;
 Fri, 29 Aug 2014 06:23:01 GMT (envelope-from hrs@FreeBSD.org)
Received: (from hrs@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7T6N1eP052540;
 Fri, 29 Aug 2014 06:23:01 GMT (envelope-from hrs@FreeBSD.org)
Message-Id: <201408290623.s7T6N1eP052540@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: hrs set sender to hrs@FreeBSD.org
 using -f
From: Hiroki Sato 
Date: Fri, 29 Aug 2014 06:23:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270780 - in head/etc: defaults rc.d
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 06:23:02 -0000

Author: hrs
Date: Fri Aug 29 06:23:00 2014
New Revision: 270780
URL: http://svnweb.freebsd.org/changeset/base/270780

Log:
  Fix rc.d/gssd script to define the default values in a standard way.

Modified:
  head/etc/defaults/rc.conf
  head/etc/rc.d/gssd

Modified: head/etc/defaults/rc.conf
==============================================================================
--- head/etc/defaults/rc.conf	Fri Aug 29 02:21:02 2014	(r270779)
+++ head/etc/defaults/rc.conf	Fri Aug 29 06:23:00 2014	(r270780)
@@ -282,6 +282,7 @@ kfd_enable="NO"			# Run kfd (or NO)
 kfd_program="/usr/libexec/kfd"	# path to kerberos 5 kfd daemon
 
 gssd_enable="NO"		# Run the gssd daemon (or NO).
+gssd_program="/usr/sbin/gssd"	# Path to gssd.
 gssd_flags=""			# Flags for gssd.
 
 rwhod_enable="NO"		# Run the rwho daemon (or NO).

Modified: head/etc/rc.d/gssd
==============================================================================
--- head/etc/rc.d/gssd	Fri Aug 29 02:21:02 2014	(r270779)
+++ head/etc/rc.d/gssd	Fri Aug 29 06:23:00 2014	(r270780)
@@ -9,10 +9,8 @@
 
 . /etc/rc.subr
 
-name="gssd"
+name=gssd
+rcvar=gssd_enable
 
 load_rc_config $name
-rcvar="gssd_enable"
-command="${gssd:-/usr/sbin/${name}}"
-eval ${name}_flags=\"${gssd_flags}\"
 run_rc_command "$1"

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 06:31:18 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 9CFC7A52;
 Fri, 29 Aug 2014 06:31:18 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7ECA51B98;
 Fri, 29 Aug 2014 06:31:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7T6VIXd054214;
 Fri, 29 Aug 2014 06:31:18 GMT (envelope-from hrs@FreeBSD.org)
Received: (from hrs@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7T6VIFZ054213;
 Fri, 29 Aug 2014 06:31:18 GMT (envelope-from hrs@FreeBSD.org)
Message-Id: <201408290631.s7T6VIFZ054213@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: hrs set sender to hrs@FreeBSD.org
 using -f
From: Hiroki Sato 
Date: Fri, 29 Aug 2014 06:31:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270781 - head/etc/rc.d
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 06:31:18 -0000

Author: hrs
Date: Fri Aug 29 06:31:18 2014
New Revision: 270781
URL: http://svnweb.freebsd.org/changeset/base/270781

Log:
  - Add a warning message when an IPv6 address is specified with no prefixlen.
  - Use a parameter argument in jls(8) instead of doing grep.

Modified:
  head/etc/rc.d/jail

Modified: head/etc/rc.d/jail
==============================================================================
--- head/etc/rc.d/jail	Fri Aug 29 06:23:00 2014	(r270780)
+++ head/etc/rc.d/jail	Fri Aug 29 06:31:18 2014	(r270781)
@@ -321,6 +321,8 @@ jail_extract_address()
 	elif [ "${_type}" = "inet6" ]; then
 		# In case _maske is not set for IPv6, use /128.
 		_mask=${_mask:-/128}
+		warn "$_type $_addr: an IPv6 address should always be " \
+		    "specified with a prefix length.  /128 is used."
 	fi
 }
 
@@ -420,7 +422,7 @@ jail_status()
 
 jail_start()
 {
-	local _j _jid _jn _jl
+	local _j _jid _jl
 
 	if [ $# = 0 ]; then
 		return
@@ -433,12 +435,10 @@ jail_start()
 		command_args="-f $jail_conf -c"
 		_tmp=`mktemp -t jail` || exit 3
 		if $command $rc_flags $command_args >> $_tmp 2>&1; then
-			$jail_jls -nq | while read IN; do
-				_jn=$(echo $IN | tr " " "\n" | grep ^name=)
-				_jid=$(echo $IN | tr " " "\n" | grep ^jid=)
-				echo -n " ${_jn#name=}"
-				echo "${_jid#jid=}" \
-				    > /var/run/jail_${_jn#name=}.id
+			$jail_jls jid name | while read IN; do
+				set -- $IN
+				echo -n " $2"
+				echo $1 > /var/run/jail_$2.id
 			done
 		else
 			tail -1 $_tmp
@@ -468,9 +468,8 @@ jail_start()
 		sleep 1
 		for _j in $_jl; do
 			echo -n " ${_hostname:-${_j}}"
-			if _jid=$($jail_jls -n -j $_j | tr " " "\n" | \
-			    grep ^jid=); then
-				echo "${_jid#jid=}" > /var/run/jail_${_j}.id
+			if _jid=$($jail_jls -j $_j jid); then
+				echo "$_jid" > /var/run/jail_${_j}.id
 			else
 				rm -f /var/run/jail_${_j}.id
 				echo " cannot start jail " \
@@ -492,9 +491,8 @@ jail_start()
 			if $command $rc_flags $command_args \
 			    >> $_tmp 2>&1  /var/run/jail_${_j}.id
+				_jid=$($jail_jls -j $_j jid)
+				echo $_jid > /var/run/jail_${_j}.id
 			else
 				rm -f /var/run/jail_${_j}.id
 				echo " cannot start jail " \
@@ -509,7 +507,7 @@ jail_start()
 
 jail_stop()
 {
-	local _j _jn
+	local _j
 
 	if [ $# = 0 ]; then
 		return
@@ -520,16 +518,14 @@ jail_stop()
 		command=$jail_program
 		rc_flags=$jail_flags
 		command_args="-f $jail_conf -r"
-		$jail_jls -nq | while read IN; do
-			_jn=$(echo $IN | tr " " "\n" | grep ^name=)
-			echo -n " ${_jn#name=}"
+		$jail_jls name | while read _j; do
+			echo -n " $_j"
 			_tmp=`mktemp -t jail` || exit 3
-			$command $rc_flags $command_args ${_jn#name=} \
-			    >> $_tmp 2>&1
-			if $jail_jls -j ${_jn#name=} > /dev/null 2>&1; then
+			$command $rc_flags $command_args $_j >> $_tmp 2>&1
+			if $jail_jls -j $_j > /dev/null 2>&1; then
 				tail -1 $_tmp
 			else
-				rm -f /var/run/jail_${_jn#name=}.id
+				rm -f /var/run/jail_${_j}.id
 			fi
 			rm -f $_tmp
 		done

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 07:02:16 2014
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: from hub.FreeBSD.org (hub.freebsd.org
 [IPv6:2001:1900:2254:206c::16:88])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 83542FC;
 Fri, 29 Aug 2014 07:02:15 +0000 (UTC)
Date: Fri, 29 Aug 2014 03:02:11 -0400
From: Glen Barber 
To: Warner Losh 
Subject: Re: svn commit: r270771 - head/bin/dd
Message-ID: <20140829070211.GE1200@hub.FreeBSD.org>
References: <201408282130.s7SLUdOq002677@svn.freebsd.org>
 <20140829135805.E965@besplex.bde.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 protocol="application/pgp-signature"; boundary="fOHHtNG4YXGJ0yqR"
Content-Disposition: inline
In-Reply-To: <20140829135805.E965@besplex.bde.org>
X-Operating-System: FreeBSD 11.0-CURRENT amd64
X-SCUD-Definition: Sudden Completely Unexpected Dataloss
X-SULE-Definition: Sudden Unexpected Learning Event
User-Agent: Mutt/1.5.23 (2014-03-12)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org, Bruce Evans 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 07:02:16 -0000


--fOHHtNG4YXGJ0yqR
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Fri, Aug 29, 2014 at 03:37:12PM +1000, Bruce Evans wrote:
> On Thu, 28 Aug 2014, Warner Losh wrote:
>=20
> >Author: imp
> >Date: Thu Aug 28 21:30:39 2014
> >New Revision: 270771
> >URL: http://svnweb.freebsd.org/changeset/base/270771
> >
> >Log:
> > Add canonical population of a disk / thumb drive from an image
> > example.
> >
> >Modified:
> > head/bin/dd/dd.1
> >
> >Modified: head/bin/dd/dd.1
> >=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> >--- head/bin/dd/dd.1	Thu Aug 28 21:27:37 2014	(r270770)
> >+++ head/bin/dd/dd.1	Thu Aug 28 21:30:39 2014	(r270771)
> >@@ -408,6 +408,11 @@ To create an image of a Mode-1 CD-ROM, w
> >for data CD-ROM disks, use a block size of 2048 bytes:
> >.Pp
> >.Dl "dd if=3D/dev/acd0 of=3Dfilename.iso bs=3D2048"
> >+.Pp
> >+Write a filesystem image to a memory stick, padding the end with zeros,
> >+if necessary, to a 1MiB boundary:
> >+.Pp
> >+.Dl "dd if=3Dmemstick.img of=3D/dev/da0 bs=3D1m conv=3Dnoerror,sync"
> >.Sh SEE ALSO
> >.Xr cp 1 ,
> >.Xr mt 1 ,
>=20
> dd.1 doesn't use the MiB uglyness anywhere else.  It even defines 1M
> correctly:
>=20
>      Where sizes are specified, a decimal, octal, or hexadecimal number of
>      bytes is expected.  If the number ends with a ``b'', ``k'', ``m'', `=
`g'',
>      or ``w'', the number is multiplied by 512, 1024 (1K), 1048576 (1M),
>      1073741824 (1G) or the number of bytes in an integer, respectively. =
 Two
>      or more numbers may be separated by an ``x'' to indicate a product.
>=20
> dd also has the correct amount of support (none) for power of 10 sizes in
> args.
>=20
> However, it is not useful to use 1M in the description of ``m''.  It
> basically describes ``m'' by saying that it is ``M''.  1048576 is
> sufficient and not mistakable for 1000000.  The technical term 1M is
> not used anywhere in the man page.  Similarly for 1K and 1G.
>=20
> However2, dd also accepts upper case aliases for ``m'', etc.  These are
> relatively recent bugs in FreeBSD.  They are too recent for news of them
> to have reached the man page.  There aren't enough letters to use 2
> aliases every power of 2 size, especially starting some years after the
> MiB uglyness.
>=20
> humanize_number(3) still have much the same bugs, except it supports
> power of 10 sizes.  expand_number(3) is a little better.
> humanize_number() doesn't humanize numbers.  It converts integers into
> a string representation in a special dehumanized (scientific) format.
> expand_number() doesn't expand numbers.  It parses string
> representations of integers into object representations of integers.
> This is rarely an expansion.  Normal English usage is that "12345"
> is a decimal expansion of a number, not that the number is an expansion
> of "12345".  The string representation is usually also larger in size.
>=20
> expand_number() documents its wastage of 2 aliases for every power of
> 2 size and its null support for power of 10 sizes.  It doesn't
> explicitly document its null support for suffixes like "MiB".  It still
> describes the suffixes as prefixes.  They may be prefixes in some
> technical SI sense, but they are always suffixes for the parser.
> (Indeed, they are prefixes in the technical sense of being prefixes
> for units.  expand_number() only "expands" raw numbers, so the units
> are null.)  It doesn't document its support for hex and octal numbers.
> dd does document this, if not the complete syntax.  expand_number()
> has some extensions like support for 3 suffixes above g, but doesn't
> support multpliers like dd.  Otherwise, it parses string representations
> of numbers much like dd.
>=20
> humanize_number() doesn't waste letters for suffixes.  It only prints
> upper case suffixes, except k means 1000 and K means 1024 (it has no
> support for floating point numbers so it doesn't need lower case
> suffixes like m for milli).  It has an option to print power of 2
> suffixes in the uglified Mi format.  It has an option to print a suffix
> like "B", so that megabytes become "MB" or "MiB" or even
>=20
>     "MB is the correct spelling of 104876 bytes; MiB is ugly, but not
>     as ugly as mebiB; fortunately, this function cannot print mebi,
>     since it only prints upper suffixes except for k."
>=20
> This explains some of the confusing uses of "prefix".  First the digits
> representing the number are put in the string.  Then an SI suffix is
> appended if necessary.  Then a suffix like "B" is appended if requested.
> So the SI suffixes may be in the middle.  expand_number() doesn't
> support suffixes like "B".  Oops.  The suffix is documented as always
> being printed, with a space between it and the rest, so "MB" is
> impossible.  There is an HN_NOSPACE flag for suppressing the space
> before the SI suffixes, but I don't see one for the final suffix.
> Most callers are like df and space-constrained, so they use HN_NOSPACE
> and don't print a "B" suffix.  I think they sometimes get the space
> before the empty suffix at the end, and either use this as a separator
> or do extra work to remove it.  There is also an HN_B flag which gives
> a suffix in the SI position if the SI suffix is null.  Most disk
> utilities use this, but only small files end up with a "B" suffix
> from this.  When they do, the space before it is controlled by HN_NOSPACE.
> Parsing "1 M B" and "1 M" would be harder than parsing "1MB" and "1M".
> expand_number() supports the "B" suffix with no space before it, as will
> occur for small numbers printed using HN_B | HN_NOSPACE, but news of this
> has not reached its man page.  It has a large incompatibily with dd
> here -- "b" and "B" mean 512 in dd.
>=20

This might be a bad time to mention it, but the .Dd wasn't bumped for
this change.

Glen


--fOHHtNG4YXGJ0yqR
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCAAGBQJUACVzAAoJELls3eqvi17QYNIP/R19VEyIeN3xXukwJGMXggJn
VDgrL41W02y15wPaAeTqHiwxkqCTBjoImJKjGWUzkOHphCcmLq6OEdN2GgUxd4SW
IN7vH83KN73801n4ypzjFA5pfxClwChR+OQ9cWsh+OUfpFc4jcc7BdKfBRC+0ZPh
URFTFpWIpH7MOkW9Vc5ZsU21gzzYN5VqQH8Heg5U5TaVLHs8FVUA2CeC+H6sCNrV
h2wlDX7jiu7vsn+KcmTpAerG66T+nyF0UgOUBsCDzfZOASTzl0zeus1Fmdzs/KYb
Gws+PLKuqKTTbLWvddaXaBPxECS09H9fu6djogrr4jtdTV6IvEkRR+Cy66TA+qxF
uYTWZUnkfHOFn2dQaJaeKV9FdqUe/45iL64E8eOi3UcKZOGjIJkLmpo9VG6iX/Pp
YZnILicJYZs1xAKHcoiCOOsmPjNGNuTK5mbS3Lu1HgnFuD0jOvAGKPdtXQD0MrVH
Rcnd5/Vy9Z+S3YmkGnHSptX0TVnmlMztvz6VKJctZbEAq/xlZq9I2/e/d4WWwFoJ
viUeSGw2KSlOeWJsDtDlKMgzTqmsAZ1IXmRR3XtZSkouxkdAXlDE6YcYuPODAE3V
xzX340+TLOI9kFFEYMun5TIuHvo3H+H/V24VEXa7y3mEU78r05TODdk9x5P4Xkv7
HpgMVXA3gwx7HKvDWZI5
=Xwfr
-----END PGP SIGNATURE-----

--fOHHtNG4YXGJ0yqR--

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 07:51:49 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 62172BDC;
 Fri, 29 Aug 2014 07:51:49 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4D955138F;
 Fri, 29 Aug 2014 07:51:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7T7pnKY093515;
 Fri, 29 Aug 2014 07:51:49 GMT (envelope-from hrs@FreeBSD.org)
Received: (from hrs@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7T7pl4P092961;
 Fri, 29 Aug 2014 07:51:47 GMT (envelope-from hrs@FreeBSD.org)
Message-Id: <201408290751.s7T7pl4P092961@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: hrs set sender to hrs@FreeBSD.org
 using -f
From: Hiroki Sato 
Date: Fri, 29 Aug 2014 07:51:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270782 - in head/etc: defaults rc.d
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 07:51:49 -0000

Author: hrs
Date: Fri Aug 29 07:51:47 2014
New Revision: 270782
URL: http://svnweb.freebsd.org/changeset/base/270782

Log:
  Restructure rc.d scripts for kerberos5 daemons:
  
  - Rename $kerberos5_server_enable with $kdc_enable and rename
    rc.d/kerberos with rc.d/kdc.
  
  - Rename $kadmin5_server_enable with $kadmind_enable.
  
  - Rename ${kerberos5,kpasswdd}_server with ${kdc,kpasswdd}_program.
  
  - Fix rc.d/{kadmind,kerberos,kpasswdd,kfd} scripts not to change variables
    after load_rc_config().
  
  - Add rc.d/ipropd_master and rc.d/ipropd_slave scripts.  These are
    for iprop-master(8) and iprop-slave(8).  Keytab used for iprop service is
    defined in ipropd_{master,slave}_keytab (/etc/krb5.keytab by default).
  
  - Add dependency on rc.d/kdc to SERVERS.  rc.d/kdc must be invoked as early
    as possible before scripts divided by rc.d/SERVERS.
  
  Note that changes to rc.d/{kdc,kpasswdd,kadmind} are backward-compatible
  with the old configuration variables:
  ${kerberos5,kpasswdd,kadmin5}_server{,_enable,_flags}.

Added:
  head/etc/rc.d/ipropd_master   (contents, props changed)
  head/etc/rc.d/ipropd_slave   (contents, props changed)
  head/etc/rc.d/kdc
     - copied, changed from r270781, head/etc/rc.d/kerberos
Deleted:
  head/etc/rc.d/kerberos
Modified:
  head/etc/defaults/rc.conf
  head/etc/rc.d/Makefile
  head/etc/rc.d/SERVERS
  head/etc/rc.d/kadmind
  head/etc/rc.d/kfd
  head/etc/rc.d/kpasswdd

Modified: head/etc/defaults/rc.conf
==============================================================================
--- head/etc/defaults/rc.conf	Fri Aug 29 06:31:18 2014	(r270781)
+++ head/etc/defaults/rc.conf	Fri Aug 29 07:51:47 2014	(r270782)
@@ -271,15 +271,28 @@ local_unbound_enable="NO"	# local cachin
 #
 # kerberos. Do not run the admin daemons on slave servers
 #
-kerberos5_server_enable="NO"	# Run a kerberos 5 master server (or NO).
-kerberos5_server="/usr/libexec/kdc"	# path to kerberos 5 KDC
-kerberos5_server_flags="--detach"	# Additional flags to the kerberos 5 server
-kadmind5_server_enable="NO"	# Run kadmind (or NO)
-kadmind5_server="/usr/libexec/kadmind"	# path to kerberos 5 admin daemon
-kpasswdd_server_enable="NO"	# Run kpasswdd (or NO)
-kpasswdd_server="/usr/libexec/kpasswdd"	# path to kerberos 5 passwd daemon
+kdc_enable="NO"			# Run a kerberos 5 KDC (or NO).
+kdc_program="/usr/libexec/kdc"	# path to kerberos 5 KDC
+kdc_flags=""			# Additional flags to the kerberos 5 KDC
+kadmind_enable="NO"		# Run kadmind (or NO)
+kadmind_program="/usr/libexec/kadmind"	# path to kadmind
+kpasswdd_enable="NO"		# Run kpasswdd (or NO)
+kpasswdd_program="/usr/libexec/kpasswdd" # path to kpasswdd
 kfd_enable="NO"			# Run kfd (or NO)
 kfd_program="/usr/libexec/kfd"	# path to kerberos 5 kfd daemon
+kfd_flags=""
+ipropd_master_enable="NO"	# Run Heimdal incremental propagation daemon
+				# (master daemon).
+ipropd_master_program="/usr/libexec/ipropd-master"
+ipropd_master_flags=""		# Flags to ipropd-master.
+ipropd_master_keytab="/etc/krb5.keytab"	# keytab for ipropd-master.
+ipropd_master_slaves=""		# slave node names used for /var/heimdal/slaves.
+ipropd_slave_enable="NO"	# Run Heimdal incremental propagation daemon
+				# (slave daemon).
+ipropd_slave_program="/usr/libexec/ipropd-slave"
+ipropd_slave_flags=""		# Flags to ipropd-slave.
+ipropd_slave_keytab="/etc/krb5.keytab"	# keytab for ipropd-slave.
+ipropd_slave_masters=""		# master node names.
 
 gssd_enable="NO"		# Run the gssd daemon (or NO).
 gssd_program="/usr/sbin/gssd"	# Path to gssd.

Modified: head/etc/rc.d/Makefile
==============================================================================
--- head/etc/rc.d/Makefile	Fri Aug 29 06:31:18 2014	(r270781)
+++ head/etc/rc.d/Makefile	Fri Aug 29 07:51:47 2014	(r270782)
@@ -65,12 +65,14 @@ FILES=	DAEMON \
 	ipfw \
 	ipmon \
 	ipnat \
+	ipropd_master \
+	ipropd_slave \
 	ipsec \
 	iscsictl \
 	iscsid \
 	jail \
 	kadmind \
-	kerberos \
+	kdc \
 	keyserv \
 	kfd \
 	kld \

Modified: head/etc/rc.d/SERVERS
==============================================================================
--- head/etc/rc.d/SERVERS	Fri Aug 29 06:31:18 2014	(r270781)
+++ head/etc/rc.d/SERVERS	Fri Aug 29 07:51:47 2014	(r270782)
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: SERVERS
-# REQUIRE: mountcritremote abi ldconfig savecore watchdogd
+# REQUIRE: mountcritremote abi ldconfig savecore watchdogd kdc
 
 #	This is a dummy dependency, for early-start servers relying on
 #	some basic configuration.

Added: head/etc/rc.d/ipropd_master
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/etc/rc.d/ipropd_master	Fri Aug 29 07:51:47 2014	(r270782)
@@ -0,0 +1,40 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: ipropd_master
+# REQUIRE: kdc
+# KEYWORD: shutdown
+
+. /etc/rc.subr
+
+name=ipropd_master
+rcvar=${name}_enable
+required_files="$ipropd_master_keytab"
+start_precmd=${name}_start_precmd
+start_postcmd=${name}_start_postcmd
+
+ipropd_master_start_precmd()
+{
+
+	if [ -z "$ipropd_master_slaves" ]; then
+		warn "\$ipropd_master_slaves is empty."
+		return 1
+	fi
+	for _slave in $ipropd_master_slaves; do
+		echo $_slave
+	done > /var/heimdal/slaves || return 1
+	command_args="$command_args \
+	    --keytab=\"$ipropd_master_keytab\" \
+	    --detach \
+	"
+}
+ipropd_master_start_postcmd()
+{
+
+	echo "${name}: slave nodes: $ipropd_master_slaves"
+}
+
+load_rc_config $name
+run_rc_command "$1"

Added: head/etc/rc.d/ipropd_slave
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/etc/rc.d/ipropd_slave	Fri Aug 29 07:51:47 2014	(r270782)
@@ -0,0 +1,32 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: ipropd_slave
+# REQUIRE: kdc
+# KEYWORD: shutdown
+
+. /etc/rc.subr
+
+name=ipropd_slave
+rcvar=${name}_enable
+required_files="$ipropd_slave_keytab"
+start_precmd=${name}_start_precmd
+
+ipropd_slave_start_precmd()
+{
+
+	if [ -z "$ipropd_slave_masters" ]; then
+		warn "\$ipropd_slave_masters is empty."
+		return 1
+	fi
+	command_args=" \
+	    $command_args \
+	    --keytab=\"$ipropd_slave_keytab\" \
+	    --detach \
+	    $ipropd_slave_masters"
+}
+
+load_rc_config $name
+run_rc_command "$1"

Modified: head/etc/rc.d/kadmind
==============================================================================
--- head/etc/rc.d/kadmind	Fri Aug 29 06:31:18 2014	(r270781)
+++ head/etc/rc.d/kadmind	Fri Aug 29 07:51:47 2014	(r270782)
@@ -3,18 +3,26 @@
 # $FreeBSD$
 #
 
-# PROVIDE: kadmin
-# REQUIRE: kerberos
-# BEFORE: DAEMON
+# PROVIDE: kadmind
+# REQUIRE: kdc
+# KEYWORD: shutdown
 
 . /etc/rc.subr
 
-name="kadmind5"
-load_rc_config $name
-rcvar="kadmind5_server_enable"
-unset start_cmd
-command="${kadmind5_server}"
-command_args="&"
-required_vars="kerberos5_server_enable"
+name=kadmind
+rcvar=${name}_enable
+required_vars=kdc_enable
+start_precmd=${name}_start_precmd
+
+set_rcvar_obsolete kadmind5_server_enable kadmind_enable
+set_rcvar_obsolete kadmind5_server kadmind_program
+set_rcvar_obsolete kerberos5_server_enable kdc_enable
+
+kadmind_start_precmd()
+{
 
+	command_args="$command_args &"
+}
+
+load_rc_config $name
 run_rc_command "$1"

Copied and modified: head/etc/rc.d/kdc (from r270781, head/etc/rc.d/kerberos)
==============================================================================
--- head/etc/rc.d/kerberos	Fri Aug 29 06:31:18 2014	(r270781, copy source)
+++ head/etc/rc.d/kdc	Fri Aug 29 07:51:47 2014	(r270782)
@@ -3,15 +3,25 @@
 # $FreeBSD$
 #
 
-# PROVIDE: kerberos
+# PROVIDE: kdc
 # REQUIRE: NETWORKING
+# KEYWORD: shutdown
 
 . /etc/rc.subr
 
-name="kerberos5"
-rcvar="kerberos5_server_enable"
+name=kdc
+rcvar=${name}_enable
+start_precmd=${name}_start_precmd
+
+set_rcvar_obsolete kerberos5_server_enable kdc_enable
+set_rcvar_obsolete kerberos5_server kdc_program
+set_rcvar_obsolete kerberos5_server_flags kdc_flags
+
+kdc_start_precmd()
+{
+
+	command_args="$command_args --detach"
+}
 
 load_rc_config $name
-command="${kerberos5_server}"
-kerberos5_flags="${kerberos5_server_flags}"
 run_rc_command "$1"

Modified: head/etc/rc.d/kfd
==============================================================================
--- head/etc/rc.d/kfd	Fri Aug 29 06:31:18 2014	(r270781)
+++ head/etc/rc.d/kfd	Fri Aug 29 07:51:47 2014	(r270782)
@@ -10,8 +10,14 @@
 . /etc/rc.subr
 
 name=kfd
-rcvar=kfd_enable
-load_rc_config $name
-command_args="-i &"
+rcvar=${name}_enable
+start_precmd=${name}_start_precmd
+
+kfd_start_precmd()
+{
 
+	command_args="$command_args -i &"
+}
+
+load_rc_config $name
 run_rc_command "$1"

Modified: head/etc/rc.d/kpasswdd
==============================================================================
--- head/etc/rc.d/kpasswdd	Fri Aug 29 06:31:18 2014	(r270781)
+++ head/etc/rc.d/kpasswdd	Fri Aug 29 07:51:47 2014	(r270782)
@@ -4,17 +4,25 @@
 #
 
 # PROVIDE: kpasswdd
-# REQUIRE: kadmin
-# BEFORE: DAEMON
+# REQUIRE: kdc
+# KEYWORD: shutdown
 
 . /etc/rc.subr
 
-name="kpasswdd"
-load_rc_config $name
-rcvar="kpasswdd_server_enable"
-unset start_cmd
-command="${kpasswdd_server}"
-command_args="&"
-required_vars="kadmind5_server_enable"
+name=kpasswdd
+rcvar=${name}_enable
+required_vars=kdc_enable
+start_precmd=${name}_start_precmd
+
+set_rcvar_obsolete kpasswdd_server_enable kpasswdd_enable
+set_rcvar_obsolete kpasswdd_server kpasswdd_program
+set_rcvar_obsolete kerberos5_server_enable kdc_enable
+
+kpasswdd_start_precmd()
+{
 
+	command_args="$command_args &"
+}
+
+load_rc_config $name
 run_rc_command "$1"

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 08:02:35 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id A88CAF5;
 Fri, 29 Aug 2014 08:02:35 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7B52D14D3;
 Fri, 29 Aug 2014 08:02:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7T82ZVR098995;
 Fri, 29 Aug 2014 08:02:35 GMT (envelope-from hrs@FreeBSD.org)
Received: (from hrs@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7T82Zvq098994;
 Fri, 29 Aug 2014 08:02:35 GMT (envelope-from hrs@FreeBSD.org)
Message-Id: <201408290802.s7T82Zvq098994@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: hrs set sender to hrs@FreeBSD.org
 using -f
From: Hiroki Sato 
Date: Fri, 29 Aug 2014 08:02:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270783 - head/etc/rc.d
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 08:02:35 -0000

Author: hrs
Date: Fri Aug 29 08:02:35 2014
New Revision: 270783
URL: http://svnweb.freebsd.org/changeset/base/270783

Log:
  Return false status only when adding a route is failed.  It could
  erroneously return false due to an afexists() check loop in routing_start().

Modified:
  head/etc/rc.d/routing

Modified: head/etc/rc.d/routing
==============================================================================
--- head/etc/rc.d/routing	Fri Aug 29 07:51:47 2014	(r270782)
+++ head/etc/rc.d/routing	Fri Aug 29 08:02:35 2014	(r270783)
@@ -23,32 +23,33 @@ ROUTE_CMD="/sbin/route"
 
 routing_start()
 {
-	local _cmd _af _if _a
+	local _cmd _af _if _a _ret
 	_cmd=$1
 	_af=$2
 	_if=$3
+	_ret=0
 
 	case $_if in
 	""|[Aa][Ll][Ll]|[Aa][Nn][Yy])	_if="" ;;
 	esac
 
 	case $_af in
-	inet|inet6|atm)
-		if afexists $_af; then
-			setroutes $_cmd $_af $_if
-		else
-			err 1 "Unsupported address family: $_af."
-		fi
-		;;
 	""|[Aa][Ll][Ll]|[Aa][Nn][Yy])
 		for _a in inet inet6 atm; do
-			afexists $_a && setroutes $_cmd $_a $_if
+			afexists $_a || continue
+			setroutes $_cmd $_a $_if || _ret=1
 		done
-		;;
+	;;
 	*)
-		err 1 "Unsupported address family: $_af."
-		;;
+		if afexists $_af; then
+			setroutes $_cmd $_af $_if || _ret=1
+		else
+			err 1 "Unsupported address family: $_af."
+		fi
+	;;
 	esac
+
+	return $_ret
 }
 
 routing_stop()
@@ -62,17 +63,6 @@ routing_stop()
 	esac
 
 	case $_af in
-	inet|inet6|atm)
-		if afexists $_af; then
-			eval static_${_af} delete $_if 
-			# When $_if is specified, do not flush routes.
-			if ! [ -n "$_if" ]; then
-				eval routing_stop_${_af}
-			fi
-		else
-			err 1 "Unsupported address family: $_af."
-		fi
-		;;
 	""|[Aa][Ll][Ll]|[Aa][Nn][Yy])
 		for _a in inet inet6 atm; do
 			afexists $_a || continue
@@ -82,10 +72,18 @@ routing_stop()
 				eval routing_stop_${_a}
 			fi
 		done
-		;;
+	;;
 	*)
-		err 1 "Unsupported address family: $_af."
-		;;
+		if afexists $_af; then
+			eval static_${_af} delete $_if 
+			# When $_if is specified, do not flush routes.
+			if ! [ -n "$_if" ]; then
+				eval routing_stop_${_af}
+			fi
+		else
+			err 1 "Unsupported address family: $_af."
+		fi
+	;;
 	esac
 }
 

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 08:16:32 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 71439468;
 Fri, 29 Aug 2014 08:16:32 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 436A7174F;
 Fri, 29 Aug 2014 08:16:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7T8GWgD004244;
 Fri, 29 Aug 2014 08:16:32 GMT (envelope-from dumbbell@FreeBSD.org)
Received: (from dumbbell@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7T8GVXH004240;
 Fri, 29 Aug 2014 08:16:31 GMT (envelope-from dumbbell@FreeBSD.org)
Message-Id: <201408290816.s7T8GVXH004240@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: dumbbell set sender to
 dumbbell@FreeBSD.org using -f
From: Jean-Sebastien Pedron 
Date: Fri, 29 Aug 2014 08:16:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270785 - head/sys/dev/vt
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 08:16:32 -0000

Author: dumbbell
Date: Fri Aug 29 08:16:31 2014
New Revision: 270785
URL: http://svnweb.freebsd.org/changeset/base/270785

Log:
  vt(4): Change vb_history_size from "int" to "unsigned int"
  
  CID:		1230002, 1230003
  MFC after:	1 week

Modified:
  head/sys/dev/vt/vt.h
  head/sys/dev/vt/vt_buf.c

Modified: head/sys/dev/vt/vt.h
==============================================================================
--- head/sys/dev/vt/vt.h	Fri Aug 29 08:11:05 2014	(r270784)
+++ head/sys/dev/vt/vt.h	Fri Aug 29 08:16:31 2014	(r270785)
@@ -182,7 +182,7 @@ struct vt_buf {
 #define	VBF_MTX_INIT	0x4	/* Mutex initialized. */
 #define	VBF_SCROLL	0x8	/* scroll locked mode. */
 #define	VBF_HISTORY_FULL 0x10	/* All rows filled. */
-	int			 vb_history_size;
+	unsigned int		 vb_history_size;
 #define	VBF_DEFAULT_HISTORY_SIZE	500
 	int			 vb_roffset;	/* (b) History rows offset. */
 	int			 vb_curroffset;	/* (b) Saved rows offset. */
@@ -200,7 +200,7 @@ void vtbuf_copy(struct vt_buf *, const t
 void vtbuf_fill_locked(struct vt_buf *, const term_rect_t *, term_char_t);
 void vtbuf_init_early(struct vt_buf *);
 void vtbuf_init(struct vt_buf *, const term_pos_t *);
-void vtbuf_grow(struct vt_buf *, const term_pos_t *, int);
+void vtbuf_grow(struct vt_buf *, const term_pos_t *, unsigned int);
 void vtbuf_putchar(struct vt_buf *, const term_pos_t *, term_char_t);
 void vtbuf_cursor_position(struct vt_buf *, const term_pos_t *);
 void vtbuf_scroll_mode(struct vt_buf *vb, int yes);

Modified: head/sys/dev/vt/vt_buf.c
==============================================================================
--- head/sys/dev/vt/vt_buf.c	Fri Aug 29 08:11:05 2014	(r270784)
+++ head/sys/dev/vt/vt_buf.c	Fri Aug 29 08:16:31 2014	(r270785)
@@ -451,7 +451,7 @@ vtbuf_sethistory_size(struct vt_buf *vb,
 }
 
 void
-vtbuf_grow(struct vt_buf *vb, const term_pos_t *p, int history_size)
+vtbuf_grow(struct vt_buf *vb, const term_pos_t *p, unsigned int history_size)
 {
 	term_char_t *old, *new, **rows, **oldrows, **copyrows, *row;
 	int bufsize, rowssize, w, h, c, r;

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 08:20:04 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 93EE16CC;
 Fri, 29 Aug 2014 08:20:04 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 805541776;
 Fri, 29 Aug 2014 08:20:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7T8K4QQ004953;
 Fri, 29 Aug 2014 08:20:04 GMT (envelope-from dumbbell@FreeBSD.org)
Received: (from dumbbell@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7T8K4HK004952;
 Fri, 29 Aug 2014 08:20:04 GMT (envelope-from dumbbell@FreeBSD.org)
Message-Id: <201408290820.s7T8K4HK004952@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: dumbbell set sender to
 dumbbell@FreeBSD.org using -f
From: Jean-Sebastien Pedron 
Date: Fri, 29 Aug 2014 08:20:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270786 - head/sys/dev/vt
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 08:20:04 -0000

Author: dumbbell
Date: Fri Aug 29 08:20:03 2014
New Revision: 270786
URL: http://svnweb.freebsd.org/changeset/base/270786

Log:
  vt(4): Indicate that KDSETRAD case falls through the next case
  
  CID:		1229953
  MFC after:	1 week

Modified:
  head/sys/dev/vt/vt_core.c

Modified: head/sys/dev/vt/vt_core.c
==============================================================================
--- head/sys/dev/vt/vt_core.c	Fri Aug 29 08:16:31 2014	(r270785)
+++ head/sys/dev/vt/vt_core.c	Fri Aug 29 08:20:03 2014	(r270786)
@@ -1799,6 +1799,7 @@ skip_thunk:
 	case KDSETRAD:		/* set keyboard repeat & delay rates (old) */
 		if (*(int *)data & ~0x7f)
 			return (EINVAL);
+		/* FALLTHROUGH */
 	case GIO_KEYMAP:
 	case PIO_KEYMAP:
 	case GIO_DEADKEYMAP:

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 08:32:55 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id D017BA0F;
 Fri, 29 Aug 2014 08:32:55 +0000 (UTC)
Received: from smtp1.multiplay.co.uk (smtp1.multiplay.co.uk [85.236.96.35])
 by mx1.freebsd.org (Postfix) with ESMTP id 6900018EB;
 Fri, 29 Aug 2014 08:32:55 +0000 (UTC)
Received: by smtp1.multiplay.co.uk (Postfix, from userid 65534)
 id C6BB220E7088B; Fri, 29 Aug 2014 08:32:52 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
 smtp1.multiplay.co.uk
X-Spam-Level: 
X-Spam-Status: No, score=0.8 required=8.0 tests=AWL,BAYES_00,DOS_OE_TO_MX,
 FSL_HELO_NON_FQDN_1,RDNS_DYNAMIC,STOX_REPLY_TYPE autolearn=no version=3.3.1
Received: from r2d2 (82-69-141-170.dsl.in-addr.zen.co.uk [82.69.141.170])
 by smtp1.multiplay.co.uk (Postfix) with ESMTP id 3068020E70885;
 Fri, 29 Aug 2014 08:32:50 +0000 (UTC)
Message-ID: <4A4B2C2D36064FD9840E3603D39E58E0@multiplay.co.uk>
From: "Steven Hartland" 
To: "Peter Wemm" ,
	"Alan Cox" 
References: <201408281950.s7SJo90I047213@svn.freebsd.org>
 <20140828211508.GK46031@over-yonder.net> <53FFAD79.7070106@rice.edu>
 <1617817.cOUOX4x8n2@overcee.wemm.org>
Subject: Re: svn commit: r270759 - in head/sys: cddl/compat/opensolaris/kern
 cddl/compat/opensolaris/sys cddl/contrib/opensolaris/uts/common/fs/zfs vm
Date: Fri, 29 Aug 2014 09:32:47 +0100
MIME-Version: 1.0
Content-Type: text/plain; format=flowed; charset="iso-8859-1";
 reply-type=original
Content-Transfer-Encoding: 7bit
X-Priority: 3
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook Express 6.00.2900.5931
X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.6157
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org, Dmitry Morozovsky ,
 "Matthew D. Fuller" 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 08:32:56 -0000

> On Thursday 28 August 2014 17:30:17 Alan Cox wrote:
> > On 08/28/2014 16:15, Matthew D. Fuller wrote:
> > > On Thu, Aug 28, 2014 at 10:11:39PM +0100 I heard the voice of
> > >
> > > Steven Hartland, and lo! it spake thus:
> > >> Its very likely applicable to stable/9 although I've never used 9
> > >> myself, we jumped from 9 direct to 10.
> > >
> > > This is actually hitting two different issues from the two bugs:
> > >
> > > - 191510 is about "ARC isn't greedy enough" on huge-memory 
> > > machines,
> > >
> > >   and from the osreldate that bug was filed on 9.2, so presumably 
> > > is
> > >   applicable.
> > >
> > > - 187594 is about "ARC is too greedy" (probably mostly on 
> > > not-so-huge
> > >
> > >   machines) and starves/drives the rest of the system into swap. 
> > > That
> > >   I believe came about as a result of some unrelated change in the
> > >   10.x stream that upset the previous balance between ARC and the 
> > > rest
> > >   of the VM, so isn't a problem on 9.x.
> >
> > 10.0 had a bug in the page daemon that was fixed in 10-STABLE about
> > three months ago (r265945).  The ARC was not the only thing affected 
> > by
> this bug.
>
> I'm concerned about potential unintended consequences of this change.
>
> Before, arc reclaim was driven by vm_paging_needed(), which was:
> vm_paging_needed(void)
> {
>     return (vm_cnt.v_free_count + vm_cnt.v_cache_count <
>         vm_pageout_wakeup_thresh);
> }
>
> Now it's ignoring the v_cache_count and looking exclusively at 
> v_free_count.
> "cache" pages are free pages that just happen to have known contents. 
> If I
> read this change right, zfs arc will now discard checksummed cache 
> pages to
> make room for non-checksummed pages:

That test is still there so if it needs to it will still trigger.

However that often a lower level as vm_pageout_wakeup_thresh is only 
110%
of min free, where as zfs_arc_free_target is based of target free which 
is
4 * (min free + reserved).

> +       if (kmem_free_count() < zfs_arc_free_target) {
> +               return (1);
> +       }
> ...
> +kmem_free_count(void)
> +{
> +       return (vm_cnt.v_free_count);
> +}
>
> This seems like a pretty substantial behavior change.  I'm concerned 
> that it
> doesn't appear to count all the forms of "free" pages.
>
> I haven't seen the problems with the over-aggressive ARC since the 
> page daemon
> bug was fixed.  It's been working fine under pretty abusive loads in 
> the freebsd
> cluster after that fix.

Others have also confirmed that even with r265945 they can still trigger
performance issue.

In addition without it we still have loads of RAM sat their unused, in 
my
particular experience we have 40GB of 192GB sitting their unused and 
that
was with a stable build from last weekend.

With the patch we confirmed that both RAM usage and performance for 
those
seeing that issue are resolved, with no reported regressions.

> (I should know better than to fire a reply off before full fact 
> checking, but
> this commit worries me..)

Not a problem, its great to know people pay attention to changes, and 
raise
their concerns. Always better to have a discussion about potential 
issues
than to wait for a problem to occur.

Hopefully the above gives you some piece of mind, but if you still have 
any
concerns I'm all ears.

Out of interest would it be possible to update machines in the cluster 
to
see how their workload reacts to the change?

    Regards
    Steve 


From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 08:33:33 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 652B7B4F;
 Fri, 29 Aug 2014 08:33:33 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5108A18F2;
 Fri, 29 Aug 2014 08:33:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7T8XX5b013501;
 Fri, 29 Aug 2014 08:33:33 GMT (envelope-from kib@FreeBSD.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7T8XX65013499;
 Fri, 29 Aug 2014 08:33:33 GMT (envelope-from kib@FreeBSD.org)
Message-Id: <201408290833.s7T8XX65013499@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org
 using -f
From: Konstantin Belousov 
Date: Fri, 29 Aug 2014 08:33:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270787 - stable/10/sys/kern
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 08:33:33 -0000

Author: kib
Date: Fri Aug 29 08:33:32 2014
New Revision: 270787
URL: http://svnweb.freebsd.org/changeset/base/270787

Log:
  MFC r270320:
  Check the validity of struct sigaction sa_flags value, reject unknown
  flags.

Modified:
  stable/10/sys/kern/kern_sig.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/kern/kern_sig.c
==============================================================================
--- stable/10/sys/kern/kern_sig.c	Fri Aug 29 08:20:03 2014	(r270786)
+++ stable/10/sys/kern/kern_sig.c	Fri Aug 29 08:33:32 2014	(r270787)
@@ -644,6 +644,10 @@ kern_sigaction(td, sig, act, oact, flags
 
 	if (!_SIG_VALID(sig))
 		return (EINVAL);
+	if (act != NULL && (act->sa_flags & ~(SA_ONSTACK | SA_RESTART |
+	    SA_RESETHAND | SA_NOCLDSTOP | SA_NODEFER | SA_NOCLDWAIT |
+	    SA_SIGINFO)) != 0)
+		return (EINVAL);
 
 	PROC_LOCK(p);
 	ps = p->p_sigacts;

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 08:38:34 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id CD9B1E90;
 Fri, 29 Aug 2014 08:38:34 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AD99F194D;
 Fri, 29 Aug 2014 08:38:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7T8cYPc014215;
 Fri, 29 Aug 2014 08:38:34 GMT (envelope-from kib@FreeBSD.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7T8cYbx014214;
 Fri, 29 Aug 2014 08:38:34 GMT (envelope-from kib@FreeBSD.org)
Message-Id: <201408290838.s7T8cYbx014214@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org
 using -f
From: Konstantin Belousov 
Date: Fri, 29 Aug 2014 08:38:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270788 - stable/10/sys/kern
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 08:38:34 -0000

Author: kib
Date: Fri Aug 29 08:38:34 2014
New Revision: 270788
URL: http://svnweb.freebsd.org/changeset/base/270788

Log:
  MFC r270321:
  Ensure that sigaction flags for signal, which disposition is reset to
  ignored or default, are not leaking.
  
  MFC r270504:
  Revert the handling of all siginfo sa_flags except SA_SIGINFO to the
  pre-r270321 state.

Modified:
  stable/10/sys/kern/kern_sig.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/kern/kern_sig.c
==============================================================================
--- stable/10/sys/kern/kern_sig.c	Fri Aug 29 08:33:32 2014	(r270787)
+++ stable/10/sys/kern/kern_sig.c	Fri Aug 29 08:38:34 2014	(r270788)
@@ -626,6 +626,20 @@ sig_ffs(sigset_t *set)
 	return (0);
 }
 
+static bool
+sigact_flag_test(struct sigaction *act, int flag)
+{
+
+	/*
+	 * SA_SIGINFO is reset when signal disposition is set to
+	 * ignore or default.  Other flags are kept according to user
+	 * settings.
+	 */
+	return ((act->sa_flags & flag) != 0 && (flag != SA_SIGINFO ||
+	    ((__sighandler_t *)act->sa_sigaction != SIG_IGN &&
+	    (__sighandler_t *)act->sa_sigaction != SIG_DFL)));
+}
+
 /*
  * kern_sigaction
  * sigaction
@@ -688,7 +702,7 @@ kern_sigaction(td, sig, act, oact, flags
 
 		ps->ps_catchmask[_SIG_IDX(sig)] = act->sa_mask;
 		SIG_CANTMASK(ps->ps_catchmask[_SIG_IDX(sig)]);
-		if (act->sa_flags & SA_SIGINFO) {
+		if (sigact_flag_test(act, SA_SIGINFO)) {
 			ps->ps_sigact[_SIG_IDX(sig)] =
 			    (__sighandler_t *)act->sa_sigaction;
 			SIGADDSET(ps->ps_siginfo, sig);
@@ -696,19 +710,19 @@ kern_sigaction(td, sig, act, oact, flags
 			ps->ps_sigact[_SIG_IDX(sig)] = act->sa_handler;
 			SIGDELSET(ps->ps_siginfo, sig);
 		}
-		if (!(act->sa_flags & SA_RESTART))
+		if (!sigact_flag_test(act, SA_RESTART))
 			SIGADDSET(ps->ps_sigintr, sig);
 		else
 			SIGDELSET(ps->ps_sigintr, sig);
-		if (act->sa_flags & SA_ONSTACK)
+		if (sigact_flag_test(act, SA_ONSTACK))
 			SIGADDSET(ps->ps_sigonstack, sig);
 		else
 			SIGDELSET(ps->ps_sigonstack, sig);
-		if (act->sa_flags & SA_RESETHAND)
+		if (sigact_flag_test(act, SA_RESETHAND))
 			SIGADDSET(ps->ps_sigreset, sig);
 		else
 			SIGDELSET(ps->ps_sigreset, sig);
-		if (act->sa_flags & SA_NODEFER)
+		if (sigact_flag_test(act, SA_NODEFER))
 			SIGADDSET(ps->ps_signodefer, sig);
 		else
 			SIGDELSET(ps->ps_signodefer, sig);
@@ -909,14 +923,31 @@ siginit(p)
 	PROC_LOCK(p);
 	ps = p->p_sigacts;
 	mtx_lock(&ps->ps_mtx);
-	for (i = 1; i <= NSIG; i++)
-		if (sigprop(i) & SA_IGNORE && i != SIGCONT)
+	for (i = 1; i <= NSIG; i++) {
+		if (sigprop(i) & SA_IGNORE && i != SIGCONT) {
 			SIGADDSET(ps->ps_sigignore, i);
+		}
+	}
 	mtx_unlock(&ps->ps_mtx);
 	PROC_UNLOCK(p);
 }
 
 /*
+ * Reset specified signal to the default disposition.
+ */
+static void
+sigdflt(struct sigacts *ps, int sig)
+{
+
+	mtx_assert(&ps->ps_mtx, MA_OWNED);
+	SIGDELSET(ps->ps_sigcatch, sig);
+	if ((sigprop(sig) & SA_IGNORE) != 0 && sig != SIGCONT)
+		SIGADDSET(ps->ps_sigignore, sig);
+	ps->ps_sigact[_SIG_IDX(sig)] = SIG_DFL;
+	SIGDELSET(ps->ps_siginfo, sig);
+}
+
+/*
  * Reset signals for an exec of the specified process.
  */
 void
@@ -937,13 +968,9 @@ execsigs(struct proc *p)
 	mtx_lock(&ps->ps_mtx);
 	while (SIGNOTEMPTY(ps->ps_sigcatch)) {
 		sig = sig_ffs(&ps->ps_sigcatch);
-		SIGDELSET(ps->ps_sigcatch, sig);
-		if (sigprop(sig) & SA_IGNORE) {
-			if (sig != SIGCONT)
-				SIGADDSET(ps->ps_sigignore, sig);
+		sigdflt(ps, sig);
+		if ((sigprop(sig) & SA_IGNORE) != 0)
 			sigqueue_delete_proc(p, sig);
-		}
-		ps->ps_sigact[_SIG_IDX(sig)] = SIG_DFL;
 	}
 	/*
 	 * Reset stack state to the user stack.
@@ -1901,16 +1928,8 @@ trapsignal(struct thread *td, ksiginfo_t
 			SIGADDSET(mask, sig);
 		kern_sigprocmask(td, SIG_BLOCK, &mask, NULL,
 		    SIGPROCMASK_PROC_LOCKED | SIGPROCMASK_PS_LOCKED);
-		if (SIGISMEMBER(ps->ps_sigreset, sig)) {
-			/*
-			 * See kern_sigaction() for origin of this code.
-			 */
-			SIGDELSET(ps->ps_sigcatch, sig);
-			if (sig != SIGCONT &&
-			    sigprop(sig) & SA_IGNORE)
-				SIGADDSET(ps->ps_sigignore, sig);
-			ps->ps_sigact[_SIG_IDX(sig)] = SIG_DFL;
-		}
+		if (SIGISMEMBER(ps->ps_sigreset, sig))
+			sigdflt(ps, sig);
 		mtx_unlock(&ps->ps_mtx);
 	} else {
 		/*
@@ -2853,16 +2872,8 @@ postsig(sig)
 		kern_sigprocmask(td, SIG_BLOCK, &mask, NULL,
 		    SIGPROCMASK_PROC_LOCKED | SIGPROCMASK_PS_LOCKED);
 
-		if (SIGISMEMBER(ps->ps_sigreset, sig)) {
-			/*
-			 * See kern_sigaction() for origin of this code.
-			 */
-			SIGDELSET(ps->ps_sigcatch, sig);
-			if (sig != SIGCONT &&
-			    sigprop(sig) & SA_IGNORE)
-				SIGADDSET(ps->ps_sigignore, sig);
-			ps->ps_sigact[_SIG_IDX(sig)] = SIG_DFL;
-		}
+		if (SIGISMEMBER(ps->ps_sigreset, sig))
+			sigdflt(ps, sig);
 		td->td_ru.ru_nsignals++;
 		if (p->p_sig == sig) {
 			p->p_code = 0;

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 08:42:21 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 4117F1DF;
 Fri, 29 Aug 2014 08:42:21 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2CFA31A0E;
 Fri, 29 Aug 2014 08:42:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7T8gLVY018039;
 Fri, 29 Aug 2014 08:42:21 GMT (envelope-from kib@FreeBSD.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7T8gLCx018037;
 Fri, 29 Aug 2014 08:42:21 GMT (envelope-from kib@FreeBSD.org)
Message-Id: <201408290842.s7T8gLCx018037@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org
 using -f
From: Konstantin Belousov 
Date: Fri, 29 Aug 2014 08:42:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270789 - stable/10/sys/kern
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 08:42:21 -0000

Author: kib
Date: Fri Aug 29 08:42:20 2014
New Revision: 270789
URL: http://svnweb.freebsd.org/changeset/base/270789

Log:
  MFC r270345:
  In do_lock_pi(), do not override error from umtxq_sleep_pi() when
  doing suspend check.

Modified:
  stable/10/sys/kern/kern_umtx.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/kern/kern_umtx.c
==============================================================================
--- stable/10/sys/kern/kern_umtx.c	Fri Aug 29 08:38:34 2014	(r270788)
+++ stable/10/sys/kern/kern_umtx.c	Fri Aug 29 08:42:20 2014	(r270789)
@@ -2071,10 +2071,12 @@ do_lock_pi(struct thread *td, struct umu
 		 * and we need to retry or we lost a race to the thread
 		 * unlocking the umtx.
 		 */
-		if (old == owner)
+		if (old == owner) {
 			error = umtxq_sleep_pi(uq, pi, owner & ~UMUTEX_CONTESTED,
 			    "umtxpi", timeout == NULL ? NULL : &timo);
-		else {
+			if (error != 0)
+				continue;
+		} else {
 			umtxq_unbusy(&uq->uq_key);
 			umtxq_unlock(&uq->uq_key);
 		}

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 09:02:02 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id DAAE9BF9;
 Fri, 29 Aug 2014 09:02:02 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id ACE531C2A;
 Fri, 29 Aug 2014 09:02:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7T9223D027559;
 Fri, 29 Aug 2014 09:02:02 GMT (envelope-from kib@FreeBSD.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7T922Dq027555;
 Fri, 29 Aug 2014 09:02:02 GMT (envelope-from kib@FreeBSD.org)
Message-Id: <201408290902.s7T922Dq027555@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org
 using -f
From: Konstantin Belousov 
Date: Fri, 29 Aug 2014 09:02:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270795 - in head/sys: kern sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 09:02:03 -0000

Author: kib
Date: Fri Aug 29 09:02:01 2014
New Revision: 270795
URL: http://svnweb.freebsd.org/changeset/base/270795

Log:
  Add function and wrapper to switch lockmgr and vnode lock back to
  auto-promotion of shared to exclusive.
  
  Tested by:	hrs, pho
  Sponsored by:	The FreeBSD Foundation
  MFC after:	1 week

Modified:
  head/sys/kern/kern_lock.c
  head/sys/sys/lockmgr.h
  head/sys/sys/vnode.h

Modified: head/sys/kern/kern_lock.c
==============================================================================
--- head/sys/kern/kern_lock.c	Fri Aug 29 08:55:58 2014	(r270794)
+++ head/sys/kern/kern_lock.c	Fri Aug 29 09:02:01 2014	(r270795)
@@ -418,6 +418,14 @@ lockallowshare(struct lock *lk)
 }
 
 void
+lockdisableshare(struct lock *lk)
+{
+
+	lockmgr_assert(lk, KA_XLOCKED);
+	lk->lock_object.lo_flags |= LK_NOSHARE;
+}
+
+void
 lockallowrecurse(struct lock *lk)
 {
 

Modified: head/sys/sys/lockmgr.h
==============================================================================
--- head/sys/sys/lockmgr.h	Fri Aug 29 08:55:58 2014	(r270794)
+++ head/sys/sys/lockmgr.h	Fri Aug 29 09:02:01 2014	(r270795)
@@ -77,6 +77,7 @@ void	 lockallowrecurse(struct lock *lk);
 void	 lockallowshare(struct lock *lk);
 void	 lockdestroy(struct lock *lk);
 void	 lockdisablerecurse(struct lock *lk);
+void	 lockdisableshare(struct lock *lk);
 void	 lockinit(struct lock *lk, int prio, const char *wmesg, int timo,
 	    int flags);
 #ifdef DDB

Modified: head/sys/sys/vnode.h
==============================================================================
--- head/sys/sys/vnode.h	Fri Aug 29 08:55:58 2014	(r270794)
+++ head/sys/sys/vnode.h	Fri Aug 29 09:02:01 2014	(r270795)
@@ -428,6 +428,7 @@ extern	struct vattr va_null;		/* predefi
 
 #define	VN_LOCK_AREC(vp)	lockallowrecurse((vp)->v_vnlock)
 #define	VN_LOCK_ASHARE(vp)	lockallowshare((vp)->v_vnlock)
+#define	VN_LOCK_DSHARE(vp)	lockdisableshare((vp)->v_vnlock)
 
 #endif /* _KERNEL */
 

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 09:04:24 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id D569DE5C;
 Fri, 29 Aug 2014 09:04:24 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C1F8E1C4E;
 Fri, 29 Aug 2014 09:04:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7T94OWm027939;
 Fri, 29 Aug 2014 09:04:24 GMT (envelope-from kib@FreeBSD.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7T94Oid027938;
 Fri, 29 Aug 2014 09:04:24 GMT (envelope-from kib@FreeBSD.org)
Message-Id: <201408290904.s7T94Oid027938@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org
 using -f
From: Konstantin Belousov 
Date: Fri, 29 Aug 2014 09:04:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270797 - head/sys/ufs/ufs
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 09:04:24 -0000

Author: kib
Date: Fri Aug 29 09:04:24 2014
New Revision: 270797
URL: http://svnweb.freebsd.org/changeset/base/270797

Log:
  Direct access to the quota files, in particular, lookup, causes lock
  conflict with the quota metadata access.  Mark quota vnode lock as
  recursive and always exclusive to avoid the problem.
  
  Reported by:	hrs
  Tested by:	hrs, pho
  Sponsored by:	The FreeBSD Foundation
  MFC after:	1 week

Modified:
  head/sys/ufs/ufs/ufs_quota.c

Modified: head/sys/ufs/ufs/ufs_quota.c
==============================================================================
--- head/sys/ufs/ufs/ufs_quota.c	Fri Aug 29 09:03:17 2014	(r270796)
+++ head/sys/ufs/ufs/ufs_quota.c	Fri Aug 29 09:04:24 2014	(r270797)
@@ -557,8 +557,21 @@ quotaon(struct thread *td, struct mount 
 	if (*vpp != vp)
 		quotaoff1(td, mp, type);
 
+	/*
+	 * When the directory vnode containing the quota file is
+	 * inactivated, due to the shared lookup of the quota file
+	 * vput()ing the dvp, the qsyncvp() call for the containing
+	 * directory would try to acquire the quota lock exclusive.
+	 * At the same time, lookup already locked the quota vnode
+	 * shared.  Mark the quota vnode lock as allowing recursion
+	 * and automatically converting shared locks to exclusive.
+	 *
+	 * Also mark quota vnode as system.
+	 */
 	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	vp->v_vflag |= VV_SYSTEM;
+	VN_LOCK_AREC(vp);
+	VN_LOCK_DSHARE(vp);
 	VOP_UNLOCK(vp, 0);
 	*vpp = vp;
 	/*

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 09:29:13 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id DBBD3C2;
 Fri, 29 Aug 2014 09:29:12 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C64A61EC2;
 Fri, 29 Aug 2014 09:29:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7T9TCAA039181;
 Fri, 29 Aug 2014 09:29:12 GMT (envelope-from kib@FreeBSD.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7T9TBBI039170;
 Fri, 29 Aug 2014 09:29:11 GMT (envelope-from kib@FreeBSD.org)
Message-Id: <201408290929.s7T9TBBI039170@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org
 using -f
From: Konstantin Belousov 
Date: Fri, 29 Aug 2014 09:29:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270798 - in head/libexec/rtld-elf: . amd64 arm i386 mips
 powerpc powerpc64 sparc64
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 09:29:13 -0000

Author: kib
Date: Fri Aug 29 09:29:10 2014
New Revision: 270798
URL: http://svnweb.freebsd.org/changeset/base/270798

Log:
  IFUNC symbol type shall be processed for non-PLT relocations,
  e.g. when a global variable is initialized with a pointer to ifunc.
  Add symbol type check and call resolver for STT_GNU_IFUNC symbol types
  when processing non-PLT relocations, but only after non-IFUNC
  relocations are done.  The two-phase proceessing is required since
  resolvers may reference other symbols, which must be ready to use when
  resolver calls are done.
  
  Restructure reloc_non_plt() on x86 to call find_symdef() and handle
  IFUNC in single place.
  
  For non-x86 reloc_non_plt(), check for call for IFUNC relocation and
  do nothing, to avoid processing relocs twice.
  
  PR:	193048
  Sponsored by:	The FreeBSD Foundation
  MFC after:	2 weeks

Modified:
  head/libexec/rtld-elf/amd64/reloc.c
  head/libexec/rtld-elf/arm/reloc.c
  head/libexec/rtld-elf/i386/reloc.c
  head/libexec/rtld-elf/mips/reloc.c
  head/libexec/rtld-elf/powerpc/reloc.c
  head/libexec/rtld-elf/powerpc64/reloc.c
  head/libexec/rtld-elf/rtld.c
  head/libexec/rtld-elf/rtld.h
  head/libexec/rtld-elf/sparc64/reloc.c

Modified: head/libexec/rtld-elf/amd64/reloc.c
==============================================================================
--- head/libexec/rtld-elf/amd64/reloc.c	Fri Aug 29 09:04:24 2014	(r270797)
+++ head/libexec/rtld-elf/amd64/reloc.c	Fri Aug 29 09:29:10 2014	(r270798)
@@ -125,213 +125,186 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry 
 	const Elf_Rela *relalim;
 	const Elf_Rela *rela;
 	SymCache *cache;
-	int r = -1;
+	const Elf_Sym *def;
+	const Obj_Entry *defobj;
+	Elf_Addr *where, symval;
+	Elf32_Addr *where32;
+	int r;
 
+	r = -1;
 	/*
 	 * The dynamic loader may be called from a thread, we have
 	 * limited amounts of stack available so we cannot use alloca().
 	 */
 	if (obj != obj_rtld) {
-	    cache = calloc(obj->dynsymcount, sizeof(SymCache));
-	    /* No need to check for NULL here */
+		cache = calloc(obj->dynsymcount, sizeof(SymCache));
+		/* No need to check for NULL here */
 	} else
-	    cache = NULL;
+		cache = NULL;
 
-	relalim = (const Elf_Rela *) ((caddr_t) obj->rela + obj->relasize);
+	relalim = (const Elf_Rela *)((caddr_t)obj->rela + obj->relasize);
 	for (rela = obj->rela;  rela < relalim;  rela++) {
-	    Elf_Addr *where = (Elf_Addr *) (obj->relocbase + rela->r_offset);
-	    Elf32_Addr *where32 = (Elf32_Addr *)where;
-
-	    switch (ELF_R_TYPE(rela->r_info)) {
-
-	    case R_X86_64_NONE:
-		break;
-
-	    case R_X86_64_64:
-		{
-		    const Elf_Sym *def;
-		    const Obj_Entry *defobj;
-
-		    def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj,
-		      flags, cache, lockstate);
-		    if (def == NULL)
-			goto done;
-
-		    *where = (Elf_Addr) (defobj->relocbase + def->st_value + rela->r_addend);
-		}
-		break;
-
-	    case R_X86_64_PC32:
-		/*
-		 * I don't think the dynamic linker should ever see this
-		 * type of relocation.  But the binutils-2.6 tools sometimes
-		 * generate it.
-		 */
-		{
-		    const Elf_Sym *def;
-		    const Obj_Entry *defobj;
-
-		    def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj,
-		      flags, cache, lockstate);
-		    if (def == NULL)
-			goto done;
-
-		    *where32 = (Elf32_Addr) (unsigned long) (defobj->relocbase +
-		        def->st_value + rela->r_addend - (Elf_Addr) where);
-		}
-		break;
-	/* missing: R_X86_64_GOT32 R_X86_64_PLT32 */
-
-	    case R_X86_64_COPY:
 		/*
-		 * These are deferred until all other relocations have
-		 * been done.  All we do here is make sure that the COPY
-		 * relocation is not in a shared library.  They are allowed
-		 * only in executable files.
+		 * First, resolve symbol for relocations which
+		 * reference symbols.
 		 */
-		if (!obj->mainprog) {
-		    _rtld_error("%s: Unexpected R_X86_64_COPY relocation"
-		      " in shared library", obj->path);
-		    goto done;
-		}
-		break;
-
-	    case R_X86_64_GLOB_DAT:
-		{
-		    const Elf_Sym *def;
-		    const Obj_Entry *defobj;
-
-		    def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj,
-		      flags, cache, lockstate);
-		    if (def == NULL)
-			goto done;
-
-		    *where = (Elf_Addr) (defobj->relocbase + def->st_value);
-		}
-		break;
-
-	    case R_X86_64_TPOFF64:
-		{
-		    const Elf_Sym *def;
-		    const Obj_Entry *defobj;
-
-		    def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj,
-		      flags, cache, lockstate);
-		    if (def == NULL)
-			goto done;
-
-		    /*
-		     * We lazily allocate offsets for static TLS as we
-		     * see the first relocation that references the
-		     * TLS block. This allows us to support (small
-		     * amounts of) static TLS in dynamically loaded
-		     * modules. If we run out of space, we generate an
-		     * error.
-		     */
-		    if (!defobj->tls_done) {
-			if (!allocate_tls_offset((Obj_Entry*) defobj)) {
-			    _rtld_error("%s: No space available for static "
-					"Thread Local Storage", obj->path);
-			    goto done;
+		switch (ELF_R_TYPE(rela->r_info)) {
+		case R_X86_64_64:
+		case R_X86_64_PC32:
+		case R_X86_64_GLOB_DAT:
+		case R_X86_64_TPOFF64:
+		case R_X86_64_TPOFF32:
+		case R_X86_64_DTPMOD64:
+		case R_X86_64_DTPOFF64:
+		case R_X86_64_DTPOFF32:
+			def = find_symdef(ELF_R_SYM(rela->r_info), obj,
+			    &defobj, flags, cache, lockstate);
+			if (def == NULL)
+				goto done;
+			/*
+			 * If symbol is IFUNC, only perform relocation
+			 * when caller allowed it by passing
+			 * SYMLOOK_IFUNC flag.  Skip the relocations
+			 * otherwise.
+			 *
+			 * Also error out in case IFUNC relocations
+			 * are specified for TLS, which cannot be
+			 * usefully interpreted.
+			 */
+			if (ELF_ST_TYPE(def->st_info) == STT_GNU_IFUNC) {
+				switch (ELF_R_TYPE(rela->r_info)) {
+				case R_X86_64_64:
+				case R_X86_64_PC32:
+				case R_X86_64_GLOB_DAT:
+					if ((flags & SYMLOOK_IFUNC) == 0)
+						continue;
+					symval = (Elf_Addr)rtld_resolve_ifunc(
+					    defobj, def);
+					break;
+				case R_X86_64_TPOFF64:
+				case R_X86_64_TPOFF32:
+				case R_X86_64_DTPMOD64:
+				case R_X86_64_DTPOFF64:
+				case R_X86_64_DTPOFF32:
+					_rtld_error("%s: IFUNC for TLS reloc",
+					    obj->path);
+					goto done;
+				}
+			} else {
+				if ((flags & SYMLOOK_IFUNC) != 0)
+					continue;
+				symval = (Elf_Addr)defobj->relocbase +
+				    def->st_value;
 			}
-		    }
-
-		    *where = (Elf_Addr) (def->st_value - defobj->tlsoffset +
-					 rela->r_addend);
+			break;
+		default:
+			if ((flags & SYMLOOK_IFUNC) != 0)
+				continue;
+			break;
 		}
-		break;
-
-	    case R_X86_64_TPOFF32:
-		{
-		    const Elf_Sym *def;
-		    const Obj_Entry *defobj;
-
-		    def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj,
-		      flags, cache, lockstate);
-		    if (def == NULL)
-			goto done;
+		where = (Elf_Addr *)(obj->relocbase + rela->r_offset);
+		where32 = (Elf32_Addr *)where;
 
-		    /*
-		     * We lazily allocate offsets for static TLS as we
-		     * see the first relocation that references the
-		     * TLS block. This allows us to support (small
-		     * amounts of) static TLS in dynamically loaded
-		     * modules. If we run out of space, we generate an
-		     * error.
-		     */
-		    if (!defobj->tls_done) {
-			if (!allocate_tls_offset((Obj_Entry*) defobj)) {
-			    _rtld_error("%s: No space available for static "
-					"Thread Local Storage", obj->path);
-			    goto done;
+		switch (ELF_R_TYPE(rela->r_info)) {
+		case R_X86_64_NONE:
+			break;
+		case R_X86_64_64:
+			*where = symval + rela->r_addend;
+			break;
+		case R_X86_64_PC32:
+			/*
+			 * I don't think the dynamic linker should
+			 * ever see this type of relocation.  But the
+			 * binutils-2.6 tools sometimes generate it.
+			 */
+			*where32 = (Elf32_Addr)(unsigned long)(symval +
+		            rela->r_addend - (Elf_Addr)where);
+			break;
+		/* missing: R_X86_64_GOT32 R_X86_64_PLT32 */
+		case R_X86_64_COPY:
+			/*
+			 * These are deferred until all other relocations have
+			 * been done.  All we do here is make sure that the COPY
+			 * relocation is not in a shared library.  They are allowed
+			 * only in executable files.
+			 */
+			if (!obj->mainprog) {
+				_rtld_error("%s: Unexpected R_X86_64_COPY "
+				    "relocation in shared library", obj->path);
+				goto done;
 			}
-		    }
-
-		    *where32 = (Elf32_Addr) (def->st_value -
-					     defobj->tlsoffset +
-					     rela->r_addend);
-		}
-		break;
-
-	    case R_X86_64_DTPMOD64:
-		{
-		    const Elf_Sym *def;
-		    const Obj_Entry *defobj;
-
-		    def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj,
-		      flags, cache, lockstate);
-		    if (def == NULL)
-			goto done;
-
-		    *where += (Elf_Addr) defobj->tlsindex;
-		}
-		break;
-
-	    case R_X86_64_DTPOFF64:
-		{
-		    const Elf_Sym *def;
-		    const Obj_Entry *defobj;
-
-		    def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj,
-		      flags, cache, lockstate);
-		    if (def == NULL)
-			goto done;
-
-		    *where += (Elf_Addr) (def->st_value + rela->r_addend);
-		}
-		break;
-
-	    case R_X86_64_DTPOFF32:
-		{
-		    const Elf_Sym *def;
-		    const Obj_Entry *defobj;
-
-		    def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj,
-		      flags, cache, lockstate);
-		    if (def == NULL)
+			break;
+		case R_X86_64_GLOB_DAT:
+			*where = symval;
+			break;
+		case R_X86_64_TPOFF64:
+			/*
+			 * We lazily allocate offsets for static TLS
+			 * as we see the first relocation that
+			 * references the TLS block. This allows us to
+			 * support (small amounts of) static TLS in
+			 * dynamically loaded modules. If we run out
+			 * of space, we generate an error.
+			 */
+			if (!defobj->tls_done) {
+				if (!allocate_tls_offset((Obj_Entry*) defobj)) {
+					_rtld_error("%s: No space available "
+					    "for static Thread Local Storage",
+					    obj->path);
+					goto done;
+				}
+			}
+			*where = (Elf_Addr)(def->st_value - defobj->tlsoffset +
+			    rela->r_addend);
+			break;
+		case R_X86_64_TPOFF32:
+			/*
+			 * We lazily allocate offsets for static TLS
+			 * as we see the first relocation that
+			 * references the TLS block. This allows us to
+			 * support (small amounts of) static TLS in
+			 * dynamically loaded modules. If we run out
+			 * of space, we generate an error.
+			 */
+			if (!defobj->tls_done) {
+				if (!allocate_tls_offset((Obj_Entry*) defobj)) {
+					_rtld_error("%s: No space available "
+					    "for static Thread Local Storage",
+					    obj->path);
+					goto done;
+				}
+			}
+			*where32 = (Elf32_Addr)(def->st_value -
+			    defobj->tlsoffset + rela->r_addend);
+			break;
+		case R_X86_64_DTPMOD64:
+			*where += (Elf_Addr)defobj->tlsindex;
+			break;
+		case R_X86_64_DTPOFF64:
+			*where += (Elf_Addr)(def->st_value + rela->r_addend);
+			break;
+		case R_X86_64_DTPOFF32:
+			*where32 += (Elf32_Addr)(def->st_value +
+			    rela->r_addend);
+			break;
+		case R_X86_64_RELATIVE:
+			*where = (Elf_Addr)(obj->relocbase + rela->r_addend);
+			break;
+		/*
+		 * missing:
+		 * R_X86_64_GOTPCREL, R_X86_64_32, R_X86_64_32S, R_X86_64_16,
+		 * R_X86_64_PC16, R_X86_64_8, R_X86_64_PC8
+		 */
+		default:
+			_rtld_error("%s: Unsupported relocation type %u"
+			    " in non-PLT relocations\n", obj->path,
+			    (unsigned int)ELF_R_TYPE(rela->r_info));
 			goto done;
-
-		    *where32 += (Elf32_Addr) (def->st_value + rela->r_addend);
 		}
-		break;
-
-	    case R_X86_64_RELATIVE:
-		*where = (Elf_Addr)(obj->relocbase + rela->r_addend);
-		break;
-
-	/* missing: R_X86_64_GOTPCREL, R_X86_64_32, R_X86_64_32S, R_X86_64_16, R_X86_64_PC16, R_X86_64_8, R_X86_64_PC8 */
-
-	    default:
-		_rtld_error("%s: Unsupported relocation type %u"
-		  " in non-PLT relocations\n", obj->path,
-		  (unsigned int)ELF_R_TYPE(rela->r_info));
-		goto done;
-	    }
 	}
 	r = 0;
 done:
-	if (cache != NULL)
-	    free(cache);
+	free(cache);
 	return (r);
 }
 

Modified: head/libexec/rtld-elf/arm/reloc.c
==============================================================================
--- head/libexec/rtld-elf/arm/reloc.c	Fri Aug 29 09:04:24 2014	(r270797)
+++ head/libexec/rtld-elf/arm/reloc.c	Fri Aug 29 09:29:10 2014	(r270798)
@@ -324,6 +324,10 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry 
 	/* The relocation for the dynamic loader has already been done. */
 	if (obj == obj_rtld)
 		return (0);
+	if ((flags & SYMLOOK_IFUNC) != 0)
+		/* XXX not implemented */
+		return (0);
+
 	/*
  	 * The dynamic loader may be called from a thread, we have
 	 * limited amounts of stack available so we cannot use alloca().

Modified: head/libexec/rtld-elf/i386/reloc.c
==============================================================================
--- head/libexec/rtld-elf/i386/reloc.c	Fri Aug 29 09:04:24 2014	(r270797)
+++ head/libexec/rtld-elf/i386/reloc.c	Fri Aug 29 09:29:10 2014	(r270798)
@@ -126,168 +126,142 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry 
 	const Elf_Rel *rellim;
 	const Elf_Rel *rel;
 	SymCache *cache;
-	int r = -1;
+	const Elf_Sym *def;
+	const Obj_Entry *defobj;
+	Elf_Addr *where, symval, add;
+	int r;
 
+	r = -1;
 	/*
 	 * The dynamic loader may be called from a thread, we have
 	 * limited amounts of stack available so we cannot use alloca().
 	 */
 	if (obj != obj_rtld) {
-	    cache = calloc(obj->dynsymcount, sizeof(SymCache));
-	    /* No need to check for NULL here */
+		cache = calloc(obj->dynsymcount, sizeof(SymCache));
+		/* No need to check for NULL here */
 	} else
-	    cache = NULL;
+		cache = NULL;
 
-	rellim = (const Elf_Rel *) ((caddr_t) obj->rel + obj->relsize);
+	rellim = (const Elf_Rel *)((caddr_t) obj->rel + obj->relsize);
 	for (rel = obj->rel;  rel < rellim;  rel++) {
-	    Elf_Addr *where = (Elf_Addr *) (obj->relocbase + rel->r_offset);
-
-	    switch (ELF_R_TYPE(rel->r_info)) {
-
-	    case R_386_NONE:
-		break;
-
-	    case R_386_32:
-		{
-		    const Elf_Sym *def;
-		    const Obj_Entry *defobj;
-
-		    def = find_symdef(ELF_R_SYM(rel->r_info), obj, &defobj,
-		      flags, cache, lockstate);
-		    if (def == NULL)
-			goto done;
-
-		    *where += (Elf_Addr) (defobj->relocbase + def->st_value);
-		}
-		break;
-
-	    case R_386_PC32:
-		/*
-		 * I don't think the dynamic linker should ever see this
-		 * type of relocation.  But the binutils-2.6 tools sometimes
-		 * generate it.
-		 */
-		{
-		    const Elf_Sym *def;
-		    const Obj_Entry *defobj;
-
-		    def = find_symdef(ELF_R_SYM(rel->r_info), obj, &defobj,
-		      flags, cache, lockstate);
-		    if (def == NULL)
-			goto done;
-
-		    *where +=
-		      (Elf_Addr) (defobj->relocbase + def->st_value) -
-		      (Elf_Addr) where;
-		}
-		break;
-
-	    case R_386_COPY:
-		/*
-		 * These are deferred until all other relocations have
-		 * been done.  All we do here is make sure that the COPY
-		 * relocation is not in a shared library.  They are allowed
-		 * only in executable files.
-		 */
-		if (!obj->mainprog) {
-		    _rtld_error("%s: Unexpected R_386_COPY relocation"
-		      " in shared library", obj->path);
-		    goto done;
-		}
-		break;
-
-	    case R_386_GLOB_DAT:
-		{
-		    const Elf_Sym *def;
-		    const Obj_Entry *defobj;
-
-		    def = find_symdef(ELF_R_SYM(rel->r_info), obj, &defobj,
-		      flags, cache, lockstate);
-		    if (def == NULL)
-			goto done;
-
-		    *where = (Elf_Addr) (defobj->relocbase + def->st_value);
+		switch (ELF_R_TYPE(rel->r_info)) {
+		case R_386_32:
+		case R_386_PC32:
+		case R_386_GLOB_DAT:
+		case R_386_TLS_TPOFF:
+		case R_386_TLS_TPOFF32:
+		case R_386_TLS_DTPMOD32:
+		case R_386_TLS_DTPOFF32:
+			def = find_symdef(ELF_R_SYM(rel->r_info), obj, &defobj,
+			    flags, cache, lockstate);
+			if (def == NULL)
+				goto done;
+			if (ELF_ST_TYPE(def->st_info) == STT_GNU_IFUNC) {
+				switch (ELF_R_TYPE(rel->r_info)) {
+				case R_386_32:
+				case R_386_PC32:
+				case R_386_GLOB_DAT:
+					if ((flags & SYMLOOK_IFUNC) == 0)
+						continue;
+					symval = (Elf_Addr)rtld_resolve_ifunc(
+					    defobj, def);
+					break;
+				case R_386_TLS_TPOFF:
+				case R_386_TLS_TPOFF32:
+				case R_386_TLS_DTPMOD32:
+				case R_386_TLS_DTPOFF32:
+					_rtld_error("%s: IFUNC for TLS reloc",
+					    obj->path);
+					goto done;
+				}
+			} else {
+				if ((flags & SYMLOOK_IFUNC) != 0)
+					continue;
+				symval = (Elf_Addr)defobj->relocbase +
+				    def->st_value;
+			}
+			break;
+		default:
+			if ((flags & SYMLOOK_IFUNC) != 0)
+				continue;
+			break;
 		}
-		break;
-
-	    case R_386_RELATIVE:
-		*where += (Elf_Addr) obj->relocbase;
-		break;
-
-	    case R_386_TLS_TPOFF:
-	    case R_386_TLS_TPOFF32:
-		{
-		    const Elf_Sym *def;
-		    const Obj_Entry *defobj;
-		    Elf_Addr add;
-
-		    def = find_symdef(ELF_R_SYM(rel->r_info), obj, &defobj,
-		      flags, cache, lockstate);
-		    if (def == NULL)
-			goto done;
+		where = (Elf_Addr *)(obj->relocbase + rel->r_offset);
 
+		switch (ELF_R_TYPE(rel->r_info)) {
+		case R_386_NONE:
+			break;
+		case R_386_32:
+			*where += symval;
+			break;
+		case R_386_PC32:
 		    /*
-		     * We lazily allocate offsets for static TLS as we
-		     * see the first relocation that references the
-		     * TLS block. This allows us to support (small
-		     * amounts of) static TLS in dynamically loaded
-		     * modules. If we run out of space, we generate an
-		     * error.
+		     * I don't think the dynamic linker should ever
+		     * see this type of relocation.  But the
+		     * binutils-2.6 tools sometimes generate it.
 		     */
-		    if (!defobj->tls_done) {
-			if (!allocate_tls_offset((Obj_Entry*) defobj)) {
-			    _rtld_error("%s: No space available for static "
-					"Thread Local Storage", obj->path);
-			    goto done;
+		    *where += symval - (Elf_Addr)where;
+		    break;
+		case R_386_COPY:
+			/*
+			 * These are deferred until all other
+			 * relocations have been done.  All we do here
+			 * is make sure that the COPY relocation is
+			 * not in a shared library.  They are allowed
+			 * only in executable files.
+			 */
+			if (!obj->mainprog) {
+				_rtld_error("%s: Unexpected R_386_COPY "
+				    "relocation in shared library", obj->path);
+				goto done;
 			}
-		    }
-		    add = (Elf_Addr) (def->st_value - defobj->tlsoffset);
-		    if (ELF_R_TYPE(rel->r_info) == R_386_TLS_TPOFF)
-			*where += add;
-		    else
-			*where -= add;
-		}
-		break;
-
-	    case R_386_TLS_DTPMOD32:
-		{
-		    const Elf_Sym *def;
-		    const Obj_Entry *defobj;
-
-		    def = find_symdef(ELF_R_SYM(rel->r_info), obj, &defobj,
-		      flags, cache, lockstate);
-		    if (def == NULL)
-			goto done;
-
-		    *where += (Elf_Addr) defobj->tlsindex;
-		}
-		break;
-
-	    case R_386_TLS_DTPOFF32:
-		{
-		    const Elf_Sym *def;
-		    const Obj_Entry *defobj;
-
-		    def = find_symdef(ELF_R_SYM(rel->r_info), obj, &defobj,
-		      flags, cache, lockstate);
-		    if (def == NULL)
+			break;
+		case R_386_GLOB_DAT:
+			*where = symval;
+			break;
+		case R_386_RELATIVE:
+			*where += (Elf_Addr)obj->relocbase;
+			break;
+		case R_386_TLS_TPOFF:
+		case R_386_TLS_TPOFF32:
+			/*
+			 * We lazily allocate offsets for static TLS
+			 * as we see the first relocation that
+			 * references the TLS block. This allows us to
+			 * support (small amounts of) static TLS in
+			 * dynamically loaded modules. If we run out
+			 * of space, we generate an error.
+			 */
+			if (!defobj->tls_done) {
+				if (!allocate_tls_offset((Obj_Entry*) defobj)) {
+					_rtld_error("%s: No space available "
+					    "for static Thread Local Storage",
+					    obj->path);
+					goto done;
+				}
+			}
+			add = (Elf_Addr)(def->st_value - defobj->tlsoffset);
+			if (ELF_R_TYPE(rel->r_info) == R_386_TLS_TPOFF)
+				*where += add;
+			else
+				*where -= add;
+			break;
+		case R_386_TLS_DTPMOD32:
+			*where += (Elf_Addr)defobj->tlsindex;
+			break;
+		case R_386_TLS_DTPOFF32:
+			*where += (Elf_Addr) def->st_value;
+			break;
+		default:
+			_rtld_error("%s: Unsupported relocation type %d"
+			    " in non-PLT relocations\n", obj->path,
+			    ELF_R_TYPE(rel->r_info));
 			goto done;
-
-		    *where += (Elf_Addr) def->st_value;
 		}
-		break;
-
-	    default:
-		_rtld_error("%s: Unsupported relocation type %d"
-		  " in non-PLT relocations\n", obj->path,
-		  ELF_R_TYPE(rel->r_info));
-		goto done;
-	    }
 	}
 	r = 0;
 done:
-	if (cache != NULL)
-	    free(cache);
+	free(cache);
 	return (r);
 }
 

Modified: head/libexec/rtld-elf/mips/reloc.c
==============================================================================
--- head/libexec/rtld-elf/mips/reloc.c	Fri Aug 29 09:04:24 2014	(r270797)
+++ head/libexec/rtld-elf/mips/reloc.c	Fri Aug 29 09:29:10 2014	(r270798)
@@ -275,6 +275,10 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry 
 	if (obj == obj_rtld)
 		return (0);
 
+	if ((flags & SYMLOOK_IFUNC) != 0)
+		/* XXX not implemented */
+		return (0);
+
 #ifdef SUPPORT_OLD_BROKEN_LD
 	broken = 0;
 	sym = obj->symtab;

Modified: head/libexec/rtld-elf/powerpc/reloc.c
==============================================================================
--- head/libexec/rtld-elf/powerpc/reloc.c	Fri Aug 29 09:04:24 2014	(r270797)
+++ head/libexec/rtld-elf/powerpc/reloc.c	Fri Aug 29 09:29:10 2014	(r270798)
@@ -294,6 +294,10 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry 
 	SymCache *cache;
 	int r = -1;
 
+	if ((flags & SYMLOOK_IFUNC) != 0)
+		/* XXX not implemented */
+		return (0);
+
 	/*
 	 * The dynamic loader may be called from a thread, we have
 	 * limited amounts of stack available so we cannot use alloca().

Modified: head/libexec/rtld-elf/powerpc64/reloc.c
==============================================================================
--- head/libexec/rtld-elf/powerpc64/reloc.c	Fri Aug 29 09:04:24 2014	(r270797)
+++ head/libexec/rtld-elf/powerpc64/reloc.c	Fri Aug 29 09:29:10 2014	(r270798)
@@ -290,6 +290,10 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry 
 	int bytes = obj->dynsymcount * sizeof(SymCache);
 	int r = -1;
 
+	if ((flags & SYMLOOK_IFUNC) != 0)
+		/* XXX not implemented */
+		return (0);
+
 	/*
 	 * The dynamic loader may be called from a thread, we have
 	 * limited amounts of stack available so we cannot use alloca().

Modified: head/libexec/rtld-elf/rtld.c
==============================================================================
--- head/libexec/rtld-elf/rtld.c	Fri Aug 29 09:04:24 2014	(r270797)
+++ head/libexec/rtld-elf/rtld.c	Fri Aug 29 09:29:10 2014	(r270798)
@@ -2546,7 +2546,7 @@ relocate_object(Obj_Entry *obj, bool bin
 		}
 	}
 
-	/* Process the non-PLT relocations. */
+	/* Process the non-PLT non-IFUNC relocations. */
 	if (reloc_non_plt(obj, rtldobj, flags, lockstate))
 		return (-1);
 
@@ -2559,7 +2559,6 @@ relocate_object(Obj_Entry *obj, bool bin
 		}
 	}
 
-
 	/* Set the special PLT or GOT entries. */
 	init_pltgot(obj);
 
@@ -2571,6 +2570,15 @@ relocate_object(Obj_Entry *obj, bool bin
 		if (reloc_jmpslots(obj, flags, lockstate) == -1)
 			return (-1);
 
+	/*
+	 * Process the non-PLT IFUNC relocations.  The relocations are
+	 * processed in two phases, because IFUNC resolvers may
+	 * reference other symbols, which must be readily processed
+	 * before resolvers are called.
+	 */
+	if (reloc_non_plt(obj, rtldobj, flags | SYMLOOK_IFUNC, lockstate))
+		return (-1);
+
 	if (obj->relro_size > 0) {
 		if (mprotect(obj->relro_page, obj->relro_size,
 		    PROT_READ) == -1) {

Modified: head/libexec/rtld-elf/rtld.h
==============================================================================
--- head/libexec/rtld-elf/rtld.h	Fri Aug 29 09:04:24 2014	(r270797)
+++ head/libexec/rtld-elf/rtld.h	Fri Aug 29 09:29:10 2014	(r270798)
@@ -293,6 +293,8 @@ typedef struct Struct_Obj_Entry {
 #define SYMLOOK_DLSYM	0x02	/* Return newest versioned symbol. Used by
 				   dlsym. */
 #define	SYMLOOK_EARLY	0x04	/* Symlook is done during initialization. */
+#define	SYMLOOK_IFUNC	0x08	/* Allow IFUNC processing in
+				   reloc_non_plt(). */
 
 /* Flags for load_object(). */
 #define	RTLD_LO_NOLOAD	0x01	/* dlopen() specified RTLD_NOLOAD. */

Modified: head/libexec/rtld-elf/sparc64/reloc.c
==============================================================================
--- head/libexec/rtld-elf/sparc64/reloc.c	Fri Aug 29 09:04:24 2014	(r270797)
+++ head/libexec/rtld-elf/sparc64/reloc.c	Fri Aug 29 09:29:10 2014	(r270798)
@@ -300,6 +300,10 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry 
 	SymCache *cache;
 	int r = -1;
 
+	if ((flags & SYMLOOK_IFUNC) != 0)
+		/* XXX not implemented */
+		return (0);
+
 	/*
 	 * The dynamic loader may be called from a thread, we have
 	 * limited amounts of stack available so we cannot use alloca().

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 09:37:18 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id E367F402;
 Fri, 29 Aug 2014 09:37:18 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B55F11FC7;
 Fri, 29 Aug 2014 09:37:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7T9bIPG043790;
 Fri, 29 Aug 2014 09:37:18 GMT (envelope-from bz@FreeBSD.org)
Received: (from bz@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7T9bIwp043789;
 Fri, 29 Aug 2014 09:37:18 GMT (envelope-from bz@FreeBSD.org)
Message-Id: <201408290937.s7T9bIwp043789@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bz set sender to bz@FreeBSD.org
 using -f
From: "Bjoern A. Zeeb" 
Date: Fri, 29 Aug 2014 09:37:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270799 - head/sys/dev/ixl
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 09:37:19 -0000

Author: bz
Date: Fri Aug 29 09:37:18 2014
New Revision: 270799
URL: http://svnweb.freebsd.org/changeset/base/270799

Log:
  First try on fixing some more compile errors without actually testing:
  - use proper __FreeBSD_version check and more importantly check for __am64__
    to be defined.  Whether the FreeBSD(_version) checks are needed is a
    different question.
  - cast uint64_t to uintmax_t and use %jx for printing.
  
  Note: there are more values that could be printed in that status function
  	but leave that for the future;  printf doesn't seem to be the right
  	way to do it anyway.
  Note: there is more breakage related to i40e_allocate_dma*() having
  	conflicting declarations, so more fixes to come.
  
  PR:		193112
  MFC after:	3 days
  X-MFC with:	r270755

Modified:
  head/sys/dev/ixl/if_ixl.c

Modified: head/sys/dev/ixl/if_ixl.c
==============================================================================
--- head/sys/dev/ixl/if_ixl.c	Fri Aug 29 09:29:10 2014	(r270798)
+++ head/sys/dev/ixl/if_ixl.c	Fri Aug 29 09:37:18 2014	(r270799)
@@ -3983,11 +3983,11 @@ ixl_print_debug_info(struct ixl_pf *pf)
 	u32			reg;	
 
 
-	printf("Queue irqs = %lx\n", que->irqs);
-	printf("AdminQ irqs = %lx\n", pf->admin_irq);
+	printf("Queue irqs = %jx\n", (uintmax_t)que->irqs);
+	printf("AdminQ irqs = %jx\n", (uintmax_t)pf->admin_irq);
 	printf("RX next check = %x\n", rxr->next_check);
-	printf("RX not ready = %lx\n", rxr->not_done);
-	printf("RX packets = %lx\n", rxr->rx_packets);
+	printf("RX not ready = %jx\n", (uintmax_t)rxr->not_done);
+	printf("RX packets = %jx\n", (uintmax_t)rxr->rx_packets);
 	printf("TX desc avail = %x\n", txr->avail);
 
 	reg = rd32(hw, I40E_GLV_GORCL(0xc));
@@ -4128,7 +4128,7 @@ ixl_stat_update48(struct i40e_hw *hw, u3
 {
 	u64 new_data;
 
-#if __FreeBSD__ >= 10 && __amd64__
+#if defined(__FreeBSD__) && (__FreeBSD_version >= 1000000) && defined(__amd64__)
 	new_data = rd64(hw, loreg);
 #else
 	/*

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 10:43:58 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 1BA243D4;
 Fri, 29 Aug 2014 10:43:58 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id EBF421992;
 Fri, 29 Aug 2014 10:43:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7TAhv6e077586;
 Fri, 29 Aug 2014 10:43:57 GMT (envelope-from kib@FreeBSD.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7TAhv5W077582;
 Fri, 29 Aug 2014 10:43:57 GMT (envelope-from kib@FreeBSD.org)
Message-Id: <201408291043.s7TAhv5W077582@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org
 using -f
From: Konstantin Belousov 
Date: Fri, 29 Aug 2014 10:43:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270802 - in head/libexec/rtld-elf: . amd64 i386
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 10:43:58 -0000

Author: kib
Date: Fri Aug 29 10:43:56 2014
New Revision: 270802
URL: http://svnweb.freebsd.org/changeset/base/270802

Log:
  Optimize r270798, only do the second pass over non-plt relocations
  when the first pass found IFUNCs.
  
  Sponsored by:	The FreeBSD Foundation
  MFC after:	2 weeks

Modified:
  head/libexec/rtld-elf/amd64/reloc.c
  head/libexec/rtld-elf/i386/reloc.c
  head/libexec/rtld-elf/rtld.c
  head/libexec/rtld-elf/rtld.h

Modified: head/libexec/rtld-elf/amd64/reloc.c
==============================================================================
--- head/libexec/rtld-elf/amd64/reloc.c	Fri Aug 29 10:13:40 2014	(r270801)
+++ head/libexec/rtld-elf/amd64/reloc.c	Fri Aug 29 10:43:56 2014	(r270802)
@@ -176,8 +176,10 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry 
 				case R_X86_64_64:
 				case R_X86_64_PC32:
 				case R_X86_64_GLOB_DAT:
-					if ((flags & SYMLOOK_IFUNC) == 0)
+					if ((flags & SYMLOOK_IFUNC) == 0) {
+						obj->non_plt_gnu_ifunc = true;
 						continue;
+					}
 					symval = (Elf_Addr)rtld_resolve_ifunc(
 					    defobj, def);
 					break;

Modified: head/libexec/rtld-elf/i386/reloc.c
==============================================================================
--- head/libexec/rtld-elf/i386/reloc.c	Fri Aug 29 10:13:40 2014	(r270801)
+++ head/libexec/rtld-elf/i386/reloc.c	Fri Aug 29 10:43:56 2014	(r270802)
@@ -161,8 +161,10 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry 
 				case R_386_32:
 				case R_386_PC32:
 				case R_386_GLOB_DAT:
-					if ((flags & SYMLOOK_IFUNC) == 0)
+					if ((flags & SYMLOOK_IFUNC) == 0) {
+						obj->non_plt_gnu_ifunc = true;
 						continue;
+					}
 					symval = (Elf_Addr)rtld_resolve_ifunc(
 					    defobj, def);
 					break;

Modified: head/libexec/rtld-elf/rtld.c
==============================================================================
--- head/libexec/rtld-elf/rtld.c	Fri Aug 29 10:13:40 2014	(r270801)
+++ head/libexec/rtld-elf/rtld.c	Fri Aug 29 10:43:56 2014	(r270802)
@@ -2576,7 +2576,8 @@ relocate_object(Obj_Entry *obj, bool bin
 	 * reference other symbols, which must be readily processed
 	 * before resolvers are called.
 	 */
-	if (reloc_non_plt(obj, rtldobj, flags | SYMLOOK_IFUNC, lockstate))
+	if (obj->non_plt_gnu_ifunc &&
+	    reloc_non_plt(obj, rtldobj, flags | SYMLOOK_IFUNC, lockstate))
 		return (-1);
 
 	if (obj->relro_size > 0) {

Modified: head/libexec/rtld-elf/rtld.h
==============================================================================
--- head/libexec/rtld-elf/rtld.h	Fri Aug 29 10:13:40 2014	(r270801)
+++ head/libexec/rtld-elf/rtld.h	Fri Aug 29 10:43:56 2014	(r270802)
@@ -271,6 +271,7 @@ typedef struct Struct_Obj_Entry {
     bool filtees_loaded : 1;	/* Filtees loaded */
     bool irelative : 1;		/* Object has R_MACHDEP_IRELATIVE relocs */
     bool gnu_ifunc : 1;		/* Object has references to STT_GNU_IFUNC */
+    bool non_plt_gnu_ifunc : 1;	/* Object has non-plt IFUNC references */
     bool crt_no_init : 1;	/* Object' crt does not call _init/_fini */
     bool valid_hash_sysv : 1;	/* A valid System V hash hash tag is available */
     bool valid_hash_gnu : 1;	/* A valid GNU hash tag is available */

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 10:44:58 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id A2EFB60F;
 Fri, 29 Aug 2014 10:44:58 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8E7ED19A8;
 Fri, 29 Aug 2014 10:44:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7TAiw6s077898;
 Fri, 29 Aug 2014 10:44:58 GMT (envelope-from kib@FreeBSD.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7TAiwmI077897;
 Fri, 29 Aug 2014 10:44:58 GMT (envelope-from kib@FreeBSD.org)
Message-Id: <201408291044.s7TAiwmI077897@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org
 using -f
From: Konstantin Belousov 
Date: Fri, 29 Aug 2014 10:44:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270803 - head/libexec/rtld-elf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 10:44:58 -0000

Author: kib
Date: Fri Aug 29 10:44:58 2014
New Revision: 270803
URL: http://svnweb.freebsd.org/changeset/base/270803

Log:
  Document the whole settings needed to build a debug version of rtld.
  
  Sponsored by:	The FreeBSD Foundation
  MFC after:	3 days

Modified:
  head/libexec/rtld-elf/Makefile

Modified: head/libexec/rtld-elf/Makefile
==============================================================================
--- head/libexec/rtld-elf/Makefile	Fri Aug 29 10:43:56 2014	(r270802)
+++ head/libexec/rtld-elf/Makefile	Fri Aug 29 10:44:58 2014	(r270803)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+# Use the following command to build local debug version of dynamic
+# linker:
+# make DEBUG_FLAGS=-g DEBUG=-DDEBUG MK_TESTS=no all
+
 .include 
 MK_SSP=		no
 

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 12:40:01 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id BFD49E9C;
 Fri, 29 Aug 2014 12:40:01 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id ABDAF1768;
 Fri, 29 Aug 2014 12:40:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7TCe1RG029987;
 Fri, 29 Aug 2014 12:40:01 GMT (envelope-from bz@FreeBSD.org)
Received: (from bz@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7TCe1OQ029986;
 Fri, 29 Aug 2014 12:40:01 GMT (envelope-from bz@FreeBSD.org)
Message-Id: <201408291240.s7TCe1OQ029986@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bz set sender to bz@FreeBSD.org
 using -f
From: "Bjoern A. Zeeb" 
Date: Fri, 29 Aug 2014 12:40:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270806 - head/sys/dev/ixl
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 12:40:01 -0000

Author: bz
Date: Fri Aug 29 12:40:01 2014
New Revision: 270806
URL: http://svnweb.freebsd.org/changeset/base/270806

Log:
  Properly handle prefetch only for amd64 and i386 as we do elsewhere.
  
  In general theraven is right that we should factr this out and provide
  a general and per-arch implementation that everything can use.
  
  MFC after:	3 days
  X-MFC with:	r270755

Modified:
  head/sys/dev/ixl/i40e_osdep.h

Modified: head/sys/dev/ixl/i40e_osdep.h
==============================================================================
--- head/sys/dev/ixl/i40e_osdep.h	Fri Aug 29 11:18:54 2014	(r270805)
+++ head/sys/dev/ixl/i40e_osdep.h	Fri Aug 29 12:40:01 2014	(r270806)
@@ -137,11 +137,15 @@ struct i40e_spinlock {
 
 #define le16_to_cpu 
 
+#if defined(__amd64__) || defined(i386)
 static __inline
 void prefetch(void *x)
 {
 	__asm volatile("prefetcht0 %0" :: "m" (*(unsigned long *)x));
 }
+#else
+#define	prefetch(x)
+#endif
 
 struct i40e_osdep
 {

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 12:45:14 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id C0D09222;
 Fri, 29 Aug 2014 12:45:14 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 930891844;
 Fri, 29 Aug 2014 12:45:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7TCjE5c034174;
 Fri, 29 Aug 2014 12:45:14 GMT (envelope-from bz@FreeBSD.org)
Received: (from bz@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7TCjEXY034173;
 Fri, 29 Aug 2014 12:45:14 GMT (envelope-from bz@FreeBSD.org)
Message-Id: <201408291245.s7TCjEXY034173@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bz set sender to bz@FreeBSD.org
 using -f
From: "Bjoern A. Zeeb" 
Date: Fri, 29 Aug 2014 12:45:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270807 - head/sys/dev/ixl
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 12:45:14 -0000

Author: bz
Date: Fri Aug 29 12:45:14 2014
New Revision: 270807
URL: http://svnweb.freebsd.org/changeset/base/270807

Log:
  Properly place #ifdef INET and #ifdef INET6 around variable declarations
  and code to make the code compile.
  
  Give the function seems to be slightly mixed with csum and tso,
  make it non-fatal if we try to setup thing on a kernel without IP
  support.  In practise the printf on the console will probably still
  make your machine unhappy.
  
  MFC after:	3 days
  X-MFC with:	r270755

Modified:
  head/sys/dev/ixl/ixl_txrx.c

Modified: head/sys/dev/ixl/ixl_txrx.c
==============================================================================
--- head/sys/dev/ixl/ixl_txrx.c	Fri Aug 29 12:40:01 2014	(r270806)
+++ head/sys/dev/ixl/ixl_txrx.c	Fri Aug 29 12:45:14 2014	(r270807)
@@ -595,8 +595,8 @@ ixl_tx_setup_offload(struct ixl_queue *q
 	}
 
 	switch (etype) {
-		case ETHERTYPE_IP:
 #ifdef INET
+		case ETHERTYPE_IP:
 			ip = (struct ip *)(mp->m_data + elen);
 			ip_hlen = ip->ip_hl << 2;
 			ipproto = ip->ip_p;
@@ -606,16 +606,16 @@ ixl_tx_setup_offload(struct ixl_queue *q
 				*cmd |= I40E_TX_DESC_CMD_IIPT_IPV4_CSUM;
 			else
 				*cmd |= I40E_TX_DESC_CMD_IIPT_IPV4;
-#endif
 			break;
-		case ETHERTYPE_IPV6:
+#endif
 #ifdef INET6
+		case ETHERTYPE_IPV6:
 			ip6 = (struct ip6_hdr *)(mp->m_data + elen);
 			ip_hlen = sizeof(struct ip6_hdr);
 			ipproto = ip6->ip6_nxt;
 			th = (struct tcphdr *)((caddr_t)ip6 + ip_hlen);
 			*cmd |= I40E_TX_DESC_CMD_IIPT_IPV6;
-			/* Falls thru */
+			break;
 #endif
 		default:
 			break;
@@ -680,7 +680,9 @@ ixl_tso_setup(struct ixl_queue *que, str
 #ifdef INET6
 	struct ip6_hdr			*ip6;
 #endif
+#if defined(INET6) || defined(INET)
 	struct tcphdr			*th;
+#endif
 	u64				type_cmd_tso_mss;
 
 	/*
@@ -722,9 +724,9 @@ ixl_tso_setup(struct ixl_queue *que, str
 		break;
 #endif
 	default:
-		panic("%s: CSUM_TSO but no supported IP version (0x%04x)",
+		printf("%s: CSUM_TSO but no supported IP version (0x%04x)",
 		    __func__, ntohs(etype));
-		break;
+		return FALSE;
         }
 
         /* Ensure we have at least the IP+TCP header in the first mbuf. */

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 12:48:38 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id E56E847B;
 Fri, 29 Aug 2014 12:48:38 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D13E2186F;
 Fri, 29 Aug 2014 12:48:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7TCmchQ034864;
 Fri, 29 Aug 2014 12:48:38 GMT (envelope-from bz@FreeBSD.org)
Received: (from bz@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7TCmcBm034863;
 Fri, 29 Aug 2014 12:48:38 GMT (envelope-from bz@FreeBSD.org)
Message-Id: <201408291248.s7TCmcBm034863@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bz set sender to bz@FreeBSD.org
 using -f
From: "Bjoern A. Zeeb" 
Date: Fri, 29 Aug 2014 12:48:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270808 - head/sys/dev/ixl
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 12:48:39 -0000

Author: bz
Date: Fri Aug 29 12:48:38 2014
New Revision: 270808
URL: http://svnweb.freebsd.org/changeset/base/270808

Log:
  These functions are #defined to "osdep" specific names without the "_mem"
  extension.  Provide prototypes for the actual implementations.
  Correct function arguments to match the implementations.
  
  MFC after:	3 days
  X-MFC with:	r270755

Modified:
  head/sys/dev/ixl/i40e_alloc.h

Modified: head/sys/dev/ixl/i40e_alloc.h
==============================================================================
--- head/sys/dev/ixl/i40e_alloc.h	Fri Aug 29 12:45:14 2014	(r270807)
+++ head/sys/dev/ixl/i40e_alloc.h	Fri Aug 29 12:48:38 2014	(r270808)
@@ -51,16 +51,15 @@ enum i40e_memory_type {
 };
 
 /* prototype for functions used for dynamic memory allocation */
-enum i40e_status_code i40e_allocate_dma_mem(struct i40e_hw *hw,
+enum i40e_status_code i40e_allocate_dma(struct i40e_hw *hw,
 					    struct i40e_dma_mem *mem,
-					    enum i40e_memory_type type,
-					    u64 size, u32 alignment);
-enum i40e_status_code i40e_free_dma_mem(struct i40e_hw *hw,
+					    bus_size_t size, u32 alignment);
+enum i40e_status_code i40e_free_dma(struct i40e_hw *hw,
 					struct i40e_dma_mem *mem);
-enum i40e_status_code i40e_allocate_virt_mem(struct i40e_hw *hw,
+enum i40e_status_code i40e_allocate_virt(struct i40e_hw *hw,
 					     struct i40e_virt_mem *mem,
 					     u32 size);
-enum i40e_status_code i40e_free_virt_mem(struct i40e_hw *hw,
+enum i40e_status_code i40e_free_virt(struct i40e_hw *hw,
 					 struct i40e_virt_mem *mem);
 
 #endif /* _I40E_ALLOC_H_ */

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 13:03:14 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id B6A569A1;
 Fri, 29 Aug 2014 13:03:14 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 966071A44;
 Fri, 29 Aug 2014 13:03:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7TD3E8O043809;
 Fri, 29 Aug 2014 13:03:14 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7TD3DAg043804;
 Fri, 29 Aug 2014 13:03:13 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201408291303.s7TD3DAg043804@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI 
Date: Fri, 29 Aug 2014 13:03:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270809 - in
 stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: . sys
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 13:03:14 -0000

Author: delphij
Date: Fri Aug 29 13:03:13 2014
New Revision: 270809
URL: http://svnweb.freebsd.org/changeset/base/270809

Log:
  MFC r270383: MFV r270198:
  
  Instead of using timestamp in the AVL, use the memory address when
  comparing.
  
  Illumos issue:
      5095 panic when adding a duplicate dbuf to dn_dbufs

Modified:
  stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
  stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
  stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h
  stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c	Fri Aug 29 12:48:38 2014	(r270808)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c	Fri Aug 29 13:03:13 2014	(r270809)
@@ -70,12 +70,6 @@ dbuf_cons(void *vdb, void *unused, int k
 	cv_init(&db->db_changed, NULL, CV_DEFAULT, NULL);
 	refcount_create(&db->db_holds);
 
-#if defined(illumos) || !defined(_KERNEL)
-	db->db_creation = gethrtime();
-#else
-	db->db_creation = cpu_ticks() ^ ((uint64_t)CPU_SEQID << 48);
-#endif
-
 	return (0);
 }
 
@@ -823,7 +817,7 @@ dbuf_free_range(dnode_t *dn, uint64_t st
 
 	db_search.db_level = 0;
 	db_search.db_blkid = start_blkid;
-	db_search.db_creation = 0;
+	db_search.db_state = DB_SEARCH;
 
 	mutex_enter(&dn->dn_dbufs_mtx);
 	if (start_blkid >= dn->dn_unlisted_l0_blkid) {

Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c	Fri Aug 29 12:48:38 2014	(r270808)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c	Fri Aug 29 13:03:13 2014	(r270809)
@@ -69,33 +69,35 @@ dbuf_compare(const void *x1, const void 
 
 	if (d1->db_level < d2->db_level) {
 		return (-1);
-	} else if (d1->db_level > d2->db_level) {
+	}
+	if (d1->db_level > d2->db_level) {
 		return (1);
 	}
 
 	if (d1->db_blkid < d2->db_blkid) {
 		return (-1);
-	} else if (d1->db_blkid > d2->db_blkid) {
+	}
+	if (d1->db_blkid > d2->db_blkid) {
 		return (1);
 	}
 
-	/*
-	 * If a dbuf is being evicted while dn_dbufs_mutex is not held, we set
-	 * the db_state to DB_EVICTING but do not remove it from dn_dbufs. If
-	 * another thread creates a dbuf of the same blkid before the dbuf is
-	 * removed from dn_dbufs, we can reach a state where there are two
-	 * dbufs of the same blkid and level in db_dbufs. To maintain the avl
-	 * invariant that there cannot be duplicate items, we distinguish
-	 * between these two dbufs based on the time they were created.
-	 */
-	if (d1->db_creation < d2->db_creation) {
+	if (d1->db_state < d2->db_state) {
 		return (-1);
-	} else if (d1->db_creation > d2->db_creation) {
+	}
+	if (d1->db_state > d2->db_state) {
 		return (1);
-	} else {
-		ASSERT3P(d1, ==, d2);
-		return (0);
 	}
+
+	ASSERT3S(d1->db_state, !=, DB_SEARCH);
+	ASSERT3S(d2->db_state, !=, DB_SEARCH);
+
+	if ((uintptr_t)d1 < (uintptr_t)d2) {
+		return (-1);
+	}
+	if ((uintptr_t)d1 > (uintptr_t)d2) {
+		return (1);
+	}
+	return (0);
 }
 
 /* ARGSUSED */

Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h	Fri Aug 29 12:48:38 2014	(r270808)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h	Fri Aug 29 13:03:13 2014	(r270809)
@@ -66,8 +66,13 @@ extern "C" {
  *		|			 |
  *		|			 |
  *		+--------> NOFILL -------+
+ *
+ * DB_SEARCH is an invalid state for a dbuf. It is used by dbuf_free_range
+ * to find all dbufs in a range of a dnode and must be less than any other
+ * dbuf_states_t (see comment on dn_dbufs in dnode.h).
  */
 typedef enum dbuf_states {
+	DB_SEARCH = -1,
 	DB_UNCACHED,
 	DB_FILL,
 	DB_NOFILL,
@@ -213,9 +218,6 @@ typedef struct dmu_buf_impl {
 	/* pointer to most recent dirty record for this buffer */
 	dbuf_dirty_record_t *db_last_dirty;
 
-	/* Creation time of dbuf (see comment in dbuf_compare). */
-	hrtime_t db_creation;
-
 	/*
 	 * Our link on the owner dnodes's dn_dbufs list.
 	 * Protected by its dn_dbufs_mtx.

Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h	Fri Aug 29 12:48:38 2014	(r270808)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h	Fri Aug 29 13:03:13 2014	(r270809)
@@ -211,7 +211,18 @@ typedef struct dnode {
 	refcount_t dn_holds;
 
 	kmutex_t dn_dbufs_mtx;
-	avl_tree_t dn_dbufs;		/* descendent dbufs */
+	/*
+	 * Descendent dbufs, ordered by dbuf_compare. Note that dn_dbufs
+	 * can contain multiple dbufs of the same (level, blkid) when a
+	 * dbuf is marked DB_EVICTING without being removed from
+	 * dn_dbufs. To maintain the avl invariant that there cannot be
+	 * duplicate entries, we order the dbufs by an arbitrary value -
+	 * their address in memory. This means that dn_dbufs cannot be used to
+	 * directly look up a dbuf. Instead, callers must use avl_walk, have
+	 * a reference to the dbuf, or look up a non-existant node with
+	 * db_state = DB_SEARCH (see dbuf_free_range for an example).
+	 */
+	avl_tree_t dn_dbufs;
 
 	/* protected by dn_struct_rwlock */
 	struct dmu_buf_impl *dn_bonus;	/* bonus buffer dbuf */

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 13:06:31 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 8E5F8B97;
 Fri, 29 Aug 2014 13:06:31 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 785C41A81;
 Fri, 29 Aug 2014 13:06:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7TD6VPm044319;
 Fri, 29 Aug 2014 13:06:31 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7TD6VaD044316;
 Fri, 29 Aug 2014 13:06:31 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201408291306.s7TD6VaD044316@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI 
Date: Fri, 29 Aug 2014 13:06:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270810 - stable/10/sys/dev/hptnr
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 13:06:31 -0000

Author: delphij
Date: Fri Aug 29 13:06:30 2014
New Revision: 270810
URL: http://svnweb.freebsd.org/changeset/base/270810

Log:
  MFC r270384:
  
  Update hptnr(4) driver to version 1.0.1 supplied by the vendor.
  
  v1.0.1 2014-8-19
    * Do not retry the command and reset the disk when failed to enable or
      disable spin up feature.
    * Fix up a bug that disk failed to probe if driver failed to access the
      10th LBA.
    * Fix a bug that request timeout but it has been completed in certain
      cases.
    * Support smartmontool for R750.
  
  Many thanks to HighPoint for continued support of FreeBSD!

Modified:
  stable/10/sys/dev/hptnr/README
  stable/10/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu
  stable/10/sys/dev/hptnr/hptnr_config.c
  stable/10/sys/dev/hptnr/hptnr_os_bsd.c
  stable/10/sys/dev/hptnr/hptnr_osm_bsd.c
  stable/10/sys/dev/hptnr/i386-elf.hptnr_lib.o.uu
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/hptnr/README
==============================================================================
--- stable/10/sys/dev/hptnr/README	Fri Aug 29 13:03:13 2014	(r270809)
+++ stable/10/sys/dev/hptnr/README	Fri Aug 29 13:06:30 2014	(r270810)
@@ -1,10 +1,19 @@
 Rocket Controller Driver for FreeBSD
-Copyright (C) 2013 HighPoint Technologies, Inc. All rights reserved.
+Copyright (C) 2014 HighPoint Technologies, Inc. All rights reserved.
 
 #############################################################################
 Revision History:
+   v1.0.1 2014-8-19
+     * Do not retry the command and reset the disk when failed to enable or 
+       disable spin up feature.
+     * Fix up a bug that disk failed to probe if driver failed to access the
+       10th LBA.
+     * Fix a bug that request timeout but it has been completed in certain 
+       cases.
+     * Support smartmontool for R750.
+
    v1.0 2013-7-3
-        First source code release
+     *First source code release
 
 #############################################################################
 
@@ -40,7 +49,7 @@ Revision History:
   2) Extract the driver files under the kernel source tree:
 
      # cd /usr/src/sys/
-     # tar xvzf /your/path/to/hptnr-freebsd-src-v1.0-130701.tgz
+     # tar xvzf /your/path/to/hptnr_freebsd_src_v1.0.1_14_08_19.tgz
 
   3) Update the kernel configuration file to include the HighPoint source.
      Assume the configure file is GENERIC, and new kernel configure file is 

Modified: stable/10/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu
==============================================================================
--- stable/10/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu	Fri Aug 29 13:03:13 2014	(r270809)
+++ stable/10/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu	Fri Aug 29 13:06:30 2014	(r270810)
@@ -1,5 +1,5 @@
 begin 644 hptnr_lib.o
-M?T5,1@(!`0D```````````$`/@`!`````````````````````````##R!0``
+M?T5,1@(!`0D```````````$`/@`!`````````````````````````+`#!@``
 M`````````$```````$``$``-`(G0Q@<(QD`P2`G"#[9'04@)P@^V1SQ(P>`H2`G"#[9'/4C
 MP@^V1S](P>`02`G"#[9'0$C!X`A(B=%("<$/ME="P>(8#[9'0\'@$`G"#[9'
 M10G"#[9'1,'@"`G02(F/B````(F'D````&:#3R(!\\-F9F:0NO____]FA?9T
 M,4B)^;\`````NO____])Q\``````9I`/M@$QT`^VP,'J"$$S%("#QP%(@\$!
-M9CGW=>6)T,-FD%-(@^Q@2(G[1`^V3SM$#[9'.@^V3SD/ME)@E0!``##9F9FD&9FD&9FD&9FD(GQ2(L'
-MBY`$`0``B14`````#[='/&8]@&1T#&8]@)%T!F8]@)1U$0^VR8/!"+@!````
-MT^`)PNL00`^VSH/!#+@!````T^`)PDB+!XF0!`$``,-F9F:09F9FD&9FD&9F
-MD(GQ2(L'BY`$`0``B14`````#[='/&8]@&1T#&8]@)%T!F8]@)1U$0^VR8/!
-M"+C^____T\`APNL00`^VSH/!#+C^____T\`APDB+!XF0!`$``,-F9F:09F9F
-MD&9FD&9FD(GQ0(#^_W1O0(#^'W(8#[9%`L'@$`G"#[9%``G"#[9%`<'@"`G"B1-!QP0D$`$``+\0
-M)P``Z``````/ME4'P>(8#[9%!L'@$`G"#[9%!`G"#[9%!<'@"`G"B1-(BUPD
-M"$B+;"003(MD)!A,BVPD($B#Q"C#2(/L&$B)7"0(3(ED)!!)B?Q`#[;>B=[H
-M`````+\0)P``Z`````")WDR)Y^@`````2(M<)`A,BV0D$$B#Q!C#D$%7059!
-M54%455-(@^Q828G_B%0D5TB+%X!_/@`/A#P"``!!O`````!!O>#___]!OO#_
-M__]`#[;&2(E$)$A(C8*``0``2(E$)$!(C8J$`0``2(E,)#A(C8*@`0``2(E$
-M)#!(C8JD`0``2(E,)"A(C8)0`@``2(E$)"!(C8I4`@``2(E,)!A(C8+@`0``
-M2(E$)!!(@<+0`0``2(E4)`AF9I!(BT0D2$2)X4C3^*@!#X2-`0``1(GE@_T#
-M=A=$B>I(`U0D*(L"B04`````@^#^B0+K&XT4[0````")TD@#5"0XBP*)!0``
-M``"#X/Z)`K\0)P``Z`````"`?"17`'1R@_T#=A=$B?)(`U0D$(L"B04`````
-M@\@"B0+K&XT4K0````")TD@#5"0(BP*)!0````"#R`*)`D2)\$B+3"002`'!
-MC02M`````(G`2(M4)`A(`<*#_0-V"HL!B04`````ZPB+`HD%`````*@"='3K
-MXV:0@_T#=B]$B>M(BT0D($@!V,<``````+\0)P``Z`````!(`UPD&(L#B04`
-M````@\@!B0/K08T<[0````")VTB+1"0@2`'8QP``````OQ`G``#H`````$@#
-M7"08BP.)!0````"#R`&)`^LW9F9FD&9FD(/]`W8K1(GJ2(M$)#!(`=#'``$`
-M``!(`U0D*(L"B04`````@\@!B0+K-F9FD&9FD(T$[0````")P$B+5"1`2`'"
-MQP(!````2`-$)#B+$(D5`````(/*`8D09F9FD&9FD$&-5"0!28/$`4&#Q0A!
-M@\8$00^V1SXYT`^'0O[__TB#Q%A;74%<05U!7D%?PV9FD%532(/L"(G12(LO
-M@_X#=B"-!/7@____BC02U`````(G`2(V4!=`!``"+`HD%`````(/(
-M`HD"C12U`````(U"\(G`2(V,!>`!``")TDB-E!70`0``@_X#=@J+`8D%````
-M`.L(BP*)!0````"H`G1UZ^.#_@-V.(T<]>#___^)VTB-A"M0`@``QP``````
-MOQ`G``#H`````$B-G"M4`@``BP.)!0````"#R`&)`^LVC1SU`````(G;2(V$
-M*U`"``#'``````"_$"<``.@`````2(V<*U0"``"+`XD%`````(/(`8D#2(/$
-M"%M=PY"0D)"0D$B)^4B+/P^W@;`2``"#P`%FB8&P$@``9CN!M!(``'()9L>!
-ML!(`````#[>!L!(``$C!X`)(`X%H$0``BQ:)$`^W@;`2``")ARP!``##9F:0
-M08G0N`````#&!`@`2(/``4B#^`1U\HGR9H'B_P\/MP%F)0#P"=!FB0$/ME<-
-MP>(,BP$E_P_P_PG0B0$/MD<*@^`"2(/X`1G2@^("@\(!P>(%#[9!`X/@'PG0
-M@\@0@^#WB$$#]D<*`7071(G"@^)_P>($#[=!`F8E#_@)T&:)00+SPV9F9I!F
-M9F:09F:09F:0N`````#&!#``2(/``4B#^`UU\@^V1SF(!@^V1SJ(1@$/MD<[
-MB$8"#[9'/(A&`P^V1SV(1@0/MD<^B$8%#[9'/XA&!O:'E@````1T(P^V1T"(
-M1@@/MD=!B$8)#[9'0HA&"@^V1T.(1@L/MD=$B$8,N`$```##9F9FD&9F9I!F
-M9I"Z`````$&Z`````$&Y_____^M2`=)$B<#3^*@!=!+WP@````%U&H'R=R?;
-M`.L29I")T#5W)]L`]\(````!#T70@^D!1#G)=@(B$@%#[?`C02%``,``(F"<`$``$B+%P^W3C*#X1^X`0``
-M`$C3X(F"=`$``+H`````Z`````!(@\0(PY!!5T%6055!5%532(/L"$B)_4F)
-M]H!_0P!T);D`````]D8-`70.ZQA!#[9C3^*@!=0R#P0$/MD5#9CG(=^A)
-MBT9`2(7`=!Q(C;"0````2(M]*.@`````28MV0$B)[^@`````28U&8$DY1F`/
-MA%P!``!)B<=,B?_H`````$B)PTB#>$``#X0I`0``@+B#``````^$H@```&:#
-M?6@`#X27````0;T`````0;P`````D$B+A;`)``!,`>!(BS!(A?9T8P^W1B!F
-M.T,X=5EF/84`=U,/M\"`O`5@"```_W1&2(M5``^W1C)FP>@%#[?`C02%``,`
-M`(F"<`$``$B+50`/MTXR@^$?N`$```!(T^")@G0!``#&1B0AN@````!(B>_H
-M`````$&#Q0%)@\0(#[=%:$0YZ`^/=O___TB+0T!(QT!@`````/9#3`1U&4B)
-M[^@`````2(MS0+H!````2(GOZ`````!(BT-`#[90`@^V<`%(Q\<`````N```
-M``#H`````$B+4T!(B[7P"```OP$```#H`````$B+4T!(B[7P"```OP8```#H
-M`````$C'0T``````08!N#@%(B=Y(B>_H`````$TY?F`/A:?^__])QT9`````
-M`$B+10"+B%@!``")#0````"%R70*2(M%`(F(6`$``$B#Q`A;74%<05U!7D%?
-MPV9F9I!F9I!F9I!F9I!(@^P(3(L'00^V<$-`A/9T-4F-@+@2``"Y`````$@Y
-M^'4:ZR(/ML%(C11`2(T4D$F-E-"X$@``2#GZ=`^#P0%`./%UX.L%N0`````/
-MML%(C11`2(T4D$B-!-4`````28NT`,`2``!(A?9T??9&"@)T=TF-A`"X$@``
-M2#E&('5I#[9&6(3`=`B#P`&(1ECK64B+5DA(@^HX2(U.2$B-0CA(.A``=2SK"F9FD$B#>A``=2#&1E@!#[:*NP```$F+N+`0``!)Q\``````Z```
-M``#K$4B+4CA(@^HX2(U".$@YR'7(2(/$",-F9I!(@^PH2(E<)`A(B6PD$$R)
-M9"083(EL)"!(B?M(B?5(BT9P3(MH*`^W5B!F@?J%`'=T#[?"#[:$!V`(```\
-M_W1E9H/Z?W<<#[;`2(N7.`D``$AIP)@!``!(BT004`^V0`CK2&:!^H$`=QP/
-MML!(BY>("0``2&G`R`\``$B+1!`(#[9`".LE#[;`2(N78`D``$B-!,!(P>`%
-M2(N$$(@````/MD`(ZP6X_P```$B81`^VI`/F"```2(MU>$B%]G0(2(G?Z```
-M``!(B>Y(B=_H`````$$/ML1(C3R`2(T\N$B-O/O``0``3(GN0?^5H````$B+
-M7"0(2(ML)!!,BV0D&$R+;"0@2(/$*,-F9F:09F9FD$%455-(B?5(B=-F@7XX
-MX0%U$0^V1CJ#Z!%!O``````\`78O2(L72(NZ.`D```^W12"^:)8!`&8]A0!W
-M$@^WP`^VA`)@"```2&GPF`$``$R-)#?&0P0%@&,%_H`CW[@`````9H%]..$!
-M=18/MD4Z@^@!/`$/EL`/ML!F9F:09F:0P>`'#[83@^)_"<*($P^VA98```"#
+M9CGW=>6)T,-FD$B#[&A$#[9/.T0/MD)^
+M__[_B9$$`0``)7[_\O](BU<(B0)(BU<(B4(,2(M7"(E"$$B+5PB)0A1(BU<(
+MB4(82(M7"(E"!$B+!XN`5`$``(D%`````"7^`/__2(L7B8)4`0``PV9F9I!F
+M9I!F9I!F9I")\4B+!XN0!`$``(D5``````^W1SQF/8!D=`QF/8"1=`9F/8"4
+M=1$/MLF#P0BX`0```-/@"<+K$$`/MLZ#P0RX`0```-/@"<)(BP>)D`0!``##
+M9F9FD&9F9I!F9I!F9I")\4B+!XN0!`$``(D5``````^W1SQF/8!D=`QF/8"1
+M=`9F/8"4=1$/MLF#P0BX_O___]/`(<+K$$`/MLZ#P0RX_O___]/`(<)(BP>)
+MD`0!``##9F9FD&9F9I!F9I!F9I")\4"`_O]T;T"`_A]W,HNW&`$``+H!````
+MT^*)T/?0(?")AQ@!``"+AU@!``")!0`````AT'1`B8=8`0``PV:0B[<<`0``
+M#[;!@^@@N@$```")P=/BB=#WT"'PB8<<`0``BX=@`0``B04`````(=!T!HF'
+M8`$``//#9F9FD&9FD$B#["A(B5PD"$B);"003(ED)!A,B6PD($B)U8GP3(LO
+M0(#^`P^&B0```$B-',4`````@>/X!P``38VD'0`"``!!QP0D#`$``+\0)P``
+MZ`````!)C9P=!`(```^V50/!XA@/MD4"P>`0"<(/MD4`"<(/MD4!P>`("<*)
+M$T''!"00`0``OQ`G``#H``````^V50?!XA@/MD4&P>`0"<(/MD4$"<(/MD4%
+MP>`("<*)$^F$````2(TZ`````"_$"<``.@`````B=Y,B>?H`````$B+7"0(3(MD
+M)!!(@\08PY!!5T%6055!5%532(/L6$F)_XA4)%=(BQ>`?SX`#X0\`@``0;P`
+M````0;W@____0;[P____0`^VQDB)1"1(2(V"@`$``$B)1"1`2(V*A`$``$B)
+M3"0X2(V"H`$``$B)1"0P2(V*I`$``$B)3"0H2(V"4`(``$B)1"0@2(V*5`(`
+M`$B)3"082(V"X`$``$B)1"002('"T`$``$B)5"0(9F:02(M$)$A$B>%(T_BH
+M`0^$C0$``$2)Y8/]`W871(GJ2`-4)"B+`HD%`````(/@_HD"ZQN-%.T`````
+MB=)(`U0D.(L"B04`````@^#^B0*_$"<``.@`````@'PD5P!TOC@_X#=CB-'/7@____B=M(
+MC80K4`(``,<``````+\0)P``Z`````!(C9PK5`(``(L#B04`````@\@!B0/K
+M-HT<]0````")VTB-A"M0`@``QP``````OQ`G``#H`````$B-G"M4`@``BP.)
+M!0````"#R`&)`TB#Q`A;7<.0D)"0D)!(B?E(BS\/MX&P$@``@\`!9HF!L!(`
+M`&8[@;02``!R"6;'@;`2``````^W@;`2``!(P>`"2`.!:!$``(L6B1`/MX&P
+M$@``B8@0B`>)T,'H"(A'`8A7`L-%#[8$,KD'````ZZ)F9F:09F9F
+MD&9F9I!F9I!(BX<($0``BQ"+4`2+4`B+0`R)!0````##9F9FD&9FD$B#[`A(
+MBX:(````1`^V1T-%A,!T(@^V4`VY`````/;"`70,ZQ)(B=!(T_BH`74(@\$!
+M1#C!=>[&1D(,Z`````!(@\0(PV9F9I!F9F:09F:02(/L"$B)^$B+/V;'0$X!
+M`,9`0AU(B<;H`````$B#Q`C#9F9FD&9F9I!F9F:09F:02(/L"$B+/P^W]DC!
+MY@-(`[>P"0``2(LV2(7V=#U(BQ@%#[?`C02%``,``(F"<`$``$B+$P^W3C*#X1^X`0```$C3X(F"=`$``,9&
+M)"&Z`````$B)W^@`````08/%`4F#Q`@/MT-H1#GH#X]X____2(M%0$C'0&``
+M````]D5,!'492(G?Z`````!(BW5`N@$```!(B=_H`````$B+54`/MH+,````
+MC02`#[92`@'02)@/MH@`````#[93.@^VY(B=_H`````$TY?F`/A9#^__])QT9``````$B+`XN(6`$`
+M`(D-`````(7)=`E(BP.)B%@!``!(@\0(6UU!7$%=05Y!7\-F9F:09F9FD$B#
+M[`A,BP=!#[9P0T"$]G0U28V`N!(``+D`````2#GX=1KK(@^VP4B-%$!(C120
+M28V4T+@2``!(.?IT#X/!`4`X\77@ZP6Y``````^VP4B-%$!(C1202(T$U0``
+M``!)B[0`R!(``$B%]G1]]D8*`G1W28V$`+@2``!(.48@=6D/MD98A,!T"(/`
+M`8A&6.M92(M62$B#ZCA(C4Y(2(U".$@YR'1$2(-Z$`!U+.L*9F:02(-Z$`!U
+M(,9&6`$/MHJ[````28NXL!```$G'P`````#H`````.L12(M2.$B#ZCA(C4(X
+M2#G(=`%2(M$"%`/MD`(ZTYF@?F!`'<<#[;`2(N7B`D``$AI
+MP,@/``!(BT00"`^V0`CK*P^VP$B+EV`)``!(C03`2,'@!4B+A!"(````#[9`
+M".L+9F:09F:0N/\```!(F$0/MJ0#Y@@``$B+=7A(A?9T"$B)W^@`````2(GN
+M2(G?Z`````!!#[;$2(T\@$B-/+A(C;S[P`$``$R)[D'_E:````!(BUPD"$B+
+M;"003(MD)!A,BVPD($B#Q"C#9F9FD&9FD&9FD&9FD$%455-(B?5(B=-F@7XX
+MX0%U$0^V1CJ#Z!%!O``````\`78T2(LW2(N^.`D```^W12"Z8)X!`&8]A0!W
+M%P^WP`^VA`9@"```2(T40$B-%)!(P>(%3(TD%\9#!`6`8P7^@"/?N`````!F
+M@7TXX0%U$0^V13J#Z`$\`0^6P`^VP&:0P>`'#[83@^)_"<*($P^VA98```"#
 MX`'!X`:#XK\)PH@3]H66`````70.3(GGZ`````!FB4,(ZP1FB4L(#[=#"(A%
 M)6:!?3CA`74E#[95.HU"_SP!=PH/ME4[@^(/ZRJ0C4+ON@\````\`78=9F9F
 MD+H`````28-\)&``=`Q!#[:4)($```"#X@\/M@.#X/`)T(@#6UU!7,-F9F:0
 M9F9FD$B#[#A(B5PD"$B);"003(ED)!A,B6PD($R)="0H3(E\)#!)B?Q(B?-)
 MB=$````/
-MMU,@9H'ZA0`/A]($```/M\)!#[:,!&`(``")R(#Y_W1F9H/Z?W<=#[;!28N4
-M)#@)``!(:<"8`0``2(M$$%`/MD`(ZT-F@?J!`'<=#[;!28N4)(@)``!(:<#(
-M#P``2(M$$`@/MD`(ZQ\/ML%)BY0D8`D``$B-!,!(P>`%2(N$$(@````/MD`(
-M#[;`00^VA`3F"```2(T4@$B-%)!)C;34P`$``$F+E"2("0``#[;!2&G`R`\`
-M`$&]`````/9$`ET0#X5*`@``QD,D!$''!P````"X`0```.DU!```9F:09I`/
-MMU,@N?\```"X_____V:!^H4`#X=]````#[?"00^VC`1@"```BT/A/4```"%
-MR69FD`^$Z@```/;"!`^$X0```$B)WDR)[^@`````A,!U%<9#)`1!QP<`````
-MN`$```#IO0(``$&`O8,````?=A%!QP_H`````&:#^!\/AF(!
-M``!!QPA(B<*#X@$/MD,Z@^@&/`D/A\8`
-M```/ML#_),4`````0;@!````N0$```!(B=I,B>Y,B>?H`````(3`#X6P````
-M0<<'`@```+@!````Z4X!``!!N`$```"Y`````$B)VDR)[DR)Y^@`````A,`/
-MA7X```!!QP<"````N`$```#I'`$```^VRD&X`0```$B)VDR)[DR)Y^@`````
-MA,!U4D''!P(```"X`0```.GP````#[;*0;@`````2(G:3(GN3(GGZ`````"$
-MP'4F0<<'`@```+@!````Z<0```#&0R0$0<<'`````+@!````Z:\```!)C;PD
-MH`\``.@`````A,!T$4''!P$```"X`0```.F-````@'LXX75.@'LY`69FD'5%
-M@'LZ#W4_@'L]`69F9I!U-0^V?H`````$@[0VAU
-M!4B%P'42QD,D!$''!P````"X`0```.LYN`````#K,F:000^VA"3E"0``2(T4
-M@$B-%)!)C;34P`$``$F+E"2("0``N#BX#P#IJOO__V9FD&:02(M<)`A(BVPD
-M$$R+9"083(ML)"!,BW0D*$R+?"0P2(/$.,-F9F:09F:09F:09F:02(/L"$B+
-M/^@`````2(/$",-F9F:09F9FD&9F9I!F9I!!5T%6055!5%532(/L6$F)_4B)
-M]4B+GS@1``!FQT8R_P](C50D+.@`````A,!T"8M$)"SI#0L``(M%."7___\`
-M/>$!$``/A=L```"_B!,``.@`````#[=5(&:!^H4`#X>X"@``#[?"00^VC`5@
-M"```B8(``!(C12`2(T4D$V-M-7``0``#[?!2&G`F`$`
-M`$D#A3@)``!(B40D"&:!_N$!=4;K,@^WP4B-!,!(P>`%20.%8`D``$B)1"08
-M3(NPB````$C'1"0(`````$C'1"00`````.M$#[95.HU"[SP!=B>-0O\\`78@
-M9H'Y_P!T"TB+1"0(]D!+!'4.QD4D!K@`````Z0/
-MA(H(``!,B:6`````00^WUTB)%"1(:<*P!```2(T<&$B-0R!)*X4X$0``20.%
-M0!$``$B+5"1(B4(@2,'H($B+5"1(B4(D28M$)!A(BU0D2(E"*$C!Z"!(BU0D
-M2(E"+$B+1"1(9D2)>`BX`````,8$&`!(@\`!2#VP!```=?!F@7TXX0%U50^V
-M13J#Z!$\`7=*2(U,)#!(BT0D2`^V4`A(B>Y(BWPD".@`````2(V#(`0``$DK
-MA3@1``!)`X5`$0``2(M4)$B)0A!(P>@@2(M4)$B)0A3I/@$``)!!#[96"O;"
-M`74LBT4X)?___P`]X0$0``^$S0```$B+3"0(#[9!2*@!#X2\````J`0/A+0`
-M``#VA98````@=`](C70D,$B)[^@`````ZQM(C4PD,$B+1"1(#[90"$B)[DB+
-M?"0(Z`````!(C8,@!```22N%.!$``$D#A4`1``!(BU0D2(E"$$C!Z"!(BU0D
-M2(E"%&:!?3CA`74/#[9%.H/H$3P!#X:4````2(M$)`@/ME!(2(G0@^`&2(/X
-M!G5_]L(!='I(B=A)*X4X$0``20.%0!$``$B+5"1(B4(82,'H($B+5"1(B4(<
-MZU/VP@)T3DB)V$DKA3@1``!)`X5`$0``2(M4)$B)0AA(P>@@2(M4)$B)0AQ(
-MC8,@!```22N%.!$``$D#A4`1``!(BU0D2(E"$$C!Z"!(BU0D2(E"%$B+1"1(
-M@$@!`@^V55E(BT0D2&:)4`*`?5D`=#._`````(GX2(T$0$C!X`))BW0D$$B+
-M36!(BQ0(2(D4!HM4"`B)5`8(@\Y,B??H`````$B-3"0P2(G:2(GN
-M3(GWZ`````!!@&8,_NF-!```9F:09I!!#[9&"J@"#X0B!```2(M$)$C&0`;^
-M2(M$)$B`8`?^2(-\)`@`#X2X````2(M,)`@/ME%(2(G0@^`&2(/X!@^%GP``
+M`7<1@XN4````"+@`````Z4D%``!$BT,X08'@____`$&!^.$!$``/A>8````/
+MMTL@9H'YA0`/A_($```/M\%!#[:\!&`(``")^$"`__]T;F:#^7]W(T`/MM=)
+MBXPD.`D``$B-!%)(C02"2,'@!4B+1`A0#[9`".M%9H'Y@0!W'D`/ML=)BY0D
+MB`D``$AIP,@/``!(BT00"`^V0`CK($`/ML=)BY0D8`D``$B-!,!(P>`%2(N$
+M$(@````/MD`(#[;`00^VA`3F"```2(T4@$B-%)!)C;34P`$``$F+E"2("0``
+M0`^VQTAIP,@/``!!O0````#V1`)=$`^%8`(``,9#)`1!QP<`````N`$```#I
+M2P0```^W4R"Y_P```+C_____9H'ZA0`/AXL````/M\)!#[:T!&`(``")\$"`
+M_O]T0`^VQDF+E"2("0``2&G`R`\``$B+1!`(#[9`".L@0`^V
+MQDF+E"1@"0``2(T$P$C!X`5(BX00B`````^V0`A`#[;.1`^V\$ECQD$/MJP$
+MY@@``$B-1*T`2(U$A0!)C;3$P`$```^WP4B-%$!(C1202,'B!4F)U4T#K"0X
+M"0``9H'_X0%U"P^V0SJ#Z`$\`78I9H'Y_P!T!T'V14L$=1O&0R0&0<<'````
+M`+@!````Z38#``!F9I!F9I!!#[952(G1@^$!="3VP@1T'T$/MD0D1$$Z1"1.
+MT/A/<```"%R0^$[P```/;"!`^$Y@``
+M`$B)WDR)[^@`````A,!U%<9#)`1!QP<`````N`$```#IP@(``$&`O8,````?
+M=A%!QP_H`````&:#^!\/AF
+M0<<'`0```+@!````Z<@!``!!@?CA`1``#X0,`0``00^W16J`>SCA#X7]````
+M@'LY`0^%\P```$C1Z$B)PH/B`0^V0SJ#Z`8\"0^'Q@````^VP/\DQ0````!!
+MN`$```"Y`0```$B)VDR)[DR)Y^@`````A,`/A;````!!QP<"````N`$```#I
+M3@$``$&X`0```+D`````2(G:3(GN3(GGZ`````"$P`^%?@```$''!P(```"X
+M`0```.D<`0``#[;*0;@!````2(G:3(GN3(GGZ`````"$P'520<<'`@```+@!
+M````Z?`````/MLI!N`````!(B=I,B>Y,B>?H`````(3`=29!QP<"````N`$`
+M``#IQ````,9#)`1!QP<`````N`$```#IKP```$F-O"2@#P``Z`````"$P'01
+M0<<'`0```+@!````Z8T```"`>SCA=4Z`>SD!9F:0=46`>SH/=3^`>ST!9F9F
+MD'4U#[9S/,'F"`^V0SL!Q@^W]DR)Y^@`````2#M#:'4%2(7`=1+&0R0$0<<'
+M`````+@!````ZSFX`````.LR9I!!#[:$).4)``!(C12`2(T4D$F-M-3``0``
+M28N4)(@)``"X.+@/`.F4^___9F:09I!(BUPD"$B+;"003(MD)!A,BVPD($R+
+M="0H3(M\)#!(@\0XPV9F9I!F9I!F9I!F9I!(@^P(2(L_Z`````!(@\0(PV9F
+M9I!F9F:09F9FD&9FD$%7059!54%455-(@^Q828G]2(GU2(N?.!$``&;'1C+_
+M#TB-5"0LZ`````"$P'0)BT0D+.D."P``BT4X)?___P`]X0$0``^%Y0```+^(
+M$P``Z``````/MTT@9H'YA0`/A[D*```/M\%!#[:T!6`(``")\$"`_O]T:V:#
+M^7]W(D`/MM9)BXTX"0``2(T$4DB-!()(P>`%2(M$"%`/MD`(ZT-F@?F!`'<=
+M0`^VQDF+E8@)``!(:<#(#P``2(M$$`@/MD`(ZQ]`#[;&28N58`D``$B-!,!(
+MP>`%2(N$$(@````/MD`(#[;`00^VA`7F"```2(T4@$B-%)!-C;35P`$``$F+
+ME8@)``!`#[;&2&G`R`\``$@!PDB)5"002,=$)`@`````2,=$)!@`````Z7(!
+M```/MU4@OO\```!F@?J%`'<,#[?"00^VM`5@"```#[=].&:!_^$!=0\/MD4Z
+M@^@1/`$/AL8```!F@?J%`'=Z#[?"00^VA`5@"```//]T:F:#^G]W(0^VT$F+
+MC3@)``!(C0122(T$@DC!X`5(BT0(4`^V0`CK2&:!^H$`=QP/ML!)BY6("0``
+M2&G`R`\``$B+1!`(#[9`".LE#[;`28N58`D``$B-!,!(P>`%2(N$$(@````/
+MMD`(ZP6X_____P^VP$$/MH0%Y@@``$B-%(!(C12038VTU<`!```/M\9(C11`
+M2(T4D$C!X@5)`Y4X"0``2(E4)`AF@?_A`75&ZS(/M\9(C03`2,'@!4D#A6`)
+M``!(B40D&$R+L(@```!(QT0D"`````!(QT0D$`````#K1`^V53J-0N\\`78G
+MC4+_/`%V(&:!_O\`=`M(BT0D"/9`2P1U#L9%)`:X`````.FV"```2,=$)!``
+M````2,=$)!@`````2(UT)$A,B>_H`````$&)QV:)13),B>_H`````$F)Q+@"
+M````387D#X1W"```3(FE@````$$/M]=(B10D2&G"L`0``$B-'!A(C4,@22N%
+M.!$``$D#A4`1``!(BU0D2(E"($C!Z"!(BU0D2(E")$F+1"082(M4)$B)0BA(
+MP>@@2(M4)$B)0BQ(BT0D2&9$B7@(N`````#&!!@`2(/``4@]L`0``'7P9H%]
+M..$!=50/MD4Z@^@1/`%W24B-3"0P2(M$)$@/ME`(2(GN2(M\)`CH`````$B-
+M@R`$``!)*X4X$0``20.%0!$``$B+5"1(B4(02,'H($B+5"1(B4(4Z14!``!!
+M#[96"O;"`74LBT4X)?___P`]X0$0``^$G````$B+3"0(#[9!2*@!#X2+````
+MJ`0/A(,```#VA98````@=`](C70D,$B)[^@`````ZQM(C4PD,$B+1"1(#[90
+M"$B)[DB+?"0(Z`````!(C8,@!```22N%.!$``$D#A4`1``!(BU0D2(E"$$C!
+MZ"!(BU0D2(E"%$B)V$DKA3@1``!)`X5`$0``2(M4)$B)0AA(P>@@2(M4)$B)
+M0ASK7/;"`G172(G822N%.!$``$D#A4`1``!(BU0D2(E"&$C!Z"!(BU0D2(E"
+M'$B-@R`$``!)*X4X$0``20.%0!$``$B+5"1(B4(02,'H($B+5"1(B4(42(M$
+M)$B`2`$"#[9564B+1"1(9HE0`H!]60!T,[\`````B?A(C01`2,'@`DF+="00
+M2(M-8$B+%`A(B10&BU0("(E4!@B#QP$/MD59.?AWTHM5-$B+1"1(B5`,9H%]
+M..$!=3\/MD4Z@^@1/`%W-$$/M\](BU0D2$B)[DR)]^@`````2(U,)#!(B=I(
+MB>Y,B??H`````$&`9@S^Z8L$``!F9I!!#[9&"J@"#X0B!```2(M$)$C&0`;^
+M2(M$)$B`8`?^2(-\)`@`#X2X````2(M$)`@/ME!(2(G0@^`&2(/X!@^%GP``
 M`/;"`0^$E@```$$/M\](BU0D2$B)[DR)]^@`````]H66`````7002(M$)$@/
 MMT`(P>`#B$0D,4B-3"0P2(G:2(GN3(GWZ`````#VA98````!=`=!@$X,`>L%
 M08!F#/[&`Z%(BU0D"`^V@NH```"#X`\/ME,!@^+P"<*(4P%(BTPD"`^W03B#
@@ -215,7 +215,7 @@ M2(!@!?Z`3"1#"$B+="1(#[9%)4$/MHWN````T^!
 M@\@@B$$!2(M%/DB)@S@$``!FP<((9HF31`0```^V13V(@T($``#&`Y%(BU0D
 M"`^W0CB#P`%FP<`(9HE#`DB+3"0(#[:1Z@```(/B#P^V0P&#X/`)T(A#`4F)
 MS$F!Q-0```#I:`(``$B+5"1(#[9%)4$/MHWN````T^!F"4((Q@.!9L=#`O__
-M2(M$)!`/MI"[````@^(/#[9#`8/@\`G0B$,!2(-]2`!U#L9%)"&X`````.G-
+M2(M$)!`/MI"[````@^(/#[9#`8/@\`G0B$,!2(-]2`!U#L9%)"&X`````.GN
 M`P``]D4[`70I3(ME4$V%Y'0@28N]L!```$R)YN@`````@^`/#[93`8/B\`G"
 MB%,!ZP5,BV0D$$B+54@/MD(!OA`````\@`^$A@```#R`=Q\\%7<2/!!F9I!F
 MD'-G@^@"/`%W1.M7/!=F9I!W.^M>/(5T+CR%9F:09F:0=Q`\@71#/()U(V9F
@@ -230,107 +230,109 @@ M````2(M%.$B)@T0$``!(BT5`2(F#3`0``$B+5"0
 M`Y%(BTPD"`^VD>H```"#X@\/MD,!@^#P"="(0P$/MT$X@\`!9L'`"&:)0P)-
 MA>1T8TF+!"1(B4,$ZUFH`71500^WSTB+5"1(2(GN3(GWZ`````#VA98````!
 M=!!(BT0D2`^W0`C!X`.(1"0Q2(U,)#!(B=I(B>Y,B??H`````/:%E@````%T
-M!T&`3@P!ZP5!@&8,_DF+A;`)``!(BQ0D2(DLT$2)^F;!Z@5!#[??@>+_!P``
-MB=F#X1^X`0```$C3X$$)A)6X"0``BT4X)?___P`]X0$0`'4H2(U,)$"Z````
-M`(G>3(GWZ``````/MD0D0X/@'X/(0(A$)$/II````&:!?3CA`74T#[9%.H/H
-M$3P!=RE(BW0D&$R)[^@`````2(U,)$!(BT0D&`^V4%")WDR)]^@`````ZVIF
-MD$B+="0(3(GOZ`````!(C4PD0$B+1"0(#[903(GWZ`````!(BTPD"`^V
-M44A(B="#X`9(@_@&=2[VP@%T*0^V1"1#@^`?@\A@B$0D0P^V47*#XG_!X@0/
-MMT0D0F8E#_@)T&:)1"1"2(UT)$!,B>_H`````+@#````ZRE!#[:%Y0D``$B-
-M%(!(C12038VTU<`!``!)BY6("0``N#BX#P#IPO7__TB#Q%A;74%<05U!7D%?
-MPV9F9I!F9F:09F9FD$%505154TB#[`A(B?U!O0````!,C:?X````Z;$!``"0
-M3(GGZ`````!(B<-(@WAP`'4V2(GOZ`````!(B4-P2(7`=25(C97X````2(N%
-M^````$B)6`A(B0-(B5,(2(F=^````.F0`0``BT,X)?___P`]X0$0``^$U@``
-M``^W0R!F/8``#X3(````#[;09HE3(&:#^G]V&F:!>SCA`74I#[9#.H/H$3P!
-M=QYF9F:09F:09H'ZA0!W$`^WP@^VC`5@"```@/G_=1G&0R0&2(G>2(GOZ```
-M``#I]0```&9FD&:0#[=S.&:!_N$!=14/MGLZC4?O/`$/A^4```#K&F9F9I`/
-MML%(:<"8`0``28G%3`.M.`D``.L*C4?_/`%V-&9FD&:!^H``="IF@?[A`74+
-M#[9#.H/H$3P!=AA!]D5+!'41QD,D!DB)WDB)[^@`````ZW](B=Y(B>_H````
-M`(/X`I!W#H/X`7,@ZPYF9F:09F:0@_@#=5OK2TB)WDB)[V9FD.@`````ZTE(
-M@[N``````'0/2(VS@````$B)[^@`````2(V5^````$B+A?@```!(B5@(2(D#
-M2(E3"$B)G?@```#K-DB)WDB)[^@`````9F:03#FE^`````^%0_[__^L9#[;!
-M2&G`F`$``$F)Q4P#K3@)``#I'O___TB#Q`A;74%<05W#9F9FD&9FD&9FD&9F
-MD$B#[$A(B5PD&$B);"0@3(ED)"A,B6PD,$R)="0X3(E\)$!(B?5)B?U,BV=0
-M38LT)$$/MD0D#*@0=`S&A^@````&Z7P"```/MI?H````@/H!#X2"````@/H!
-M\02(N5"!$`
-M`$B!PD`(``!!#[9$)'+!X`A(F$@!PHM"!(D%`````(A$)!")PL'J"(A4)!'!
-MZ!"(1"022(N5"!$``$B!PD`(``!!#[9$)'+!X`A(F$@!PHM""(D%`````(A$
-M)!.)PL'J"(A4)!3!Z!"(1"05QD0D%@#&1"07`(M,)!!!B?9!P>X800^VWT2+
-M1"041(GRB=Y(Q\<`````N`````#H`````(G8@_`!B<*#X@%T%$6$_W0/0<9%
-M)`"X`````.F@`@``08!])(%U(4B-3"001(GRB=Y,B>_H`````$'&120"N```
-M``#I>`(``$&+13@E____`#WA`0X`=0]!QD4D(;@`````Z5D"``!!]H66````
-M`74HA-)U)$&`?"1*_W0<2(U,)!!$B?*)WDR)[^@`````N`````#I)P(``$R)
-MYDB)[^@`````3(GF2(GOZ`````!(BU4`00^W13)FP>@%#[?`C02%``,``(F"
-M<`$``$B+10!!#[=-,H/A'[H!````2(G32-/CB9AT`0``00^W13)(P>`#2`.%
-ML`D``$C'``````!!#[=-,HG(9L'H!27_!P``@^$?2(G62-/F2(GQ]]$AC(6X
-M"0``00^W33*)R&;!Z`4E_P<``(/A'TC3XO?2(52%;$F+50!)BT4(2(E""$B)
-M$$$/MW4R2(V]H`\``.@`````08"L)(,````!0<9%)(%)@[V``````'0/28VU
-M@````$B)[^@`````28U$)"!).40D(`^$!`$``$F)QDB-A:`/``!(B40D"$R-
-MO?@```!FD$R)]^@`````2(G#2(M5``^W0#)FP>@%#[?`C02%``,``(F"<`$`
-M`$B+10`/MTLR@^$?N@$```!(B=9(T^:)L'0!```/MT,R2,'@`T@#A;`)``!(
-MQP``````#[=+,HG(9L'H!27_!P``@^$?2(G62-/F2(GQ]]$AC(6X"0``#[=+
-M,HG(9L'H!27_!P``@^$?2-/B]](A5(5L#[=S,DB+?"0(Z`````!!@*PD@P``
-M``%(@[N``````'0/2(VS@````$B)[^@`````2(N%^````$B)6`A(B0-,B7L(
-M2(F=^````$TY="0@#X44____08&EE````/___O]!QH0DZ`````1,B>Y,B>?H
-M`````+@!````2(/$*%M=05Q!74%>05_#D$B#[%A(B5PD*$B);"0P3(ED)#A,
-MB6PD0$R)="1(3(E\)%!(B50D$$B++TR+A3@1``!(A=(/A,8"```/M]9(:<*P
-M!```2HT,`/9!(0)T&$B-!-4`````2`.%L`D``$B+`,9`)`+K%DB-!-4`````
-M2`.%L`D``$B+`,9`)"%,C135`````$B+A;`)``!,`=!(BQ"+0C@E____`#WA
-M`1``#X2L`0``#[="(&8]A0!W$@^WP`^VA`5@"```//]U&69FD$R)T$@#A;`)
-M``!(BP#&0"0&Z;H(```/ML!(:<"8`0``3(N=.`D``$D!PX!\)!,`>6Y!#[93
-M2$B)T(/@!DB#^`9U(_;"`70>2(M%`(N06`$``(D5`````(72=`I(BT4`B9!8
-M`0``2(M%`(N`4`$``(D%`````(/(`DB+50")@E`!``!(BT4`BX`$`0``B04`
-M````@,S_2(M5`(F"!`$``&;W02`""`^$ZP```(!]0P`/A.$```"[`````$&Y
-M`````$6)R$$/MLD/MD<-2-/XJ`%T84&`^0-V*$B+10!(!=`!``"-%(T`````
-M2&/22`'0BP")!0````#!Z!2#X`'K)I!(BT4`2`70`0``C12-`````$ACTD@!
-MT(L`B04`````P>@4@^`!A,!T"K@!````2-/@"<-!@\$!08U``3A%0W>`A-MT
-M4CA?#75-B?!FP>@%)?\'``"+1(5LB?](T_BH`74R08"[Z`````)W"$'&
-M@^@````#3(G02`.%L`D``$B+,$R)W^@`````Z4`'``!!NP````#V1"03`0^$
-M+P<``$R)T$@#A;`)``!(BS#&1B0ABT8X)?___P`]X0$.``^$"P<``$B+E0@1
-M``!(@<)`"```00^V0W+!X`A(F$@!PHL"B04`````2(N5"!$``$B!PD0(``!!
-M#[9#`(2)A(
-M`<*+`HD%`````$B)[^@`````Z94&``!F9I!FD`^W]DB-'/4`````2(N%L`D`
-M`$@!V$B+$&:!>CCA`0^%#`$```^V>CI`@/\0#X=>!@``N`$```")^4C3X*G`
-M,```#X7,````J0```0!U5/;$@`^$.08``$AIQK`$``!*C0P`#[9!,XA")$B)
-MV$@#A;`)``!(BP#V0",$#X00!@``@'@D``^$!@8``$B+4%!(A=(/A/D%```/
-MMD$SB`+I[@4``$AIQK`$``!*C0P`3(UA*$B)V$@#A;`)``!(BQ!!#[9$)`*(
-M0B1(B=A(`X6P"0``2(L`2(-X2``/A+$%```/MKDA!```Z`````!(B=I(`Y6P
-M"0``2(L*BU$T.=`/1\*)PDB+>4A,B>;H`````.E]!0``2(G82`.%L`D``$B+
-M`,9`)`#I9P4``&9F9I!F9I!(B=A(`X6P"0``3(LH38M]:+C_____9D&!?2"%
-M`'<92(G82`.%L`D``$B+``^W0"`/MH0%8`@```^VP$AIP)@!``!,BZ4X"0``
-M20'$0<:$).@`````00^V5"1(2(G0@^`&2(/X!@^%EP$``/;"`0^$C@$``$'&
-M120`0?:%E@```"`/A-D$``!-A?\/A-`$``!!]H>Q`````@^$H0```$&+132%
-MP`^$E0```$F+OZ````!(A?]T#8G"28MU2.@`````ZWQ)@WU(`'1U28._N```
-M``!U"DF#O\``````=&%-BVU(28N'N````$B%P'0-2(G#0?:'L0````%T)DB+
-MM4`*``"Z`0```$R)_T'_E\````"[`````(7`=`=(BYU`"@``2(M["(L33(GN
-MZ`````"+`TD!Q8M#!$B#PQ"%P'3B2(N5"!$``$B!PD`(``!!#[9$)'+!X`A(
-MF$@!PHL"B04`````B<+!ZA!!B)>;````P>@89D&)AY````!(BY4($0``2('"
-M1`@``$$/MD0D6
-M````B=#!Z!`/ML!F08F'F````,'J&$&(EYH```!(BY4($0``2('"3`@``$$/
-MMD0D`P``2&G&L`0``$Z-
-M-`!!#[9&,X3`#X7,````2(G82`.%L`D``$B+`,9`)`!!]H66````$`^$)P,`
-M`$V%_P^$'@,``$$/MD8S08B'D@```$'VA[$````"#X0$`P``08-]-``/A/D"
-M``!)@[^X`````'4.28._P``````/A.$"``!-BV5(28N'N````$B%P'0-2(G#
-M0?:'L0````%T)DB+M4`*``"Z`0```$R)_T'_E\````"[`````(7`=`=(BYU`
-M"@``2(M["(L33(GFZ`````"+`TD!Q(M#!$B#PQ"%P`^%?`(``.O+_!P``
+M1(GA@^$?N`$```!(T^!!"825N`D``(M%."7___\`/>$!$`!U*4B-3"1`N@``
+M``!$B>9,B??H``````^V1"1#@^`?@\A`B$0D0^FD````9H%]..$!=3,/MD4Z
+M@^@1/`%W*$B+="083(GOZ`````!(C4PD0$B+1"08#[904$2)YDR)]^@`````
+MZVE(BW0D"$R)[^@`````2(U,)$!(BT0D"`^V4')$B>9,B??H`````$B+3"0(
+M#[912$B)T(/@!DB#^`9U+O;"`70I#[9$)$.#X!^#R&"(1"1##[91?H`````$B)PTB#
+M>'``=39(B>_H`````$B)0W!(A_H`````.G]````9F:09I`/
+MMW,X9H'^X0%U%0^V>SJ-1^\\`0^'[0```.L?9F9FD`^VPDB-%$!(C1202,'B
+M!4F)U4P#K3@)``#K!XU'_SP!=C9F@?F``'0O9H'^X0%FD'4+#[9#.H/H$3P!
+M=AM!]D5+!'44QD,D!DB)WDB)[^@`````Z8````!(B=Y(B>_H`````(/X`G<*
+M@_@!_H`````&9FD.M&2(.[
+M@`````!T#TB-LX````!(B>_H`````$B-E?@```!(BX7X````2(E8"$B)`TB)
+M4PA(B9WX````ZSA(B=Y(B>_H`````$PYI?@````/A3O^___K'@^VPDB-%$!(
+MC1202,'B!4F)U4P#K3@)``#I%O___TB#Q`A;74%<05W#2(/L2$B)7"082(EL
+M)"!,B60D*$R);"0P3(ET)#A,B7PD0$B)]4F)_4R+9U!-BS0D00^V1"0,J!!T
+M#,:'Z`````;IC`(```^VE^@```"`^@$/A((```"`^@%R&H#Z!`^$HP```(#Z
+M!@^%S0(``&9FD.E=`@``QH?H`````4B)_DR)]^@`````QD4D@4&`3"0,"$B#
+MO8``````=`](C;6`````3(GWZ`````!)BX;X````2(EH"$B)10!)C8;X````
+M2(E%"$F)KO@```!,B??H`````.EB`@``@^#W08A$)`R`A^L````!QH?H````
+M`,9&)`),B??H`````$R)]^@`````Z3,"``#&A^L`````2(.^@`````!T#TB-
+MMH````!,B??H`````$F+34!(A?H`````.FH`0``00^V1"0,@^#W@\@008A$
+M)`Q)BW582(7V=11!@'PD#@!U+.GE````9F9FD&9FD$$/MI6!````0;@`````
+MN0(```!,B>?H`````.E:`0``0;\`````QD0D%P!)C40D8$B)1"0(2(M\)`CH
+M`````$B)Q4F+1"1H28EL)&A(BU0D"$B)50!(B44(2(DH2(M50$B%TG0528NV
+M\`@``+\%````Z`````"`34P"2(GJO@8```!,B>?H`````("]@P````!T-D&-
+M7P%!@?]_EI@`=R9,B??H`````+\!````Z`````"`O8,`````=`N#PP&!^X&6
+MF`!UVD&)WX!$)!?H`````(#[_W4.3(GJ3(GF3(GWZ`````!,B??H
+M`````$B+7"082(ML)"!,BV0D*$R+;"0P3(MT)#A,BWPD0$B#Q$C#9F:005=!
+M5D%505154TB#["A(B?U)B?5(BX\X"0``N&">`0!F@7X@A0!W&P^W1B`/MH0'
+M8`@``$B-%$!(C1202(G02,'@!4R-)`%(BY4($0``2('"0`@``$$/MD0D\02(N5"!$``$B!PD`(``!!#[9$)'+!X`A(
+MF$@!PHM"!(D%`````(A$)!")PL'J"(A4)!'!Z!"(1"022(N5"!$``$B!PD`(
+M``!!#[9$)'+!X`A(F$@!PHM""(D%`````(A$)!.)PL'J"(A4)!3!Z!"(1"05
+MQD0D%@#&1"07`(M,)!!!B?9!P>X800^VWT2+1"041(GRB=Y(Q\<`````N```
+M``#H`````(G8@_`!B<*#X@%T%$6$_W0/0<9%)`"X`````.FH`@``08!])(%F
+M9I!U(4B-3"001(GRB=Y,B>_H`````$'&120"N`````#I?0(``$&+13@E____
+M`#WA`0X`=0]!QD4D(;@`````Z5X"``!!]H66`````74HA-)U)$&`?"1*_W0<
+M2(U,)!!$B?*)WDR)[^@`````N`````#I+`(``$R)YDB)[^@`````3(GF2(GO
+MZ`````!(BU4`00^W13)FP>@%#[?`C02%``,``(F"<`$``$B+10!!#[=-,H/A
+M'[H!````2(G32-/CB9AT`0``00^W13)(P>`#2`.%L`D``$C'``````!!#[=-
+M,HG(9L'H!27_!P``@^$?2(G62-/F2(GQ]]$AC(6X"0``00^W33*)R&;!Z`4E
+M_P<``(/A'TC3XO?2(52%;$F+50!)BT4(2(E""$B)$$$/MW4R2(V]H`\``.@`
+M````08"L)(,````!0<9%)(%)@[V``````'0/28VU@````$B)[^@`````28U$
+M)"!).40D(`^$"0$``$F)QDB-A:`/``!(B40D"$R-O?@```!F9F:09F:03(GW
+MZ`````!(B<-(BU4`#[=`,F;!Z`4/M\"-!(4``P``B8)P`0``2(M%``^W2S*#
+MX1^Z`0```$B)UDC3YHFP=`$```^W0S)(P>`#2`.%L`D``$C'```````/MTLR
+MB@%)?\'``"#X1](B=9(T^9(B?'WT2&,A;@)```/MTLRB@%)?\'
+M``"#X1](T^+WTB%4A6P/MW,R2(M\)`CH`````$&`K"2#`````4B#NX``````
+M=`](C;.`````2(GOZ`````!(BX7X````2(E8"$B)`TR)>PA(B9WX````33ET
+M)"`/A13___]!@:64````___^_T'&A"3H````!$R)[DR)Y^@`````N`$```!(
+M@\0H6UU!7$%=05Y!7\.02(/L6$B)7"0H2(EL)#!,B60D.$R);"1`3(ET)$A,
+MB7PD4$B)5"002(LO3(N%.!$``$B%T@^$Q@(```^WUDAIPK`$``!*C0P`]D$A
+M`G082(T$U0````!(`X6P"0``2(L`QD`D`NL62(T$U0````!(`X6P"0``2(L`
+MQD`D(4R-%-4`````2(N%L`D``$P!T$B+$(M"."7___\`/>$!$``/A+`!```/
+MMT(@9CV%`'<2#[?`#[:$!6`(```\_W499F:03(G02`.%L`D``$B+`,9`)`;I
+MR@@```^VP$B-%$!(C1202,'B!4R+G3@)``!)`=.`?"03`'EN00^V4TA(B="#
+MX`9(@_@&=2/VP@%T'DB+10"+D%@!``")%0````"%TG0*2(M%`(F06`$``$B+
+M10"+@%`!``")!0````"#R`)(BU4`B8)0`0``2(M%`(N`!`$``(D%`````(#,
+M_TB+50")@@0!``!F]T$@`@@/A.H```"`?4,`#X3@````NP````!!N0````!%
+MB@4@^`!ZR5(BT4`2`70`0``C12-`````$ACTD@!T(L`B04`
+M````P>@4@^`!A,!T"K@!````2-/@"<-!@\$!08U``3A%0W>!A-MT4CA?#75-
+MB?!FP>@%)?\'``"+1(5LB?](T_BH`74R08"[Z`````)W"$'&@^@````#
+M3(G02`.%L`D``$B+,$R)W^@`````Z4P'``!!NP````#V1"03`0^$.P<``$R)
+MT$@#A;`)``!(BS#&1B0ABT8X)?___P`]X0$.``^$%P<``$B+E0@1``!(@<)`
+M"```00^V0W+!X`A(F$@!PHL"B04`````2(N5"!$``$B!PD0(``!!#[9#`(2)A(`<*+`HD%
+M`````$B)[^@`````Z:$&``"0#[?V2(T<]0````!(BX6P"0``2`'82(L09H%Z
+M..$!#X4,`0``#[9Z.D"`_Q`/AVX&``"X`0```(GY2-/@J<`P```/A"0`#X06!@``2(M04$B%T@^$"08```^V03.(`NG^!0``
+M2&G&L`0``$J-#`!,C6$H2(G82`.%L`D``$B+$$$/MD0D`HA")$B)V$@#A;`)
+M``!(BP!(@WA(``^$P04```^VN2$$``#H`````$B)VD@#E;`)``!(BPJ+430Y
+MT`]'PHG"2(MY2$R)YN@`````Z8T%``!(B=A(`X6P"0``2(L`QD`D`.EW!0``
+M9F9FD&9FD$B)V$@#A;`)``!,BRA-BWUHN/____]F08%]((4`=QE(B=A(`X6P
+M"0``2(L`#[=`(`^VA`5@"```#[;`2(T40$B-%)!(P>(%3(NE.`D``$D!U$'&
+MA"3H`````$$/ME0D2$B)T(/@!DB#^`8/A9PB+$TR)[N@`````
+MBP-)`<6+0P1(@\,0A`(2)A(`<*+
+M`HD%`````(G"P>H008B7FP```,'H&&9!B8>0````2(N5"!$``$B!PD0(``!!
+M#[9$)'+!X`A(F$@!PHL2B14`````#[;"9D&)AY0````/ML9F08F'E@```(G0
+MP>@0#[;`9D&)AY@```#!ZAA!B)>:````2(N5"!$``$B!PDP(``!!#[9$)'+!
+MX`A(F$@!PHL"B04`````#[;`9D&)AY(```#I:0,``$AIQK`$``!.C30`00^V
+M1C.$P`^%T0```$B)V$@#A;`)``!(BP#&0"0`0?:%E@```!`/A#(#``!-A?\/
+MA"D#``!!#[9&,T&(AY(```!!]H>Q`````@^$#P,``$&#?30`#X0$`P``28._
+MN`````!U#DF#O\``````#X3L`@``38ME2$F+A[@```!(APB+$TR)YN@`````BP-)`<2+0P1(@\,0A<`/A8<"``#KW&9FD&:0/`(/A2@"
 M``!!#[9.0$&+1CB)1"0D#[94)"`(08G400G$@^%_@/EQ=CS&1"0-`$&#_`%V#$$/MD9!@^`/B$0D#<9$)`X`
 M08/\`G8)00^V3D*(3"0.08/\`W9F00^V1D.(1"0/ZV#&1"0-`$&#_`)V#$$/
@@ -338,4490 +340,1720 @@ MMDY"@^$/B$PD#<9$)`X`QD0D#P!!@_P'=CE!#[9
 M`$&#_`QV"4$/MD9,B$0D#D&#_`UV"T$/MDY-B$PD#^L%QD0D#P!(B=A(`X6P
 M"0``2(L`@'@P`'1(187D=$/&0"0@2(G82`.%L`D``$B+``^V0#`/MM!$..!$
 M#T+B2(G82`.%L`D``$B+`$B+>%!(A?]T'T2)XDF-=D#H`````.L12(G82`.%
-ML`D``$B+`,9`)"*`?"0-!'412(G82`.%L`D``$B+`,9`)`)).6TH#X0,`0``
-M387_#X0#`0``0?:%E@```!!T0$$/MD8S08B'D@```$'VA[$````"="I!#[9%
+ML`D``$B+`,9`)"*`?"0-!'412(G82`.%L`D``$B+`,9`)`)).6TH#X02`0``
+M387_#X0)`0``0?:%E@```!!T0$$/MD8S08B'D@```$'VA[$````"="I!#[9%
 M,$2)XD$XQ`]'T(32=!A)B[^H````2(7_=`P/MM))C79`Z`````"`?"0-"W=<
-M#[9$)`W_),4`````0<:'L@````'IF0```(!\)`X$=12`?"0/`G4-0<:'L@``
-M`!'I?@```$'&A[(````"ZW1!QH>R````$.MJ0<:'L@````OK8$'&A[(````&
-MZU9!QH>R````#>M,/"AU)T$/MH0D@P```(/H`4&(A"2"````2(G82`.%L`D`
-M`$B+`,9`)('K(3P(=0J_$"<``.@`````2(G82`.%L`D``$B+`,9`)"%FD$B+
-M7"0H2(ML)#!,BV0D.$R+;"1`3(MT)$A,BWPD4$B#Q%C#9F9FD&9FD&9FD&9F
-MD$%7059!54%455-(@^PH2(G[2(E\)!A$#[>GLA(``$B+!XN`0`$``(D%````
-M`&8E_P]FB8>R$@``9D0YX'5.2(L'B[!0`0``B34`````2(L'B;!0`0``N```
-M``#WQ@#__P`/A-T&``!(Q\<`````N`````#H`````$B+?"08Z`````"X`0``
-M`.FX!@``9H&_LA(``/\/#X45!@``Z3X&``!(B[,X$0``08/$`69$.Z.V$@``
-MN`````!$#T/@2(N3F!$``$B#P@1!#[?$BP2"08G`0<'H$$'VP`@/A+$```!(
-MBP.+D%`!``")%0````!(BP.)D%`!``#WP@#__P!T;8![0P!T9XG6]\8``0``
-M=3"_`````/?&```!`'1$ZR%FD`^WUXU*"$B)\$C3^*@!=12-2A!(B?!(T_BH
-M`74'ZR&_``````^WQTB-%(!(C1202(VLT\`!``!(A>UU'^L.9I"#QP$/MD-#
-M9CGX=[1(BWPD&.@`````Z54%``!(BWPD&.@`````B$4/Z4,%``!F9I")P6:!
-MX?\/#[?!2&G0L`0``$R+3!8@2(T\Q0````!(BX.P"0``2`'X2(LH2(7M#X0,
-M!0``0?;`(`^$?@$``(!])($/A5@!``#&120A#[=%,DC!X`-(`X.P"0``2,<`
-M``````^W33*)R&;!Z`4E_P<``(/A'[H!````2(G62-/F2(GQ]]$AC(.X"0``
-M#[=-,HG(9L'H!27_!P``@^$?2-/B]](A5(-L#[=U,DB+?"00Z`````!(@[V`
-M`````'0/2(VU@````$B)W^@`````#[=5(&:!^H4`#X?$````#[?"#[:$`V`(
-M```\_P^$L0```&:#^G]W'@^VP$AIP)@!``!(`X,X"0``2(M`4(!X"/\/E<#K
-M60^W12!F/8$`=R8/M\`/MH0#8`@``$AIP,@/``!(`X.("0``2(M`"(!X"/\/
-ME<#K*0^W12`/MH0#8`@``$B-!,!(P>`%2`.#8`D``$B+@(@```"`>`C_#Y7`
-MA,!T,$B)[DB)W^@`````2(N#^````$B):`A(B44`2(M$)`A(B44(2(FK^```
-M`.FA`P``D$F+5@A(C44028E&"$R)=1!(B5`(2(D"Z80#``")R&;!Z`4/M\")
-M1"0@2)@/M_&)\H/B'XE4)"2+1(-LB=%(T_BH`0^%6`,``$B)^$@#@[`)``!(
-MBP`/MU`@9H'ZA0`/A[4````/M\(/MH0#8`@``#S_#X2B````9H/Z?W<;#[;`
-M2&G`F`$``$@#@S@)``!(BT!0#[9`".MM2(GX2`.#L`D``$B+``^W0"!F/8$`
-M=R,/M\`/MH0#8`@``$AIP,@/``!(`X.("0``2(M`"`^V0`CK,TB)^$@#@[`)
-M``!(BP`/MT`@#[:$`V`(``!(C03`2,'@!4@#@V`)``!(BX"(````#[9`"#S_
-M=!`/MM!(8\*`O`/F"```_W4_2&-$)""+1(-L#[9,)"1(T_BH`0^%;@(``,9%
-M)`:^`````$B)[^@`````N@````!(B>Y(B=_H`````.E(`@``2&/"#[:$`^8(
-M``!(C12`2(T4D$B-O-/``0``387)=`U!]L`"N`````!,#T3(]D<*`@^$4@$`
-M`$R)RN@`````2&-$)""+1(-L#[9,)"1(T_BH`0^%\`$``(!])($/A9`````/
-MMT4R2,'@`T@#@[`)``!(QP``````#[=-,HG*9L'J!8'B_P<``(/A'[@!````
-M2-/@]]`AA).X"0``#[=U,DB+?"00Z`````!(B>Y(B=_H`````$B#O8``````
-M=`](C;6`````2(G?Z`````!(BX/X````2(EH"$B)10!(BW0D"$B)=0A(B:OX
-M````Z58!``!(BX,(`0``3#GP=%9!O0````!!@\4!2(L`23G&=?1%A.UT/T&_
-M`````$R)]^@`````2(U(\$F+5@A)B48(3(DP2(E0"$B)`D@YZ;@!````1`]$
-M^$&`[0%UT$6$_P^%]````$F+5@A(C44028E&"$R)=1!(B5`(2(D"2&-4)""X
-M`0````^V3"0D2-/@"823K````.F_````3(G*Z`````!(BX,(`0``3#GP=%)!
-MO0````!!@\4!2(L`23G&=?1%A.UT.T&_`````$R)]^@`````2(U(\$F+5@A)
-MB48(3(DP2(E0"$B)`D@YZ;@!````1`]$^$&`[0%UT$6$_W59@'TD@71328M6
-M"$B-11!)B48(3(EU$$B)4`A(B0)(8U0D(+@!````#[9,)"1(T^`)A).L````
-MZR&03(VW"`$``$B-MZ`/``!(B70D$$B-A_@```!(B40D")!F1#FCLA(```^%
-MPOG__TB-@P@!``!(.8,(`0``=$E(B<5(B>_H`````$B-H%
-M@>+_!P``@^$?N`$```!(T^#WT"&$DZP```"Z`````$B)W^@`````2#FK"`$`
-M`'6Z2(G?Z`````"X`0```$B#Q"A;74%<05U!7D%?PV9F9I!F9I!F9I!F9I!(
-M@^PH2(E<)`A(B6PD$$R)9"083(EL)"!(BY_P"```2(M#"$2+*$2)+0````!!
-M]\4```"0='I(BT,(1(DHZW&02('#>!0``$B+`XN04`$``(D5`````$B+`XF0
-M4`$``(72=#SWP@```!!T'$B+`\>`4`$``````!!(BP.+@%`!``")!0````!(
-MBP/'@%`!```!````2(G?Z`````!!`<2#Q0&#_0)UF>L79F9FD&9FD$&\````
-M`+T`````ZXIF9I!%A.0/ET/E<()T`^VP$B+7"0(2(ML)!!,BV0D&$R+
-M;"0@2(/$*,-F9I!F9I!!5T%6055!5%532(/L*$F)_$B+!XN04`$``(D5````
-M`$B+!XF04`$``&9F9I!F9I#WP@#__P`/A"@)``!!@'PD0P`/A!P)``#&1"00
-M`(G22(E4)`A$#[9L)!!!C4T(2(M$)`A(T_BH`74408U-$$B+1"0(2-/XJ`$/
-MA-$(``"`?"00`W8K28L$)$@%@`$``$*-%.T`````2&/22`'0BP")!0````#!
-MZ!.#X`'K*69FD$F+!"1(!8`!``!"C13M`````$ACTD@!T(L`B04`````P>@3
-M@^`!A,!T)DR)Y^@`````26/52(T$4DB-!()!@8S$Z!(`````"`!F9F:09F:0
-M28L4)(!\)!`#=B5"C03M`````$B82(V$`H`!``"+`(D%`````"4```$`ZR-F
-M9F:00HT$[0````!(F$B-A`*``0``BP")!0`````E```!`(7`=$&`?"00`W8=
-M0HT$[0````!(F$B-A`*``0``QP````$`Z1D(``!"C03M`````$B82(V$`H`!
-M``#'`````0#I_`<``$&`?"11`0^%J`8``(!\)!`#=BE)BP0D2`6``0``0HT4
-M[0````!(8])(`="+`(D%`````(/@`>LG9F9FD$F+!"1(!8`!``!"C13M````
-M`$ACTD@!T(L`B04`````@^`!A,`/A%4!``!)8\5(C1Q`2(T$#2HTT(8F6\!(``$C'A@`3````
-M````#[9$)!!(C11`2(T4D$F-E-2X$@``2(F6"!,``$F-M`SP$@``28M\)"CH
-M`````&9FD(!\)!`#=CU"C13M`````$ACTDF+!"1(!8`!``!(`="+`(D%````
-M`$F+!"1(!8`!``!(`<*+`HD%`````,'H!X/@`>L[0HT4[0````!(8]))BP0D
-M2`6``0``2`'0BP")!0````!)BP0D2`6``0``2`'"BP*)!0````#!Z`>#X`&$
-MP'1U@'PD$`-V-T*-#.T`````2&/)28L$)$@%A`$``$@!R(L`B04`````28L4
-M)$B!PH0!``!(`=$-```!`(D!ZSY"C0SM`````$ACR4F+!"1(!80!``!(`LO@'PD$`-V*$F+!"1(!8`!
-M``!"C13M`````$ACTD@!T(L`B04`````P>@2@^`!ZR9)BP0D2`6``0``0HT4
-M[0````!(8])(`="+`(D%`````,'H$H/@`83`#X0B`@``@'PD$`-V-T*-#.T`
-M````2&/)28L$)$@%@`$``$@!R(L`B04`````#0``!`!)BQ0D2('"@`$``$@!
-MT8D!ZS5"C0SM`````$ACR4F+!"1(!8`!``!(`$``
-M#X6B````Z80!``"`?"00`W9*0HT4[0````!(8]))BP0D2`6``0``2`'0BPB)
-M#0````!)BP0D2`6``0``2(T$`HD(28L$)$@%@`$``$@!PHL"B04`````Z=`#
-M``!"C13M`````$ACTDF+!"1(!8`!``!(`="+"(D-`````$F+!"1(!8`!``!(
-MC00"B0A)BP0D2`6``0``2`'"BP*)!0````#IA@,``&:02(M(0`^W04X/M]#V
-MQ@$/A=,```!(B.QX7`````
-M0$M,`$C'A=``````````2(FMV````$B-M<````!)BWPD*.@`````@'PD$`-V
-M,DF+!"1(!8`!```/ME0D$$C!X@.!XO@'``!(`="+`(D%`````,'H"(/@`>LP
-M9F:09F:028L$)$@%@`$```^V5"002,'B`X'B^`<``$@!T(L`B04`````P>@(
-M@^`!A,`/A!8!``"`?"00`W8L28L$)$@%@`$```^V5"002,'B`X'B^`<``$@!
-MT(L`B04`````@_`!@^`!ZRI)BP0D2`6``0``#[94)!!(P>(#@>+X!P``2`'0
-MBP")!0````"#\`&#X`&$P`^$L0````^V1"002(T40$B-%)!)C934L!(``$R-
-M>@A)BT<(2(7`#X2+````28G&2(UR0$F+?"0HZ`````!!@'X.`'110;T`````
-M28UN8)!(B>_H`````$B)PTB+10A(B5T(2(DK2(E#"$B)&$B+4T!(A=)T%DF+
-MM"3P"```OP4```#H`````(!+3`)!@\4!13AN#G>Z0<='.("$'@!)QT=(````
-M`$V)?U!)C7,#@>/X!P``
-M28L$)$@%@`$``$@!V(L0B14`````28L$)$@%@`$``$B-!`.)$$F+!"1(!8`!
-M``!(C00#BP")!0````!)BP0D2`4P`@``2(T$`\<``````+\0)P``Z`````!)
-MBP0D2`4T`@``2`'#BP.)!0````#K?0^V7"002,'C`X'C^`<``$F+!"1(!8`!
-M``!(`=B+$(D5`````$F+!"1(!8`!``!(C00#B1!)BP0D2`6``0``2(T$`XL`
-MB04`````28L$)$@%4`(``$B-!`/'``````"_$"<``.@`````28L$)$@%5`(`
-M`$@!PXL#B04`````@$0D$`$/MD0D$$$X1"1##X?P]O__28L$)(N04`$``(D5
-M`````$F+!"2)D%`!``#WP@#__P!T)NFE]O__9F:09I!)8]5(C0122(T$@D&!
-MC,3H$@`````!`.GH]___N`````!(@\0H6UU!7$%=05Y!7\-!5T%6055!5%53
-M2(/L:$F)_4"(="1+0`^VQHE$)$Q(F$B-%$!(C1202(T4UTR+NL`2```/MJKA
-M$@``2(L'0(#^`W8,QX!P`0``Q`$``.L*QX!P`0``J`$``$B)1"1@2`5T`0``
-M2(E$)%!(BU0D8(N"=`$``(D%`````(M,)$R#X0.[!P```-/C08G<00G$1(FB
-M=`$``+_H`P``Z`````#WTT0AXTB+3"1@B9ET`0``@'PD2P-V58M$)$S!X`)(
-MF$B-E`'0`0``BP*)!0````"#R`B)`HM<)$S!XP-(8]M(C809``(``,<`.```
-M`+\0)P``Z`````!(BU0D8$B-A!H$`@``QP``````ZUB+1"1,P>`"2)A(BTPD
-M8$B-E`'0`0``BP*)!0````"#R`B)`HM<)$S!XP-(8]M(C809``(``,<`.```
-M`+\0)P``Z`````!(BU0D8$B-A!H$`@``QP``````387_#X0V"```08!]0P!T
-M++L`````#[;+00^V1PU(T_BH`70/N@$```")SDR)[^@`````@\,!03A=0W?9
-M0?9'"@%T9TR)_DR)[^@`````BW0D3$R)[^@`````2&-$)$Q(C11`2(T4D$F-
-ME-70$@``BT(4J0``$`!T""7__^__B4(43(G^3(GOZ`````!(8T0D3$B-%$!(
-MC1202<>$U<`2````````Z94'``!!@']8`'0428N]L!```$R)_N@`````08!O
-M6`%(Q\#^____#[9,)$Q(T\!`(.B(1"1;#X2]`@``BW0D3$R)[^@`````2&-$
-M)$Q(C11`2(T4D$F-E-70$@``BT(4J0``$`!T""7__^__B4(4#[9$)%M!B$<-
-M08!]0P`/A.\!``#'1"1<``````^VT$B)5"0P2(M,)&!(@<$``@``2(E,)"A(
-MBT0D8$@%!`(``$B)1"0@#[94)%N)5"0<2(M,)&!(@<'0`0``2(E,)!!$#[9T
-M)%Q!#[;N2(M$)#")Z4C3^*@!#X1-`0``2&/%2(T40$B-%)`/MD0D6T&(A-7A
-M$@``08#^`P^&E0```(T<[0````!(8]M(BT0D*$@!V,<`.````+\0)P``Z```
-M``!(`UPD((M4)!R)$TB+3"1@QX%P`0``Q`$``$B+5"10BP*)!0````")Z8/A
-M`[L'````T^-!B=Q!"<1$B2*_Z`,``.@`````]]-$(>-(BTPD4(D9C12M````
-M`$ACTD@#5"00BP*)!0````"#R`B)`NF6````C1SM`````$ACVTB+1"0H2`'8
-MQP`X````OQ`G``#H`````$@#7"0@BT0D'(D#2(M4)&#'@G`!``"H`0``2(M,
-M)%"+`8D%`````(GI@^$#NP<```#3XT&)W$$)Q$B+1"101(D@O^@#``#H````
-M`/?302'<2(M4)%!$B2*-%*T`````2&/22`-4)!"+`HD%`````(/("(D"@T0D
-M7`%!C48!03A%0W8LZ8/^__](B=_H`````$B-<,A(BU,(2(E#"$B)&$B)4`A(
-MB0)(@WC8`'01ZPF^`````$F-7TA).5](=_H`````$B+#"1).4](#X4$_O__28U'8$DY1V`/A.\```"]`````$F)Q$R)
-MY^@`````2(G#@+B#`````'0ZC44!@?U_EI@`=@>)Q>LK9F:0B<5,B>_H````
-M`+\!````Z`````"`NX,`````=`N#Q0&!_8&6F`!UVDB+0T!(A_H`````$B+0T`/ME`"#[9P
-M`4C'QP````"X`````.@`````2(M30$F+M?`(``"_`0```.@`````2(M30$F+
-MM?`(``"_!@```.@`````2,=#0`````!!@&\.`4B)WDR)[^@`````33EG8`^%
-M&?___TR)_DR)[^@`````2&-$)$Q(C11`2(T4D$G'A-7`$@```````.EW_/__
-M0;\`````#[9$)%M(B40D0$B+5"1@2('"T`$``$B)5"0X18G^00^V[TB+1"1`
-MB>E(T_BH`74+1#A\)$L/A=4```!!@/X#=FA(BT0D8,>`<`$``,0!``!(BU0D
-M4(L"B04`````B>F#X0.-#$F[!P```-/C08G<00G$1(DBO^@#``#H`````/?3
-M1"'C2(M,)%")&8T4K0````!(8])(`U0D.(L"B04`````@\@(B0+K9TB+1"1@
-MQX!P`0``J`$``$B+5"10BP*)!0````")Z8/A`XT,2;L'````T^-!B=Q!"<1$
-MB2*_Z`,``.@`````]]-!(=Q(BTPD4$2)(8T4K0````!(8])(`U0D.(L"B04`
-M````@\@(B0)!@\_H`````(3`=%%,B>?H`````$B)QDB%P'1,2(M5:$B)16A(C45@2(D&2(E6
-M"$B),H!%#@%(B6Y0QD9(!<9&20#&AH$````/N0$```"Z`0```$B)[^@`````
-MZPL/MO-,B>?H`````%M=05S#9F:09I!!5D%505154TB)_4&)]40/MO9"C02U
-M`````$QCX+L`````OQ`G``#H`````$&`_0-V'DB+10!(!=`!``!,`>"+`(D%
-M`````,'H%(/@`>L=D$B+10!(!=`!``!)C00$BP")!0````#!Z!2#X`&$P'4*
-M@\,!9H'[+`%UJ$2)]DB)[^@`````2(GOZ`````!)8\9(C11`2(T4D$B-1-4`
-M]H#@$@```70/2(NPP!(``$B)[^@`````6UU!7$%=05[#9I!!5D%505154T&)
-M]4F)_$0/MO9)8\9(C11`2(T4D$B+K-?`$@``2(7M#X26`0``2,?`_O___T2)
-M\4C3P(1%#0^%@`$``$B-14A(.45(=15!O0````!(C5U@@'T.`'4CZ?,"``!`
-M#[;&2(T\0$B-/+A)C;S\N!(``.@`````Z=4"``!(B=_H`````$B)P4B+0PA(
-MB4L(2(D92(E!"$B)"(!Y20`/A0D!```/MT$X28.\Q&`$````=0M(@WE```^$
-MV0````^W03A)BX3$8`0``$B#N(``````#X2G````QH'H``````^V44A(B="#
-MX`9(@_@&=2WVP@%T*,9!2@7&04L$#[:1@0```$B+<5A(BWE0Z`````#IF```
-M`&9F9I!F9I`/ME%(2(G0@^`&2(/X!'4@]L(!=!O&04H#QD%+!$B)SDR)Y^@`
-M````ZV=F9I!F9I`/ME%(2(G0@^`&2(/X!G51]L(!=4S&04L&QD%*!6;'@<@`
-M`````$B)SDR)Y^@`````ZRY(BU%`28NT)/`(``"_!````.@`````ZQ8/MU$X
-M28NT)/`(``"_`@```.@`````08/%`40X;0X/AI@4@^`!ZQM)BP0D2`70`0``2`'HBP")!0````#!Z!2#X`&$P'4*@\,!9H'[
-M+`%UJD2)]DR)Y^@`````3(GGZ`````!)8\9(C11`2(T4D$F+K-3`$@``2(7M
-M#X3]````08!\)$,`="R[``````^VRP^V10U(T_BH`70/N@````")SDR)Y^@`
-M````@\,!03A<)$-WV4$/ML5(C11`2(T4D$F-E-2X$@``2(E5($B-14A(.45(
-M=3A(C45@2#E%8'4NZWMF9I!FD$B)W^@`````2(UPR$B+4PA(B4,(2(D82(E0
-M"$B)`DB#>-@`=!'K";X`````2(U=2$@Y74AURDB%]G1;QD9:`$&`?"1#`'1/
-MN0````"Z``````^V10U(T_BH`70.#[;"B$P&<(!&6@&#P@&#P0%!.$PD0W8B
-MZ]OV10H!=`U(B>Y,B>?H`````.L-O@````!(B>_H`````%M=05Q!74%>PY!(
-M@^P(3(L'1(M/,$$/MG!#0(3V=&))C8"X$@``N0````!(.?AU&NM/#[;!2(T4
-M0$B-%)!)C930N!(``$@Y^G0(@\$!0#CQ=>"`^0-V+TF+`$@%T`$``$B-%(T`
-M````@>+\`P``2`'0BP")!0````#!Z!2#X`'K+;D`````28L`2`70`0``2(T4
-MC0````"!XOP#``!(`="+`(D%`````,'H%(/@`83`=!`/MO%$B(````28LL)$'V1"0,$'0$QD=1!D$/MD91/`%T>3P!,"``!!@&0D#/=!@$92`4'&1E$`QD,D`DB)WDB)
-M[^@`````2(GOZ`````#IMP(``$$/MD0D#(/@]X/($$&(1"0,08N6"`$``(U"
-M`4&)A@@!``"#^@(/AP,!``!(@[N``````'0/2(VS@````$B)[^@`````2(V5
-M^````$B+A?@```!(B5@(2(D#2(E3"$B)G?@```!!@'Y"`'480;\`````38UL
-M)&!!@'PD#@!U'NF>````N@````"^`@```$R)Y^@`````9I#I&P(``$R)[^@`
-M````2(G#28M%"$F)70A,B2M(B4,(2(D82(M30$B%TG052(NU\`@``+\%````
-MZ`````"`2TP"2(G:O@8```!,B>?H`````("[@P````!T(F9F9I!F9I!(B>_H
-M`````+\!````Z`````"`NX,`````=>5!@\&"`$```````!(@[N``````'0/2(VS@````$B)[^@`
-M````2(V5^````$B+A?@```!(B5@(2(D#2(E3"$B)G?@```"Z`````+X&````
-M3(GGZ`````!)C40D8$DY1"1@='Q)B<5,B>_H`````$B)PTB+0$!(A_H`````$B+4T!(B[7P"```OP$`
-M``#H`````$B+4T!(B[7P"```OP8```#H`````$C'0T``````2(G>2(GOZ```
-M``!-.6PD8'6'3(GV2(GOZ`````!)QT0D0`````!(BT4`BY!8`0``B14`````
-MA=)T"DB+10")D%@!``!!]D0D"@%T:X!]0P!T++D`````0?9$)`T!=!7K'69F
-MD&9FD$$/MD0D#4C3^*@!=0^#P0$X34-WZ^L%N0`````/MMF)WDB)[^@`````
-M3(GF2(GOZ`````!(8]M(C01;2(T$@TC'A,7`$@```````&9FD&:02(/$"%M=
-M05Q!74%>05_#D$B#["A(B5PD"$B);"003(ED)!A,B6PD($B)\TB)_4R+;U!-
-MBV4`#[=.,HG(9L'H!0^W\$ACQD&+1(1L@^$?2-/XJ`$/A6<#``!)BQ0DC02U
-M``,``(F"<`$``$F+!"2+D'0!``")%0````#&0R0ABT,X)?___P`]X0$/`'4C
-MO@````!(B=_H`````+H`````2(G>3(GGZ`````#I$0,``)")T`^W2S*#X1](
-MT_BH`705O@$```!(B=_H`````$R)Y^@`````#[:%Z````#P$#X?<`@``#[;`
-M_R3%`````,:%Z`````&Z`0```$B)WDR)[^@`````Z;8"``#&A>@````"N@@`
-M``!(B=Y,B>_H`````.F:`@``QH7H`````TB)ZKXA````3(GOZ`````!(BW58
-M2(7V=!\/MI6!````0;@`````N0$```!,B>_H`````.E;`@``00^V=0VZ````
-M`$R)Y^@`````Z40"``#&A>@````$2(-]6`!T,TB)ZKXA````3(GOZ``````/
-MMI6!````2(MU6$&X`````+D"````3(GOZ`````#I`P(``+H`````OB$```!,
-MB>_H`````$$/MG4-N@$```!,B>?H`````.G:`0``@'U*_W052(GJO@8```!,
-MB>_H`````.F_`0``2(GJO@8```!,B>_H`````$B+34!(A9F:03(GGZ`````"_`0```.@`
-M````@+V#`````'7E2(-]6`!T&4B+51!(BT482(E""$B)$$B+15B`:%@!ZQE(
-MBU5@2(72=!`/MH6!````2,=$PE@`````2(M5`$B+10A(B4((2(D008!M#@%(
-MB[T@`0``2(7_=!$/MK4-`0``N@$```#H`````$B+?5A(A?]T$0^VM8$```"Z
-M`0```.@`````2(M%0$B%P'1R2,=`8`````!,B>?H`````$B+=4"Z`0```$R)
-MY^@`````2(M%0`^V4`(/MG`!2,?'`````+@`````Z`````!(BU5`28NT)/`(
-M``"_`0```.@`````2(M50$F+M"3P"```OP8```#H`````$C'14``````2(GN
-M3(GGZ`````!!@'T)_W14O0````!!@'T.`'0RO0````!)C5U@2(G?Z`````!(
-MBU,(2(E#"$B)&$B)4`A(B0*`>$K_=0F#Q0%!.&T.=]=!.&T.=Q!!QD4)_TR)
-M[DR)Y^@`````2(M<)`A(BVPD$$R+9"083(ML)"!(@\0HPV9F9I!F9I!!5T%6
-M055!5%532(/L&$F)_$R+OX@```!)BQ](BX.8$0``1(LH2(G^2(G?Z`````!!
-M@'PD4@%V!D'&1"11!$F-;"0H23EL)"@/A/\!``!(B>_H`````$F)QDF+1"0H
-M3(EP"$F)!DF);@A-B70D*&:#>V@`#X2T`0``O0````!(C8.@#P``2(E$)!!(
-MC;OX````2(E\)`@/M\5(P>`#2`.#L`D``$B+,$B%]@^$<`$```^W1B!F03E$
-M)$`/A6`!```/MY.R$@``03G5=$]F9F:0@\(!#[>#MA(``#G"N``````/0]"-
-M0@%(P>`"2`.#F!$``(L`J0``"`!U&V8E_P]F.>AU$DDY]G422(G?Z`````#I
-M-P$``$0YZG6U#[=&(&8]A0`/A_<````/M\"`O`-@"```_P^$Y@```$&`?U@`
-M#X7;````0?9'"@$/A-````!(BQ,/MT8R9L'H!0^WP(T$A0`#``")@G`!``!(
-MBP,/MTXR@^$?N@$```!(B==(T^>)N'0!```/MT8R2,'@`T@#@[`)``!(QP``
-M````#[=.,HG(9L'H!27_!P``@^$?2(G72-/G2(GY]]$AC(.X"0``#[=.,HG(
-M9L'H!27_!P``@^$?2-/B]](A5(-L3#GV="Q(BP9(BU8(2(E0"$B)`DB+@_@`
-M``!(B7`(2(D&2(M$)`A(B48(2(FS^`````^W=C)(BWPD$.@`````08!L)$4!
-M@\4!9CEK:`^':?[__T'V1PH!=!E)BQ9)BT8(2(E""$B)$$R)]DR)Y^@`````
-M2(/$&%M=05Q!74%>05_#9F9FD$%505154TB#[`A(B10D3(LG#[?V2,'F`TD#
-MM"2P"0``2(L>9H%[..$!=28/MD,Z@^@1/`%W&TB+;T!!O0````!(A=)U4L9%
-M40!!O0````#K1DF+E"0X"0``N&B6`0!F@7L@A0!W%`^W0R!!#[:$!&`(``!(
-M:<"8`0``3(TL`KT`````2(,\)`!U#4'&A>@`````O0````"`>R2!=02`9PSW
-M2(,\)``/A00!``#&0R0`]H.6````(`^$*@,``$B+0VA(A<`/A!T#``!(B<7V
-M@+$````"=!U(B[B@````2(7_=!%(BW-(2(7V=`B+4S3H`````$F+E"0($0``
-M2('"0`@``$$/MD5RP>`(2)A(`<*+`HD%`````(G"P>H0B)6;````P>@89HF%
-MD````$F+E"0($0``2('"1`@``$$/MD5RP>`(2)A(`<*+$HD5``````^VPF:)
-MA90````/ML9FB866````B=#!Z!`/ML!FB868````P>H8B)6:````28N4)`@1
-M``!(@<),"```00^V17+!X`A(F$@!PHL"B04`````#[;`9HF%D@```.DX`@``
-MD(![)(!U"L9#)"%F9I!F9I!(BS0D2,?'`````+@`````Z`````!F@7LXX0%U
-M&`^V0SJ#Z!$\`7<-2(GOZ`````#I\@$``$B)X0^V5"0#]L(!#X1]`0``BT,X
-M)?___P`]X0$.``^$:@$``$F+E"0($0``2('"0`@``$$/MD5RP>`(2)A(`<*+
-M,HDU`````$F+E"0($0``2('"1`@``$$/MD5RP>`(2)A(`<)$BP)$B04`````
-M28N4)`@1``!(@<)("```00^V17+!X`A(F$@!PHL*B0T`````]H.6````(`^$
-MX@```$B+>VC&A[(````0QD,D((GPP>@0B(>;````B?#!Z!AFB8>0````B4````BH0P>((1(G`
-MP>@0#[;``<)FB9>8````28N4)`@1``!(@<),"```00^V17+!X`A(F$@!PHLR
-MB34`````0`^V]F:)MY(````/MX^6````#[>7F`````^W]D0/MX>4````2,?'
-M`````+@`````Z`````!)BY0D"!$``$B!PD`(``!!#[9%?H`````.MDA-)Y($F+!"2+B%@!``")#0````"%R71,28L$
-M)(F(6`$``.M`@#D`>#N`>0<`>35)BQ0D#[=#,F;!Z`4/M\"-!(4``P``B8)P
-M`0``28L4)`^W2S*#X1^X`0```$C3X(F"=`$``$B#Q`A;74%<05W#9F9FD&9F
-M9I!F9I!F9I!(@^P(#[9&.$@Y?BAU2CP(=&4\*'1A/*AT73R(9F9FD'15/`IT
-M43PJ=$T\JF9F9I!T13R*=$%(BX?X````2(EP"$B)!DB-A_@```!(B48(2(FW
-M^````.L?2(N7``$``$B)MP`!``!(C8?X````2(D&2(E6"$B),N@`````2(/$
-M",-F9F:09F9FD&9F9I!F9I!(@^P(Z`````!(@\0(PV:04TB#[&!(B?M(C4PD
-M74B-5"1>2(UT)%\/MW\\2(U$)%)(B40D.$B-1"142(E$)#!(C40D3$B)1"0H
-M2(U$)$Y(B40D($B-1"182(E$)!A(C40D6DB)1"002(U$)%M(B40D"$B-1"16
-M2(D$)$R-3"1<3(U$)%#H``````^V5"1?#[9T)%Y(C7PD2.@`````#[94)%](
-M:=*8`0``2(MS($B-NQ@)``"Y`0```.@`````#[94)%U(C1322,'B!4B+2&G2R`\``$B+(#2(MS($B-NV@*``"Y`0```.@`````#[94)%P/MT0D4$@/K]!(C112
-M2,'B`DB+(#
-M2(MS($B-NS`+``"Y`0```.@`````#[=4)%A(`=)(BW,@2(V[>`\``+D!````
-MZ``````/ME0D7T@!TDB+(+2(MS($B-NZ@1``!!N`$```"Y"````.@`````2(MS($B-N]@1``!!
-MN`$```"Y"````+H```@`Z``````/MU0D5DAITHP!``!(BW,@2('#"!(``$&X
-M`0```+D(````2(G?Z`````"X`````$B#Q&!;PV9F9I!F9I!F9I!(@^PX2(E<
-M)`A(B6PD$$R)9"083(EL)"!,B70D*$R)?"0P28GW28G]2(L'2(D$)$R-9TA,
-MB>?H`````$B)PTR-<,A(BSPDZ`````!(B<5)BT5028E=4$V)9CA)B49`2(D8
-MN`$```!(A>UT>,9%..'&13D!QD4Z$(!-.P%)BX>@````2(E%:$B+17!,B7@H
-M28V'D````$B)15#&127,00^V1EMFB44@28M%`$B)12C'1320````3(E]2$C'
-MA:``````````2(U]6+X`````Z`````!(B>Y(BSPDZ`````"X`````$B+7"0(
-M2(ML)!!,BV0D&$R+;"0@3(MT)"A,BWPD,$B#Q#C#9F9FD&9FD&9FD$%7059!
-M54%455-(@^P82(G]2,=$)!``````2(M$)!`/MI0HY@@``(#Z_P^$Z@````^V
-MRDB-!(E(C02!2(V$Q<`!``!(B40D"`^V\DACQDB-%(!(C120@+S5S@$````/
-MA+8```!!O`````!(C02)2(T$@4C!X`-,C;0%(`(``$R-+"A(8\9(C12`2(T4
-MD$R-O-7``0``3(GWZ`````!(B<-)BX4H`@``28F=*`(``$R),TB)0PA(B1A(
-MBU-`2(72=!5(B[7P"```OP4```#H`````(!+3`)(B=J^`@```$B+?"0(Z```
-M``"`NX,`````=!M(B>_H`````+\!````Z`````"`NX,`````=>5!@\0!13AG
-M#@^'>____TB#1"00`4B#?"00!`^%[O[__TB)[^@`````2(/$&%M=05Q!74%>
-M05_#9F9FD&9FD&9FD&9FD$%7059!54%455-(@^QX2(G[QD=1`,9'4`#&1T\`
-MQH=I%````$B-E[@2``"X`````,8$$`!(@\`!2#V@`0``=?!(C8/X````2(F#
-M^````$B)@P`!``!(C8,(`0``2(F#"`$``$B)@Q`!``!,C:,8`0``3(FC&`$`
-M`$R)HR`!``!,C:LH`0``3(FK*`$``$R)JS`!``!(C8,X`0``2(E$)$A(B8,X
-M`0``2(F#0`$``$B-BT@!``!(B4PD4$B)BT@!``!(B8M0`0``3(VS:`$``$R)
-MLV@!``!,B;-P`0``2(VS>`$``$B)="1`2(FS>`$``$B)LX`!``!,C;M8`0``
-M3(F[6`$``$R)NV`!``!(C4PD;DB-5"1P2(UT)'$/MWL\2(U$)')(B40D.$B-
-M1"1T2(E$)#!(C40D9$B)1"0H2(U$)&I(B40D($B-1"1V2(E$)!A(C40D;$B)
-M1"002(U$)&U(B40D"$B-1"1H2(D$)$R-3"1O3(U$)&;H``````^V1"1QB$-&
-M#[9$)'"(0T(%2(72=!!(B`L``$B+DX`!``!(
-MB8.``0``2(M,)$!(B0A(B5`(2(D"@\4!#[9$)'%F.>AWPTB-NW@/``#H````
-M`$B)@Y@/``!(B8.@#P``#[=T)'9FB;.J#P``#[?V2(V[H`\``.@`````2(V[
-ML`\``.@`````2(F#T`\``$B)@]@/```/MG0D<6:)L^(/```/M_9(C;O8#P``
-MZ`````!(C;OH#P``Z`````!(B8,($```2(F#$!````^V="1N9HFS&A````^W
-M]DB-NQ`0``#H`````$B-NR`0``#H`````$B)@T`0``!(B8-($```#[9T)'!F
-MB;-2$```#[?V2(V[2!```.@`````2(V[6!```.@`````2(F#>!```$B)@X`0
-M```/MD,^9HF#BA````^V`A!QD`)`$B)F,`!``!!QD`.`,:`&`(```#&@.@!````QX!@`@``````
-M`$B-C!/P`0``2(F(\`$``$B)B/@!``!(C8P3"`(``$B)B`@"``!(B8@0`@``
-M2(V4$R`"``!(B9`@`@``2(F0*`(``$'&0`H"@\$`L@``````$C'A,M@!```````
-M`$B)T4@#BS@)``!(C4$@2(E!($@#DS@)``!(C4(@2(E"*(/&`0^V1"1Q9CGP
-M#X=T____9L>#[```````N`````!F9I!F9I#&A!A@"```_TB#P`%(/88```!U
-M[(!\)'``#X2]````O@`````/M\9(:<#(#P``2(N3B`D``,9$`E@`2(N3B`D`
-M`,9$$%D`2(N3B`D``$C'1!`0`````$B)P4@#BX@)``!(C5$82(E1&$B)P4@#
-MBX@)``!(C5$82(E1($B)P4@#BX@)``!(C5$H2(E1*$B)P4@#BX@)``!(C5$H
-M2(E1,$B+DX@)``!,B400"$B)P4@#BX@)``!(C5%(2(E12$@#@X@)``!(C5!(
-M2(E04(/&`0^V1"1P9CGP#X=(____QH/O````@(!\)&X`#X2"````O@`````/
-MM\9(C03`2,'@!4B+DV`)``!FQT0"3@0`2(N38`D``,9$$$(`2(N38`D``,9$
-M$$3_2(N38`D``,9$$%#_2(G!2`.+8`D``$B-42A(B5$H2(G!2`.+8`D``$B-
-M42A(B5$P2(N38`D``$R)A!"(````@\8!#[9$)&YF.?!W@\:#\````()(C;/@
-M$```2(V[N!```.@`````2(F#V!```$B-LQ`1``!(C;OH$```Z`````!(B8,(
-M$0``2(VS0!$``$B-NQ@1``#H`````$B)@S@1``!(C;-P$0``2(V[2!$``.@`
-M````2(F#:!$``$B-LZ`1``!(C;MX$0``Z`````!(B8.8$0``2(VST!$``$B-
-MNZ@1``#H`````$F)Q$B)@\@1``!(BZO0$0``@'PD;0!T4D&]`````$B+?"1(
-MZ`````!,B6`02(EH&$B+DT`!``!(B8-``0``2(MT)$A(B3!(B5`(2(D"28'$
-M``@``$B!Q0`(``!!@\4!#[9$)&UF1#GH=[1(C;,`$@``2(V[V!$``.@`````
-M28G$2(F#^!$``$B+JP`2``!!O0````!(BWPD4.@`````3(E@$$B):!A(BY-0
-M`0``2(F#4`$``$B+3"102(D(2(E0"$B)`DF!Q````0!(@<4```$`08/%`69!
-M@_T(=;A(C;,P$@``2(V["!(``.@`````2(F#*!(``$R+HS`2``!F@WPD:`!T
-M2$B)Q4&U`$R)_^@`````2(EH$$R)8!A(BY-@`0``2(F#8`$``$R).$B)4`A(
-MB0)(@<6,`0``28'$C`$``$&#Q0%F1#EL)&AWODB#Q'A;74%<05U!7D%?PV9F
-M9I!F9F:0055!5%532(/L"$F)_4F)]$B+GH@````/ME9'2(G^2(G?Z`````!(
-MB<5F08-,)$X008!]0P!T6;D`````]D,-`70-ZTP/MD,-2-/XJ`%U#8/!`4$/
-MMD5#9CG(=^AF@_D#=C-)BT4`2`70`0``2(T4C0````"!XOS_`P!(`="+`(D%
-M`````,'H%(/P`8/@`>LQN0````!)BT4`2`70`0``2(T4C0````"!XOS_`P!(
-M`="+`(D%`````,'H%(/P`8/@`83`=!`/MO%,B>_H`````.F7`0``2(U#8$@Y
-M0V`/A!D!``!(A>T/A!`!```/MH6!````2<=$Q%@`````2(M5`$B+10A(B4((
-M2(D02(GJO@8```!(B=_H`````("]@P````!T&TR)[^@`````OP$```#H````
-M`("]@P````!UY4B+14!(AY,B>_H`````$F+10"+D%@!``")%0````"%TG0*28M%`(F06`$`
-M`$'&1"1"`&9!@V0D3N]!@'PD.P!T*KH`````#[?"28M$Q%A(AM+3(GF
-M3(GOZ`````!FD.M*#[?%28M_H`````$F)QTF+1"0@3(EX"$F)!TF);PA-
-MB7PD(&:#>V@`#X0+`@``0;T`````2(VSH`\``$B)="002(V#^````$B)1"0(
-M00^WQ4C!X`-(`X.P"0``2(LH2(7M#X3#`0``#[=%(&9!.40D.`^%LP$```^W
-MD[(2``!!.=9T469FD&:0@\(!#[>#MA(``#G"N``````/0]"-0@%(P>`"2`.#
-MF!$``(L`J0``"`!U'&8E_P]F1#GH=1)).>]U$DB)W^@`````Z9D!``!$.?)U
-MM$B+="0@@'Y8``^%1P$```^W12!F/84`#X
Delivered-To: svn-src-all@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 ESMTPS id 459DAE03;
 Fri, 29 Aug 2014 13:12:46 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 253601B8D;
 Fri, 29 Aug 2014 13:12:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7TDCk6c048470;
 Fri, 29 Aug 2014 13:12:46 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7TDCkGr048469;
 Fri, 29 Aug 2014 13:12:46 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201408291312.s7TDCkGr048469@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI 
Date: Fri, 29 Aug 2014 13:12:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270811 - stable/10/sys/kern
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 13:12:46 -0000

Author: delphij
Date: Fri Aug 29 13:12:45 2014
New Revision: 270811
URL: http://svnweb.freebsd.org/changeset/base/270811

Log:
  MFC r269963+269964:
  
  Re-instate UMA cached backend for 4K - 64K allocations.  New consumers
  like geli(4) uses malloc(9) to allocate temporary buffers that gets
  free'ed shortly, causing frequent TLB shootdown as observed in hwpmc
  supported flame graph.
  
  Add a new loader tunable, vm.kmem_zmax which allows a system administrator
  to limit the maximum allocation size that malloc(9) would consider using
  the UMA cache allocator as backend.

Modified:
  stable/10/sys/kern/kern_malloc.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/kern/kern_malloc.c
==============================================================================
--- stable/10/sys/kern/kern_malloc.c	Fri Aug 29 13:06:30 2014	(r270810)
+++ stable/10/sys/kern/kern_malloc.c	Fri Aug 29 13:12:45 2014	(r270811)
@@ -121,7 +121,7 @@ static int kmemcount;
 #define KMEM_ZBASE	16
 #define KMEM_ZMASK	(KMEM_ZBASE - 1)
 
-#define KMEM_ZMAX	PAGE_SIZE
+#define KMEM_ZMAX	65536
 #define KMEM_ZSIZE	(KMEM_ZMAX >> KMEM_ZSHIFT)
 static uint8_t kmemsize[KMEM_ZSIZE + 1];
 
@@ -152,21 +152,10 @@ struct {
 	{1024, "1024", },
 	{2048, "2048", },
 	{4096, "4096", },
-#if PAGE_SIZE > 4096
 	{8192, "8192", },
-#if PAGE_SIZE > 8192
 	{16384, "16384", },
-#if PAGE_SIZE > 16384
 	{32768, "32768", },
-#if PAGE_SIZE > 32768
 	{65536, "65536", },
-#if PAGE_SIZE > 65536
-#error	"Unsupported PAGE_SIZE"
-#endif	/* 65536 */
-#endif	/* 32768 */
-#endif	/* 16384 */
-#endif	/* 8192 */
-#endif	/* 4096 */
 	{0, NULL},
 };
 
@@ -184,6 +173,10 @@ u_long vm_kmem_size;
 SYSCTL_ULONG(_vm, OID_AUTO, kmem_size, CTLFLAG_RDTUN, &vm_kmem_size, 0,
     "Size of kernel memory");
 
+static u_long kmem_zmax = KMEM_ZMAX;
+SYSCTL_ULONG(_vm, OID_AUTO, kmem_zmax, CTLFLAG_RDTUN, &kmem_zmax, 0,
+    "Maximum allocation size that malloc(9) would use UMA as backend");
+
 static u_long vm_kmem_size_min;
 SYSCTL_ULONG(_vm, OID_AUTO, kmem_size_min, CTLFLAG_RDTUN, &vm_kmem_size_min, 0,
     "Minimum size of kernel memory");
@@ -498,7 +491,7 @@ malloc(unsigned long size, struct malloc
 	size = redzone_size_ntor(size);
 #endif
 
-	if (size <= KMEM_ZMAX) {
+	if (size <= kmem_zmax) {
 		mtip = mtp->ks_handle;
 		if (size & KMEM_ZMASK)
 			size = (size & ~KMEM_ZMASK) + KMEM_ZBASE;
@@ -783,6 +776,9 @@ mallocinit(void *dummy)
 
 	uma_startup2();
 
+	if (kmem_zmax < PAGE_SIZE || kmem_zmax > KMEM_ZMAX)
+		kmem_zmax = KMEM_ZMAX;
+
 	mt_zone = uma_zcreate("mt_zone", sizeof(struct malloc_type_internal),
 #ifdef INVARIANTS
 	    mtrash_ctor, mtrash_dtor, mtrash_init, mtrash_fini,
@@ -807,7 +803,7 @@ mallocinit(void *dummy)
 		}		    
 		for (;i <= size; i+= KMEM_ZBASE)
 			kmemsize[i >> KMEM_ZSHIFT] = indx;
-		
+
 	}
 }
 SYSINIT(kmem, SI_SUB_KMEM, SI_ORDER_FIRST, mallocinit, NULL);

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 13:22:57 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 1B4BC2E5;
 Fri, 29 Aug 2014 13:22:57 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 042ED1CA4;
 Fri, 29 Aug 2014 13:22:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7TDMupL053149;
 Fri, 29 Aug 2014 13:22:56 GMT (envelope-from pluknet@FreeBSD.org)
Received: (from pluknet@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7TDMucO053143;
 Fri, 29 Aug 2014 13:22:56 GMT (envelope-from pluknet@FreeBSD.org)
Message-Id: <201408291322.s7TDMucO053143@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: pluknet set sender to
 pluknet@FreeBSD.org using -f
From: Sergey Kandaurov 
Date: Fri, 29 Aug 2014 13:22:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
Subject: svn commit: r270812 - stable/6/share/zoneinfo
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 13:22:57 -0000

Author: pluknet
Date: Fri Aug 29 13:22:56 2014
New Revision: 270812
URL: http://svnweb.freebsd.org/changeset/base/270812

Log:
  MFC r270728, tzdata2014f
  
  - Parts of Russia will change times on 2014-10-26.
  - Time zone name changes for Asia/Novokuznetsk and Xinjiang and Samoa
    and America/Metlakatla, new zones Asia/Chita and Asia/Srednekolymsk.
  - Australia will now use Axxx.
  - New zone tab data format.
  
  And lots of historical changes (See
  http://mm.icann.org/pipermail/tz-announce/2014-August/000023.html
  for the full details.)

Added:
  stable/6/share/zoneinfo/zone1970.tab
     - copied unchanged from r270728, head/contrib/tzdata/zone1970.tab
Modified:
  stable/6/share/zoneinfo/africa
  stable/6/share/zoneinfo/antarctica
  stable/6/share/zoneinfo/asia
  stable/6/share/zoneinfo/australasia
  stable/6/share/zoneinfo/backward
  stable/6/share/zoneinfo/etcetera
  stable/6/share/zoneinfo/europe
  stable/6/share/zoneinfo/factory
  stable/6/share/zoneinfo/leap-seconds.list   (contents, props changed)
  stable/6/share/zoneinfo/northamerica
  stable/6/share/zoneinfo/southamerica
  stable/6/share/zoneinfo/systemv
  stable/6/share/zoneinfo/yearistype.sh
  stable/6/share/zoneinfo/zone.tab
Directory Properties:
  stable/6/share/zoneinfo/   (props changed)

Modified: stable/6/share/zoneinfo/africa
==============================================================================
--- stable/6/share/zoneinfo/africa	Fri Aug 29 13:12:45 2014	(r270811)
+++ stable/6/share/zoneinfo/africa	Fri Aug 29 13:22:56 2014	(r270812)
@@ -1,4 +1,3 @@
-# 
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -35,13 +34,13 @@
 # Previous editions of this database used WAT, CAT, SAT, and EAT
 # for +0:00 through +3:00, respectively,
 # but Mark R V Murray reports that
-# `SAST' is the official abbreviation for +2:00 in the country of South Africa,
-# `CAT' is commonly used for +2:00 in countries north of South Africa, and
-# `WAT' is probably the best name for +1:00, as the common phrase for
-# the area that includes Nigeria is ``West Africa''.
-# He has heard of ``Western Sahara Time'' for +0:00 but can find no reference.
+# 'SAST' is the official abbreviation for +2:00 in the country of South Africa,
+# 'CAT' is commonly used for +2:00 in countries north of South Africa, and
+# 'WAT' is probably the best name for +1:00, as the common phrase for
+# the area that includes Nigeria is "West Africa".
+# He has heard of "Western Sahara Time" for +0:00 but can find no reference.
 #
-# To make things confusing, `WAT' seems to have been used for -1:00 long ago;
+# To make things confusing, 'WAT' seems to have been used for -1:00 long ago;
 # I'd guess that this was because people needed _some_ name for -1:00,
 # and at the time, far west Africa was the only major land area in -1:00.
 # This usage is now obsolete, as the last use of -1:00 on the African
@@ -54,7 +53,7 @@
 #	 2:00	SAST	South Africa Standard Time
 # and Murray suggests the following abbreviation:
 #	 1:00	WAT	West Africa Time
-# I realize that this leads to `WAT' being used for both -1:00 and 1:00
+# I realize that this leads to 'WAT' being used for both -1:00 and 1:00
 # for times before 1976, but this is the best I can think of
 # until we get more information.
 #
@@ -131,9 +130,7 @@ Zone	Africa/Gaborone	1:43:40 -	LMT	1885
 			2:00	-	CAT
 
 # Burkina Faso
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Africa/Ouagadougou	-0:06:04 -	LMT	1912
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Burundi
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -161,7 +158,7 @@ Zone	Africa/Bangui	1:14:20	-	LMT	1912
 
 # Chad
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Ndjamena	1:00:12 -	LMT	1912
+Zone	Africa/Ndjamena	1:00:12 -	LMT	1912 # N'Djamena
 			1:00	-	WAT	1979 Oct 14
 			1:00	1:00	WAST	1980 Mar  8
 			1:00	-	WAT
@@ -183,10 +180,20 @@ Zone Africa/Lubumbashi	1:49:52 -	LMT	189
 Zone Africa/Brazzaville	1:01:08 -	LMT	1912
 			1:00	-	WAT
 
-# Cote D'Ivoire
+# Côte D'Ivoire / Ivory Coast
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Abidjan	-0:16:08 -	LMT	1912
 			 0:00	-	GMT
+Link Africa/Abidjan Africa/Bamako	# Mali
+Link Africa/Abidjan Africa/Banjul	# Gambia
+Link Africa/Abidjan Africa/Conakry	# Guinea
+Link Africa/Abidjan Africa/Dakar	# Senegal
+Link Africa/Abidjan Africa/Freetown	# Sierra Leone
+Link Africa/Abidjan Africa/Lome		# Togo
+Link Africa/Abidjan Africa/Nouakchott	# Mauritania
+Link Africa/Abidjan Africa/Ouagadougou	# Burkina Faso
+Link Africa/Abidjan Africa/Sao_Tome	# São Tomé and Príncipe
+Link Africa/Abidjan Atlantic/St_Helena	# St Helena
 
 # Djibouti
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -231,13 +238,9 @@ Rule	Egypt	1990	1994	-	May	 1	1:00	1:00	
 # Egyptians would approve the cancellation."
 #
 # Egypt to cancel daylight saving time
-# 
 # http://www.almasryalyoum.com/en/node/407168
-# 
 # or
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_egypt04.html
-# 
 Rule	Egypt	1995	2010	-	Apr	lastFri	 0:00s	1:00	S
 Rule	Egypt	1995	2005	-	Sep	lastThu	24:00	0	-
 # From Steffen Thorsen (2006-09-19):
@@ -249,7 +252,7 @@ Rule	Egypt	2006	only	-	Sep	21	24:00	0	-
 # From Dirk Losch (2007-08-14):
 # I received a mail from an airline which says that the daylight
 # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07.
-# From Jesper Norgaard Welen (2007-08-15): [The following agree:]
+# From Jesper Nørgaard Welen (2007-08-15): [The following agree:]
 # http://www.nentjes.info/Bill/bill5.htm
 # http://www.timeanddate.com/worldclock/city.html?n=53
 # From Steffen Thorsen (2007-09-04): The official information...:
@@ -288,15 +291,9 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	24:00	
 #
 # timeanddate[2] and another site I've found[3] also support that.
 #
-# [1] 
-# https://bugzilla.redhat.com/show_bug.cgi?id=492263
-# 
-# [2] 
-# http://www.timeanddate.com/worldclock/clockchange.html?n=53
-# 
-# [3] 
-# http://wwp.greenwichmeantime.com/time-zone/africa/egypt/
-# 
+# [1] https://bugzilla.redhat.com/show_bug.cgi?id=492263
+# [2] http://www.timeanddate.com/worldclock/clockchange.html?n=53
+# [3] http://wwp.greenwichmeantime.com/time-zone/africa/egypt/
 
 # From Arthur David Olson (2009-04-20):
 # In 2009 (and for the next several years), Ramadan ends before the fourth
@@ -306,14 +303,10 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	24:00	
 # From Steffen Thorsen (2009-08-11):
 # We have been able to confirm the August change with the Egyptian Cabinet
 # Information and Decision Support Center:
-# 
 # http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html
-# 
 #
 # The Middle East News Agency
-# 
 # http://www.mena.org.eg/index.aspx
-# 
 # also reports "Egypt starts winter time on August 21"
 # today in article numbered "71, 11/08/2009 12:25 GMT."
 # Only the title above is available without a subscription to their service,
@@ -321,19 +314,14 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	24:00	
 # (at least today).
 
 # From Alexander Krivenyshev (2010-07-20):
-# According to News from Egypt -  Al-Masry Al-Youm Egypt's cabinet has
+# According to News from Egypt - Al-Masry Al-Youm Egypt's cabinet has
 # decided that Daylight Saving Time will not be used in Egypt during
 # Ramadan.
 #
 # Arabic translation:
-# "Clocks to go back during Ramadan--and then forward again"
-# 
+# "Clocks to go back during Ramadan - and then forward again"
 # http://www.almasryalyoum.com/en/news/clocks-go-back-during-ramadan-and-then-forward-again
-# 
-# or
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_egypt02.html
-# 
 
 # From Ahmad El-Dardiry (2014-05-07):
 # Egypt is to change back to Daylight system on May 15
@@ -433,10 +421,15 @@ Zone	Africa/Asmara	2:35:32 -	LMT	1870
 			3:00	-	EAT
 
 # Ethiopia
-# From Paul Eggert (2006-03-22):
-# Shanks & Pottenger write that Ethiopia had six narrowly-spaced time zones
-# between 1870 and 1890, and that they merged to 38E50 (2:35:20) in 1890.
-# We'll guess that 38E50 is for Adis Dera.
+# From Paul Eggert (2014-07-31):
+# Like the Swahili of Kenya and Tanzania, many Ethiopians keep a
+# 12-hour clock starting at our 06:00, so their "8 o'clock" is our
+# 02:00 or 14:00.  Keep this in mind when you ask the time in Amharic.
+#
+# Shanks & Pottenger write that Ethiopia had six narrowly-spaced time
+# zones between 1870 and 1890, that they merged to 38E50 (2:35:20) in
+# 1890, and that they switched to 3:00 on 1936-05-05.  Perhaps 38E50
+# was for Adis Dera.  Quite likely the Shanks data are wrong anyway.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Addis_Ababa	2:34:48 -	LMT	1870
 			2:35:20	-	ADMT	1936 May 5    # Adis Dera MT
@@ -448,28 +441,24 @@ Zone Africa/Libreville	0:37:48 -	LMT	191
 			1:00	-	WAT
 
 # Gambia
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Banjul	-1:06:36 -	LMT	1912
-			-1:06:36 -	BMT	1935	# Banjul Mean Time
-			-1:00	-	WAT	1964
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Ghana
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-# Whitman says DST was observed from 1931 to ``the present'';
-# go with Shanks & Pottenger.
-Rule	Ghana	1936	1942	-	Sep	 1	0:00	0:20	GHST
-Rule	Ghana	1936	1942	-	Dec	31	0:00	0	GMT
+# Whitman says DST was observed from 1931 to "the present";
+# Shanks & Pottenger say 1936 to 1942;
+# and September 1 to January 1 is given by:
+# Scott Keltie J, Epstein M (eds), The Statesman's Year-Book,
+# 57th ed. Macmillan, London (1920), OCLC 609408015, pp xxviii.
+# For lack of better info, assume DST was observed from 1920 to 1942.
+Rule	Ghana	1920	1942	-	Sep	 1	0:00	0:20	GHST
+Rule	Ghana	1920	1942	-	Dec	31	0:00	0	GMT
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Accra	-0:00:52 -	LMT	1918
 			 0:00	Ghana	%s
 
 # Guinea
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Conakry	-0:54:52 -	LMT	1912
-			 0:00	-	GMT	1934 Feb 26
-			-1:00	-	WAT	1960
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Guinea-Bissau
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -577,18 +566,8 @@ Zone	Africa/Blantyre	2:20:00 -	LMT	1903 
 			2:00	-	CAT
 
 # Mali
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Bamako	-0:32:00 -	LMT	1912
-			 0:00	-	GMT	1934 Feb 26
-			-1:00	-	WAT	1960 Jun 20
-			 0:00	-	GMT
-
 # Mauritania
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Africa/Nouakchott	-1:03:48 -	LMT	1912
-			 0:00	-	GMT	1934 Feb 26
-			-1:00	-	WAT	1960 Nov 28
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Mauritius
 
@@ -612,9 +591,7 @@ Zone Africa/Nouakchott	-1:03:48 -	LMT	19
 
 # From Steffen Thorsen (2008-07-10):
 # According to
-# 
 # http://www.lexpress.mu/display_article.php?news_id=111216
-# 
 # (in French), Mauritius will start and end their DST a few days earlier
 # than previously announced (2008-11-01 to 2009-03-31).  The new start
 # date is 2008-10-26 at 02:00 and the new end date is 2009-03-27 (no time
@@ -633,18 +610,13 @@ Zone Africa/Nouakchott	-1:03:48 -	LMT	19
 # published on Monday, June 30, 2008...
 #
 # I guess that article in French "Le gouvernement avance l'introduction
-# de l'heure d'ete" stating that DST in Mauritius starting on October 26
-# and ending on March 27, 2009 is the most recent one.
-# ...
-# 
+# de l'heure d'été" stating that DST in Mauritius starting on October 26
+# and ending on March 27, 2009 is the most recent one....
 # http://www.worldtimezone.com/dst_news/dst_news_mauritius02.html
-# 
 
 # From Riad M. Hossen Ally (2008-08-03):
 # The Government of Mauritius weblink
-# 
 # http://www.gov.mu/portal/site/pmosite/menuitem.4ca0efdee47462e7440a600248a521ca/?content_id=4728ca68b2a5b110VgnVCM1000000a04a8c0RCRD
-# 
 # Cabinet Decision of July 18th, 2008 states as follows:
 #
 # 4. ...Cabinet has agreed to the introduction into the National Assembly
@@ -654,33 +626,25 @@ Zone Africa/Nouakchott	-1:03:48 -	LMT	19
 # States of America. It will start at two o'clock in the morning on the
 # last Sunday of October and will end at two o'clock in the morning on
 # the last Sunday of March the following year. The summer time for the
-# year 2008 - 2009 will, therefore, be effective as from 26 October 2008
+# year 2008-2009 will, therefore, be effective as from 26 October 2008
 # and end on 29 March 2009.
 
 # From Ed Maste (2008-10-07):
 # THE TIME BILL (No. XXVII of 2008) Explanatory Memorandum states the
 # beginning / ending of summer time is 2 o'clock standard time in the
 # morning of the last Sunday of October / last Sunday of March.
-# 
 # http://www.gov.mu/portal/goc/assemblysite/file/bill2708.pdf
-# 
 
 # From Steffen Thorsen (2009-06-05):
 # According to several sources, Mauritius will not continue to observe
 # DST the coming summer...
 #
 # Some sources, in French:
-# 
 # http://www.defimedia.info/news/946/Rashid-Beebeejaun-:-%C2%AB-L%E2%80%99heure-d%E2%80%99%C3%A9t%C3%A9-ne-sera-pas-appliqu%C3%A9e-cette-ann%C3%A9e-%C2%BB
-# 
-# 
 # http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-%C3%A9conomie-d-%C3%A9nergie-de-l-heure-d-%C3%A9t%C3%A9-ont-%C3%A9t%C3%A9-atteints-
-# 
 #
 # Our wrap-up:
-# 
 # http://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html
-# 
 
 # From Arthur David Olson (2009-07-11):
 # The "mauritius-dst-will-not-repeat" wrapup includes this:
@@ -704,7 +668,7 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 			3:00	-	EAT
 
 # Morocco
-# See the `europe' file for Spanish Morocco (Africa/Ceuta).
+# See the 'europe' file for Spanish Morocco (Africa/Ceuta).
 
 # From Alex Krivenyshev (2008-05-09):
 # Here is an article that Morocco plan to introduce Daylight Saving Time between
@@ -712,60 +676,43 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 #
 # "... Morocco is to save energy by adjusting its clock during summer so it will
 # be one hour ahead of GMT between 1 June and 27 September, according to
-# Communication Minister and Gov ernment Spokesman, Khalid Naciri...."
+# Communication Minister and Government Spokesman, Khalid Naciri...."
 #
-# 
 # http://www.worldtimezone.net/dst_news/dst_news_morocco01.html
-# 
-# OR
-# 
 # http://en.afrik.com/news11892.html
-# 
 
 # From Alex Krivenyshev (2008-05-09):
 # The Morocco time change can be confirmed on Morocco web site Maghreb Arabe Presse:
-# 
 # http://www.map.ma/eng/sections/box3/morocco_shifts_to_da/view
-# 
 #
 # Morocco shifts to daylight time on June 1st through September 27, Govt.
 # spokesman.
 
 # From Patrice Scattolin (2008-05-09):
 # According to this article:
-# 
 # http://www.avmaroc.com/actualite/heure-dete-comment-a127896.html
-# 
-# (and republished here:
-# 
-# http://www.actu.ma/heure-dete-comment_i127896_0.html
-# 
-# )
-# the changes occurs at midnight:
-#
-# saturday night may 31st at midnight (which in french is to be
-# intrepreted as the night between saturday and sunday)
-# sunday night the 28th  at midnight
-#
-# Seeing that the 28th is monday, I am guessing that she intends to say
-# the midnight of the 28th which is the midnight between sunday and
-# monday, which jives with other sources that say that it's inclusive
-# june1st to sept 27th.
+# (and republished here: )
+# the changes occur at midnight:
+#
+# Saturday night May 31st at midnight (which in French is to be
+# interpreted as the night between Saturday and Sunday)
+# Sunday night the 28th at midnight
+#
+# Seeing that the 28th is Monday, I am guessing that she intends to say
+# the midnight of the 28th which is the midnight between Sunday and
+# Monday, which jives with other sources that say that it's inclusive
+# June 1st to Sept 27th.
 #
 # The decision was taken by decree *2-08-224 *but I can't find the decree
 # published on the web.
 #
 # It's also confirmed here:
-# 
 # http://www.maroc.ma/NR/exeres/FACF141F-D910-44B0-B7FA-6E03733425D1.htm
-# 
-# on a government portal as being  between june 1st and sept 27th (not yet
-# posted in english).
+# on a government portal as being between June 1st and Sept 27th (not yet
+# posted in English).
 #
-# The following google query will generate many relevant hits:
-# 
+# The following Google query will generate many relevant hits:
 # http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search
-# 
 
 # From Steffen Thorsen (2008-08-27):
 # Morocco will change the clocks back on the midnight between August 31
@@ -773,47 +720,32 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 # of September:
 #
 # One article about it (in French):
-# 
 # http://www.menara.ma/fr/Actualites/Maroc/Societe/ci.retour_a_l_heure_gmt_a_partir_du_dimanche_31_aout_a_minuit_officiel_.default
-# 
 #
 # We have some further details posted here:
-# 
 # http://www.timeanddate.com/news/time/morocco-ends-dst-early-2008.html
-# 
 
 # From Steffen Thorsen (2009-03-17):
 # Morocco will observe DST from 2009-06-01 00:00 to 2009-08-21 00:00 according
 # to many sources, such as
-# 
 # http://news.marweb.com/morocco/entertainment/morocco-daylight-saving.html
-# 
-# 
 # http://www.medi1sat.ma/fr/depeche.aspx?idp=2312
-# 
 # (French)
 #
 # Our summary:
-# 
 # http://www.timeanddate.com/news/time/morocco-starts-dst-2009.html
-# 
 
 # From Alexander Krivenyshev (2009-03-17):
 # Here is a link to official document from Royaume du Maroc Premier Ministre,
-# Ministere de la Modernisation des Secteurs Publics
+# Ministère de la Modernisation des Secteurs Publics
 #
 # Under Article 1 of Royal Decree No. 455-67 of Act 23 safar 1387 (2 june 1967)
 # concerning the amendment of the legal time, the Ministry of Modernization of
 # Public Sectors announced that the official time in the Kingdom will be
 # advanced 60 minutes from Sunday 31 May 2009 at midnight.
 #
-# 
 # http://www.mmsp.gov.ma/francais/Actualites_fr/PDF_Actualites_Fr/HeureEte_FR.pdf
-# 
-#
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_morocco03.html
-# 
 
 # From Steffen Thorsen (2010-04-13):
 # Several news media in Morocco report that the Ministry of Modernization
@@ -821,14 +753,10 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 # 2010-05-02 to 2010-08-08.
 #
 # Example:
-# 
 # http://www.lavieeco.com/actualites/4099-le-maroc-passera-a-l-heure-d-ete-gmt1-le-2-mai.html
-# 
 # (French)
 # Our page:
-# 
 # http://www.timeanddate.com/news/time/morocco-starts-dst-2010.html
-# 
 
 # From Dan Abitol (2011-03-30):
 # ...Rules for Africa/Casablanca are the following (24h format)
@@ -838,34 +766,20 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 # The change was broadcast on the FM Radio
 # I ve called ANRT (telecom regulations in Morocco) at
 # +212.537.71.84.00
-# 
 # http://www.anrt.net.ma/fr/
-# 
 # They said that
-# 
 # http://www.map.ma/fr/sections/accueil/l_heure_legale_au_ma/view
-# 
 # is the official publication to look at.
 # They said that the decision was already taken.
 #
 # More articles in the press
-# 
-# http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-lev
-# 
-# e.html
-# 
+# http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-leve.html
 # http://www.lematin.ma/Actualite/Express/Article.asp?id=148923
-# 
-# 
 # http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT%2B1-a-partir-de-dim
-# anche-prochain-5538.html
-# 
 
 # From Petr Machata (2011-03-30):
 # They have it written in English here:
-# 
 # http://www.map.ma/eng/sections/home/morocco_to_spring_fo/view
-# 
 #
 # It says there that "Morocco will resume its standard time on July 31,
 # 2011 at midnight." Now they don't say whether they mean midnight of
@@ -873,20 +787,16 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 # also been like that in the past.
 
 # From Alexander Krivenyshev (2012-03-09):
-# According to Infomédiaire web site from Morocco (infomediaire.ma),
-# on March 9, 2012, (in French) Heure légale:
-# Le Maroc adopte officiellement l'heure d'été
-# 
+# According to Infomédiaire web site from Morocco (infomediaire.ma),
+# on March 9, 2012, (in French) Heure légale:
+# Le Maroc adopte officiellement l'heure d'été
 # http://www.infomediaire.ma/news/maroc/heure-l%C3%A9gale-le-maroc-adopte-officiellement-lheure-d%C3%A9t%C3%A9
-# 
 # Governing Council adopted draft decree, that Morocco DST starts on
 # the last Sunday of March (March 25, 2012) and ends on
 # last Sunday of September (September 30, 2012)
 # except the month of Ramadan.
 # or (brief)
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_morocco06.html
-# 
 
 # From Arthur David Olson (2012-03-10):
 # The infomediaire.ma source indicates that the system is to be in
@@ -897,17 +807,13 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 
 # From Christophe Tropamer (2012-03-16):
 # Seen Morocco change again:
-# 
 # http://www.le2uminutes.com/actualite.php
-# 
-# "...à partir du dernier dimance d'avril et non fins mars,
-# comme annoncé précédemment."
+# "...à partir du dernier dimanche d'avril et non fins mars,
+# comme annoncé précédemment."
 
 # From Milamber Space Network (2012-07-17):
 # The official return to GMT is announced by the Moroccan government:
-# 
 # http://www.mmsp.gov.ma/fr/actualites.aspx?id=288 [in French]
-# 
 #
 # Google translation, lightly edited:
 # Back to the standard time of the Kingdom (GMT)
@@ -1052,7 +958,7 @@ Zone Africa/Casablanca	-0:30:20 -	LMT	19
 # Assume that this has been true since Western Sahara switched to GMT,
 # since most of it was then controlled by Morocco.
 
-Zone Africa/El_Aaiun	-0:52:48 -	LMT	1934 Jan
+Zone Africa/El_Aaiun	-0:52:48 -	LMT	1934 Jan # El Aaiún
 			-1:00	-	WAT	1976 Apr 14
 			 0:00	Morocco	WE%sT
 
@@ -1102,15 +1008,17 @@ Zone	Africa/Niamey	 0:08:28 -	LMT	1912
 Zone	Africa/Lagos	0:13:36 -	LMT	1919 Sep
 			1:00	-	WAT
 
-# Reunion
+# Réunion
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Indian/Reunion	3:41:52 -	LMT	1911 Jun	# Saint-Denis
-			4:00	-	RET	# Reunion Time
+			4:00	-	RET	# Réunion Time
 #
-# Scattered Islands (Iles Eparses) administered from Reunion are as follows.
+# Crozet Islands also observes Réunion time; see the 'antarctica' file.
+#
+# Scattered Islands (Îles Éparses) administered from Réunion are as follows.
 # The following information about them is taken from
-# Iles Eparses (www.outre-mer.gouv.fr/domtom/ile.htm, 1997-07-22, in French;
-# no longer available as of 1999-08-17).
+# Îles Éparses (, 1997-07-22,
+# in French; no longer available as of 1999-08-17).
 # We have no info about their time zone histories.
 #
 # Bassas da India - uninhabited
@@ -1125,28 +1033,17 @@ Zone	Africa/Kigali	2:00:16 -	LMT	1935 Ju
 			2:00	-	CAT
 
 # St Helena
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Atlantic/St_Helena	-0:22:48 -	LMT	1890		# Jamestown
-			-0:22:48 -	JMT	1951	# Jamestown Mean Time
-			 0:00	-	GMT
+# See Africa/Abidjan.
 # The other parts of the St Helena territory are similar:
 #	Tristan da Cunha: on GMT, say Whitman and the CIA
-#	Ascension: on GMT, says usno1995 and the CIA
+#	Ascension: on GMT, say the USNO (1995-12-21) and the CIA
 #	Gough (scientific station since 1955; sealers wintered previously):
 #		on GMT, says the CIA
-#	Inaccessible, Nightingale: no information, but probably GMT
-
-# Sao Tome and Principe
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Sao_Tome	 0:26:56 -	LMT	1884
-			-0:36:32 -	LMT	1912	# Lisbon Mean Time
-			 0:00	-	GMT
+#	Inaccessible, Nightingale: uninhabited
 
+# São Tomé and Príncipe
 # Senegal
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Dakar	-1:09:44 -	LMT	1912
-			-1:00	-	WAT	1941 Jun
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Seychelles
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1160,17 +1057,7 @@ Zone	Indian/Mahe	3:41:48 -	LMT	1906 Jun	
 # Possibly the islands were uninhabited.
 
 # Sierra Leone
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-# Whitman gives Mar 31 - Aug 31 for 1931 on; go with Shanks & Pottenger.
-Rule	SL	1935	1942	-	Jun	 1	0:00	0:40	SLST
-Rule	SL	1935	1942	-	Oct	 1	0:00	0	WAT
-Rule	SL	1957	1962	-	Jun	 1	0:00	1:00	SLST
-Rule	SL	1957	1962	-	Sep	 1	0:00	0	GMT
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Freetown	-0:53:00 -	LMT	1882
-			-0:53:00 -	FMT	1913 Jun # Freetown Mean Time
-			-1:00	SL	%s	1957
-			 0:00	SL	%s
+# See Africa/Abidjan.
 
 # Somalia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1193,9 +1080,9 @@ Zone Africa/Johannesburg 1:52:00 -	LMT	1
 
 # Sudan
 #
-# From 
-# Sudan News Agency (2000-01-13)
-# , also reported by Michael De Beukelaer-Dossche via Steffen Thorsen:
+# From 
+# Sudan News Agency (2000-01-13),
+# also reported by Michaël De Beukelaer-Dossche via Steffen Thorsen:
 # Clocks will be moved ahead for 60 minutes all over the Sudan as of noon
 # Saturday....  This was announced Thursday by Caretaker State Minister for
 # Manpower Abdul-Rahman Nur-Eddin.
@@ -1226,14 +1113,12 @@ Zone Africa/Dar_es_Salaam 2:37:08 -	LMT	
 			3:00	-	EAT
 
 # Togo
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Lome	0:04:52 -	LMT	1893
-			0:00	-	GMT
+# See Africa/Abidjan.
 
 # Tunisia
 
 # From Gwillim Law (2005-04-30):
-# My correspondent, Risto Nykanen, has alerted me to another adoption of DST,
+# My correspondent, Risto Nykänen, has alerted me to another adoption of DST,
 # this time in Tunisia.  According to Yahoo France News
 # , in a story attributed to AP
 # and dated 2005-04-26, "Tunisia has decided to advance its official time by
@@ -1242,7 +1127,7 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
 # Saturday."  (My translation)
 #
 # From Oscar van Vlijmen (2005-05-02):
-# LaPresse, the first national daily newspaper ...
+# La Presse, the first national daily newspaper ...
 # 
 # ... DST for 2005: on: Sun May 1 0h standard time, off: Fri Sept. 30,
 # 1h standard time.
@@ -1256,18 +1141,12 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
 # From Steffen Thorsen (2009-03-16):
 # According to several news sources, Tunisia will not observe DST this year.
 # (Arabic)
-# 
 # http://www.elbashayer.com/?page=viewn&nid=42546
-# 
-# 
 # http://www.babnet.net/kiwidetail-15295.asp
-# 
 #
 # We have also confirmed this with the US embassy in Tunisia.
 # We have a wrap-up about this on the following page:
-# 
 # http://www.timeanddate.com/news/time/tunisia-cancels-dst-2009.html
-# 
 
 # From Alexander Krivenyshev (2009-03-17):
 # Here is a link to Tunis Afrique Presse News Agency
@@ -1275,20 +1154,17 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
 # Standard time to be kept the whole year long (tap.info.tn):
 #
 # (in English)
-# 
 # http://www.tap.info.tn/en/index.php?option=com_content&task=view&id=26813&Itemid=157
-# 
 #
 # (in Arabic)
-# 
 # http://www.tap.info.tn/ar/index.php?option=com_content&task=view&id=61240&Itemid=1
-# 
 
-# From Arthur David Olson (2009--3-18):
-# The Tunis Afrique Presse News Agency notice contains this: "This measure is due to the fact
-# that the fasting month of ramadan coincides with the period concerned by summer time.
-# Therefore, the standard time will be kept unchanged the whole year long."
-# So foregoing DST seems to be an exception (albeit one that may be repeated in the  future).
+# From Arthur David Olson (2009-03-18):
+# The Tunis Afrique Presse News Agency notice contains this: "This measure is
+# due to the fact that the fasting month of Ramadan coincides with the period
+# concerned by summer time.  Therefore, the standard time will be kept
+# unchanged the whole year long."  So foregoing DST seems to be an exception
+# (albeit one that may be repeated in the future).
 
 # From Alexander Krivenyshev (2010-03-27):
 # According to some news reports Tunis confirmed not to use DST in 2010
@@ -1300,12 +1176,8 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
 # coincided with the month of Ramadan..."
 #
 # (in Arabic)
-# 
 # http://www.moheet.com/show_news.aspx?nid=358861&pg=1
-# 
 # http://www.almadenahnews.com/newss/news.php?c=118&id=38036
-# or
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_tunis02.html
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S

Modified: stable/6/share/zoneinfo/antarctica
==============================================================================
--- stable/6/share/zoneinfo/antarctica	Fri Aug 29 13:12:45 2014	(r270811)
+++ stable/6/share/zoneinfo/antarctica	Fri Aug 29 13:22:56 2014	(r270812)
@@ -1,16 +1,13 @@
-# 
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
 # From Paul Eggert (1999-11-15):
 # To keep things manageable, we list only locations occupied year-round; see
-# 
 # COMNAP - Stations and Bases
-# 
+# 
 # and
-# 
 # Summary of the Peri-Antarctic Islands (1998-07-23)
-# 
+# 
 # for information.
 # Unless otherwise specified, we have no time zone information.
 #
@@ -55,19 +52,19 @@ Rule	ChileAQ	2012	max	-	Sep	Sun>=2	4:00u
 
 # Argentina - year-round bases
 # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05
-# Esperanza, San Martin Land, -6323-05659, since 1952-12-17
-# Jubany, Potter Peninsula, King George Island, -6414-0602320, since 1982-01
-# Marambio, Seymour I, -6414-05637, since 1969-10-29
+# Carlini, Potter Cove, King George Island, -6414-0602320, since 1982-01
+# Esperanza, Hope Bay, -6323-05659, since 1952-12-17
+# Marambio, -6414-05637, since 1969-10-29
 # Orcadas, Laurie I, -6016-04444, since 1904-02-22
-# San Martin, Debenham I, -6807-06708, since 1951-03-21
+# San Martín, Barry I, -6808-06706, since 1951-03-21
 #	(except 1960-03 / 1976-03-21)
 
 # Australia - territories
 # Heard Island, McDonald Islands (uninhabited)
 #	previously sealers and scientific personnel wintered
-#	
 #	Margaret Turner reports
-#	 (1999-09-30) that they're UTC+5, with no DST;
+#	
+#	(1999-09-30) that they're UTC+5, with no DST;
 #	presumably this is when they have visitors.
 #
 # year-round bases
@@ -84,14 +81,10 @@ Rule	ChileAQ	2012	max	-	Sep	Sun>=2	4:00u
 # The changes occurred on 2009-10-18 at 02:00 (local times).
 #
 # Government source: (Australian Antarctic Division)
-# 
 # http://www.aad.gov.au/default.asp?casid=37079
-# 
 #
 # We have more background information here:
-# 
 # http://www.timeanddate.com/news/time/antarctica-new-times.html
-# 
 
 # From Steffen Thorsen (2010-03-10):
 # We got these changes from the Australian Antarctic Division: ...
@@ -106,19 +99,17 @@ Rule	ChileAQ	2012	max	-	Sep	Sun>=2	4:00u
 # - Mawson station stays on UTC+5.
 #
 # Background:
-# 
 # http://www.timeanddate.com/news/time/antartica-time-changes-2010.html
-# 
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Antarctica/Casey	0	-	zzz	1969
-			8:00	-	WST	2009 Oct 18 2:00
-						# Western (Aus) Standard Time
+			8:00	-	AWST	2009 Oct 18 2:00
+						# Australian Western Std Time
 			11:00	-	CAST	2010 Mar 5 2:00
 						# Casey Time
-			8:00	-	WST	2011 Oct 28 2:00
+			8:00	-	AWST	2011 Oct 28 2:00
 			11:00	-	CAST	2012 Feb 21 17:00u
-			8:00	-	WST
+			8:00	-	AWST
 Zone Antarctica/Davis	0	-	zzz	1957 Jan 13
 			7:00	-	DAVT	1964 Nov # Davis Time
 			0	-	zzz	1969 Feb
@@ -132,24 +123,27 @@ Zone Antarctica/Mawson	0	-	zzz	1954 Feb 
 						# Mawson Time
 			5:00	-	MAWT
 # References:
-# 
 # Casey Weather (1998-02-26)
-# 
-# 
+# 
 # Davis Station, Antarctica (1998-02-26)
-# 
-# 
+# 
 # Mawson Station, Antarctica (1998-02-25)
-# 
+# 
+
+# Belgium - year-round base
+# Princess Elisabeth, Queen Maud Land, -713412+0231200, since 2007
 
 # Brazil - year-round base
-# Comandante Ferraz, King George Island, -6205+05824, since 1983/4
+# Ferraz, King George Island, -6205+05824, since 1983/4
+
+# Bulgaria - year-round base
+# St. Kliment Ohridski, Livingston Island, -623829-0602153, since 1988
 
 # Chile - year-round bases and towns
 # Escudero, South Shetland Is, -621157-0585735, since 1994
-# Presidente Eduadro Frei, King George Island, -6214-05848, since 1969-03-07
-# General Bernardo O'Higgins, Antarctic Peninsula, -6319-05704, since 1948-02
-# Capitan Arturo Prat, -6230-05941
+# Frei Montalva, King George Island, -6214-05848, since 1969-03-07
+# O'Higgins, Antarctic Peninsula, -6319-05704, since 1948-02
+# Prat, -6230-05941
 # Villa Las Estrellas (a town), around the Frei base, since 1984-04-09
 # These locations have always used Santiago time; use TZ='America/Santiago'.
 
@@ -157,31 +151,35 @@ Zone Antarctica/Mawson	0	-	zzz	1954 Feb 
 # Great Wall, King George Island, -6213-05858, since 1985-02-20
 # Zhongshan, Larsemann Hills, Prydz Bay, -6922+07623, since 1989-02-26
 
-# France - year-round bases
+# France - year-round bases (also see "France & Italy")
 #
 # From Antoine Leca (1997-01-20):
 # Time data are from Nicole Pailleau at the IFRTP
 # (French Institute for Polar Research and Technology).
-# She confirms that French Southern Territories and Terre Adelie bases
-# don't observe daylight saving time, even if Terre Adelie supplies came
+# She confirms that French Southern Territories and Terre Adélie bases
+# don't observe daylight saving time, even if Terre Adélie supplies came
 # from Tasmania.
 #
 # French Southern Territories with year-round inhabitants
 #
-# Martin-de-Vivies Base, Amsterdam Island, -374105+0773155, since 1950
-# Alfred-Faure Base, Crozet Islands, -462551+0515152, since 1964
-# Port-aux-Francais, Kerguelen Islands, -492110+0701303, since 1951;
+# Alfred Faure, Possession Island, Crozet Islands, -462551+0515152, since 1964;
+#	sealing & whaling stations operated variously 1802/1911+;
+#	see Indian/Reunion.
+#
+# Martin-de-Viviès, Amsterdam Island, -374105+0773155, since 1950
+# Port-aux-Français, Kerguelen Islands, -492110+0701303, since 1951;
 #	whaling & sealing station operated 1908/1914, 1920/1929, and 1951/1956
 #
 # St Paul Island - near Amsterdam, uninhabited
 #	fishing stations operated variously 1819/1931
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Indian/Kerguelen	0	-	zzz	1950	# Port-aux-Francais
+Zone Indian/Kerguelen	0	-	zzz	1950	# Port-aux-Français
 			5:00	-	TFT	# ISO code TF Time
 #
 # year-round base in the main continent
-# Dumont-d'Urville, Ile des Petrels, -6640+14001, since 1956-11
+# Dumont d'Urville, Île des Pétrels, -6640+14001, since 1956-11
+#  (2005-12-05)
 #
 # Another base at Port-Martin, 50km east, began operation in 1947.
 # It was destroyed by fire on 1952-01-14.
@@ -191,20 +189,22 @@ Zone Antarctica/DumontDUrville 0 -	zzz	1
 			10:00	-	PMT	1952 Jan 14 # Port-Martin Time
 			0	-	zzz	1956 Nov
 			10:00	-	DDUT	# Dumont-d'Urville Time
-# Reference:
-# 
-# Dumont d'Urville Station (2005-12-05)
-# 
+
+# France & Italy - year-round base
+# Concordia, -750600+1232000, since 2005
 
 # Germany - year-round base
-# Georg von Neumayer, -7039-00815
+# Neumayer III, -704080-0081602, since 2009
 
-# India - year-round base
-# Dakshin Gangotri, -7005+01200
+# India - year-round bases
+# Bharati, -692428+0761114, since 2012
+# Maitri, -704558+0114356, since 1989
+
+# Italy - year-round base (also see "France & Italy")
+# Zuchelli, Terra Nova Bay, -744140+1640647, since 1986
 
 # Japan - year-round bases
-# Dome Fuji, -7719+03942
-# Syowa, -690022+0393524
+# Syowa (also known as Showa), -690022+0393524, since 1957
 #
 # From Hideyuki Suzuki (1999-02-06):
 # In all Japanese stations, +0300 is used as the standard time.
@@ -216,11 +216,11 @@ Zone Antarctica/DumontDUrville 0 -	zzz	1
 Zone Antarctica/Syowa	0	-	zzz	1957 Jan 29
 			3:00	-	SYOT	# Syowa Time
 # See:
-# 
 # NIPR Antarctic Research Activities (1999-08-17)
-# 
+# 
 
 # S Korea - year-round base
+# Jang Bogo, Terra Nova Bay, -743700+1641205 since 2014
 # King Sejong, King George Island, -6213-05847, since 1988
 
 # New Zealand - claims
@@ -269,6 +269,9 @@ Zone Antarctica/Troll	0	-	zzz	2005 Feb 1
 # Poland - year-round base
 # Arctowski, King George Island, -620945-0582745, since 1977
 
+# Romania - year-bound base
+# Law-Racoviță, Larsemann Hills, -692319+0762251, since 1986
+
 # Russia - year-round bases
 # Bellingshausen, King George Island, -621159-0585337, since 1968-02-22
 # Mirny, Davis coast, -6633+09301, since 1956-02
@@ -278,8 +281,8 @@ Zone Antarctica/Troll	0	-	zzz	2005 Feb 1
 #	year-round from 1960/61 to 1992
 
 # Vostok, since 1957-12-16, temporarily closed 1994-02/1994-11
-# 
-# From Craig Mundell (1994-12-15):
+# From Craig Mundell (1994-12-15)
+# :
 # Vostok, which is one of the Russian stations, is set on the same
 # time as Moscow, Russia.
 #
@@ -294,7 +297,7 @@ Zone Antarctica/Troll	0	-	zzz	2005 Feb 1
 #
 # From Paul Eggert (2001-05-04):
 # This seems to be hopelessly confusing, so I asked Lee Hotz about it
-# in person.  He said that some Antartic locations set their local
+# in person.  He said that some Antarctic locations set their local
 # time so that noon is the warmest part of the day, and that this
 # changes during the year and does not necessarily correspond to mean
 # solar noon.  So the Vostok time might have been whatever the clocks
@@ -306,9 +309,12 @@ Zone Antarctica/Vostok	0	-	zzz	1957 Dec 
 
 # S Africa - year-round bases
 # Marion Island, -4653+03752
-# Sanae, -7141-00250
+# SANAE IV, Vesleskarvet, Queen Maud Land, -714022-0025026, since 1997
+
+# Ukraine - year-round base
+# Vernadsky (formerly Faraday), Galindez Island, -651445-0641526, since 1954
 
-# UK
+# United Kingdom
 #
 # British Antarctic Territories (BAT) claims
 # South Orkney Islands
@@ -364,7 +370,7 @@ Zone Antarctica/Palmer	0	-	zzz	1965
 # but that he found it more convenient to keep GMT+12
 # as supplies for the station were coming from McMurdo Sound,
 # which was on GMT+12 because New Zealand was on GMT+12 all year
-# at that time (1957).  (Source: Siple's book 90 degrees SOUTH.)
+# at that time (1957).  (Source: Siple's book 90 Degrees South.)
 #
 # From Susan Smith
 # http://www.cybertours.com/whs/pole10.html

Modified: stable/6/share/zoneinfo/asia
==============================================================================
--- stable/6/share/zoneinfo/asia	Fri Aug 29 13:12:45 2014	(r270811)
+++ stable/6/share/zoneinfo/asia	Fri Aug 29 13:22:56 2014	(r270812)
@@ -1,4 +1,3 @@
-# 
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -32,7 +31,7 @@
 # A reliable and entertaining source about time zones is
 # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
 #
-# I invented the abbreviations marked `*' in the following table;
+# I invented the abbreviations marked '*' in the following table;
 # the rest are from earlier versions of this file, or from other sources.
 # Corrections are welcome!
 #	     std  dst
@@ -47,13 +46,14 @@
 #	7:00 WIB	west Indonesia (Waktu Indonesia Barat)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 13:24:50 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 4F20251E;
 Fri, 29 Aug 2014 13:24:50 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 38A0F1CBC;
 Fri, 29 Aug 2014 13:24:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7TDOom2053560;
 Fri, 29 Aug 2014 13:24:50 GMT (envelope-from pluknet@FreeBSD.org)
Received: (from pluknet@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7TDOn8l053556;
 Fri, 29 Aug 2014 13:24:49 GMT (envelope-from pluknet@FreeBSD.org)
Message-Id: <201408291324.s7TDOn8l053556@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: pluknet set sender to
 pluknet@FreeBSD.org using -f
From: Sergey Kandaurov 
Date: Fri, 29 Aug 2014 13:24:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject: svn commit: r270813 - stable/7/share/zoneinfo
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 13:24:50 -0000

Author: pluknet
Date: Fri Aug 29 13:24:49 2014
New Revision: 270813
URL: http://svnweb.freebsd.org/changeset/base/270813

Log:
  MFC r270728, tzdata2014f
  
  - Parts of Russia will change times on 2014-10-26.
  - Time zone name changes for Asia/Novokuznetsk and Xinjiang and Samoa
    and America/Metlakatla, new zones Asia/Chita and Asia/Srednekolymsk.
  - Australia will now use Axxx.
  - New zone tab data format.
  
  And lots of historical changes (See
  http://mm.icann.org/pipermail/tz-announce/2014-August/000023.html
  for the full details.)

Added:
  stable/7/share/zoneinfo/zone1970.tab
     - copied unchanged from r270728, head/contrib/tzdata/zone1970.tab
Modified:
  stable/7/share/zoneinfo/africa
  stable/7/share/zoneinfo/antarctica
  stable/7/share/zoneinfo/asia
  stable/7/share/zoneinfo/australasia
  stable/7/share/zoneinfo/backward
  stable/7/share/zoneinfo/etcetera
  stable/7/share/zoneinfo/europe
  stable/7/share/zoneinfo/factory
  stable/7/share/zoneinfo/leap-seconds.list   (contents, props changed)
  stable/7/share/zoneinfo/northamerica
  stable/7/share/zoneinfo/southamerica
  stable/7/share/zoneinfo/systemv
  stable/7/share/zoneinfo/yearistype.sh
  stable/7/share/zoneinfo/zone.tab
Directory Properties:
  stable/7/share/zoneinfo/   (props changed)

Modified: stable/7/share/zoneinfo/africa
==============================================================================
--- stable/7/share/zoneinfo/africa	Fri Aug 29 13:22:56 2014	(r270812)
+++ stable/7/share/zoneinfo/africa	Fri Aug 29 13:24:49 2014	(r270813)
@@ -1,4 +1,3 @@
-# 
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -35,13 +34,13 @@
 # Previous editions of this database used WAT, CAT, SAT, and EAT
 # for +0:00 through +3:00, respectively,
 # but Mark R V Murray reports that
-# `SAST' is the official abbreviation for +2:00 in the country of South Africa,
-# `CAT' is commonly used for +2:00 in countries north of South Africa, and
-# `WAT' is probably the best name for +1:00, as the common phrase for
-# the area that includes Nigeria is ``West Africa''.
-# He has heard of ``Western Sahara Time'' for +0:00 but can find no reference.
+# 'SAST' is the official abbreviation for +2:00 in the country of South Africa,
+# 'CAT' is commonly used for +2:00 in countries north of South Africa, and
+# 'WAT' is probably the best name for +1:00, as the common phrase for
+# the area that includes Nigeria is "West Africa".
+# He has heard of "Western Sahara Time" for +0:00 but can find no reference.
 #
-# To make things confusing, `WAT' seems to have been used for -1:00 long ago;
+# To make things confusing, 'WAT' seems to have been used for -1:00 long ago;
 # I'd guess that this was because people needed _some_ name for -1:00,
 # and at the time, far west Africa was the only major land area in -1:00.
 # This usage is now obsolete, as the last use of -1:00 on the African
@@ -54,7 +53,7 @@
 #	 2:00	SAST	South Africa Standard Time
 # and Murray suggests the following abbreviation:
 #	 1:00	WAT	West Africa Time
-# I realize that this leads to `WAT' being used for both -1:00 and 1:00
+# I realize that this leads to 'WAT' being used for both -1:00 and 1:00
 # for times before 1976, but this is the best I can think of
 # until we get more information.
 #
@@ -131,9 +130,7 @@ Zone	Africa/Gaborone	1:43:40 -	LMT	1885
 			2:00	-	CAT
 
 # Burkina Faso
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Africa/Ouagadougou	-0:06:04 -	LMT	1912
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Burundi
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -161,7 +158,7 @@ Zone	Africa/Bangui	1:14:20	-	LMT	1912
 
 # Chad
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Ndjamena	1:00:12 -	LMT	1912
+Zone	Africa/Ndjamena	1:00:12 -	LMT	1912 # N'Djamena
 			1:00	-	WAT	1979 Oct 14
 			1:00	1:00	WAST	1980 Mar  8
 			1:00	-	WAT
@@ -183,10 +180,20 @@ Zone Africa/Lubumbashi	1:49:52 -	LMT	189
 Zone Africa/Brazzaville	1:01:08 -	LMT	1912
 			1:00	-	WAT
 
-# Cote D'Ivoire
+# Côte D'Ivoire / Ivory Coast
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Abidjan	-0:16:08 -	LMT	1912
 			 0:00	-	GMT
+Link Africa/Abidjan Africa/Bamako	# Mali
+Link Africa/Abidjan Africa/Banjul	# Gambia
+Link Africa/Abidjan Africa/Conakry	# Guinea
+Link Africa/Abidjan Africa/Dakar	# Senegal
+Link Africa/Abidjan Africa/Freetown	# Sierra Leone
+Link Africa/Abidjan Africa/Lome		# Togo
+Link Africa/Abidjan Africa/Nouakchott	# Mauritania
+Link Africa/Abidjan Africa/Ouagadougou	# Burkina Faso
+Link Africa/Abidjan Africa/Sao_Tome	# São Tomé and Príncipe
+Link Africa/Abidjan Atlantic/St_Helena	# St Helena
 
 # Djibouti
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -231,13 +238,9 @@ Rule	Egypt	1990	1994	-	May	 1	1:00	1:00	
 # Egyptians would approve the cancellation."
 #
 # Egypt to cancel daylight saving time
-# 
 # http://www.almasryalyoum.com/en/node/407168
-# 
 # or
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_egypt04.html
-# 
 Rule	Egypt	1995	2010	-	Apr	lastFri	 0:00s	1:00	S
 Rule	Egypt	1995	2005	-	Sep	lastThu	24:00	0	-
 # From Steffen Thorsen (2006-09-19):
@@ -249,7 +252,7 @@ Rule	Egypt	2006	only	-	Sep	21	24:00	0	-
 # From Dirk Losch (2007-08-14):
 # I received a mail from an airline which says that the daylight
 # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07.
-# From Jesper Norgaard Welen (2007-08-15): [The following agree:]
+# From Jesper Nørgaard Welen (2007-08-15): [The following agree:]
 # http://www.nentjes.info/Bill/bill5.htm
 # http://www.timeanddate.com/worldclock/city.html?n=53
 # From Steffen Thorsen (2007-09-04): The official information...:
@@ -288,15 +291,9 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	24:00	
 #
 # timeanddate[2] and another site I've found[3] also support that.
 #
-# [1] 
-# https://bugzilla.redhat.com/show_bug.cgi?id=492263
-# 
-# [2] 
-# http://www.timeanddate.com/worldclock/clockchange.html?n=53
-# 
-# [3] 
-# http://wwp.greenwichmeantime.com/time-zone/africa/egypt/
-# 
+# [1] https://bugzilla.redhat.com/show_bug.cgi?id=492263
+# [2] http://www.timeanddate.com/worldclock/clockchange.html?n=53
+# [3] http://wwp.greenwichmeantime.com/time-zone/africa/egypt/
 
 # From Arthur David Olson (2009-04-20):
 # In 2009 (and for the next several years), Ramadan ends before the fourth
@@ -306,14 +303,10 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	24:00	
 # From Steffen Thorsen (2009-08-11):
 # We have been able to confirm the August change with the Egyptian Cabinet
 # Information and Decision Support Center:
-# 
 # http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html
-# 
 #
 # The Middle East News Agency
-# 
 # http://www.mena.org.eg/index.aspx
-# 
 # also reports "Egypt starts winter time on August 21"
 # today in article numbered "71, 11/08/2009 12:25 GMT."
 # Only the title above is available without a subscription to their service,
@@ -321,19 +314,14 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	24:00	
 # (at least today).
 
 # From Alexander Krivenyshev (2010-07-20):
-# According to News from Egypt -  Al-Masry Al-Youm Egypt's cabinet has
+# According to News from Egypt - Al-Masry Al-Youm Egypt's cabinet has
 # decided that Daylight Saving Time will not be used in Egypt during
 # Ramadan.
 #
 # Arabic translation:
-# "Clocks to go back during Ramadan--and then forward again"
-# 
+# "Clocks to go back during Ramadan - and then forward again"
 # http://www.almasryalyoum.com/en/news/clocks-go-back-during-ramadan-and-then-forward-again
-# 
-# or
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_egypt02.html
-# 
 
 # From Ahmad El-Dardiry (2014-05-07):
 # Egypt is to change back to Daylight system on May 15
@@ -433,10 +421,15 @@ Zone	Africa/Asmara	2:35:32 -	LMT	1870
 			3:00	-	EAT
 
 # Ethiopia
-# From Paul Eggert (2006-03-22):
-# Shanks & Pottenger write that Ethiopia had six narrowly-spaced time zones
-# between 1870 and 1890, and that they merged to 38E50 (2:35:20) in 1890.
-# We'll guess that 38E50 is for Adis Dera.
+# From Paul Eggert (2014-07-31):
+# Like the Swahili of Kenya and Tanzania, many Ethiopians keep a
+# 12-hour clock starting at our 06:00, so their "8 o'clock" is our
+# 02:00 or 14:00.  Keep this in mind when you ask the time in Amharic.
+#
+# Shanks & Pottenger write that Ethiopia had six narrowly-spaced time
+# zones between 1870 and 1890, that they merged to 38E50 (2:35:20) in
+# 1890, and that they switched to 3:00 on 1936-05-05.  Perhaps 38E50
+# was for Adis Dera.  Quite likely the Shanks data are wrong anyway.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Addis_Ababa	2:34:48 -	LMT	1870
 			2:35:20	-	ADMT	1936 May 5    # Adis Dera MT
@@ -448,28 +441,24 @@ Zone Africa/Libreville	0:37:48 -	LMT	191
 			1:00	-	WAT
 
 # Gambia
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Banjul	-1:06:36 -	LMT	1912
-			-1:06:36 -	BMT	1935	# Banjul Mean Time
-			-1:00	-	WAT	1964
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Ghana
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-# Whitman says DST was observed from 1931 to ``the present'';
-# go with Shanks & Pottenger.
-Rule	Ghana	1936	1942	-	Sep	 1	0:00	0:20	GHST
-Rule	Ghana	1936	1942	-	Dec	31	0:00	0	GMT
+# Whitman says DST was observed from 1931 to "the present";
+# Shanks & Pottenger say 1936 to 1942;
+# and September 1 to January 1 is given by:
+# Scott Keltie J, Epstein M (eds), The Statesman's Year-Book,
+# 57th ed. Macmillan, London (1920), OCLC 609408015, pp xxviii.
+# For lack of better info, assume DST was observed from 1920 to 1942.
+Rule	Ghana	1920	1942	-	Sep	 1	0:00	0:20	GHST
+Rule	Ghana	1920	1942	-	Dec	31	0:00	0	GMT
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Accra	-0:00:52 -	LMT	1918
 			 0:00	Ghana	%s
 
 # Guinea
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Conakry	-0:54:52 -	LMT	1912
-			 0:00	-	GMT	1934 Feb 26
-			-1:00	-	WAT	1960
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Guinea-Bissau
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -577,18 +566,8 @@ Zone	Africa/Blantyre	2:20:00 -	LMT	1903 
 			2:00	-	CAT
 
 # Mali
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Bamako	-0:32:00 -	LMT	1912
-			 0:00	-	GMT	1934 Feb 26
-			-1:00	-	WAT	1960 Jun 20
-			 0:00	-	GMT
-
 # Mauritania
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Africa/Nouakchott	-1:03:48 -	LMT	1912
-			 0:00	-	GMT	1934 Feb 26
-			-1:00	-	WAT	1960 Nov 28
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Mauritius
 
@@ -612,9 +591,7 @@ Zone Africa/Nouakchott	-1:03:48 -	LMT	19
 
 # From Steffen Thorsen (2008-07-10):
 # According to
-# 
 # http://www.lexpress.mu/display_article.php?news_id=111216
-# 
 # (in French), Mauritius will start and end their DST a few days earlier
 # than previously announced (2008-11-01 to 2009-03-31).  The new start
 # date is 2008-10-26 at 02:00 and the new end date is 2009-03-27 (no time
@@ -633,18 +610,13 @@ Zone Africa/Nouakchott	-1:03:48 -	LMT	19
 # published on Monday, June 30, 2008...
 #
 # I guess that article in French "Le gouvernement avance l'introduction
-# de l'heure d'ete" stating that DST in Mauritius starting on October 26
-# and ending on March 27, 2009 is the most recent one.
-# ...
-# 
+# de l'heure d'été" stating that DST in Mauritius starting on October 26
+# and ending on March 27, 2009 is the most recent one....
 # http://www.worldtimezone.com/dst_news/dst_news_mauritius02.html
-# 
 
 # From Riad M. Hossen Ally (2008-08-03):
 # The Government of Mauritius weblink
-# 
 # http://www.gov.mu/portal/site/pmosite/menuitem.4ca0efdee47462e7440a600248a521ca/?content_id=4728ca68b2a5b110VgnVCM1000000a04a8c0RCRD
-# 
 # Cabinet Decision of July 18th, 2008 states as follows:
 #
 # 4. ...Cabinet has agreed to the introduction into the National Assembly
@@ -654,33 +626,25 @@ Zone Africa/Nouakchott	-1:03:48 -	LMT	19
 # States of America. It will start at two o'clock in the morning on the
 # last Sunday of October and will end at two o'clock in the morning on
 # the last Sunday of March the following year. The summer time for the
-# year 2008 - 2009 will, therefore, be effective as from 26 October 2008
+# year 2008-2009 will, therefore, be effective as from 26 October 2008
 # and end on 29 March 2009.
 
 # From Ed Maste (2008-10-07):
 # THE TIME BILL (No. XXVII of 2008) Explanatory Memorandum states the
 # beginning / ending of summer time is 2 o'clock standard time in the
 # morning of the last Sunday of October / last Sunday of March.
-# 
 # http://www.gov.mu/portal/goc/assemblysite/file/bill2708.pdf
-# 
 
 # From Steffen Thorsen (2009-06-05):
 # According to several sources, Mauritius will not continue to observe
 # DST the coming summer...
 #
 # Some sources, in French:
-# 
 # http://www.defimedia.info/news/946/Rashid-Beebeejaun-:-%C2%AB-L%E2%80%99heure-d%E2%80%99%C3%A9t%C3%A9-ne-sera-pas-appliqu%C3%A9e-cette-ann%C3%A9e-%C2%BB
-# 
-# 
 # http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-%C3%A9conomie-d-%C3%A9nergie-de-l-heure-d-%C3%A9t%C3%A9-ont-%C3%A9t%C3%A9-atteints-
-# 
 #
 # Our wrap-up:
-# 
 # http://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html
-# 
 
 # From Arthur David Olson (2009-07-11):
 # The "mauritius-dst-will-not-repeat" wrapup includes this:
@@ -704,7 +668,7 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 			3:00	-	EAT
 
 # Morocco
-# See the `europe' file for Spanish Morocco (Africa/Ceuta).
+# See the 'europe' file for Spanish Morocco (Africa/Ceuta).
 
 # From Alex Krivenyshev (2008-05-09):
 # Here is an article that Morocco plan to introduce Daylight Saving Time between
@@ -712,60 +676,43 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 #
 # "... Morocco is to save energy by adjusting its clock during summer so it will
 # be one hour ahead of GMT between 1 June and 27 September, according to
-# Communication Minister and Gov ernment Spokesman, Khalid Naciri...."
+# Communication Minister and Government Spokesman, Khalid Naciri...."
 #
-# 
 # http://www.worldtimezone.net/dst_news/dst_news_morocco01.html
-# 
-# OR
-# 
 # http://en.afrik.com/news11892.html
-# 
 
 # From Alex Krivenyshev (2008-05-09):
 # The Morocco time change can be confirmed on Morocco web site Maghreb Arabe Presse:
-# 
 # http://www.map.ma/eng/sections/box3/morocco_shifts_to_da/view
-# 
 #
 # Morocco shifts to daylight time on June 1st through September 27, Govt.
 # spokesman.
 
 # From Patrice Scattolin (2008-05-09):
 # According to this article:
-# 
 # http://www.avmaroc.com/actualite/heure-dete-comment-a127896.html
-# 
-# (and republished here:
-# 
-# http://www.actu.ma/heure-dete-comment_i127896_0.html
-# 
-# )
-# the changes occurs at midnight:
-#
-# saturday night may 31st at midnight (which in french is to be
-# intrepreted as the night between saturday and sunday)
-# sunday night the 28th  at midnight
-#
-# Seeing that the 28th is monday, I am guessing that she intends to say
-# the midnight of the 28th which is the midnight between sunday and
-# monday, which jives with other sources that say that it's inclusive
-# june1st to sept 27th.
+# (and republished here: )
+# the changes occur at midnight:
+#
+# Saturday night May 31st at midnight (which in French is to be
+# interpreted as the night between Saturday and Sunday)
+# Sunday night the 28th at midnight
+#
+# Seeing that the 28th is Monday, I am guessing that she intends to say
+# the midnight of the 28th which is the midnight between Sunday and
+# Monday, which jives with other sources that say that it's inclusive
+# June 1st to Sept 27th.
 #
 # The decision was taken by decree *2-08-224 *but I can't find the decree
 # published on the web.
 #
 # It's also confirmed here:
-# 
 # http://www.maroc.ma/NR/exeres/FACF141F-D910-44B0-B7FA-6E03733425D1.htm
-# 
-# on a government portal as being  between june 1st and sept 27th (not yet
-# posted in english).
+# on a government portal as being between June 1st and Sept 27th (not yet
+# posted in English).
 #
-# The following google query will generate many relevant hits:
-# 
+# The following Google query will generate many relevant hits:
 # http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search
-# 
 
 # From Steffen Thorsen (2008-08-27):
 # Morocco will change the clocks back on the midnight between August 31
@@ -773,47 +720,32 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 # of September:
 #
 # One article about it (in French):
-# 
 # http://www.menara.ma/fr/Actualites/Maroc/Societe/ci.retour_a_l_heure_gmt_a_partir_du_dimanche_31_aout_a_minuit_officiel_.default
-# 
 #
 # We have some further details posted here:
-# 
 # http://www.timeanddate.com/news/time/morocco-ends-dst-early-2008.html
-# 
 
 # From Steffen Thorsen (2009-03-17):
 # Morocco will observe DST from 2009-06-01 00:00 to 2009-08-21 00:00 according
 # to many sources, such as
-# 
 # http://news.marweb.com/morocco/entertainment/morocco-daylight-saving.html
-# 
-# 
 # http://www.medi1sat.ma/fr/depeche.aspx?idp=2312
-# 
 # (French)
 #
 # Our summary:
-# 
 # http://www.timeanddate.com/news/time/morocco-starts-dst-2009.html
-# 
 
 # From Alexander Krivenyshev (2009-03-17):
 # Here is a link to official document from Royaume du Maroc Premier Ministre,
-# Ministere de la Modernisation des Secteurs Publics
+# Ministère de la Modernisation des Secteurs Publics
 #
 # Under Article 1 of Royal Decree No. 455-67 of Act 23 safar 1387 (2 june 1967)
 # concerning the amendment of the legal time, the Ministry of Modernization of
 # Public Sectors announced that the official time in the Kingdom will be
 # advanced 60 minutes from Sunday 31 May 2009 at midnight.
 #
-# 
 # http://www.mmsp.gov.ma/francais/Actualites_fr/PDF_Actualites_Fr/HeureEte_FR.pdf
-# 
-#
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_morocco03.html
-# 
 
 # From Steffen Thorsen (2010-04-13):
 # Several news media in Morocco report that the Ministry of Modernization
@@ -821,14 +753,10 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 # 2010-05-02 to 2010-08-08.
 #
 # Example:
-# 
 # http://www.lavieeco.com/actualites/4099-le-maroc-passera-a-l-heure-d-ete-gmt1-le-2-mai.html
-# 
 # (French)
 # Our page:
-# 
 # http://www.timeanddate.com/news/time/morocco-starts-dst-2010.html
-# 
 
 # From Dan Abitol (2011-03-30):
 # ...Rules for Africa/Casablanca are the following (24h format)
@@ -838,34 +766,20 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 # The change was broadcast on the FM Radio
 # I ve called ANRT (telecom regulations in Morocco) at
 # +212.537.71.84.00
-# 
 # http://www.anrt.net.ma/fr/
-# 
 # They said that
-# 
 # http://www.map.ma/fr/sections/accueil/l_heure_legale_au_ma/view
-# 
 # is the official publication to look at.
 # They said that the decision was already taken.
 #
 # More articles in the press
-# 
-# http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-lev
-# 
-# e.html
-# 
+# http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-leve.html
 # http://www.lematin.ma/Actualite/Express/Article.asp?id=148923
-# 
-# 
 # http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT%2B1-a-partir-de-dim
-# anche-prochain-5538.html
-# 
 
 # From Petr Machata (2011-03-30):
 # They have it written in English here:
-# 
 # http://www.map.ma/eng/sections/home/morocco_to_spring_fo/view
-# 
 #
 # It says there that "Morocco will resume its standard time on July 31,
 # 2011 at midnight." Now they don't say whether they mean midnight of
@@ -873,20 +787,16 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 # also been like that in the past.
 
 # From Alexander Krivenyshev (2012-03-09):
-# According to Infomédiaire web site from Morocco (infomediaire.ma),
-# on March 9, 2012, (in French) Heure légale:
-# Le Maroc adopte officiellement l'heure d'été
-# 
+# According to Infomédiaire web site from Morocco (infomediaire.ma),
+# on March 9, 2012, (in French) Heure légale:
+# Le Maroc adopte officiellement l'heure d'été
 # http://www.infomediaire.ma/news/maroc/heure-l%C3%A9gale-le-maroc-adopte-officiellement-lheure-d%C3%A9t%C3%A9
-# 
 # Governing Council adopted draft decree, that Morocco DST starts on
 # the last Sunday of March (March 25, 2012) and ends on
 # last Sunday of September (September 30, 2012)
 # except the month of Ramadan.
 # or (brief)
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_morocco06.html
-# 
 
 # From Arthur David Olson (2012-03-10):
 # The infomediaire.ma source indicates that the system is to be in
@@ -897,17 +807,13 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 
 # From Christophe Tropamer (2012-03-16):
 # Seen Morocco change again:
-# 
 # http://www.le2uminutes.com/actualite.php
-# 
-# "...à partir du dernier dimance d'avril et non fins mars,
-# comme annoncé précédemment."
+# "...à partir du dernier dimanche d'avril et non fins mars,
+# comme annoncé précédemment."
 
 # From Milamber Space Network (2012-07-17):
 # The official return to GMT is announced by the Moroccan government:
-# 
 # http://www.mmsp.gov.ma/fr/actualites.aspx?id=288 [in French]
-# 
 #
 # Google translation, lightly edited:
 # Back to the standard time of the Kingdom (GMT)
@@ -1052,7 +958,7 @@ Zone Africa/Casablanca	-0:30:20 -	LMT	19
 # Assume that this has been true since Western Sahara switched to GMT,
 # since most of it was then controlled by Morocco.
 
-Zone Africa/El_Aaiun	-0:52:48 -	LMT	1934 Jan
+Zone Africa/El_Aaiun	-0:52:48 -	LMT	1934 Jan # El Aaiún
 			-1:00	-	WAT	1976 Apr 14
 			 0:00	Morocco	WE%sT
 
@@ -1102,15 +1008,17 @@ Zone	Africa/Niamey	 0:08:28 -	LMT	1912
 Zone	Africa/Lagos	0:13:36 -	LMT	1919 Sep
 			1:00	-	WAT
 
-# Reunion
+# Réunion
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Indian/Reunion	3:41:52 -	LMT	1911 Jun	# Saint-Denis
-			4:00	-	RET	# Reunion Time
+			4:00	-	RET	# Réunion Time
 #
-# Scattered Islands (Iles Eparses) administered from Reunion are as follows.
+# Crozet Islands also observes Réunion time; see the 'antarctica' file.
+#
+# Scattered Islands (Îles Éparses) administered from Réunion are as follows.
 # The following information about them is taken from
-# Iles Eparses (www.outre-mer.gouv.fr/domtom/ile.htm, 1997-07-22, in French;
-# no longer available as of 1999-08-17).
+# Îles Éparses (, 1997-07-22,
+# in French; no longer available as of 1999-08-17).
 # We have no info about their time zone histories.
 #
 # Bassas da India - uninhabited
@@ -1125,28 +1033,17 @@ Zone	Africa/Kigali	2:00:16 -	LMT	1935 Ju
 			2:00	-	CAT
 
 # St Helena
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Atlantic/St_Helena	-0:22:48 -	LMT	1890		# Jamestown
-			-0:22:48 -	JMT	1951	# Jamestown Mean Time
-			 0:00	-	GMT
+# See Africa/Abidjan.
 # The other parts of the St Helena territory are similar:
 #	Tristan da Cunha: on GMT, say Whitman and the CIA
-#	Ascension: on GMT, says usno1995 and the CIA
+#	Ascension: on GMT, say the USNO (1995-12-21) and the CIA
 #	Gough (scientific station since 1955; sealers wintered previously):
 #		on GMT, says the CIA
-#	Inaccessible, Nightingale: no information, but probably GMT
-
-# Sao Tome and Principe
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Sao_Tome	 0:26:56 -	LMT	1884
-			-0:36:32 -	LMT	1912	# Lisbon Mean Time
-			 0:00	-	GMT
+#	Inaccessible, Nightingale: uninhabited
 
+# São Tomé and Príncipe
 # Senegal
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Dakar	-1:09:44 -	LMT	1912
-			-1:00	-	WAT	1941 Jun
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Seychelles
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1160,17 +1057,7 @@ Zone	Indian/Mahe	3:41:48 -	LMT	1906 Jun	
 # Possibly the islands were uninhabited.
 
 # Sierra Leone
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-# Whitman gives Mar 31 - Aug 31 for 1931 on; go with Shanks & Pottenger.
-Rule	SL	1935	1942	-	Jun	 1	0:00	0:40	SLST
-Rule	SL	1935	1942	-	Oct	 1	0:00	0	WAT
-Rule	SL	1957	1962	-	Jun	 1	0:00	1:00	SLST
-Rule	SL	1957	1962	-	Sep	 1	0:00	0	GMT
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Freetown	-0:53:00 -	LMT	1882
-			-0:53:00 -	FMT	1913 Jun # Freetown Mean Time
-			-1:00	SL	%s	1957
-			 0:00	SL	%s
+# See Africa/Abidjan.
 
 # Somalia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1193,9 +1080,9 @@ Zone Africa/Johannesburg 1:52:00 -	LMT	1
 
 # Sudan
 #
-# From 
-# Sudan News Agency (2000-01-13)
-# , also reported by Michael De Beukelaer-Dossche via Steffen Thorsen:
+# From 
+# Sudan News Agency (2000-01-13),
+# also reported by Michaël De Beukelaer-Dossche via Steffen Thorsen:
 # Clocks will be moved ahead for 60 minutes all over the Sudan as of noon
 # Saturday....  This was announced Thursday by Caretaker State Minister for
 # Manpower Abdul-Rahman Nur-Eddin.
@@ -1226,14 +1113,12 @@ Zone Africa/Dar_es_Salaam 2:37:08 -	LMT	
 			3:00	-	EAT
 
 # Togo
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Lome	0:04:52 -	LMT	1893
-			0:00	-	GMT
+# See Africa/Abidjan.
 
 # Tunisia
 
 # From Gwillim Law (2005-04-30):
-# My correspondent, Risto Nykanen, has alerted me to another adoption of DST,
+# My correspondent, Risto Nykänen, has alerted me to another adoption of DST,
 # this time in Tunisia.  According to Yahoo France News
 # , in a story attributed to AP
 # and dated 2005-04-26, "Tunisia has decided to advance its official time by
@@ -1242,7 +1127,7 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
 # Saturday."  (My translation)
 #
 # From Oscar van Vlijmen (2005-05-02):
-# LaPresse, the first national daily newspaper ...
+# La Presse, the first national daily newspaper ...
 # 
 # ... DST for 2005: on: Sun May 1 0h standard time, off: Fri Sept. 30,
 # 1h standard time.
@@ -1256,18 +1141,12 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
 # From Steffen Thorsen (2009-03-16):
 # According to several news sources, Tunisia will not observe DST this year.
 # (Arabic)
-# 
 # http://www.elbashayer.com/?page=viewn&nid=42546
-# 
-# 
 # http://www.babnet.net/kiwidetail-15295.asp
-# 
 #
 # We have also confirmed this with the US embassy in Tunisia.
 # We have a wrap-up about this on the following page:
-# 
 # http://www.timeanddate.com/news/time/tunisia-cancels-dst-2009.html
-# 
 
 # From Alexander Krivenyshev (2009-03-17):
 # Here is a link to Tunis Afrique Presse News Agency
@@ -1275,20 +1154,17 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
 # Standard time to be kept the whole year long (tap.info.tn):
 #
 # (in English)
-# 
 # http://www.tap.info.tn/en/index.php?option=com_content&task=view&id=26813&Itemid=157
-# 
 #
 # (in Arabic)
-# 
 # http://www.tap.info.tn/ar/index.php?option=com_content&task=view&id=61240&Itemid=1
-# 
 
-# From Arthur David Olson (2009--3-18):
-# The Tunis Afrique Presse News Agency notice contains this: "This measure is due to the fact
-# that the fasting month of ramadan coincides with the period concerned by summer time.
-# Therefore, the standard time will be kept unchanged the whole year long."
-# So foregoing DST seems to be an exception (albeit one that may be repeated in the  future).
+# From Arthur David Olson (2009-03-18):
+# The Tunis Afrique Presse News Agency notice contains this: "This measure is
+# due to the fact that the fasting month of Ramadan coincides with the period
+# concerned by summer time.  Therefore, the standard time will be kept
+# unchanged the whole year long."  So foregoing DST seems to be an exception
+# (albeit one that may be repeated in the future).
 
 # From Alexander Krivenyshev (2010-03-27):
 # According to some news reports Tunis confirmed not to use DST in 2010
@@ -1300,12 +1176,8 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
 # coincided with the month of Ramadan..."
 #
 # (in Arabic)
-# 
 # http://www.moheet.com/show_news.aspx?nid=358861&pg=1
-# 
 # http://www.almadenahnews.com/newss/news.php?c=118&id=38036
-# or
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_tunis02.html
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S

Modified: stable/7/share/zoneinfo/antarctica
==============================================================================
--- stable/7/share/zoneinfo/antarctica	Fri Aug 29 13:22:56 2014	(r270812)
+++ stable/7/share/zoneinfo/antarctica	Fri Aug 29 13:24:49 2014	(r270813)
@@ -1,16 +1,13 @@
-# 
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
 # From Paul Eggert (1999-11-15):
 # To keep things manageable, we list only locations occupied year-round; see
-# 
 # COMNAP - Stations and Bases
-# 
+# 
 # and
-# 
 # Summary of the Peri-Antarctic Islands (1998-07-23)
-# 
+# 
 # for information.
 # Unless otherwise specified, we have no time zone information.
 #
@@ -55,19 +52,19 @@ Rule	ChileAQ	2012	max	-	Sep	Sun>=2	4:00u
 
 # Argentina - year-round bases
 # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05
-# Esperanza, San Martin Land, -6323-05659, since 1952-12-17
-# Jubany, Potter Peninsula, King George Island, -6414-0602320, since 1982-01
-# Marambio, Seymour I, -6414-05637, since 1969-10-29
+# Carlini, Potter Cove, King George Island, -6414-0602320, since 1982-01
+# Esperanza, Hope Bay, -6323-05659, since 1952-12-17
+# Marambio, -6414-05637, since 1969-10-29
 # Orcadas, Laurie I, -6016-04444, since 1904-02-22
-# San Martin, Debenham I, -6807-06708, since 1951-03-21
+# San Martín, Barry I, -6808-06706, since 1951-03-21
 #	(except 1960-03 / 1976-03-21)
 
 # Australia - territories
 # Heard Island, McDonald Islands (uninhabited)
 #	previously sealers and scientific personnel wintered
-#	
 #	Margaret Turner reports
-#	 (1999-09-30) that they're UTC+5, with no DST;
+#	
+#	(1999-09-30) that they're UTC+5, with no DST;
 #	presumably this is when they have visitors.
 #
 # year-round bases
@@ -84,14 +81,10 @@ Rule	ChileAQ	2012	max	-	Sep	Sun>=2	4:00u
 # The changes occurred on 2009-10-18 at 02:00 (local times).
 #
 # Government source: (Australian Antarctic Division)
-# 
 # http://www.aad.gov.au/default.asp?casid=37079
-# 
 #
 # We have more background information here:
-# 
 # http://www.timeanddate.com/news/time/antarctica-new-times.html
-# 
 
 # From Steffen Thorsen (2010-03-10):
 # We got these changes from the Australian Antarctic Division: ...
@@ -106,19 +99,17 @@ Rule	ChileAQ	2012	max	-	Sep	Sun>=2	4:00u
 # - Mawson station stays on UTC+5.
 #
 # Background:
-# 
 # http://www.timeanddate.com/news/time/antartica-time-changes-2010.html
-# 
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Antarctica/Casey	0	-	zzz	1969
-			8:00	-	WST	2009 Oct 18 2:00
-						# Western (Aus) Standard Time
+			8:00	-	AWST	2009 Oct 18 2:00
+						# Australian Western Std Time
 			11:00	-	CAST	2010 Mar 5 2:00
 						# Casey Time
-			8:00	-	WST	2011 Oct 28 2:00
+			8:00	-	AWST	2011 Oct 28 2:00
 			11:00	-	CAST	2012 Feb 21 17:00u
-			8:00	-	WST
+			8:00	-	AWST
 Zone Antarctica/Davis	0	-	zzz	1957 Jan 13
 			7:00	-	DAVT	1964 Nov # Davis Time
 			0	-	zzz	1969 Feb
@@ -132,24 +123,27 @@ Zone Antarctica/Mawson	0	-	zzz	1954 Feb 
 						# Mawson Time
 			5:00	-	MAWT
 # References:
-# 
 # Casey Weather (1998-02-26)
-# 
-# 
+# 
 # Davis Station, Antarctica (1998-02-26)
-# 
-# 
+# 
 # Mawson Station, Antarctica (1998-02-25)
-# 
+# 
+
+# Belgium - year-round base
+# Princess Elisabeth, Queen Maud Land, -713412+0231200, since 2007
 
 # Brazil - year-round base
-# Comandante Ferraz, King George Island, -6205+05824, since 1983/4
+# Ferraz, King George Island, -6205+05824, since 1983/4
+
+# Bulgaria - year-round base
+# St. Kliment Ohridski, Livingston Island, -623829-0602153, since 1988
 
 # Chile - year-round bases and towns
 # Escudero, South Shetland Is, -621157-0585735, since 1994
-# Presidente Eduadro Frei, King George Island, -6214-05848, since 1969-03-07
-# General Bernardo O'Higgins, Antarctic Peninsula, -6319-05704, since 1948-02
-# Capitan Arturo Prat, -6230-05941
+# Frei Montalva, King George Island, -6214-05848, since 1969-03-07
+# O'Higgins, Antarctic Peninsula, -6319-05704, since 1948-02
+# Prat, -6230-05941
 # Villa Las Estrellas (a town), around the Frei base, since 1984-04-09
 # These locations have always used Santiago time; use TZ='America/Santiago'.
 
@@ -157,31 +151,35 @@ Zone Antarctica/Mawson	0	-	zzz	1954 Feb 
 # Great Wall, King George Island, -6213-05858, since 1985-02-20
 # Zhongshan, Larsemann Hills, Prydz Bay, -6922+07623, since 1989-02-26
 
-# France - year-round bases
+# France - year-round bases (also see "France & Italy")
 #
 # From Antoine Leca (1997-01-20):
 # Time data are from Nicole Pailleau at the IFRTP
 # (French Institute for Polar Research and Technology).
-# She confirms that French Southern Territories and Terre Adelie bases
-# don't observe daylight saving time, even if Terre Adelie supplies came
+# She confirms that French Southern Territories and Terre Adélie bases
+# don't observe daylight saving time, even if Terre Adélie supplies came
 # from Tasmania.
 #
 # French Southern Territories with year-round inhabitants
 #
-# Martin-de-Vivies Base, Amsterdam Island, -374105+0773155, since 1950
-# Alfred-Faure Base, Crozet Islands, -462551+0515152, since 1964
-# Port-aux-Francais, Kerguelen Islands, -492110+0701303, since 1951;
+# Alfred Faure, Possession Island, Crozet Islands, -462551+0515152, since 1964;
+#	sealing & whaling stations operated variously 1802/1911+;
+#	see Indian/Reunion.
+#
+# Martin-de-Viviès, Amsterdam Island, -374105+0773155, since 1950
+# Port-aux-Français, Kerguelen Islands, -492110+0701303, since 1951;
 #	whaling & sealing station operated 1908/1914, 1920/1929, and 1951/1956
 #
 # St Paul Island - near Amsterdam, uninhabited
 #	fishing stations operated variously 1819/1931
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Indian/Kerguelen	0	-	zzz	1950	# Port-aux-Francais
+Zone Indian/Kerguelen	0	-	zzz	1950	# Port-aux-Français
 			5:00	-	TFT	# ISO code TF Time
 #
 # year-round base in the main continent
-# Dumont-d'Urville, Ile des Petrels, -6640+14001, since 1956-11
+# Dumont d'Urville, Île des Pétrels, -6640+14001, since 1956-11
+#  (2005-12-05)
 #
 # Another base at Port-Martin, 50km east, began operation in 1947.
 # It was destroyed by fire on 1952-01-14.
@@ -191,20 +189,22 @@ Zone Antarctica/DumontDUrville 0 -	zzz	1
 			10:00	-	PMT	1952 Jan 14 # Port-Martin Time
 			0	-	zzz	1956 Nov
 			10:00	-	DDUT	# Dumont-d'Urville Time
-# Reference:
-# 
-# Dumont d'Urville Station (2005-12-05)
-# 
+
+# France & Italy - year-round base
+# Concordia, -750600+1232000, since 2005
 
 # Germany - year-round base
-# Georg von Neumayer, -7039-00815
+# Neumayer III, -704080-0081602, since 2009
 
-# India - year-round base
-# Dakshin Gangotri, -7005+01200
+# India - year-round bases
+# Bharati, -692428+0761114, since 2012
+# Maitri, -704558+0114356, since 1989
+
+# Italy - year-round base (also see "France & Italy")
+# Zuchelli, Terra Nova Bay, -744140+1640647, since 1986
 
 # Japan - year-round bases
-# Dome Fuji, -7719+03942
-# Syowa, -690022+0393524
+# Syowa (also known as Showa), -690022+0393524, since 1957
 #
 # From Hideyuki Suzuki (1999-02-06):
 # In all Japanese stations, +0300 is used as the standard time.
@@ -216,11 +216,11 @@ Zone Antarctica/DumontDUrville 0 -	zzz	1
 Zone Antarctica/Syowa	0	-	zzz	1957 Jan 29
 			3:00	-	SYOT	# Syowa Time
 # See:
-# 
 # NIPR Antarctic Research Activities (1999-08-17)
-# 
+# 
 
 # S Korea - year-round base
+# Jang Bogo, Terra Nova Bay, -743700+1641205 since 2014
 # King Sejong, King George Island, -6213-05847, since 1988
 
 # New Zealand - claims
@@ -269,6 +269,9 @@ Zone Antarctica/Troll	0	-	zzz	2005 Feb 1
 # Poland - year-round base
 # Arctowski, King George Island, -620945-0582745, since 1977
 
+# Romania - year-bound base
+# Law-Racoviță, Larsemann Hills, -692319+0762251, since 1986
+
 # Russia - year-round bases
 # Bellingshausen, King George Island, -621159-0585337, since 1968-02-22
 # Mirny, Davis coast, -6633+09301, since 1956-02
@@ -278,8 +281,8 @@ Zone Antarctica/Troll	0	-	zzz	2005 Feb 1
 #	year-round from 1960/61 to 1992
 
 # Vostok, since 1957-12-16, temporarily closed 1994-02/1994-11
-# 
-# From Craig Mundell (1994-12-15):
+# From Craig Mundell (1994-12-15)
+# :
 # Vostok, which is one of the Russian stations, is set on the same
 # time as Moscow, Russia.
 #
@@ -294,7 +297,7 @@ Zone Antarctica/Troll	0	-	zzz	2005 Feb 1
 #
 # From Paul Eggert (2001-05-04):
 # This seems to be hopelessly confusing, so I asked Lee Hotz about it
-# in person.  He said that some Antartic locations set their local
+# in person.  He said that some Antarctic locations set their local
 # time so that noon is the warmest part of the day, and that this
 # changes during the year and does not necessarily correspond to mean
 # solar noon.  So the Vostok time might have been whatever the clocks
@@ -306,9 +309,12 @@ Zone Antarctica/Vostok	0	-	zzz	1957 Dec 
 
 # S Africa - year-round bases
 # Marion Island, -4653+03752
-# Sanae, -7141-00250
+# SANAE IV, Vesleskarvet, Queen Maud Land, -714022-0025026, since 1997
+
+# Ukraine - year-round base
+# Vernadsky (formerly Faraday), Galindez Island, -651445-0641526, since 1954
 
-# UK
+# United Kingdom
 #
 # British Antarctic Territories (BAT) claims
 # South Orkney Islands
@@ -364,7 +370,7 @@ Zone Antarctica/Palmer	0	-	zzz	1965
 # but that he found it more convenient to keep GMT+12
 # as supplies for the station were coming from McMurdo Sound,
 # which was on GMT+12 because New Zealand was on GMT+12 all year
-# at that time (1957).  (Source: Siple's book 90 degrees SOUTH.)
+# at that time (1957).  (Source: Siple's book 90 Degrees South.)
 #
 # From Susan Smith
 # http://www.cybertours.com/whs/pole10.html

Modified: stable/7/share/zoneinfo/asia
==============================================================================
--- stable/7/share/zoneinfo/asia	Fri Aug 29 13:22:56 2014	(r270812)
+++ stable/7/share/zoneinfo/asia	Fri Aug 29 13:24:49 2014	(r270813)
@@ -1,4 +1,3 @@
-# 
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -32,7 +31,7 @@
 # A reliable and entertaining source about time zones is
 # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
 #
-# I invented the abbreviations marked `*' in the following table;
+# I invented the abbreviations marked '*' in the following table;
 # the rest are from earlier versions of this file, or from other sources.
 # Corrections are welcome!
 #	     std  dst
@@ -47,13 +46,14 @@
 #	7:00 WIB	west Indonesia (Waktu Indonesia Barat)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 13:26:12 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id C6E1B66A;
 Fri, 29 Aug 2014 13:26:12 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B03C31CCE;
 Fri, 29 Aug 2014 13:26:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7TDQCQQ053820;
 Fri, 29 Aug 2014 13:26:12 GMT (envelope-from pluknet@FreeBSD.org)
Received: (from pluknet@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7TDQCiL053815;
 Fri, 29 Aug 2014 13:26:12 GMT (envelope-from pluknet@FreeBSD.org)
Message-Id: <201408291326.s7TDQCiL053815@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: pluknet set sender to
 pluknet@FreeBSD.org using -f
From: Sergey Kandaurov 
Date: Fri, 29 Aug 2014 13:26:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r270814 - stable/8/share/zoneinfo
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 13:26:12 -0000

Author: pluknet
Date: Fri Aug 29 13:26:11 2014
New Revision: 270814
URL: http://svnweb.freebsd.org/changeset/base/270814

Log:
  MFC r270728, tzdata2014f
  
  - Parts of Russia will change times on 2014-10-26.
  - Time zone name changes for Asia/Novokuznetsk and Xinjiang and Samoa
    and America/Metlakatla, new zones Asia/Chita and Asia/Srednekolymsk.
  - Australia will now use Axxx.
  - New zone tab data format.
  
  And lots of historical changes (See
  http://mm.icann.org/pipermail/tz-announce/2014-August/000023.html
  for the full details.)

Added:
  stable/8/share/zoneinfo/zone1970.tab
     - copied unchanged from r270728, head/contrib/tzdata/zone1970.tab
Modified:
  stable/8/share/zoneinfo/africa
  stable/8/share/zoneinfo/antarctica
  stable/8/share/zoneinfo/asia
  stable/8/share/zoneinfo/australasia
  stable/8/share/zoneinfo/backward
  stable/8/share/zoneinfo/etcetera
  stable/8/share/zoneinfo/europe
  stable/8/share/zoneinfo/factory
  stable/8/share/zoneinfo/leap-seconds.list   (contents, props changed)
  stable/8/share/zoneinfo/northamerica
  stable/8/share/zoneinfo/pacificnew
  stable/8/share/zoneinfo/southamerica
  stable/8/share/zoneinfo/systemv
  stable/8/share/zoneinfo/yearistype.sh
  stable/8/share/zoneinfo/zone.tab
Directory Properties:
  stable/8/share/zoneinfo/   (props changed)

Modified: stable/8/share/zoneinfo/africa
==============================================================================
--- stable/8/share/zoneinfo/africa	Fri Aug 29 13:24:49 2014	(r270813)
+++ stable/8/share/zoneinfo/africa	Fri Aug 29 13:26:11 2014	(r270814)
@@ -1,4 +1,3 @@
-# 
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -35,13 +34,13 @@
 # Previous editions of this database used WAT, CAT, SAT, and EAT
 # for +0:00 through +3:00, respectively,
 # but Mark R V Murray reports that
-# `SAST' is the official abbreviation for +2:00 in the country of South Africa,
-# `CAT' is commonly used for +2:00 in countries north of South Africa, and
-# `WAT' is probably the best name for +1:00, as the common phrase for
-# the area that includes Nigeria is ``West Africa''.
-# He has heard of ``Western Sahara Time'' for +0:00 but can find no reference.
+# 'SAST' is the official abbreviation for +2:00 in the country of South Africa,
+# 'CAT' is commonly used for +2:00 in countries north of South Africa, and
+# 'WAT' is probably the best name for +1:00, as the common phrase for
+# the area that includes Nigeria is "West Africa".
+# He has heard of "Western Sahara Time" for +0:00 but can find no reference.
 #
-# To make things confusing, `WAT' seems to have been used for -1:00 long ago;
+# To make things confusing, 'WAT' seems to have been used for -1:00 long ago;
 # I'd guess that this was because people needed _some_ name for -1:00,
 # and at the time, far west Africa was the only major land area in -1:00.
 # This usage is now obsolete, as the last use of -1:00 on the African
@@ -54,7 +53,7 @@
 #	 2:00	SAST	South Africa Standard Time
 # and Murray suggests the following abbreviation:
 #	 1:00	WAT	West Africa Time
-# I realize that this leads to `WAT' being used for both -1:00 and 1:00
+# I realize that this leads to 'WAT' being used for both -1:00 and 1:00
 # for times before 1976, but this is the best I can think of
 # until we get more information.
 #
@@ -131,9 +130,7 @@ Zone	Africa/Gaborone	1:43:40 -	LMT	1885
 			2:00	-	CAT
 
 # Burkina Faso
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Africa/Ouagadougou	-0:06:04 -	LMT	1912
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Burundi
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -161,7 +158,7 @@ Zone	Africa/Bangui	1:14:20	-	LMT	1912
 
 # Chad
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Ndjamena	1:00:12 -	LMT	1912
+Zone	Africa/Ndjamena	1:00:12 -	LMT	1912 # N'Djamena
 			1:00	-	WAT	1979 Oct 14
 			1:00	1:00	WAST	1980 Mar  8
 			1:00	-	WAT
@@ -183,10 +180,20 @@ Zone Africa/Lubumbashi	1:49:52 -	LMT	189
 Zone Africa/Brazzaville	1:01:08 -	LMT	1912
 			1:00	-	WAT
 
-# Cote D'Ivoire
+# Côte D'Ivoire / Ivory Coast
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Abidjan	-0:16:08 -	LMT	1912
 			 0:00	-	GMT
+Link Africa/Abidjan Africa/Bamako	# Mali
+Link Africa/Abidjan Africa/Banjul	# Gambia
+Link Africa/Abidjan Africa/Conakry	# Guinea
+Link Africa/Abidjan Africa/Dakar	# Senegal
+Link Africa/Abidjan Africa/Freetown	# Sierra Leone
+Link Africa/Abidjan Africa/Lome		# Togo
+Link Africa/Abidjan Africa/Nouakchott	# Mauritania
+Link Africa/Abidjan Africa/Ouagadougou	# Burkina Faso
+Link Africa/Abidjan Africa/Sao_Tome	# São Tomé and Príncipe
+Link Africa/Abidjan Atlantic/St_Helena	# St Helena
 
 # Djibouti
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -231,13 +238,9 @@ Rule	Egypt	1990	1994	-	May	 1	1:00	1:00	
 # Egyptians would approve the cancellation."
 #
 # Egypt to cancel daylight saving time
-# 
 # http://www.almasryalyoum.com/en/node/407168
-# 
 # or
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_egypt04.html
-# 
 Rule	Egypt	1995	2010	-	Apr	lastFri	 0:00s	1:00	S
 Rule	Egypt	1995	2005	-	Sep	lastThu	24:00	0	-
 # From Steffen Thorsen (2006-09-19):
@@ -249,7 +252,7 @@ Rule	Egypt	2006	only	-	Sep	21	24:00	0	-
 # From Dirk Losch (2007-08-14):
 # I received a mail from an airline which says that the daylight
 # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07.
-# From Jesper Norgaard Welen (2007-08-15): [The following agree:]
+# From Jesper Nørgaard Welen (2007-08-15): [The following agree:]
 # http://www.nentjes.info/Bill/bill5.htm
 # http://www.timeanddate.com/worldclock/city.html?n=53
 # From Steffen Thorsen (2007-09-04): The official information...:
@@ -288,15 +291,9 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	24:00	
 #
 # timeanddate[2] and another site I've found[3] also support that.
 #
-# [1] 
-# https://bugzilla.redhat.com/show_bug.cgi?id=492263
-# 
-# [2] 
-# http://www.timeanddate.com/worldclock/clockchange.html?n=53
-# 
-# [3] 
-# http://wwp.greenwichmeantime.com/time-zone/africa/egypt/
-# 
+# [1] https://bugzilla.redhat.com/show_bug.cgi?id=492263
+# [2] http://www.timeanddate.com/worldclock/clockchange.html?n=53
+# [3] http://wwp.greenwichmeantime.com/time-zone/africa/egypt/
 
 # From Arthur David Olson (2009-04-20):
 # In 2009 (and for the next several years), Ramadan ends before the fourth
@@ -306,14 +303,10 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	24:00	
 # From Steffen Thorsen (2009-08-11):
 # We have been able to confirm the August change with the Egyptian Cabinet
 # Information and Decision Support Center:
-# 
 # http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html
-# 
 #
 # The Middle East News Agency
-# 
 # http://www.mena.org.eg/index.aspx
-# 
 # also reports "Egypt starts winter time on August 21"
 # today in article numbered "71, 11/08/2009 12:25 GMT."
 # Only the title above is available without a subscription to their service,
@@ -321,19 +314,14 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	24:00	
 # (at least today).
 
 # From Alexander Krivenyshev (2010-07-20):
-# According to News from Egypt -  Al-Masry Al-Youm Egypt's cabinet has
+# According to News from Egypt - Al-Masry Al-Youm Egypt's cabinet has
 # decided that Daylight Saving Time will not be used in Egypt during
 # Ramadan.
 #
 # Arabic translation:
-# "Clocks to go back during Ramadan--and then forward again"
-# 
+# "Clocks to go back during Ramadan - and then forward again"
 # http://www.almasryalyoum.com/en/news/clocks-go-back-during-ramadan-and-then-forward-again
-# 
-# or
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_egypt02.html
-# 
 
 # From Ahmad El-Dardiry (2014-05-07):
 # Egypt is to change back to Daylight system on May 15
@@ -433,10 +421,15 @@ Zone	Africa/Asmara	2:35:32 -	LMT	1870
 			3:00	-	EAT
 
 # Ethiopia
-# From Paul Eggert (2006-03-22):
-# Shanks & Pottenger write that Ethiopia had six narrowly-spaced time zones
-# between 1870 and 1890, and that they merged to 38E50 (2:35:20) in 1890.
-# We'll guess that 38E50 is for Adis Dera.
+# From Paul Eggert (2014-07-31):
+# Like the Swahili of Kenya and Tanzania, many Ethiopians keep a
+# 12-hour clock starting at our 06:00, so their "8 o'clock" is our
+# 02:00 or 14:00.  Keep this in mind when you ask the time in Amharic.
+#
+# Shanks & Pottenger write that Ethiopia had six narrowly-spaced time
+# zones between 1870 and 1890, that they merged to 38E50 (2:35:20) in
+# 1890, and that they switched to 3:00 on 1936-05-05.  Perhaps 38E50
+# was for Adis Dera.  Quite likely the Shanks data are wrong anyway.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Addis_Ababa	2:34:48 -	LMT	1870
 			2:35:20	-	ADMT	1936 May 5    # Adis Dera MT
@@ -448,28 +441,24 @@ Zone Africa/Libreville	0:37:48 -	LMT	191
 			1:00	-	WAT
 
 # Gambia
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Banjul	-1:06:36 -	LMT	1912
-			-1:06:36 -	BMT	1935	# Banjul Mean Time
-			-1:00	-	WAT	1964
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Ghana
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-# Whitman says DST was observed from 1931 to ``the present'';
-# go with Shanks & Pottenger.
-Rule	Ghana	1936	1942	-	Sep	 1	0:00	0:20	GHST
-Rule	Ghana	1936	1942	-	Dec	31	0:00	0	GMT
+# Whitman says DST was observed from 1931 to "the present";
+# Shanks & Pottenger say 1936 to 1942;
+# and September 1 to January 1 is given by:
+# Scott Keltie J, Epstein M (eds), The Statesman's Year-Book,
+# 57th ed. Macmillan, London (1920), OCLC 609408015, pp xxviii.
+# For lack of better info, assume DST was observed from 1920 to 1942.
+Rule	Ghana	1920	1942	-	Sep	 1	0:00	0:20	GHST
+Rule	Ghana	1920	1942	-	Dec	31	0:00	0	GMT
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Accra	-0:00:52 -	LMT	1918
 			 0:00	Ghana	%s
 
 # Guinea
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Conakry	-0:54:52 -	LMT	1912
-			 0:00	-	GMT	1934 Feb 26
-			-1:00	-	WAT	1960
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Guinea-Bissau
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -577,18 +566,8 @@ Zone	Africa/Blantyre	2:20:00 -	LMT	1903 
 			2:00	-	CAT
 
 # Mali
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Bamako	-0:32:00 -	LMT	1912
-			 0:00	-	GMT	1934 Feb 26
-			-1:00	-	WAT	1960 Jun 20
-			 0:00	-	GMT
-
 # Mauritania
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Africa/Nouakchott	-1:03:48 -	LMT	1912
-			 0:00	-	GMT	1934 Feb 26
-			-1:00	-	WAT	1960 Nov 28
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Mauritius
 
@@ -612,9 +591,7 @@ Zone Africa/Nouakchott	-1:03:48 -	LMT	19
 
 # From Steffen Thorsen (2008-07-10):
 # According to
-# 
 # http://www.lexpress.mu/display_article.php?news_id=111216
-# 
 # (in French), Mauritius will start and end their DST a few days earlier
 # than previously announced (2008-11-01 to 2009-03-31).  The new start
 # date is 2008-10-26 at 02:00 and the new end date is 2009-03-27 (no time
@@ -633,18 +610,13 @@ Zone Africa/Nouakchott	-1:03:48 -	LMT	19
 # published on Monday, June 30, 2008...
 #
 # I guess that article in French "Le gouvernement avance l'introduction
-# de l'heure d'ete" stating that DST in Mauritius starting on October 26
-# and ending on March 27, 2009 is the most recent one.
-# ...
-# 
+# de l'heure d'été" stating that DST in Mauritius starting on October 26
+# and ending on March 27, 2009 is the most recent one....
 # http://www.worldtimezone.com/dst_news/dst_news_mauritius02.html
-# 
 
 # From Riad M. Hossen Ally (2008-08-03):
 # The Government of Mauritius weblink
-# 
 # http://www.gov.mu/portal/site/pmosite/menuitem.4ca0efdee47462e7440a600248a521ca/?content_id=4728ca68b2a5b110VgnVCM1000000a04a8c0RCRD
-# 
 # Cabinet Decision of July 18th, 2008 states as follows:
 #
 # 4. ...Cabinet has agreed to the introduction into the National Assembly
@@ -654,33 +626,25 @@ Zone Africa/Nouakchott	-1:03:48 -	LMT	19
 # States of America. It will start at two o'clock in the morning on the
 # last Sunday of October and will end at two o'clock in the morning on
 # the last Sunday of March the following year. The summer time for the
-# year 2008 - 2009 will, therefore, be effective as from 26 October 2008
+# year 2008-2009 will, therefore, be effective as from 26 October 2008
 # and end on 29 March 2009.
 
 # From Ed Maste (2008-10-07):
 # THE TIME BILL (No. XXVII of 2008) Explanatory Memorandum states the
 # beginning / ending of summer time is 2 o'clock standard time in the
 # morning of the last Sunday of October / last Sunday of March.
-# 
 # http://www.gov.mu/portal/goc/assemblysite/file/bill2708.pdf
-# 
 
 # From Steffen Thorsen (2009-06-05):
 # According to several sources, Mauritius will not continue to observe
 # DST the coming summer...
 #
 # Some sources, in French:
-# 
 # http://www.defimedia.info/news/946/Rashid-Beebeejaun-:-%C2%AB-L%E2%80%99heure-d%E2%80%99%C3%A9t%C3%A9-ne-sera-pas-appliqu%C3%A9e-cette-ann%C3%A9e-%C2%BB
-# 
-# 
 # http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-%C3%A9conomie-d-%C3%A9nergie-de-l-heure-d-%C3%A9t%C3%A9-ont-%C3%A9t%C3%A9-atteints-
-# 
 #
 # Our wrap-up:
-# 
 # http://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html
-# 
 
 # From Arthur David Olson (2009-07-11):
 # The "mauritius-dst-will-not-repeat" wrapup includes this:
@@ -704,7 +668,7 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 			3:00	-	EAT
 
 # Morocco
-# See the `europe' file for Spanish Morocco (Africa/Ceuta).
+# See the 'europe' file for Spanish Morocco (Africa/Ceuta).
 
 # From Alex Krivenyshev (2008-05-09):
 # Here is an article that Morocco plan to introduce Daylight Saving Time between
@@ -712,60 +676,43 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 #
 # "... Morocco is to save energy by adjusting its clock during summer so it will
 # be one hour ahead of GMT between 1 June and 27 September, according to
-# Communication Minister and Gov ernment Spokesman, Khalid Naciri...."
+# Communication Minister and Government Spokesman, Khalid Naciri...."
 #
-# 
 # http://www.worldtimezone.net/dst_news/dst_news_morocco01.html
-# 
-# OR
-# 
 # http://en.afrik.com/news11892.html
-# 
 
 # From Alex Krivenyshev (2008-05-09):
 # The Morocco time change can be confirmed on Morocco web site Maghreb Arabe Presse:
-# 
 # http://www.map.ma/eng/sections/box3/morocco_shifts_to_da/view
-# 
 #
 # Morocco shifts to daylight time on June 1st through September 27, Govt.
 # spokesman.
 
 # From Patrice Scattolin (2008-05-09):
 # According to this article:
-# 
 # http://www.avmaroc.com/actualite/heure-dete-comment-a127896.html
-# 
-# (and republished here:
-# 
-# http://www.actu.ma/heure-dete-comment_i127896_0.html
-# 
-# )
-# the changes occurs at midnight:
-#
-# saturday night may 31st at midnight (which in french is to be
-# intrepreted as the night between saturday and sunday)
-# sunday night the 28th  at midnight
-#
-# Seeing that the 28th is monday, I am guessing that she intends to say
-# the midnight of the 28th which is the midnight between sunday and
-# monday, which jives with other sources that say that it's inclusive
-# june1st to sept 27th.
+# (and republished here: )
+# the changes occur at midnight:
+#
+# Saturday night May 31st at midnight (which in French is to be
+# interpreted as the night between Saturday and Sunday)
+# Sunday night the 28th at midnight
+#
+# Seeing that the 28th is Monday, I am guessing that she intends to say
+# the midnight of the 28th which is the midnight between Sunday and
+# Monday, which jives with other sources that say that it's inclusive
+# June 1st to Sept 27th.
 #
 # The decision was taken by decree *2-08-224 *but I can't find the decree
 # published on the web.
 #
 # It's also confirmed here:
-# 
 # http://www.maroc.ma/NR/exeres/FACF141F-D910-44B0-B7FA-6E03733425D1.htm
-# 
-# on a government portal as being  between june 1st and sept 27th (not yet
-# posted in english).
+# on a government portal as being between June 1st and Sept 27th (not yet
+# posted in English).
 #
-# The following google query will generate many relevant hits:
-# 
+# The following Google query will generate many relevant hits:
 # http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search
-# 
 
 # From Steffen Thorsen (2008-08-27):
 # Morocco will change the clocks back on the midnight between August 31
@@ -773,47 +720,32 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 # of September:
 #
 # One article about it (in French):
-# 
 # http://www.menara.ma/fr/Actualites/Maroc/Societe/ci.retour_a_l_heure_gmt_a_partir_du_dimanche_31_aout_a_minuit_officiel_.default
-# 
 #
 # We have some further details posted here:
-# 
 # http://www.timeanddate.com/news/time/morocco-ends-dst-early-2008.html
-# 
 
 # From Steffen Thorsen (2009-03-17):
 # Morocco will observe DST from 2009-06-01 00:00 to 2009-08-21 00:00 according
 # to many sources, such as
-# 
 # http://news.marweb.com/morocco/entertainment/morocco-daylight-saving.html
-# 
-# 
 # http://www.medi1sat.ma/fr/depeche.aspx?idp=2312
-# 
 # (French)
 #
 # Our summary:
-# 
 # http://www.timeanddate.com/news/time/morocco-starts-dst-2009.html
-# 
 
 # From Alexander Krivenyshev (2009-03-17):
 # Here is a link to official document from Royaume du Maroc Premier Ministre,
-# Ministere de la Modernisation des Secteurs Publics
+# Ministère de la Modernisation des Secteurs Publics
 #
 # Under Article 1 of Royal Decree No. 455-67 of Act 23 safar 1387 (2 june 1967)
 # concerning the amendment of the legal time, the Ministry of Modernization of
 # Public Sectors announced that the official time in the Kingdom will be
 # advanced 60 minutes from Sunday 31 May 2009 at midnight.
 #
-# 
 # http://www.mmsp.gov.ma/francais/Actualites_fr/PDF_Actualites_Fr/HeureEte_FR.pdf
-# 
-#
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_morocco03.html
-# 
 
 # From Steffen Thorsen (2010-04-13):
 # Several news media in Morocco report that the Ministry of Modernization
@@ -821,14 +753,10 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 # 2010-05-02 to 2010-08-08.
 #
 # Example:
-# 
 # http://www.lavieeco.com/actualites/4099-le-maroc-passera-a-l-heure-d-ete-gmt1-le-2-mai.html
-# 
 # (French)
 # Our page:
-# 
 # http://www.timeanddate.com/news/time/morocco-starts-dst-2010.html
-# 
 
 # From Dan Abitol (2011-03-30):
 # ...Rules for Africa/Casablanca are the following (24h format)
@@ -838,34 +766,20 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 # The change was broadcast on the FM Radio
 # I ve called ANRT (telecom regulations in Morocco) at
 # +212.537.71.84.00
-# 
 # http://www.anrt.net.ma/fr/
-# 
 # They said that
-# 
 # http://www.map.ma/fr/sections/accueil/l_heure_legale_au_ma/view
-# 
 # is the official publication to look at.
 # They said that the decision was already taken.
 #
 # More articles in the press
-# 
-# http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-lev
-# 
-# e.html
-# 
+# http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-leve.html
 # http://www.lematin.ma/Actualite/Express/Article.asp?id=148923
-# 
-# 
 # http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT%2B1-a-partir-de-dim
-# anche-prochain-5538.html
-# 
 
 # From Petr Machata (2011-03-30):
 # They have it written in English here:
-# 
 # http://www.map.ma/eng/sections/home/morocco_to_spring_fo/view
-# 
 #
 # It says there that "Morocco will resume its standard time on July 31,
 # 2011 at midnight." Now they don't say whether they mean midnight of
@@ -873,20 +787,16 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 # also been like that in the past.
 
 # From Alexander Krivenyshev (2012-03-09):
-# According to Infomédiaire web site from Morocco (infomediaire.ma),
-# on March 9, 2012, (in French) Heure légale:
-# Le Maroc adopte officiellement l'heure d'été
-# 
+# According to Infomédiaire web site from Morocco (infomediaire.ma),
+# on March 9, 2012, (in French) Heure légale:
+# Le Maroc adopte officiellement l'heure d'été
 # http://www.infomediaire.ma/news/maroc/heure-l%C3%A9gale-le-maroc-adopte-officiellement-lheure-d%C3%A9t%C3%A9
-# 
 # Governing Council adopted draft decree, that Morocco DST starts on
 # the last Sunday of March (March 25, 2012) and ends on
 # last Sunday of September (September 30, 2012)
 # except the month of Ramadan.
 # or (brief)
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_morocco06.html
-# 
 
 # From Arthur David Olson (2012-03-10):
 # The infomediaire.ma source indicates that the system is to be in
@@ -897,17 +807,13 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 
 # From Christophe Tropamer (2012-03-16):
 # Seen Morocco change again:
-# 
 # http://www.le2uminutes.com/actualite.php
-# 
-# "...à partir du dernier dimance d'avril et non fins mars,
-# comme annoncé précédemment."
+# "...à partir du dernier dimanche d'avril et non fins mars,
+# comme annoncé précédemment."
 
 # From Milamber Space Network (2012-07-17):
 # The official return to GMT is announced by the Moroccan government:
-# 
 # http://www.mmsp.gov.ma/fr/actualites.aspx?id=288 [in French]
-# 
 #
 # Google translation, lightly edited:
 # Back to the standard time of the Kingdom (GMT)
@@ -1052,7 +958,7 @@ Zone Africa/Casablanca	-0:30:20 -	LMT	19
 # Assume that this has been true since Western Sahara switched to GMT,
 # since most of it was then controlled by Morocco.
 
-Zone Africa/El_Aaiun	-0:52:48 -	LMT	1934 Jan
+Zone Africa/El_Aaiun	-0:52:48 -	LMT	1934 Jan # El Aaiún
 			-1:00	-	WAT	1976 Apr 14
 			 0:00	Morocco	WE%sT
 
@@ -1102,15 +1008,17 @@ Zone	Africa/Niamey	 0:08:28 -	LMT	1912
 Zone	Africa/Lagos	0:13:36 -	LMT	1919 Sep
 			1:00	-	WAT
 
-# Reunion
+# Réunion
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Indian/Reunion	3:41:52 -	LMT	1911 Jun	# Saint-Denis
-			4:00	-	RET	# Reunion Time
+			4:00	-	RET	# Réunion Time
 #
-# Scattered Islands (Iles Eparses) administered from Reunion are as follows.
+# Crozet Islands also observes Réunion time; see the 'antarctica' file.
+#
+# Scattered Islands (Îles Éparses) administered from Réunion are as follows.
 # The following information about them is taken from
-# Iles Eparses (www.outre-mer.gouv.fr/domtom/ile.htm, 1997-07-22, in French;
-# no longer available as of 1999-08-17).
+# Îles Éparses (, 1997-07-22,
+# in French; no longer available as of 1999-08-17).
 # We have no info about their time zone histories.
 #
 # Bassas da India - uninhabited
@@ -1125,28 +1033,17 @@ Zone	Africa/Kigali	2:00:16 -	LMT	1935 Ju
 			2:00	-	CAT
 
 # St Helena
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Atlantic/St_Helena	-0:22:48 -	LMT	1890		# Jamestown
-			-0:22:48 -	JMT	1951	# Jamestown Mean Time
-			 0:00	-	GMT
+# See Africa/Abidjan.
 # The other parts of the St Helena territory are similar:
 #	Tristan da Cunha: on GMT, say Whitman and the CIA
-#	Ascension: on GMT, says usno1995 and the CIA
+#	Ascension: on GMT, say the USNO (1995-12-21) and the CIA
 #	Gough (scientific station since 1955; sealers wintered previously):
 #		on GMT, says the CIA
-#	Inaccessible, Nightingale: no information, but probably GMT
-
-# Sao Tome and Principe
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Sao_Tome	 0:26:56 -	LMT	1884
-			-0:36:32 -	LMT	1912	# Lisbon Mean Time
-			 0:00	-	GMT
+#	Inaccessible, Nightingale: uninhabited
 
+# São Tomé and Príncipe
 # Senegal
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Dakar	-1:09:44 -	LMT	1912
-			-1:00	-	WAT	1941 Jun
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Seychelles
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1160,17 +1057,7 @@ Zone	Indian/Mahe	3:41:48 -	LMT	1906 Jun	
 # Possibly the islands were uninhabited.
 
 # Sierra Leone
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-# Whitman gives Mar 31 - Aug 31 for 1931 on; go with Shanks & Pottenger.
-Rule	SL	1935	1942	-	Jun	 1	0:00	0:40	SLST
-Rule	SL	1935	1942	-	Oct	 1	0:00	0	WAT
-Rule	SL	1957	1962	-	Jun	 1	0:00	1:00	SLST
-Rule	SL	1957	1962	-	Sep	 1	0:00	0	GMT
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Freetown	-0:53:00 -	LMT	1882
-			-0:53:00 -	FMT	1913 Jun # Freetown Mean Time
-			-1:00	SL	%s	1957
-			 0:00	SL	%s
+# See Africa/Abidjan.
 
 # Somalia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1193,9 +1080,9 @@ Zone Africa/Johannesburg 1:52:00 -	LMT	1
 
 # Sudan
 #
-# From 
-# Sudan News Agency (2000-01-13)
-# , also reported by Michael De Beukelaer-Dossche via Steffen Thorsen:
+# From 
+# Sudan News Agency (2000-01-13),
+# also reported by Michaël De Beukelaer-Dossche via Steffen Thorsen:
 # Clocks will be moved ahead for 60 minutes all over the Sudan as of noon
 # Saturday....  This was announced Thursday by Caretaker State Minister for
 # Manpower Abdul-Rahman Nur-Eddin.
@@ -1226,14 +1113,12 @@ Zone Africa/Dar_es_Salaam 2:37:08 -	LMT	
 			3:00	-	EAT
 
 # Togo
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Lome	0:04:52 -	LMT	1893
-			0:00	-	GMT
+# See Africa/Abidjan.
 
 # Tunisia
 
 # From Gwillim Law (2005-04-30):
-# My correspondent, Risto Nykanen, has alerted me to another adoption of DST,
+# My correspondent, Risto Nykänen, has alerted me to another adoption of DST,
 # this time in Tunisia.  According to Yahoo France News
 # , in a story attributed to AP
 # and dated 2005-04-26, "Tunisia has decided to advance its official time by
@@ -1242,7 +1127,7 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
 # Saturday."  (My translation)
 #
 # From Oscar van Vlijmen (2005-05-02):
-# LaPresse, the first national daily newspaper ...
+# La Presse, the first national daily newspaper ...
 # 
 # ... DST for 2005: on: Sun May 1 0h standard time, off: Fri Sept. 30,
 # 1h standard time.
@@ -1256,18 +1141,12 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
 # From Steffen Thorsen (2009-03-16):
 # According to several news sources, Tunisia will not observe DST this year.
 # (Arabic)
-# 
 # http://www.elbashayer.com/?page=viewn&nid=42546
-# 
-# 
 # http://www.babnet.net/kiwidetail-15295.asp
-# 
 #
 # We have also confirmed this with the US embassy in Tunisia.
 # We have a wrap-up about this on the following page:
-# 
 # http://www.timeanddate.com/news/time/tunisia-cancels-dst-2009.html
-# 
 
 # From Alexander Krivenyshev (2009-03-17):
 # Here is a link to Tunis Afrique Presse News Agency
@@ -1275,20 +1154,17 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
 # Standard time to be kept the whole year long (tap.info.tn):
 #
 # (in English)
-# 
 # http://www.tap.info.tn/en/index.php?option=com_content&task=view&id=26813&Itemid=157
-# 
 #
 # (in Arabic)
-# 
 # http://www.tap.info.tn/ar/index.php?option=com_content&task=view&id=61240&Itemid=1
-# 
 
-# From Arthur David Olson (2009--3-18):
-# The Tunis Afrique Presse News Agency notice contains this: "This measure is due to the fact
-# that the fasting month of ramadan coincides with the period concerned by summer time.
-# Therefore, the standard time will be kept unchanged the whole year long."
-# So foregoing DST seems to be an exception (albeit one that may be repeated in the  future).
+# From Arthur David Olson (2009-03-18):
+# The Tunis Afrique Presse News Agency notice contains this: "This measure is
+# due to the fact that the fasting month of Ramadan coincides with the period
+# concerned by summer time.  Therefore, the standard time will be kept
+# unchanged the whole year long."  So foregoing DST seems to be an exception
+# (albeit one that may be repeated in the future).
 
 # From Alexander Krivenyshev (2010-03-27):
 # According to some news reports Tunis confirmed not to use DST in 2010
@@ -1300,12 +1176,8 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
 # coincided with the month of Ramadan..."
 #
 # (in Arabic)
-# 
 # http://www.moheet.com/show_news.aspx?nid=358861&pg=1
-# 
 # http://www.almadenahnews.com/newss/news.php?c=118&id=38036
-# or
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_tunis02.html
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S

Modified: stable/8/share/zoneinfo/antarctica
==============================================================================
--- stable/8/share/zoneinfo/antarctica	Fri Aug 29 13:24:49 2014	(r270813)
+++ stable/8/share/zoneinfo/antarctica	Fri Aug 29 13:26:11 2014	(r270814)
@@ -1,16 +1,13 @@
-# 
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
 # From Paul Eggert (1999-11-15):
 # To keep things manageable, we list only locations occupied year-round; see
-# 
 # COMNAP - Stations and Bases
-# 
+# 
 # and
-# 
 # Summary of the Peri-Antarctic Islands (1998-07-23)
-# 
+# 
 # for information.
 # Unless otherwise specified, we have no time zone information.
 #
@@ -55,19 +52,19 @@ Rule	ChileAQ	2012	max	-	Sep	Sun>=2	4:00u
 
 # Argentina - year-round bases
 # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05
-# Esperanza, San Martin Land, -6323-05659, since 1952-12-17
-# Jubany, Potter Peninsula, King George Island, -6414-0602320, since 1982-01
-# Marambio, Seymour I, -6414-05637, since 1969-10-29
+# Carlini, Potter Cove, King George Island, -6414-0602320, since 1982-01
+# Esperanza, Hope Bay, -6323-05659, since 1952-12-17
+# Marambio, -6414-05637, since 1969-10-29
 # Orcadas, Laurie I, -6016-04444, since 1904-02-22
-# San Martin, Debenham I, -6807-06708, since 1951-03-21
+# San Martín, Barry I, -6808-06706, since 1951-03-21
 #	(except 1960-03 / 1976-03-21)
 
 # Australia - territories
 # Heard Island, McDonald Islands (uninhabited)
 #	previously sealers and scientific personnel wintered
-#	
 #	Margaret Turner reports
-#	 (1999-09-30) that they're UTC+5, with no DST;
+#	
+#	(1999-09-30) that they're UTC+5, with no DST;
 #	presumably this is when they have visitors.
 #
 # year-round bases
@@ -84,14 +81,10 @@ Rule	ChileAQ	2012	max	-	Sep	Sun>=2	4:00u
 # The changes occurred on 2009-10-18 at 02:00 (local times).
 #
 # Government source: (Australian Antarctic Division)
-# 
 # http://www.aad.gov.au/default.asp?casid=37079
-# 
 #
 # We have more background information here:
-# 
 # http://www.timeanddate.com/news/time/antarctica-new-times.html
-# 
 
 # From Steffen Thorsen (2010-03-10):
 # We got these changes from the Australian Antarctic Division: ...
@@ -106,19 +99,17 @@ Rule	ChileAQ	2012	max	-	Sep	Sun>=2	4:00u
 # - Mawson station stays on UTC+5.
 #
 # Background:
-# 
 # http://www.timeanddate.com/news/time/antartica-time-changes-2010.html
-# 
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Antarctica/Casey	0	-	zzz	1969
-			8:00	-	WST	2009 Oct 18 2:00
-						# Western (Aus) Standard Time
+			8:00	-	AWST	2009 Oct 18 2:00
+						# Australian Western Std Time
 			11:00	-	CAST	2010 Mar 5 2:00
 						# Casey Time
-			8:00	-	WST	2011 Oct 28 2:00
+			8:00	-	AWST	2011 Oct 28 2:00
 			11:00	-	CAST	2012 Feb 21 17:00u
-			8:00	-	WST
+			8:00	-	AWST
 Zone Antarctica/Davis	0	-	zzz	1957 Jan 13
 			7:00	-	DAVT	1964 Nov # Davis Time
 			0	-	zzz	1969 Feb
@@ -132,24 +123,27 @@ Zone Antarctica/Mawson	0	-	zzz	1954 Feb 
 						# Mawson Time
 			5:00	-	MAWT
 # References:
-# 
 # Casey Weather (1998-02-26)
-# 
-# 
+# 
 # Davis Station, Antarctica (1998-02-26)
-# 
-# 
+# 
 # Mawson Station, Antarctica (1998-02-25)
-# 
+# 
+
+# Belgium - year-round base
+# Princess Elisabeth, Queen Maud Land, -713412+0231200, since 2007
 
 # Brazil - year-round base
-# Comandante Ferraz, King George Island, -6205+05824, since 1983/4
+# Ferraz, King George Island, -6205+05824, since 1983/4
+
+# Bulgaria - year-round base
+# St. Kliment Ohridski, Livingston Island, -623829-0602153, since 1988
 
 # Chile - year-round bases and towns
 # Escudero, South Shetland Is, -621157-0585735, since 1994
-# Presidente Eduadro Frei, King George Island, -6214-05848, since 1969-03-07
-# General Bernardo O'Higgins, Antarctic Peninsula, -6319-05704, since 1948-02
-# Capitan Arturo Prat, -6230-05941
+# Frei Montalva, King George Island, -6214-05848, since 1969-03-07
+# O'Higgins, Antarctic Peninsula, -6319-05704, since 1948-02
+# Prat, -6230-05941
 # Villa Las Estrellas (a town), around the Frei base, since 1984-04-09
 # These locations have always used Santiago time; use TZ='America/Santiago'.
 
@@ -157,31 +151,35 @@ Zone Antarctica/Mawson	0	-	zzz	1954 Feb 
 # Great Wall, King George Island, -6213-05858, since 1985-02-20
 # Zhongshan, Larsemann Hills, Prydz Bay, -6922+07623, since 1989-02-26
 
-# France - year-round bases
+# France - year-round bases (also see "France & Italy")
 #
 # From Antoine Leca (1997-01-20):
 # Time data are from Nicole Pailleau at the IFRTP
 # (French Institute for Polar Research and Technology).
-# She confirms that French Southern Territories and Terre Adelie bases
-# don't observe daylight saving time, even if Terre Adelie supplies came
+# She confirms that French Southern Territories and Terre Adélie bases
+# don't observe daylight saving time, even if Terre Adélie supplies came
 # from Tasmania.
 #
 # French Southern Territories with year-round inhabitants
 #
-# Martin-de-Vivies Base, Amsterdam Island, -374105+0773155, since 1950
-# Alfred-Faure Base, Crozet Islands, -462551+0515152, since 1964
-# Port-aux-Francais, Kerguelen Islands, -492110+0701303, since 1951;
+# Alfred Faure, Possession Island, Crozet Islands, -462551+0515152, since 1964;
+#	sealing & whaling stations operated variously 1802/1911+;
+#	see Indian/Reunion.
+#
+# Martin-de-Viviès, Amsterdam Island, -374105+0773155, since 1950
+# Port-aux-Français, Kerguelen Islands, -492110+0701303, since 1951;
 #	whaling & sealing station operated 1908/1914, 1920/1929, and 1951/1956
 #
 # St Paul Island - near Amsterdam, uninhabited
 #	fishing stations operated variously 1819/1931
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Indian/Kerguelen	0	-	zzz	1950	# Port-aux-Francais
+Zone Indian/Kerguelen	0	-	zzz	1950	# Port-aux-Français
 			5:00	-	TFT	# ISO code TF Time
 #
 # year-round base in the main continent
-# Dumont-d'Urville, Ile des Petrels, -6640+14001, since 1956-11
+# Dumont d'Urville, Île des Pétrels, -6640+14001, since 1956-11
+#  (2005-12-05)
 #
 # Another base at Port-Martin, 50km east, began operation in 1947.
 # It was destroyed by fire on 1952-01-14.
@@ -191,20 +189,22 @@ Zone Antarctica/DumontDUrville 0 -	zzz	1
 			10:00	-	PMT	1952 Jan 14 # Port-Martin Time
 			0	-	zzz	1956 Nov
 			10:00	-	DDUT	# Dumont-d'Urville Time
-# Reference:
-# 
-# Dumont d'Urville Station (2005-12-05)
-# 
+
+# France & Italy - year-round base
+# Concordia, -750600+1232000, since 2005
 
 # Germany - year-round base
-# Georg von Neumayer, -7039-00815
+# Neumayer III, -704080-0081602, since 2009
 
-# India - year-round base
-# Dakshin Gangotri, -7005+01200
+# India - year-round bases
+# Bharati, -692428+0761114, since 2012
+# Maitri, -704558+0114356, since 1989
+
+# Italy - year-round base (also see "France & Italy")
+# Zuchelli, Terra Nova Bay, -744140+1640647, since 1986
 
 # Japan - year-round bases
-# Dome Fuji, -7719+03942
-# Syowa, -690022+0393524
+# Syowa (also known as Showa), -690022+0393524, since 1957
 #
 # From Hideyuki Suzuki (1999-02-06):
 # In all Japanese stations, +0300 is used as the standard time.
@@ -216,11 +216,11 @@ Zone Antarctica/DumontDUrville 0 -	zzz	1
 Zone Antarctica/Syowa	0	-	zzz	1957 Jan 29
 			3:00	-	SYOT	# Syowa Time
 # See:
-# 
 # NIPR Antarctic Research Activities (1999-08-17)
-# 
+# 
 
 # S Korea - year-round base
+# Jang Bogo, Terra Nova Bay, -743700+1641205 since 2014
 # King Sejong, King George Island, -6213-05847, since 1988
 
 # New Zealand - claims
@@ -269,6 +269,9 @@ Zone Antarctica/Troll	0	-	zzz	2005 Feb 1
 # Poland - year-round base
 # Arctowski, King George Island, -620945-0582745, since 1977
 
+# Romania - year-bound base
+# Law-Racoviță, Larsemann Hills, -692319+0762251, since 1986
+
 # Russia - year-round bases
 # Bellingshausen, King George Island, -621159-0585337, since 1968-02-22
 # Mirny, Davis coast, -6633+09301, since 1956-02
@@ -278,8 +281,8 @@ Zone Antarctica/Troll	0	-	zzz	2005 Feb 1
 #	year-round from 1960/61 to 1992
 
 # Vostok, since 1957-12-16, temporarily closed 1994-02/1994-11
-# 
-# From Craig Mundell (1994-12-15):
+# From Craig Mundell (1994-12-15)
+# :
 # Vostok, which is one of the Russian stations, is set on the same
 # time as Moscow, Russia.
 #
@@ -294,7 +297,7 @@ Zone Antarctica/Troll	0	-	zzz	2005 Feb 1
 #
 # From Paul Eggert (2001-05-04):
 # This seems to be hopelessly confusing, so I asked Lee Hotz about it
-# in person.  He said that some Antartic locations set their local
+# in person.  He said that some Antarctic locations set their local
 # time so that noon is the warmest part of the day, and that this
 # changes during the year and does not necessarily correspond to mean
 # solar noon.  So the Vostok time might have been whatever the clocks
@@ -306,9 +309,12 @@ Zone Antarctica/Vostok	0	-	zzz	1957 Dec 
 
 # S Africa - year-round bases
 # Marion Island, -4653+03752
-# Sanae, -7141-00250
+# SANAE IV, Vesleskarvet, Queen Maud Land, -714022-0025026, since 1997
+
+# Ukraine - year-round base
+# Vernadsky (formerly Faraday), Galindez Island, -651445-0641526, since 1954
 
-# UK
+# United Kingdom
 #
 # British Antarctic Territories (BAT) claims
 # South Orkney Islands
@@ -364,7 +370,7 @@ Zone Antarctica/Palmer	0	-	zzz	1965
 # but that he found it more convenient to keep GMT+12
 # as supplies for the station were coming from McMurdo Sound,
 # which was on GMT+12 because New Zealand was on GMT+12 all year
-# at that time (1957).  (Source: Siple's book 90 degrees SOUTH.)
+# at that time (1957).  (Source: Siple's book 90 Degrees South.)
 #
 # From Susan Smith
 # http://www.cybertours.com/whs/pole10.html

Modified: stable/8/share/zoneinfo/asia
==============================================================================
--- stable/8/share/zoneinfo/asia	Fri Aug 29 13:24:49 2014	(r270813)
+++ stable/8/share/zoneinfo/asia	Fri Aug 29 13:26:11 2014	(r270814)
@@ -1,4 +1,3 @@
-# 
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -32,7 +31,7 @@
 # A reliable and entertaining source about time zones is
 # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
 #
-# I invented the abbreviations marked `*' in the following table;
+# I invented the abbreviations marked '*' in the following table;
 # the rest are from earlier versions of this file, or from other sources.
 # Corrections are welcome!
 #	     std  dst
@@ -47,13 +46,14 @@
 #	7:00 WIB	west Indonesia (Waktu Indonesia Barat)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 13:27:50 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id A65577C3;
 Fri, 29 Aug 2014 13:27:50 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8F4071CE1;
 Fri, 29 Aug 2014 13:27:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7TDRoqv054060;
 Fri, 29 Aug 2014 13:27:50 GMT (envelope-from pluknet@FreeBSD.org)
Received: (from pluknet@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7TDRoN7054056;
 Fri, 29 Aug 2014 13:27:50 GMT (envelope-from pluknet@FreeBSD.org)
Message-Id: <201408291327.s7TDRoN7054056@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: pluknet set sender to
 pluknet@FreeBSD.org using -f
From: Sergey Kandaurov 
Date: Fri, 29 Aug 2014 13:27:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r270815 - stable/9/contrib/tzdata
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 13:27:50 -0000

Author: pluknet
Date: Fri Aug 29 13:27:49 2014
New Revision: 270815
URL: http://svnweb.freebsd.org/changeset/base/270815

Log:
  MFC r270728, tzdata2014f
  
  - Parts of Russia will change times on 2014-10-26.
  - Time zone name changes for Asia/Novokuznetsk and Xinjiang and Samoa
    and America/Metlakatla, new zones Asia/Chita and Asia/Srednekolymsk.
  - Australia will now use Axxx.
  - New zone tab data format.
  
  And lots of historical changes (See
  http://mm.icann.org/pipermail/tz-announce/2014-August/000023.html
  for the full details.)

Added:
  stable/9/contrib/tzdata/zone1970.tab
     - copied unchanged from r270728, head/contrib/tzdata/zone1970.tab
Modified:
  stable/9/contrib/tzdata/africa
  stable/9/contrib/tzdata/antarctica
  stable/9/contrib/tzdata/asia
  stable/9/contrib/tzdata/australasia
  stable/9/contrib/tzdata/backward
  stable/9/contrib/tzdata/etcetera
  stable/9/contrib/tzdata/europe
  stable/9/contrib/tzdata/factory
  stable/9/contrib/tzdata/leap-seconds.list   (contents, props changed)
  stable/9/contrib/tzdata/northamerica
  stable/9/contrib/tzdata/pacificnew
  stable/9/contrib/tzdata/southamerica
  stable/9/contrib/tzdata/systemv
  stable/9/contrib/tzdata/yearistype.sh
  stable/9/contrib/tzdata/zone.tab
Directory Properties:
  stable/9/contrib/tzdata/   (props changed)

Modified: stable/9/contrib/tzdata/africa
==============================================================================
--- stable/9/contrib/tzdata/africa	Fri Aug 29 13:26:11 2014	(r270814)
+++ stable/9/contrib/tzdata/africa	Fri Aug 29 13:27:49 2014	(r270815)
@@ -1,4 +1,3 @@
-# 
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -35,13 +34,13 @@
 # Previous editions of this database used WAT, CAT, SAT, and EAT
 # for +0:00 through +3:00, respectively,
 # but Mark R V Murray reports that
-# `SAST' is the official abbreviation for +2:00 in the country of South Africa,
-# `CAT' is commonly used for +2:00 in countries north of South Africa, and
-# `WAT' is probably the best name for +1:00, as the common phrase for
-# the area that includes Nigeria is ``West Africa''.
-# He has heard of ``Western Sahara Time'' for +0:00 but can find no reference.
+# 'SAST' is the official abbreviation for +2:00 in the country of South Africa,
+# 'CAT' is commonly used for +2:00 in countries north of South Africa, and
+# 'WAT' is probably the best name for +1:00, as the common phrase for
+# the area that includes Nigeria is "West Africa".
+# He has heard of "Western Sahara Time" for +0:00 but can find no reference.
 #
-# To make things confusing, `WAT' seems to have been used for -1:00 long ago;
+# To make things confusing, 'WAT' seems to have been used for -1:00 long ago;
 # I'd guess that this was because people needed _some_ name for -1:00,
 # and at the time, far west Africa was the only major land area in -1:00.
 # This usage is now obsolete, as the last use of -1:00 on the African
@@ -54,7 +53,7 @@
 #	 2:00	SAST	South Africa Standard Time
 # and Murray suggests the following abbreviation:
 #	 1:00	WAT	West Africa Time
-# I realize that this leads to `WAT' being used for both -1:00 and 1:00
+# I realize that this leads to 'WAT' being used for both -1:00 and 1:00
 # for times before 1976, but this is the best I can think of
 # until we get more information.
 #
@@ -131,9 +130,7 @@ Zone	Africa/Gaborone	1:43:40 -	LMT	1885
 			2:00	-	CAT
 
 # Burkina Faso
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Africa/Ouagadougou	-0:06:04 -	LMT	1912
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Burundi
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -161,7 +158,7 @@ Zone	Africa/Bangui	1:14:20	-	LMT	1912
 
 # Chad
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Ndjamena	1:00:12 -	LMT	1912
+Zone	Africa/Ndjamena	1:00:12 -	LMT	1912 # N'Djamena
 			1:00	-	WAT	1979 Oct 14
 			1:00	1:00	WAST	1980 Mar  8
 			1:00	-	WAT
@@ -183,10 +180,20 @@ Zone Africa/Lubumbashi	1:49:52 -	LMT	189
 Zone Africa/Brazzaville	1:01:08 -	LMT	1912
 			1:00	-	WAT
 
-# Cote D'Ivoire
+# Côte D'Ivoire / Ivory Coast
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Abidjan	-0:16:08 -	LMT	1912
 			 0:00	-	GMT
+Link Africa/Abidjan Africa/Bamako	# Mali
+Link Africa/Abidjan Africa/Banjul	# Gambia
+Link Africa/Abidjan Africa/Conakry	# Guinea
+Link Africa/Abidjan Africa/Dakar	# Senegal
+Link Africa/Abidjan Africa/Freetown	# Sierra Leone
+Link Africa/Abidjan Africa/Lome		# Togo
+Link Africa/Abidjan Africa/Nouakchott	# Mauritania
+Link Africa/Abidjan Africa/Ouagadougou	# Burkina Faso
+Link Africa/Abidjan Africa/Sao_Tome	# São Tomé and Príncipe
+Link Africa/Abidjan Atlantic/St_Helena	# St Helena
 
 # Djibouti
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -231,13 +238,9 @@ Rule	Egypt	1990	1994	-	May	 1	1:00	1:00	
 # Egyptians would approve the cancellation."
 #
 # Egypt to cancel daylight saving time
-# 
 # http://www.almasryalyoum.com/en/node/407168
-# 
 # or
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_egypt04.html
-# 
 Rule	Egypt	1995	2010	-	Apr	lastFri	 0:00s	1:00	S
 Rule	Egypt	1995	2005	-	Sep	lastThu	24:00	0	-
 # From Steffen Thorsen (2006-09-19):
@@ -249,7 +252,7 @@ Rule	Egypt	2006	only	-	Sep	21	24:00	0	-
 # From Dirk Losch (2007-08-14):
 # I received a mail from an airline which says that the daylight
 # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07.
-# From Jesper Norgaard Welen (2007-08-15): [The following agree:]
+# From Jesper Nørgaard Welen (2007-08-15): [The following agree:]
 # http://www.nentjes.info/Bill/bill5.htm
 # http://www.timeanddate.com/worldclock/city.html?n=53
 # From Steffen Thorsen (2007-09-04): The official information...:
@@ -288,15 +291,9 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	24:00	
 #
 # timeanddate[2] and another site I've found[3] also support that.
 #
-# [1] 
-# https://bugzilla.redhat.com/show_bug.cgi?id=492263
-# 
-# [2] 
-# http://www.timeanddate.com/worldclock/clockchange.html?n=53
-# 
-# [3] 
-# http://wwp.greenwichmeantime.com/time-zone/africa/egypt/
-# 
+# [1] https://bugzilla.redhat.com/show_bug.cgi?id=492263
+# [2] http://www.timeanddate.com/worldclock/clockchange.html?n=53
+# [3] http://wwp.greenwichmeantime.com/time-zone/africa/egypt/
 
 # From Arthur David Olson (2009-04-20):
 # In 2009 (and for the next several years), Ramadan ends before the fourth
@@ -306,14 +303,10 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	24:00	
 # From Steffen Thorsen (2009-08-11):
 # We have been able to confirm the August change with the Egyptian Cabinet
 # Information and Decision Support Center:
-# 
 # http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html
-# 
 #
 # The Middle East News Agency
-# 
 # http://www.mena.org.eg/index.aspx
-# 
 # also reports "Egypt starts winter time on August 21"
 # today in article numbered "71, 11/08/2009 12:25 GMT."
 # Only the title above is available without a subscription to their service,
@@ -321,19 +314,14 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	24:00	
 # (at least today).
 
 # From Alexander Krivenyshev (2010-07-20):
-# According to News from Egypt -  Al-Masry Al-Youm Egypt's cabinet has
+# According to News from Egypt - Al-Masry Al-Youm Egypt's cabinet has
 # decided that Daylight Saving Time will not be used in Egypt during
 # Ramadan.
 #
 # Arabic translation:
-# "Clocks to go back during Ramadan--and then forward again"
-# 
+# "Clocks to go back during Ramadan - and then forward again"
 # http://www.almasryalyoum.com/en/news/clocks-go-back-during-ramadan-and-then-forward-again
-# 
-# or
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_egypt02.html
-# 
 
 # From Ahmad El-Dardiry (2014-05-07):
 # Egypt is to change back to Daylight system on May 15
@@ -433,10 +421,15 @@ Zone	Africa/Asmara	2:35:32 -	LMT	1870
 			3:00	-	EAT
 
 # Ethiopia
-# From Paul Eggert (2006-03-22):
-# Shanks & Pottenger write that Ethiopia had six narrowly-spaced time zones
-# between 1870 and 1890, and that they merged to 38E50 (2:35:20) in 1890.
-# We'll guess that 38E50 is for Adis Dera.
+# From Paul Eggert (2014-07-31):
+# Like the Swahili of Kenya and Tanzania, many Ethiopians keep a
+# 12-hour clock starting at our 06:00, so their "8 o'clock" is our
+# 02:00 or 14:00.  Keep this in mind when you ask the time in Amharic.
+#
+# Shanks & Pottenger write that Ethiopia had six narrowly-spaced time
+# zones between 1870 and 1890, that they merged to 38E50 (2:35:20) in
+# 1890, and that they switched to 3:00 on 1936-05-05.  Perhaps 38E50
+# was for Adis Dera.  Quite likely the Shanks data are wrong anyway.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Addis_Ababa	2:34:48 -	LMT	1870
 			2:35:20	-	ADMT	1936 May 5    # Adis Dera MT
@@ -448,28 +441,24 @@ Zone Africa/Libreville	0:37:48 -	LMT	191
 			1:00	-	WAT
 
 # Gambia
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Banjul	-1:06:36 -	LMT	1912
-			-1:06:36 -	BMT	1935	# Banjul Mean Time
-			-1:00	-	WAT	1964
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Ghana
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-# Whitman says DST was observed from 1931 to ``the present'';
-# go with Shanks & Pottenger.
-Rule	Ghana	1936	1942	-	Sep	 1	0:00	0:20	GHST
-Rule	Ghana	1936	1942	-	Dec	31	0:00	0	GMT
+# Whitman says DST was observed from 1931 to "the present";
+# Shanks & Pottenger say 1936 to 1942;
+# and September 1 to January 1 is given by:
+# Scott Keltie J, Epstein M (eds), The Statesman's Year-Book,
+# 57th ed. Macmillan, London (1920), OCLC 609408015, pp xxviii.
+# For lack of better info, assume DST was observed from 1920 to 1942.
+Rule	Ghana	1920	1942	-	Sep	 1	0:00	0:20	GHST
+Rule	Ghana	1920	1942	-	Dec	31	0:00	0	GMT
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Accra	-0:00:52 -	LMT	1918
 			 0:00	Ghana	%s
 
 # Guinea
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Conakry	-0:54:52 -	LMT	1912
-			 0:00	-	GMT	1934 Feb 26
-			-1:00	-	WAT	1960
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Guinea-Bissau
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -577,18 +566,8 @@ Zone	Africa/Blantyre	2:20:00 -	LMT	1903 
 			2:00	-	CAT
 
 # Mali
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Bamako	-0:32:00 -	LMT	1912
-			 0:00	-	GMT	1934 Feb 26
-			-1:00	-	WAT	1960 Jun 20
-			 0:00	-	GMT
-
 # Mauritania
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Africa/Nouakchott	-1:03:48 -	LMT	1912
-			 0:00	-	GMT	1934 Feb 26
-			-1:00	-	WAT	1960 Nov 28
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Mauritius
 
@@ -612,9 +591,7 @@ Zone Africa/Nouakchott	-1:03:48 -	LMT	19
 
 # From Steffen Thorsen (2008-07-10):
 # According to
-# 
 # http://www.lexpress.mu/display_article.php?news_id=111216
-# 
 # (in French), Mauritius will start and end their DST a few days earlier
 # than previously announced (2008-11-01 to 2009-03-31).  The new start
 # date is 2008-10-26 at 02:00 and the new end date is 2009-03-27 (no time
@@ -633,18 +610,13 @@ Zone Africa/Nouakchott	-1:03:48 -	LMT	19
 # published on Monday, June 30, 2008...
 #
 # I guess that article in French "Le gouvernement avance l'introduction
-# de l'heure d'ete" stating that DST in Mauritius starting on October 26
-# and ending on March 27, 2009 is the most recent one.
-# ...
-# 
+# de l'heure d'été" stating that DST in Mauritius starting on October 26
+# and ending on March 27, 2009 is the most recent one....
 # http://www.worldtimezone.com/dst_news/dst_news_mauritius02.html
-# 
 
 # From Riad M. Hossen Ally (2008-08-03):
 # The Government of Mauritius weblink
-# 
 # http://www.gov.mu/portal/site/pmosite/menuitem.4ca0efdee47462e7440a600248a521ca/?content_id=4728ca68b2a5b110VgnVCM1000000a04a8c0RCRD
-# 
 # Cabinet Decision of July 18th, 2008 states as follows:
 #
 # 4. ...Cabinet has agreed to the introduction into the National Assembly
@@ -654,33 +626,25 @@ Zone Africa/Nouakchott	-1:03:48 -	LMT	19
 # States of America. It will start at two o'clock in the morning on the
 # last Sunday of October and will end at two o'clock in the morning on
 # the last Sunday of March the following year. The summer time for the
-# year 2008 - 2009 will, therefore, be effective as from 26 October 2008
+# year 2008-2009 will, therefore, be effective as from 26 October 2008
 # and end on 29 March 2009.
 
 # From Ed Maste (2008-10-07):
 # THE TIME BILL (No. XXVII of 2008) Explanatory Memorandum states the
 # beginning / ending of summer time is 2 o'clock standard time in the
 # morning of the last Sunday of October / last Sunday of March.
-# 
 # http://www.gov.mu/portal/goc/assemblysite/file/bill2708.pdf
-# 
 
 # From Steffen Thorsen (2009-06-05):
 # According to several sources, Mauritius will not continue to observe
 # DST the coming summer...
 #
 # Some sources, in French:
-# 
 # http://www.defimedia.info/news/946/Rashid-Beebeejaun-:-%C2%AB-L%E2%80%99heure-d%E2%80%99%C3%A9t%C3%A9-ne-sera-pas-appliqu%C3%A9e-cette-ann%C3%A9e-%C2%BB
-# 
-# 
 # http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-%C3%A9conomie-d-%C3%A9nergie-de-l-heure-d-%C3%A9t%C3%A9-ont-%C3%A9t%C3%A9-atteints-
-# 
 #
 # Our wrap-up:
-# 
 # http://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html
-# 
 
 # From Arthur David Olson (2009-07-11):
 # The "mauritius-dst-will-not-repeat" wrapup includes this:
@@ -704,7 +668,7 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 			3:00	-	EAT
 
 # Morocco
-# See the `europe' file for Spanish Morocco (Africa/Ceuta).
+# See the 'europe' file for Spanish Morocco (Africa/Ceuta).
 
 # From Alex Krivenyshev (2008-05-09):
 # Here is an article that Morocco plan to introduce Daylight Saving Time between
@@ -712,60 +676,43 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 #
 # "... Morocco is to save energy by adjusting its clock during summer so it will
 # be one hour ahead of GMT between 1 June and 27 September, according to
-# Communication Minister and Gov ernment Spokesman, Khalid Naciri...."
+# Communication Minister and Government Spokesman, Khalid Naciri...."
 #
-# 
 # http://www.worldtimezone.net/dst_news/dst_news_morocco01.html
-# 
-# OR
-# 
 # http://en.afrik.com/news11892.html
-# 
 
 # From Alex Krivenyshev (2008-05-09):
 # The Morocco time change can be confirmed on Morocco web site Maghreb Arabe Presse:
-# 
 # http://www.map.ma/eng/sections/box3/morocco_shifts_to_da/view
-# 
 #
 # Morocco shifts to daylight time on June 1st through September 27, Govt.
 # spokesman.
 
 # From Patrice Scattolin (2008-05-09):
 # According to this article:
-# 
 # http://www.avmaroc.com/actualite/heure-dete-comment-a127896.html
-# 
-# (and republished here:
-# 
-# http://www.actu.ma/heure-dete-comment_i127896_0.html
-# 
-# )
-# the changes occurs at midnight:
-#
-# saturday night may 31st at midnight (which in french is to be
-# intrepreted as the night between saturday and sunday)
-# sunday night the 28th  at midnight
-#
-# Seeing that the 28th is monday, I am guessing that she intends to say
-# the midnight of the 28th which is the midnight between sunday and
-# monday, which jives with other sources that say that it's inclusive
-# june1st to sept 27th.
+# (and republished here: )
+# the changes occur at midnight:
+#
+# Saturday night May 31st at midnight (which in French is to be
+# interpreted as the night between Saturday and Sunday)
+# Sunday night the 28th at midnight
+#
+# Seeing that the 28th is Monday, I am guessing that she intends to say
+# the midnight of the 28th which is the midnight between Sunday and
+# Monday, which jives with other sources that say that it's inclusive
+# June 1st to Sept 27th.
 #
 # The decision was taken by decree *2-08-224 *but I can't find the decree
 # published on the web.
 #
 # It's also confirmed here:
-# 
 # http://www.maroc.ma/NR/exeres/FACF141F-D910-44B0-B7FA-6E03733425D1.htm
-# 
-# on a government portal as being  between june 1st and sept 27th (not yet
-# posted in english).
+# on a government portal as being between June 1st and Sept 27th (not yet
+# posted in English).
 #
-# The following google query will generate many relevant hits:
-# 
+# The following Google query will generate many relevant hits:
 # http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search
-# 
 
 # From Steffen Thorsen (2008-08-27):
 # Morocco will change the clocks back on the midnight between August 31
@@ -773,47 +720,32 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 # of September:
 #
 # One article about it (in French):
-# 
 # http://www.menara.ma/fr/Actualites/Maroc/Societe/ci.retour_a_l_heure_gmt_a_partir_du_dimanche_31_aout_a_minuit_officiel_.default
-# 
 #
 # We have some further details posted here:
-# 
 # http://www.timeanddate.com/news/time/morocco-ends-dst-early-2008.html
-# 
 
 # From Steffen Thorsen (2009-03-17):
 # Morocco will observe DST from 2009-06-01 00:00 to 2009-08-21 00:00 according
 # to many sources, such as
-# 
 # http://news.marweb.com/morocco/entertainment/morocco-daylight-saving.html
-# 
-# 
 # http://www.medi1sat.ma/fr/depeche.aspx?idp=2312
-# 
 # (French)
 #
 # Our summary:
-# 
 # http://www.timeanddate.com/news/time/morocco-starts-dst-2009.html
-# 
 
 # From Alexander Krivenyshev (2009-03-17):
 # Here is a link to official document from Royaume du Maroc Premier Ministre,
-# Ministere de la Modernisation des Secteurs Publics
+# Ministère de la Modernisation des Secteurs Publics
 #
 # Under Article 1 of Royal Decree No. 455-67 of Act 23 safar 1387 (2 june 1967)
 # concerning the amendment of the legal time, the Ministry of Modernization of
 # Public Sectors announced that the official time in the Kingdom will be
 # advanced 60 minutes from Sunday 31 May 2009 at midnight.
 #
-# 
 # http://www.mmsp.gov.ma/francais/Actualites_fr/PDF_Actualites_Fr/HeureEte_FR.pdf
-# 
-#
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_morocco03.html
-# 
 
 # From Steffen Thorsen (2010-04-13):
 # Several news media in Morocco report that the Ministry of Modernization
@@ -821,14 +753,10 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 # 2010-05-02 to 2010-08-08.
 #
 # Example:
-# 
 # http://www.lavieeco.com/actualites/4099-le-maroc-passera-a-l-heure-d-ete-gmt1-le-2-mai.html
-# 
 # (French)
 # Our page:
-# 
 # http://www.timeanddate.com/news/time/morocco-starts-dst-2010.html
-# 
 
 # From Dan Abitol (2011-03-30):
 # ...Rules for Africa/Casablanca are the following (24h format)
@@ -838,34 +766,20 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 # The change was broadcast on the FM Radio
 # I ve called ANRT (telecom regulations in Morocco) at
 # +212.537.71.84.00
-# 
 # http://www.anrt.net.ma/fr/
-# 
 # They said that
-# 
 # http://www.map.ma/fr/sections/accueil/l_heure_legale_au_ma/view
-# 
 # is the official publication to look at.
 # They said that the decision was already taken.
 #
 # More articles in the press
-# 
-# http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-lev
-# 
-# e.html
-# 
+# http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-leve.html
 # http://www.lematin.ma/Actualite/Express/Article.asp?id=148923
-# 
-# 
 # http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT%2B1-a-partir-de-dim
-# anche-prochain-5538.html
-# 
 
 # From Petr Machata (2011-03-30):
 # They have it written in English here:
-# 
 # http://www.map.ma/eng/sections/home/morocco_to_spring_fo/view
-# 
 #
 # It says there that "Morocco will resume its standard time on July 31,
 # 2011 at midnight." Now they don't say whether they mean midnight of
@@ -873,20 +787,16 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 # also been like that in the past.
 
 # From Alexander Krivenyshev (2012-03-09):
-# According to Infomédiaire web site from Morocco (infomediaire.ma),
-# on March 9, 2012, (in French) Heure légale:
-# Le Maroc adopte officiellement l'heure d'été
-# 
+# According to Infomédiaire web site from Morocco (infomediaire.ma),
+# on March 9, 2012, (in French) Heure légale:
+# Le Maroc adopte officiellement l'heure d'été
 # http://www.infomediaire.ma/news/maroc/heure-l%C3%A9gale-le-maroc-adopte-officiellement-lheure-d%C3%A9t%C3%A9
-# 
 # Governing Council adopted draft decree, that Morocco DST starts on
 # the last Sunday of March (March 25, 2012) and ends on
 # last Sunday of September (September 30, 2012)
 # except the month of Ramadan.
 # or (brief)
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_morocco06.html
-# 
 
 # From Arthur David Olson (2012-03-10):
 # The infomediaire.ma source indicates that the system is to be in
@@ -897,17 +807,13 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 
 # From Christophe Tropamer (2012-03-16):
 # Seen Morocco change again:
-# 
 # http://www.le2uminutes.com/actualite.php
-# 
-# "...à partir du dernier dimance d'avril et non fins mars,
-# comme annoncé précédemment."
+# "...à partir du dernier dimanche d'avril et non fins mars,
+# comme annoncé précédemment."
 
 # From Milamber Space Network (2012-07-17):
 # The official return to GMT is announced by the Moroccan government:
-# 
 # http://www.mmsp.gov.ma/fr/actualites.aspx?id=288 [in French]
-# 
 #
 # Google translation, lightly edited:
 # Back to the standard time of the Kingdom (GMT)
@@ -1052,7 +958,7 @@ Zone Africa/Casablanca	-0:30:20 -	LMT	19
 # Assume that this has been true since Western Sahara switched to GMT,
 # since most of it was then controlled by Morocco.
 
-Zone Africa/El_Aaiun	-0:52:48 -	LMT	1934 Jan
+Zone Africa/El_Aaiun	-0:52:48 -	LMT	1934 Jan # El Aaiún
 			-1:00	-	WAT	1976 Apr 14
 			 0:00	Morocco	WE%sT
 
@@ -1102,15 +1008,17 @@ Zone	Africa/Niamey	 0:08:28 -	LMT	1912
 Zone	Africa/Lagos	0:13:36 -	LMT	1919 Sep
 			1:00	-	WAT
 
-# Reunion
+# Réunion
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Indian/Reunion	3:41:52 -	LMT	1911 Jun	# Saint-Denis
-			4:00	-	RET	# Reunion Time
+			4:00	-	RET	# Réunion Time
 #
-# Scattered Islands (Iles Eparses) administered from Reunion are as follows.
+# Crozet Islands also observes Réunion time; see the 'antarctica' file.
+#
+# Scattered Islands (Îles Éparses) administered from Réunion are as follows.
 # The following information about them is taken from
-# Iles Eparses (www.outre-mer.gouv.fr/domtom/ile.htm, 1997-07-22, in French;
-# no longer available as of 1999-08-17).
+# Îles Éparses (, 1997-07-22,
+# in French; no longer available as of 1999-08-17).
 # We have no info about their time zone histories.
 #
 # Bassas da India - uninhabited
@@ -1125,28 +1033,17 @@ Zone	Africa/Kigali	2:00:16 -	LMT	1935 Ju
 			2:00	-	CAT
 
 # St Helena
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Atlantic/St_Helena	-0:22:48 -	LMT	1890		# Jamestown
-			-0:22:48 -	JMT	1951	# Jamestown Mean Time
-			 0:00	-	GMT
+# See Africa/Abidjan.
 # The other parts of the St Helena territory are similar:
 #	Tristan da Cunha: on GMT, say Whitman and the CIA
-#	Ascension: on GMT, says usno1995 and the CIA
+#	Ascension: on GMT, say the USNO (1995-12-21) and the CIA
 #	Gough (scientific station since 1955; sealers wintered previously):
 #		on GMT, says the CIA
-#	Inaccessible, Nightingale: no information, but probably GMT
-
-# Sao Tome and Principe
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Sao_Tome	 0:26:56 -	LMT	1884
-			-0:36:32 -	LMT	1912	# Lisbon Mean Time
-			 0:00	-	GMT
+#	Inaccessible, Nightingale: uninhabited
 
+# São Tomé and Príncipe
 # Senegal
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Dakar	-1:09:44 -	LMT	1912
-			-1:00	-	WAT	1941 Jun
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Seychelles
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1160,17 +1057,7 @@ Zone	Indian/Mahe	3:41:48 -	LMT	1906 Jun	
 # Possibly the islands were uninhabited.
 
 # Sierra Leone
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-# Whitman gives Mar 31 - Aug 31 for 1931 on; go with Shanks & Pottenger.
-Rule	SL	1935	1942	-	Jun	 1	0:00	0:40	SLST
-Rule	SL	1935	1942	-	Oct	 1	0:00	0	WAT
-Rule	SL	1957	1962	-	Jun	 1	0:00	1:00	SLST
-Rule	SL	1957	1962	-	Sep	 1	0:00	0	GMT
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Freetown	-0:53:00 -	LMT	1882
-			-0:53:00 -	FMT	1913 Jun # Freetown Mean Time
-			-1:00	SL	%s	1957
-			 0:00	SL	%s
+# See Africa/Abidjan.
 
 # Somalia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1193,9 +1080,9 @@ Zone Africa/Johannesburg 1:52:00 -	LMT	1
 
 # Sudan
 #
-# From 
-# Sudan News Agency (2000-01-13)
-# , also reported by Michael De Beukelaer-Dossche via Steffen Thorsen:
+# From 
+# Sudan News Agency (2000-01-13),
+# also reported by Michaël De Beukelaer-Dossche via Steffen Thorsen:
 # Clocks will be moved ahead for 60 minutes all over the Sudan as of noon
 # Saturday....  This was announced Thursday by Caretaker State Minister for
 # Manpower Abdul-Rahman Nur-Eddin.
@@ -1226,14 +1113,12 @@ Zone Africa/Dar_es_Salaam 2:37:08 -	LMT	
 			3:00	-	EAT
 
 # Togo
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Lome	0:04:52 -	LMT	1893
-			0:00	-	GMT
+# See Africa/Abidjan.
 
 # Tunisia
 
 # From Gwillim Law (2005-04-30):
-# My correspondent, Risto Nykanen, has alerted me to another adoption of DST,
+# My correspondent, Risto Nykänen, has alerted me to another adoption of DST,
 # this time in Tunisia.  According to Yahoo France News
 # , in a story attributed to AP
 # and dated 2005-04-26, "Tunisia has decided to advance its official time by
@@ -1242,7 +1127,7 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
 # Saturday."  (My translation)
 #
 # From Oscar van Vlijmen (2005-05-02):
-# LaPresse, the first national daily newspaper ...
+# La Presse, the first national daily newspaper ...
 # 
 # ... DST for 2005: on: Sun May 1 0h standard time, off: Fri Sept. 30,
 # 1h standard time.
@@ -1256,18 +1141,12 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
 # From Steffen Thorsen (2009-03-16):
 # According to several news sources, Tunisia will not observe DST this year.
 # (Arabic)
-# 
 # http://www.elbashayer.com/?page=viewn&nid=42546
-# 
-# 
 # http://www.babnet.net/kiwidetail-15295.asp
-# 
 #
 # We have also confirmed this with the US embassy in Tunisia.
 # We have a wrap-up about this on the following page:
-# 
 # http://www.timeanddate.com/news/time/tunisia-cancels-dst-2009.html
-# 
 
 # From Alexander Krivenyshev (2009-03-17):
 # Here is a link to Tunis Afrique Presse News Agency
@@ -1275,20 +1154,17 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
 # Standard time to be kept the whole year long (tap.info.tn):
 #
 # (in English)
-# 
 # http://www.tap.info.tn/en/index.php?option=com_content&task=view&id=26813&Itemid=157
-# 
 #
 # (in Arabic)
-# 
 # http://www.tap.info.tn/ar/index.php?option=com_content&task=view&id=61240&Itemid=1
-# 
 
-# From Arthur David Olson (2009--3-18):
-# The Tunis Afrique Presse News Agency notice contains this: "This measure is due to the fact
-# that the fasting month of ramadan coincides with the period concerned by summer time.
-# Therefore, the standard time will be kept unchanged the whole year long."
-# So foregoing DST seems to be an exception (albeit one that may be repeated in the  future).
+# From Arthur David Olson (2009-03-18):
+# The Tunis Afrique Presse News Agency notice contains this: "This measure is
+# due to the fact that the fasting month of Ramadan coincides with the period
+# concerned by summer time.  Therefore, the standard time will be kept
+# unchanged the whole year long."  So foregoing DST seems to be an exception
+# (albeit one that may be repeated in the future).
 
 # From Alexander Krivenyshev (2010-03-27):
 # According to some news reports Tunis confirmed not to use DST in 2010
@@ -1300,12 +1176,8 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
 # coincided with the month of Ramadan..."
 #
 # (in Arabic)
-# 
 # http://www.moheet.com/show_news.aspx?nid=358861&pg=1
-# 
 # http://www.almadenahnews.com/newss/news.php?c=118&id=38036
-# or
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_tunis02.html
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S

Modified: stable/9/contrib/tzdata/antarctica
==============================================================================
--- stable/9/contrib/tzdata/antarctica	Fri Aug 29 13:26:11 2014	(r270814)
+++ stable/9/contrib/tzdata/antarctica	Fri Aug 29 13:27:49 2014	(r270815)
@@ -1,16 +1,13 @@
-# 
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
 # From Paul Eggert (1999-11-15):
 # To keep things manageable, we list only locations occupied year-round; see
-# 
 # COMNAP - Stations and Bases
-# 
+# 
 # and
-# 
 # Summary of the Peri-Antarctic Islands (1998-07-23)
-# 
+# 
 # for information.
 # Unless otherwise specified, we have no time zone information.
 #
@@ -55,19 +52,19 @@ Rule	ChileAQ	2012	max	-	Sep	Sun>=2	4:00u
 
 # Argentina - year-round bases
 # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05
-# Esperanza, San Martin Land, -6323-05659, since 1952-12-17
-# Jubany, Potter Peninsula, King George Island, -6414-0602320, since 1982-01
-# Marambio, Seymour I, -6414-05637, since 1969-10-29
+# Carlini, Potter Cove, King George Island, -6414-0602320, since 1982-01
+# Esperanza, Hope Bay, -6323-05659, since 1952-12-17
+# Marambio, -6414-05637, since 1969-10-29
 # Orcadas, Laurie I, -6016-04444, since 1904-02-22
-# San Martin, Debenham I, -6807-06708, since 1951-03-21
+# San Martín, Barry I, -6808-06706, since 1951-03-21
 #	(except 1960-03 / 1976-03-21)
 
 # Australia - territories
 # Heard Island, McDonald Islands (uninhabited)
 #	previously sealers and scientific personnel wintered
-#	
 #	Margaret Turner reports
-#	 (1999-09-30) that they're UTC+5, with no DST;
+#	
+#	(1999-09-30) that they're UTC+5, with no DST;
 #	presumably this is when they have visitors.
 #
 # year-round bases
@@ -84,14 +81,10 @@ Rule	ChileAQ	2012	max	-	Sep	Sun>=2	4:00u
 # The changes occurred on 2009-10-18 at 02:00 (local times).
 #
 # Government source: (Australian Antarctic Division)
-# 
 # http://www.aad.gov.au/default.asp?casid=37079
-# 
 #
 # We have more background information here:
-# 
 # http://www.timeanddate.com/news/time/antarctica-new-times.html
-# 
 
 # From Steffen Thorsen (2010-03-10):
 # We got these changes from the Australian Antarctic Division: ...
@@ -106,19 +99,17 @@ Rule	ChileAQ	2012	max	-	Sep	Sun>=2	4:00u
 # - Mawson station stays on UTC+5.
 #
 # Background:
-# 
 # http://www.timeanddate.com/news/time/antartica-time-changes-2010.html
-# 
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Antarctica/Casey	0	-	zzz	1969
-			8:00	-	WST	2009 Oct 18 2:00
-						# Western (Aus) Standard Time
+			8:00	-	AWST	2009 Oct 18 2:00
+						# Australian Western Std Time
 			11:00	-	CAST	2010 Mar 5 2:00
 						# Casey Time
-			8:00	-	WST	2011 Oct 28 2:00
+			8:00	-	AWST	2011 Oct 28 2:00
 			11:00	-	CAST	2012 Feb 21 17:00u
-			8:00	-	WST
+			8:00	-	AWST
 Zone Antarctica/Davis	0	-	zzz	1957 Jan 13
 			7:00	-	DAVT	1964 Nov # Davis Time
 			0	-	zzz	1969 Feb
@@ -132,24 +123,27 @@ Zone Antarctica/Mawson	0	-	zzz	1954 Feb 
 						# Mawson Time
 			5:00	-	MAWT
 # References:
-# 
 # Casey Weather (1998-02-26)
-# 
-# 
+# 
 # Davis Station, Antarctica (1998-02-26)
-# 
-# 
+# 
 # Mawson Station, Antarctica (1998-02-25)
-# 
+# 
+
+# Belgium - year-round base
+# Princess Elisabeth, Queen Maud Land, -713412+0231200, since 2007
 
 # Brazil - year-round base
-# Comandante Ferraz, King George Island, -6205+05824, since 1983/4
+# Ferraz, King George Island, -6205+05824, since 1983/4
+
+# Bulgaria - year-round base
+# St. Kliment Ohridski, Livingston Island, -623829-0602153, since 1988
 
 # Chile - year-round bases and towns
 # Escudero, South Shetland Is, -621157-0585735, since 1994
-# Presidente Eduadro Frei, King George Island, -6214-05848, since 1969-03-07
-# General Bernardo O'Higgins, Antarctic Peninsula, -6319-05704, since 1948-02
-# Capitan Arturo Prat, -6230-05941
+# Frei Montalva, King George Island, -6214-05848, since 1969-03-07
+# O'Higgins, Antarctic Peninsula, -6319-05704, since 1948-02
+# Prat, -6230-05941
 # Villa Las Estrellas (a town), around the Frei base, since 1984-04-09
 # These locations have always used Santiago time; use TZ='America/Santiago'.
 
@@ -157,31 +151,35 @@ Zone Antarctica/Mawson	0	-	zzz	1954 Feb 
 # Great Wall, King George Island, -6213-05858, since 1985-02-20
 # Zhongshan, Larsemann Hills, Prydz Bay, -6922+07623, since 1989-02-26
 
-# France - year-round bases
+# France - year-round bases (also see "France & Italy")
 #
 # From Antoine Leca (1997-01-20):
 # Time data are from Nicole Pailleau at the IFRTP
 # (French Institute for Polar Research and Technology).
-# She confirms that French Southern Territories and Terre Adelie bases
-# don't observe daylight saving time, even if Terre Adelie supplies came
+# She confirms that French Southern Territories and Terre Adélie bases
+# don't observe daylight saving time, even if Terre Adélie supplies came
 # from Tasmania.
 #
 # French Southern Territories with year-round inhabitants
 #
-# Martin-de-Vivies Base, Amsterdam Island, -374105+0773155, since 1950
-# Alfred-Faure Base, Crozet Islands, -462551+0515152, since 1964
-# Port-aux-Francais, Kerguelen Islands, -492110+0701303, since 1951;
+# Alfred Faure, Possession Island, Crozet Islands, -462551+0515152, since 1964;
+#	sealing & whaling stations operated variously 1802/1911+;
+#	see Indian/Reunion.
+#
+# Martin-de-Viviès, Amsterdam Island, -374105+0773155, since 1950
+# Port-aux-Français, Kerguelen Islands, -492110+0701303, since 1951;
 #	whaling & sealing station operated 1908/1914, 1920/1929, and 1951/1956
 #
 # St Paul Island - near Amsterdam, uninhabited
 #	fishing stations operated variously 1819/1931
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Indian/Kerguelen	0	-	zzz	1950	# Port-aux-Francais
+Zone Indian/Kerguelen	0	-	zzz	1950	# Port-aux-Français
 			5:00	-	TFT	# ISO code TF Time
 #
 # year-round base in the main continent
-# Dumont-d'Urville, Ile des Petrels, -6640+14001, since 1956-11
+# Dumont d'Urville, Île des Pétrels, -6640+14001, since 1956-11
+#  (2005-12-05)
 #
 # Another base at Port-Martin, 50km east, began operation in 1947.
 # It was destroyed by fire on 1952-01-14.
@@ -191,20 +189,22 @@ Zone Antarctica/DumontDUrville 0 -	zzz	1
 			10:00	-	PMT	1952 Jan 14 # Port-Martin Time
 			0	-	zzz	1956 Nov
 			10:00	-	DDUT	# Dumont-d'Urville Time
-# Reference:
-# 
-# Dumont d'Urville Station (2005-12-05)
-# 
+
+# France & Italy - year-round base
+# Concordia, -750600+1232000, since 2005
 
 # Germany - year-round base
-# Georg von Neumayer, -7039-00815
+# Neumayer III, -704080-0081602, since 2009
 
-# India - year-round base
-# Dakshin Gangotri, -7005+01200
+# India - year-round bases
+# Bharati, -692428+0761114, since 2012
+# Maitri, -704558+0114356, since 1989
+
+# Italy - year-round base (also see "France & Italy")
+# Zuchelli, Terra Nova Bay, -744140+1640647, since 1986
 
 # Japan - year-round bases
-# Dome Fuji, -7719+03942
-# Syowa, -690022+0393524
+# Syowa (also known as Showa), -690022+0393524, since 1957
 #
 # From Hideyuki Suzuki (1999-02-06):
 # In all Japanese stations, +0300 is used as the standard time.
@@ -216,11 +216,11 @@ Zone Antarctica/DumontDUrville 0 -	zzz	1
 Zone Antarctica/Syowa	0	-	zzz	1957 Jan 29
 			3:00	-	SYOT	# Syowa Time
 # See:
-# 
 # NIPR Antarctic Research Activities (1999-08-17)
-# 
+# 
 
 # S Korea - year-round base
+# Jang Bogo, Terra Nova Bay, -743700+1641205 since 2014
 # King Sejong, King George Island, -6213-05847, since 1988
 
 # New Zealand - claims
@@ -269,6 +269,9 @@ Zone Antarctica/Troll	0	-	zzz	2005 Feb 1
 # Poland - year-round base
 # Arctowski, King George Island, -620945-0582745, since 1977
 
+# Romania - year-bound base
+# Law-Racoviță, Larsemann Hills, -692319+0762251, since 1986
+
 # Russia - year-round bases
 # Bellingshausen, King George Island, -621159-0585337, since 1968-02-22
 # Mirny, Davis coast, -6633+09301, since 1956-02
@@ -278,8 +281,8 @@ Zone Antarctica/Troll	0	-	zzz	2005 Feb 1
 #	year-round from 1960/61 to 1992
 
 # Vostok, since 1957-12-16, temporarily closed 1994-02/1994-11
-# 
-# From Craig Mundell (1994-12-15):
+# From Craig Mundell (1994-12-15)
+# :
 # Vostok, which is one of the Russian stations, is set on the same
 # time as Moscow, Russia.
 #
@@ -294,7 +297,7 @@ Zone Antarctica/Troll	0	-	zzz	2005 Feb 1
 #
 # From Paul Eggert (2001-05-04):
 # This seems to be hopelessly confusing, so I asked Lee Hotz about it
-# in person.  He said that some Antartic locations set their local
+# in person.  He said that some Antarctic locations set their local
 # time so that noon is the warmest part of the day, and that this
 # changes during the year and does not necessarily correspond to mean
 # solar noon.  So the Vostok time might have been whatever the clocks
@@ -306,9 +309,12 @@ Zone Antarctica/Vostok	0	-	zzz	1957 Dec 
 
 # S Africa - year-round bases
 # Marion Island, -4653+03752
-# Sanae, -7141-00250
+# SANAE IV, Vesleskarvet, Queen Maud Land, -714022-0025026, since 1997
+
+# Ukraine - year-round base
+# Vernadsky (formerly Faraday), Galindez Island, -651445-0641526, since 1954
 
-# UK
+# United Kingdom
 #
 # British Antarctic Territories (BAT) claims
 # South Orkney Islands
@@ -364,7 +370,7 @@ Zone Antarctica/Palmer	0	-	zzz	1965
 # but that he found it more convenient to keep GMT+12
 # as supplies for the station were coming from McMurdo Sound,
 # which was on GMT+12 because New Zealand was on GMT+12 all year
-# at that time (1957).  (Source: Siple's book 90 degrees SOUTH.)
+# at that time (1957).  (Source: Siple's book 90 Degrees South.)
 #
 # From Susan Smith
 # http://www.cybertours.com/whs/pole10.html

Modified: stable/9/contrib/tzdata/asia
==============================================================================
--- stable/9/contrib/tzdata/asia	Fri Aug 29 13:26:11 2014	(r270814)
+++ stable/9/contrib/tzdata/asia	Fri Aug 29 13:27:49 2014	(r270815)
@@ -1,4 +1,3 @@
-# 
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -32,7 +31,7 @@
 # A reliable and entertaining source about time zones is
 # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
 #
-# I invented the abbreviations marked `*' in the following table;
+# I invented the abbreviations marked '*' in the following table;
 # the rest are from earlier versions of this file, or from other sources.
 # Corrections are welcome!
 #	     std  dst
@@ -47,13 +46,14 @@
 #	7:00 WIB	west Indonesia (Waktu Indonesia Barat)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 13:37:02 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 7BC74CFC;
 Fri, 29 Aug 2014 13:37:02 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 643F51DDB;
 Fri, 29 Aug 2014 13:37:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7TDb2q6058862;
 Fri, 29 Aug 2014 13:37:02 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7TDb2Wc058859;
 Fri, 29 Aug 2014 13:37:02 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201408291337.s7TDb2Wc058859@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI 
Date: Fri, 29 Aug 2014 13:37:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r270816 - stable/9/sys/dev/hptnr
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 13:37:02 -0000

Author: delphij
Date: Fri Aug 29 13:37:01 2014
New Revision: 270816
URL: http://svnweb.freebsd.org/changeset/base/270816

Log:
  MFC r270384:
  
  Update hptnr(4) driver to version 1.0.1 supplied by the vendor.
  
  v1.0.1 2014-8-19
    * Do not retry the command and reset the disk when failed to enable or
      disable spin up feature.
    * Fix up a bug that disk failed to probe if driver failed to access the
      10th LBA.
    * Fix a bug that request timeout but it has been completed in certain
      cases.
    * Support smartmontool for R750.
  
  Many thanks to HighPoint for continued support of FreeBSD!

Modified:
  stable/9/sys/dev/hptnr/README
  stable/9/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu
  stable/9/sys/dev/hptnr/hptnr_config.c
  stable/9/sys/dev/hptnr/hptnr_os_bsd.c
  stable/9/sys/dev/hptnr/hptnr_osm_bsd.c
  stable/9/sys/dev/hptnr/i386-elf.hptnr_lib.o.uu
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/hptnr/README
==============================================================================
--- stable/9/sys/dev/hptnr/README	Fri Aug 29 13:27:49 2014	(r270815)
+++ stable/9/sys/dev/hptnr/README	Fri Aug 29 13:37:01 2014	(r270816)
@@ -1,10 +1,19 @@
 Rocket Controller Driver for FreeBSD
-Copyright (C) 2013 HighPoint Technologies, Inc. All rights reserved.
+Copyright (C) 2014 HighPoint Technologies, Inc. All rights reserved.
 
 #############################################################################
 Revision History:
+   v1.0.1 2014-8-19
+     * Do not retry the command and reset the disk when failed to enable or 
+       disable spin up feature.
+     * Fix up a bug that disk failed to probe if driver failed to access the
+       10th LBA.
+     * Fix a bug that request timeout but it has been completed in certain 
+       cases.
+     * Support smartmontool for R750.
+
    v1.0 2013-7-3
-        First source code release
+     *First source code release
 
 #############################################################################
 
@@ -40,7 +49,7 @@ Revision History:
   2) Extract the driver files under the kernel source tree:
 
      # cd /usr/src/sys/
-     # tar xvzf /your/path/to/hptnr-freebsd-src-v1.0-130701.tgz
+     # tar xvzf /your/path/to/hptnr_freebsd_src_v1.0.1_14_08_19.tgz
 
   3) Update the kernel configuration file to include the HighPoint source.
      Assume the configure file is GENERIC, and new kernel configure file is 

Modified: stable/9/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu
==============================================================================
--- stable/9/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu	Fri Aug 29 13:27:49 2014	(r270815)
+++ stable/9/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu	Fri Aug 29 13:37:01 2014	(r270816)
@@ -1,5 +1,5 @@
 begin 644 hptnr_lib.o
-M?T5,1@(!`0D```````````$`/@`!`````````````````````````##R!0``
+M?T5,1@(!`0D```````````$`/@`!`````````````````````````+`#!@``
 M`````````$```````$``$``-`(G0Q@<(QD`P2`G"#[9'04@)P@^V1SQ(P>`H2`G"#[9'/4C
 MP@^V1S](P>`02`G"#[9'0$C!X`A(B=%("<$/ME="P>(8#[9'0\'@$`G"#[9'
 M10G"#[9'1,'@"`G02(F/B````(F'D````&:#3R(!\\-F9F:0NO____]FA?9T
 M,4B)^;\`````NO____])Q\``````9I`/M@$QT`^VP,'J"$$S%("#QP%(@\$!
-M9CGW=>6)T,-FD%-(@^Q@2(G[1`^V3SM$#[9'.@^V3SD/ME)@E0!``##9F9FD&9FD&9FD&9FD(GQ2(L'
-MBY`$`0``B14`````#[='/&8]@&1T#&8]@)%T!F8]@)1U$0^VR8/!"+@!````
-MT^`)PNL00`^VSH/!#+@!````T^`)PDB+!XF0!`$``,-F9F:09F9FD&9FD&9F
-MD(GQ2(L'BY`$`0``B14`````#[='/&8]@&1T#&8]@)%T!F8]@)1U$0^VR8/!
-M"+C^____T\`APNL00`^VSH/!#+C^____T\`APDB+!XF0!`$``,-F9F:09F9F
-MD&9FD&9FD(GQ0(#^_W1O0(#^'W(8#[9%`L'@$`G"#[9%``G"#[9%`<'@"`G"B1-!QP0D$`$``+\0
-M)P``Z``````/ME4'P>(8#[9%!L'@$`G"#[9%!`G"#[9%!<'@"`G"B1-(BUPD
-M"$B+;"003(MD)!A,BVPD($B#Q"C#2(/L&$B)7"0(3(ED)!!)B?Q`#[;>B=[H
-M`````+\0)P``Z`````")WDR)Y^@`````2(M<)`A,BV0D$$B#Q!C#D$%7059!
-M54%455-(@^Q828G_B%0D5TB+%X!_/@`/A#P"``!!O`````!!O>#___]!OO#_
-M__]`#[;&2(E$)$A(C8*``0``2(E$)$!(C8J$`0``2(E,)#A(C8*@`0``2(E$
-M)#!(C8JD`0``2(E,)"A(C8)0`@``2(E$)"!(C8I4`@``2(E,)!A(C8+@`0``
-M2(E$)!!(@<+0`0``2(E4)`AF9I!(BT0D2$2)X4C3^*@!#X2-`0``1(GE@_T#
-M=A=$B>I(`U0D*(L"B04`````@^#^B0+K&XT4[0````")TD@#5"0XBP*)!0``
-M``"#X/Z)`K\0)P``Z`````"`?"17`'1R@_T#=A=$B?)(`U0D$(L"B04`````
-M@\@"B0+K&XT4K0````")TD@#5"0(BP*)!0````"#R`*)`D2)\$B+3"002`'!
-MC02M`````(G`2(M4)`A(`<*#_0-V"HL!B04`````ZPB+`HD%`````*@"='3K
-MXV:0@_T#=B]$B>M(BT0D($@!V,<``````+\0)P``Z`````!(`UPD&(L#B04`
-M````@\@!B0/K08T<[0````")VTB+1"0@2`'8QP``````OQ`G``#H`````$@#
-M7"08BP.)!0````"#R`&)`^LW9F9FD&9FD(/]`W8K1(GJ2(M$)#!(`=#'``$`
-M``!(`U0D*(L"B04`````@\@!B0+K-F9FD&9FD(T$[0````")P$B+5"1`2`'"
-MQP(!````2`-$)#B+$(D5`````(/*`8D09F9FD&9FD$&-5"0!28/$`4&#Q0A!
-M@\8$00^V1SXYT`^'0O[__TB#Q%A;74%<05U!7D%?PV9FD%532(/L"(G12(LO
-M@_X#=B"-!/7@____BC02U`````(G`2(V4!=`!``"+`HD%`````(/(
-M`HD"C12U`````(U"\(G`2(V,!>`!``")TDB-E!70`0``@_X#=@J+`8D%````
-M`.L(BP*)!0````"H`G1UZ^.#_@-V.(T<]>#___^)VTB-A"M0`@``QP``````
-MOQ`G``#H`````$B-G"M4`@``BP.)!0````"#R`&)`^LVC1SU`````(G;2(V$
-M*U`"``#'``````"_$"<``.@`````2(V<*U0"``"+`XD%`````(/(`8D#2(/$
-M"%M=PY"0D)"0D$B)^4B+/P^W@;`2``"#P`%FB8&P$@``9CN!M!(``'()9L>!
-ML!(`````#[>!L!(``$C!X`)(`X%H$0``BQ:)$`^W@;`2``")ARP!``##9F:0
-M08G0N`````#&!`@`2(/``4B#^`1U\HGR9H'B_P\/MP%F)0#P"=!FB0$/ME<-
-MP>(,BP$E_P_P_PG0B0$/MD<*@^`"2(/X`1G2@^("@\(!P>(%#[9!`X/@'PG0
-M@\@0@^#WB$$#]D<*`7071(G"@^)_P>($#[=!`F8E#_@)T&:)00+SPV9F9I!F
-M9F:09F:09F:0N`````#&!#``2(/``4B#^`UU\@^V1SF(!@^V1SJ(1@$/MD<[
-MB$8"#[9'/(A&`P^V1SV(1@0/MD<^B$8%#[9'/XA&!O:'E@````1T(P^V1T"(
-M1@@/MD=!B$8)#[9'0HA&"@^V1T.(1@L/MD=$B$8,N`$```##9F9FD&9F9I!F
-M9I"Z`````$&Z`````$&Y_____^M2`=)$B<#3^*@!=!+WP@````%U&H'R=R?;
-M`.L29I")T#5W)]L`]\(````!#T70@^D!1#G)=@(B$@%#[?`C02%``,``(F"<`$``$B+%P^W3C*#X1^X`0``
-M`$C3X(F"=`$``+H`````Z`````!(@\0(PY!!5T%6055!5%532(/L"$B)_4F)
-M]H!_0P!T);D`````]D8-`70.ZQA!#[9C3^*@!=0R#P0$/MD5#9CG(=^A)
-MBT9`2(7`=!Q(C;"0````2(M]*.@`````28MV0$B)[^@`````28U&8$DY1F`/
-MA%P!``!)B<=,B?_H`````$B)PTB#>$``#X0I`0``@+B#``````^$H@```&:#
-M?6@`#X27````0;T`````0;P`````D$B+A;`)``!,`>!(BS!(A?9T8P^W1B!F
-M.T,X=5EF/84`=U,/M\"`O`5@"```_W1&2(M5``^W1C)FP>@%#[?`C02%``,`
-M`(F"<`$``$B+50`/MTXR@^$?N`$```!(T^")@G0!``#&1B0AN@````!(B>_H
-M`````$&#Q0%)@\0(#[=%:$0YZ`^/=O___TB+0T!(QT!@`````/9#3`1U&4B)
-M[^@`````2(MS0+H!````2(GOZ`````!(BT-`#[90`@^V<`%(Q\<`````N```
-M``#H`````$B+4T!(B[7P"```OP$```#H`````$B+4T!(B[7P"```OP8```#H
-M`````$C'0T``````08!N#@%(B=Y(B>_H`````$TY?F`/A:?^__])QT9`````
-M`$B+10"+B%@!``")#0````"%R70*2(M%`(F(6`$``$B#Q`A;74%<05U!7D%?
-MPV9F9I!F9I!F9I!F9I!(@^P(3(L'00^V<$-`A/9T-4F-@+@2``"Y`````$@Y
-M^'4:ZR(/ML%(C11`2(T4D$F-E-"X$@``2#GZ=`^#P0%`./%UX.L%N0`````/
-MML%(C11`2(T4D$B-!-4`````28NT`,`2``!(A?9T??9&"@)T=TF-A`"X$@``
-M2#E&('5I#[9&6(3`=`B#P`&(1ECK64B+5DA(@^HX2(U.2$B-0CA(.A``=2SK"F9FD$B#>A``=2#&1E@!#[:*NP```$F+N+`0``!)Q\``````Z```
-M``#K$4B+4CA(@^HX2(U".$@YR'7(2(/$",-F9I!(@^PH2(E<)`A(B6PD$$R)
-M9"083(EL)"!(B?M(B?5(BT9P3(MH*`^W5B!F@?J%`'=T#[?"#[:$!V`(```\
-M_W1E9H/Z?W<<#[;`2(N7.`D``$AIP)@!``!(BT004`^V0`CK2&:!^H$`=QP/
-MML!(BY>("0``2&G`R`\``$B+1!`(#[9`".LE#[;`2(N78`D``$B-!,!(P>`%
-M2(N$$(@````/MD`(ZP6X_P```$B81`^VI`/F"```2(MU>$B%]G0(2(G?Z```
-M``!(B>Y(B=_H`````$$/ML1(C3R`2(T\N$B-O/O``0``3(GN0?^5H````$B+
-M7"0(2(ML)!!,BV0D&$R+;"0@2(/$*,-F9F:09F9FD$%455-(B?5(B=-F@7XX
-MX0%U$0^V1CJ#Z!%!O``````\`78O2(L72(NZ.`D```^W12"^:)8!`&8]A0!W
-M$@^WP`^VA`)@"```2&GPF`$``$R-)#?&0P0%@&,%_H`CW[@`````9H%]..$!
-M=18/MD4Z@^@!/`$/EL`/ML!F9F:09F:0P>`'#[83@^)_"<*($P^VA98```"#
+M9CGW=>6)T,-FD$B#[&A$#[9/.T0/MD)^
+M__[_B9$$`0``)7[_\O](BU<(B0)(BU<(B4(,2(M7"(E"$$B+5PB)0A1(BU<(
+MB4(82(M7"(E"!$B+!XN`5`$``(D%`````"7^`/__2(L7B8)4`0``PV9F9I!F
+M9I!F9I!F9I")\4B+!XN0!`$``(D5``````^W1SQF/8!D=`QF/8"1=`9F/8"4
+M=1$/MLF#P0BX`0```-/@"<+K$$`/MLZ#P0RX`0```-/@"<)(BP>)D`0!``##
+M9F9FD&9F9I!F9I!F9I")\4B+!XN0!`$``(D5``````^W1SQF/8!D=`QF/8"1
+M=`9F/8"4=1$/MLF#P0BX_O___]/`(<+K$$`/MLZ#P0RX_O___]/`(<)(BP>)
+MD`0!``##9F9FD&9F9I!F9I!F9I")\4"`_O]T;T"`_A]W,HNW&`$``+H!````
+MT^*)T/?0(?")AQ@!``"+AU@!``")!0`````AT'1`B8=8`0``PV:0B[<<`0``
+M#[;!@^@@N@$```")P=/BB=#WT"'PB8<<`0``BX=@`0``B04`````(=!T!HF'
+M8`$``//#9F9FD&9FD$B#["A(B5PD"$B);"003(ED)!A,B6PD($B)U8GP3(LO
+M0(#^`P^&B0```$B-',4`````@>/X!P``38VD'0`"``!!QP0D#`$``+\0)P``
+MZ`````!)C9P=!`(```^V50/!XA@/MD4"P>`0"<(/MD4`"<(/MD4!P>`("<*)
+M$T''!"00`0``OQ`G``#H``````^V50?!XA@/MD4&P>`0"<(/MD4$"<(/MD4%
+MP>`("<*)$^F$````2(TZ`````"_$"<``.@`````B=Y,B>?H`````$B+7"0(3(MD
+M)!!(@\08PY!!5T%6055!5%532(/L6$F)_XA4)%=(BQ>`?SX`#X0\`@``0;P`
+M````0;W@____0;[P____0`^VQDB)1"1(2(V"@`$``$B)1"1`2(V*A`$``$B)
+M3"0X2(V"H`$``$B)1"0P2(V*I`$``$B)3"0H2(V"4`(``$B)1"0@2(V*5`(`
+M`$B)3"082(V"X`$``$B)1"002('"T`$``$B)5"0(9F:02(M$)$A$B>%(T_BH
+M`0^$C0$``$2)Y8/]`W871(GJ2`-4)"B+`HD%`````(/@_HD"ZQN-%.T`````
+MB=)(`U0D.(L"B04`````@^#^B0*_$"<``.@`````@'PD5P!TOC@_X#=CB-'/7@____B=M(
+MC80K4`(``,<``````+\0)P``Z`````!(C9PK5`(``(L#B04`````@\@!B0/K
+M-HT<]0````")VTB-A"M0`@``QP``````OQ`G``#H`````$B-G"M4`@``BP.)
+M!0````"#R`&)`TB#Q`A;7<.0D)"0D)!(B?E(BS\/MX&P$@``@\`!9HF!L!(`
+M`&8[@;02``!R"6;'@;`2``````^W@;`2``!(P>`"2`.!:!$``(L6B1`/MX&P
+M$@``B8@0B`>)T,'H"(A'`8A7`L-%#[8$,KD'````ZZ)F9F:09F9F
+MD&9F9I!F9I!(BX<($0``BQ"+4`2+4`B+0`R)!0````##9F9FD&9FD$B#[`A(
+MBX:(````1`^V1T-%A,!T(@^V4`VY`````/;"`70,ZQ)(B=!(T_BH`74(@\$!
+M1#C!=>[&1D(,Z`````!(@\0(PV9F9I!F9F:09F:02(/L"$B)^$B+/V;'0$X!
+M`,9`0AU(B<;H`````$B#Q`C#9F9FD&9F9I!F9F:09F:02(/L"$B+/P^W]DC!
+MY@-(`[>P"0``2(LV2(7V=#U(BQ@%#[?`C02%``,``(F"<`$``$B+$P^W3C*#X1^X`0```$C3X(F"=`$``,9&
+M)"&Z`````$B)W^@`````08/%`4F#Q`@/MT-H1#GH#X]X____2(M%0$C'0&``
+M````]D5,!'492(G?Z`````!(BW5`N@$```!(B=_H`````$B+54`/MH+,````
+MC02`#[92`@'02)@/MH@`````#[93.@^VY(B=_H`````$TY?F`/A9#^__])QT9``````$B+`XN(6`$`
+M`(D-`````(7)=`E(BP.)B%@!``!(@\0(6UU!7$%=05Y!7\-F9F:09F9FD$B#
+M[`A,BP=!#[9P0T"$]G0U28V`N!(``+D`````2#GX=1KK(@^VP4B-%$!(C120
+M28V4T+@2``!(.?IT#X/!`4`X\77@ZP6Y``````^VP4B-%$!(C1202(T$U0``
+M``!)B[0`R!(``$B%]G1]]D8*`G1W28V$`+@2``!(.48@=6D/MD98A,!T"(/`
+M`8A&6.M92(M62$B#ZCA(C4Y(2(U".$@YR'1$2(-Z$`!U+.L*9F:02(-Z$`!U
+M(,9&6`$/MHJ[````28NXL!```$G'P`````#H`````.L12(M2.$B#ZCA(C4(X
+M2#G(=`%2(M$"%`/MD`(ZTYF@?F!`'<<#[;`2(N7B`D``$AI
+MP,@/``!(BT00"`^V0`CK*P^VP$B+EV`)``!(C03`2,'@!4B+A!"(````#[9`
+M".L+9F:09F:0N/\```!(F$0/MJ0#Y@@``$B+=7A(A?9T"$B)W^@`````2(GN
+M2(G?Z`````!!#[;$2(T\@$B-/+A(C;S[P`$``$R)[D'_E:````!(BUPD"$B+
+M;"003(MD)!A,BVPD($B#Q"C#9F9FD&9FD&9FD&9FD$%455-(B?5(B=-F@7XX
+MX0%U$0^V1CJ#Z!%!O``````\`78T2(LW2(N^.`D```^W12"Z8)X!`&8]A0!W
+M%P^WP`^VA`9@"```2(T40$B-%)!(P>(%3(TD%\9#!`6`8P7^@"/?N`````!F
+M@7TXX0%U$0^V13J#Z`$\`0^6P`^VP&:0P>`'#[83@^)_"<*($P^VA98```"#
 MX`'!X`:#XK\)PH@3]H66`````70.3(GGZ`````!FB4,(ZP1FB4L(#[=#"(A%
 M)6:!?3CA`74E#[95.HU"_SP!=PH/ME4[@^(/ZRJ0C4+ON@\````\`78=9F9F
 MD+H`````28-\)&``=`Q!#[:4)($```"#X@\/M@.#X/`)T(@#6UU!7,-F9F:0
 M9F9FD$B#[#A(B5PD"$B);"003(ED)!A,B6PD($R)="0H3(E\)#!)B?Q(B?-)
 MB=$````/
-MMU,@9H'ZA0`/A]($```/M\)!#[:,!&`(``")R(#Y_W1F9H/Z?W<=#[;!28N4
-M)#@)``!(:<"8`0``2(M$$%`/MD`(ZT-F@?J!`'<=#[;!28N4)(@)``!(:<#(
-M#P``2(M$$`@/MD`(ZQ\/ML%)BY0D8`D``$B-!,!(P>`%2(N$$(@````/MD`(
-M#[;`00^VA`3F"```2(T4@$B-%)!)C;34P`$``$F+E"2("0``#[;!2&G`R`\`
-M`$&]`````/9$`ET0#X5*`@``QD,D!$''!P````"X`0```.DU!```9F:09I`/
-MMU,@N?\```"X_____V:!^H4`#X=]````#[?"00^VC`1@"```BT/A/4```"%
-MR69FD`^$Z@```/;"!`^$X0```$B)WDR)[^@`````A,!U%<9#)`1!QP<`````
-MN`$```#IO0(``$&`O8,````?=A%!QP_H`````&:#^!\/AF(!
-M``!!QPA(B<*#X@$/MD,Z@^@&/`D/A\8`
-M```/ML#_),4`````0;@!````N0$```!(B=I,B>Y,B>?H`````(3`#X6P````
-M0<<'`@```+@!````Z4X!``!!N`$```"Y`````$B)VDR)[DR)Y^@`````A,`/
-MA7X```!!QP<"````N`$```#I'`$```^VRD&X`0```$B)VDR)[DR)Y^@`````
-MA,!U4D''!P(```"X`0```.GP````#[;*0;@`````2(G:3(GN3(GGZ`````"$
-MP'4F0<<'`@```+@!````Z<0```#&0R0$0<<'`````+@!````Z:\```!)C;PD
-MH`\``.@`````A,!T$4''!P$```"X`0```.F-````@'LXX75.@'LY`69FD'5%
-M@'LZ#W4_@'L]`69F9I!U-0^V?H`````$@[0VAU
-M!4B%P'42QD,D!$''!P````"X`0```.LYN`````#K,F:000^VA"3E"0``2(T4
-M@$B-%)!)C;34P`$``$F+E"2("0``N#BX#P#IJOO__V9FD&:02(M<)`A(BVPD
-M$$R+9"083(ML)"!,BW0D*$R+?"0P2(/$.,-F9F:09F:09F:09F:02(/L"$B+
-M/^@`````2(/$",-F9F:09F9FD&9F9I!F9I!!5T%6055!5%532(/L6$F)_4B)
-M]4B+GS@1``!FQT8R_P](C50D+.@`````A,!T"8M$)"SI#0L``(M%."7___\`
-M/>$!$``/A=L```"_B!,``.@`````#[=5(&:!^H4`#X>X"@``#[?"00^VC`5@
-M"```B8(``!(C12`2(T4D$V-M-7``0``#[?!2&G`F`$`
-M`$D#A3@)``!(B40D"&:!_N$!=4;K,@^WP4B-!,!(P>`%20.%8`D``$B)1"08
-M3(NPB````$C'1"0(`````$C'1"00`````.M$#[95.HU"[SP!=B>-0O\\`78@
-M9H'Y_P!T"TB+1"0(]D!+!'4.QD4D!K@`````Z0/
-MA(H(``!,B:6`````00^WUTB)%"1(:<*P!```2(T<&$B-0R!)*X4X$0``20.%
-M0!$``$B+5"1(B4(@2,'H($B+5"1(B4(D28M$)!A(BU0D2(E"*$C!Z"!(BU0D
-M2(E"+$B+1"1(9D2)>`BX`````,8$&`!(@\`!2#VP!```=?!F@7TXX0%U50^V
-M13J#Z!$\`7=*2(U,)#!(BT0D2`^V4`A(B>Y(BWPD".@`````2(V#(`0``$DK
-MA3@1``!)`X5`$0``2(M4)$B)0A!(P>@@2(M4)$B)0A3I/@$``)!!#[96"O;"
-M`74LBT4X)?___P`]X0$0``^$S0```$B+3"0(#[9!2*@!#X2\````J`0/A+0`
-M``#VA98````@=`](C70D,$B)[^@`````ZQM(C4PD,$B+1"1(#[90"$B)[DB+
-M?"0(Z`````!(C8,@!```22N%.!$``$D#A4`1``!(BU0D2(E"$$C!Z"!(BU0D
-M2(E"%&:!?3CA`74/#[9%.H/H$3P!#X:4````2(M$)`@/ME!(2(G0@^`&2(/X
-M!G5_]L(!='I(B=A)*X4X$0``20.%0!$``$B+5"1(B4(82,'H($B+5"1(B4(<
-MZU/VP@)T3DB)V$DKA3@1``!)`X5`$0``2(M4)$B)0AA(P>@@2(M4)$B)0AQ(
-MC8,@!```22N%.!$``$D#A4`1``!(BU0D2(E"$$C!Z"!(BU0D2(E"%$B+1"1(
-M@$@!`@^V55E(BT0D2&:)4`*`?5D`=#._`````(GX2(T$0$C!X`))BW0D$$B+
-M36!(BQ0(2(D4!HM4"`B)5`8(@\Y,B??H`````$B-3"0P2(G:2(GN
-M3(GWZ`````!!@&8,_NF-!```9F:09I!!#[9&"J@"#X0B!```2(M$)$C&0`;^
-M2(M$)$B`8`?^2(-\)`@`#X2X````2(M,)`@/ME%(2(G0@^`&2(/X!@^%GP``
+M`7<1@XN4````"+@`````Z4D%``!$BT,X08'@____`$&!^.$!$``/A>8````/
+MMTL@9H'YA0`/A_($```/M\%!#[:\!&`(``")^$"`__]T;F:#^7]W(T`/MM=)
+MBXPD.`D``$B-!%)(C02"2,'@!4B+1`A0#[9`".M%9H'Y@0!W'D`/ML=)BY0D
+MB`D``$AIP,@/``!(BT00"`^V0`CK($`/ML=)BY0D8`D``$B-!,!(P>`%2(N$
+M$(@````/MD`(#[;`00^VA`3F"```2(T4@$B-%)!)C;34P`$``$F+E"2("0``
+M0`^VQTAIP,@/``!!O0````#V1`)=$`^%8`(``,9#)`1!QP<`````N`$```#I
+M2P0```^W4R"Y_P```+C_____9H'ZA0`/AXL````/M\)!#[:T!&`(``")\$"`
+M_O]T0`^VQDF+E"2("0``2&G`R`\``$B+1!`(#[9`".L@0`^V
+MQDF+E"1@"0``2(T$P$C!X`5(BX00B`````^V0`A`#[;.1`^V\$ECQD$/MJP$
+MY@@``$B-1*T`2(U$A0!)C;3$P`$```^WP4B-%$!(C1202,'B!4F)U4T#K"0X
+M"0``9H'_X0%U"P^V0SJ#Z`$\`78I9H'Y_P!T!T'V14L$=1O&0R0&0<<'````
+M`+@!````Z38#``!F9I!F9I!!#[952(G1@^$!="3VP@1T'T$/MD0D1$$Z1"1.
+MT/A/<```"%R0^$[P```/;"!`^$Y@``
+M`$B)WDR)[^@`````A,!U%<9#)`1!QP<`````N`$```#IP@(``$&`O8,````?
+M=A%!QP_H`````&:#^!\/AF
+M0<<'`0```+@!````Z<@!``!!@?CA`1``#X0,`0``00^W16J`>SCA#X7]````
+M@'LY`0^%\P```$C1Z$B)PH/B`0^V0SJ#Z`8\"0^'Q@````^VP/\DQ0````!!
+MN`$```"Y`0```$B)VDR)[DR)Y^@`````A,`/A;````!!QP<"````N`$```#I
+M3@$``$&X`0```+D`````2(G:3(GN3(GGZ`````"$P`^%?@```$''!P(```"X
+M`0```.D<`0``#[;*0;@!````2(G:3(GN3(GGZ`````"$P'520<<'`@```+@!
+M````Z?`````/MLI!N`````!(B=I,B>Y,B>?H`````(3`=29!QP<"````N`$`
+M``#IQ````,9#)`1!QP<`````N`$```#IKP```$F-O"2@#P``Z`````"$P'01
+M0<<'`0```+@!````Z8T```"`>SCA=4Z`>SD!9F:0=46`>SH/=3^`>ST!9F9F
+MD'4U#[9S/,'F"`^V0SL!Q@^W]DR)Y^@`````2#M#:'4%2(7`=1+&0R0$0<<'
+M`````+@!````ZSFX`````.LR9I!!#[:$).4)``!(C12`2(T4D$F-M-3``0``
+M28N4)(@)``"X.+@/`.F4^___9F:09I!(BUPD"$B+;"003(MD)!A,BVPD($R+
+M="0H3(M\)#!(@\0XPV9F9I!F9I!F9I!F9I!(@^P(2(L_Z`````!(@\0(PV9F
+M9I!F9F:09F9FD&9FD$%7059!54%455-(@^Q828G]2(GU2(N?.!$``&;'1C+_
+M#TB-5"0LZ`````"$P'0)BT0D+.D."P``BT4X)?___P`]X0$0``^%Y0```+^(
+M$P``Z``````/MTT@9H'YA0`/A[D*```/M\%!#[:T!6`(``")\$"`_O]T:V:#
+M^7]W(D`/MM9)BXTX"0``2(T$4DB-!()(P>`%2(M$"%`/MD`(ZT-F@?F!`'<=
+M0`^VQDF+E8@)``!(:<#(#P``2(M$$`@/MD`(ZQ]`#[;&28N58`D``$B-!,!(
+MP>`%2(N$$(@````/MD`(#[;`00^VA`7F"```2(T4@$B-%)!-C;35P`$``$F+
+ME8@)``!`#[;&2&G`R`\``$@!PDB)5"002,=$)`@`````2,=$)!@`````Z7(!
+M```/MU4@OO\```!F@?J%`'<,#[?"00^VM`5@"```#[=].&:!_^$!=0\/MD4Z
+M@^@1/`$/AL8```!F@?J%`'=Z#[?"00^VA`5@"```//]T:F:#^G]W(0^VT$F+
+MC3@)``!(C0122(T$@DC!X`5(BT0(4`^V0`CK2&:!^H$`=QP/ML!)BY6("0``
+M2&G`R`\``$B+1!`(#[9`".LE#[;`28N58`D``$B-!,!(P>`%2(N$$(@````/
+MMD`(ZP6X_____P^VP$$/MH0%Y@@``$B-%(!(C12038VTU<`!```/M\9(C11`
+M2(T4D$C!X@5)`Y4X"0``2(E4)`AF@?_A`75&ZS(/M\9(C03`2,'@!4D#A6`)
+M``!(B40D&$R+L(@```!(QT0D"`````!(QT0D$`````#K1`^V53J-0N\\`78G
+MC4+_/`%V(&:!_O\`=`M(BT0D"/9`2P1U#L9%)`:X`````.FV"```2,=$)!``
+M````2,=$)!@`````2(UT)$A,B>_H`````$&)QV:)13),B>_H`````$F)Q+@"
+M````387D#X1W"```3(FE@````$$/M]=(B10D2&G"L`0``$B-'!A(C4,@22N%
+M.!$``$D#A4`1``!(BU0D2(E"($C!Z"!(BU0D2(E")$F+1"082(M4)$B)0BA(
+MP>@@2(M4)$B)0BQ(BT0D2&9$B7@(N`````#&!!@`2(/``4@]L`0``'7P9H%]
+M..$!=50/MD4Z@^@1/`%W24B-3"0P2(M$)$@/ME`(2(GN2(M\)`CH`````$B-
+M@R`$``!)*X4X$0``20.%0!$``$B+5"1(B4(02,'H($B+5"1(B4(4Z14!``!!
+M#[96"O;"`74LBT4X)?___P`]X0$0``^$G````$B+3"0(#[9!2*@!#X2+````
+MJ`0/A(,```#VA98````@=`](C70D,$B)[^@`````ZQM(C4PD,$B+1"1(#[90
+M"$B)[DB+?"0(Z`````!(C8,@!```22N%.!$``$D#A4`1``!(BU0D2(E"$$C!
+MZ"!(BU0D2(E"%$B)V$DKA3@1``!)`X5`$0``2(M4)$B)0AA(P>@@2(M4)$B)
+M0ASK7/;"`G172(G822N%.!$``$D#A4`1``!(BU0D2(E"&$C!Z"!(BU0D2(E"
+M'$B-@R`$``!)*X4X$0``20.%0!$``$B+5"1(B4(02,'H($B+5"1(B4(42(M$
+M)$B`2`$"#[9564B+1"1(9HE0`H!]60!T,[\`````B?A(C01`2,'@`DF+="00
+M2(M-8$B+%`A(B10&BU0("(E4!@B#QP$/MD59.?AWTHM5-$B+1"1(B5`,9H%]
+M..$!=3\/MD4Z@^@1/`%W-$$/M\](BU0D2$B)[DR)]^@`````2(U,)#!(B=I(
+MB>Y,B??H`````$&`9@S^Z8L$``!F9I!!#[9&"J@"#X0B!```2(M$)$C&0`;^
+M2(M$)$B`8`?^2(-\)`@`#X2X````2(M$)`@/ME!(2(G0@^`&2(/X!@^%GP``
 M`/;"`0^$E@```$$/M\](BU0D2$B)[DR)]^@`````]H66`````7002(M$)$@/
 MMT`(P>`#B$0D,4B-3"0P2(G:2(GN3(GWZ`````#VA98````!=`=!@$X,`>L%
 M08!F#/[&`Z%(BU0D"`^V@NH```"#X`\/ME,!@^+P"<*(4P%(BTPD"`^W03B#
@@ -215,7 +215,7 @@ M2(!@!?Z`3"1#"$B+="1(#[9%)4$/MHWN````T^!
 M@\@@B$$!2(M%/DB)@S@$``!FP<((9HF31`0```^V13V(@T($``#&`Y%(BU0D
 M"`^W0CB#P`%FP<`(9HE#`DB+3"0(#[:1Z@```(/B#P^V0P&#X/`)T(A#`4F)
 MS$F!Q-0```#I:`(``$B+5"1(#[9%)4$/MHWN````T^!F"4((Q@.!9L=#`O__
-M2(M$)!`/MI"[````@^(/#[9#`8/@\`G0B$,!2(-]2`!U#L9%)"&X`````.G-
+M2(M$)!`/MI"[````@^(/#[9#`8/@\`G0B$,!2(-]2`!U#L9%)"&X`````.GN
 M`P``]D4[`70I3(ME4$V%Y'0@28N]L!```$R)YN@`````@^`/#[93`8/B\`G"
 MB%,!ZP5,BV0D$$B+54@/MD(!OA`````\@`^$A@```#R`=Q\\%7<2/!!F9I!F
 MD'-G@^@"/`%W1.M7/!=F9I!W.^M>/(5T+CR%9F:09F:0=Q`\@71#/()U(V9F
@@ -230,107 +230,109 @@ M````2(M%.$B)@T0$``!(BT5`2(F#3`0``$B+5"0
 M`Y%(BTPD"`^VD>H```"#X@\/MD,!@^#P"="(0P$/MT$X@\`!9L'`"&:)0P)-
 MA>1T8TF+!"1(B4,$ZUFH`71500^WSTB+5"1(2(GN3(GWZ`````#VA98````!
 M=!!(BT0D2`^W0`C!X`.(1"0Q2(U,)#!(B=I(B>Y,B??H`````/:%E@````%T
-M!T&`3@P!ZP5!@&8,_DF+A;`)``!(BQ0D2(DLT$2)^F;!Z@5!#[??@>+_!P``
-MB=F#X1^X`0```$C3X$$)A)6X"0``BT4X)?___P`]X0$0`'4H2(U,)$"Z````
-M`(G>3(GWZ``````/MD0D0X/@'X/(0(A$)$/II````&:!?3CA`74T#[9%.H/H
-M$3P!=RE(BW0D&$R)[^@`````2(U,)$!(BT0D&`^V4%")WDR)]^@`````ZVIF
-MD$B+="0(3(GOZ`````!(C4PD0$B+1"0(#[903(GWZ`````!(BTPD"`^V
-M44A(B="#X`9(@_@&=2[VP@%T*0^V1"1#@^`?@\A@B$0D0P^V47*#XG_!X@0/
-MMT0D0F8E#_@)T&:)1"1"2(UT)$!,B>_H`````+@#````ZRE!#[:%Y0D``$B-
-M%(!(C12038VTU<`!``!)BY6("0``N#BX#P#IPO7__TB#Q%A;74%<05U!7D%?
-MPV9F9I!F9F:09F9FD$%505154TB#[`A(B?U!O0````!,C:?X````Z;$!``"0
-M3(GGZ`````!(B<-(@WAP`'4V2(GOZ`````!(B4-P2(7`=25(C97X````2(N%
-M^````$B)6`A(B0-(B5,(2(F=^````.F0`0``BT,X)?___P`]X0$0``^$U@``
-M``^W0R!F/8``#X3(````#[;09HE3(&:#^G]V&F:!>SCA`74I#[9#.H/H$3P!
-M=QYF9F:09F:09H'ZA0!W$`^WP@^VC`5@"```@/G_=1G&0R0&2(G>2(GOZ```
-M``#I]0```&9FD&:0#[=S.&:!_N$!=14/MGLZC4?O/`$/A^4```#K&F9F9I`/
-MML%(:<"8`0``28G%3`.M.`D``.L*C4?_/`%V-&9FD&:!^H``="IF@?[A`74+
-M#[9#.H/H$3P!=AA!]D5+!'41QD,D!DB)WDB)[^@`````ZW](B=Y(B>_H````
-M`(/X`I!W#H/X`7,@ZPYF9F:09F:0@_@#=5OK2TB)WDB)[V9FD.@`````ZTE(
-M@[N``````'0/2(VS@````$B)[^@`````2(V5^````$B+A?@```!(B5@(2(D#
-M2(E3"$B)G?@```#K-DB)WDB)[^@`````9F:03#FE^`````^%0_[__^L9#[;!
-M2&G`F`$``$F)Q4P#K3@)``#I'O___TB#Q`A;74%<05W#9F9FD&9FD&9FD&9F
-MD$B#[$A(B5PD&$B);"0@3(ED)"A,B6PD,$R)="0X3(E\)$!(B?5)B?U,BV=0
-M38LT)$$/MD0D#*@0=`S&A^@````&Z7P"```/MI?H````@/H!#X2"````@/H!
-M\02(N5"!$`
-M`$B!PD`(``!!#[9$)'+!X`A(F$@!PHM"!(D%`````(A$)!")PL'J"(A4)!'!
-MZ!"(1"022(N5"!$``$B!PD`(``!!#[9$)'+!X`A(F$@!PHM""(D%`````(A$
-M)!.)PL'J"(A4)!3!Z!"(1"05QD0D%@#&1"07`(M,)!!!B?9!P>X800^VWT2+
-M1"041(GRB=Y(Q\<`````N`````#H`````(G8@_`!B<*#X@%T%$6$_W0/0<9%
-M)`"X`````.F@`@``08!])(%U(4B-3"001(GRB=Y,B>_H`````$'&120"N```
-M``#I>`(``$&+13@E____`#WA`0X`=0]!QD4D(;@`````Z5D"``!!]H66````
-M`74HA-)U)$&`?"1*_W0<2(U,)!!$B?*)WDR)[^@`````N`````#I)P(``$R)
-MYDB)[^@`````3(GF2(GOZ`````!(BU4`00^W13)FP>@%#[?`C02%``,``(F"
-M<`$``$B+10!!#[=-,H/A'[H!````2(G32-/CB9AT`0``00^W13)(P>`#2`.%
-ML`D``$C'``````!!#[=-,HG(9L'H!27_!P``@^$?2(G62-/F2(GQ]]$AC(6X
-M"0``00^W33*)R&;!Z`4E_P<``(/A'TC3XO?2(52%;$F+50!)BT4(2(E""$B)
-M$$$/MW4R2(V]H`\``.@`````08"L)(,````!0<9%)(%)@[V``````'0/28VU
-M@````$B)[^@`````28U$)"!).40D(`^$!`$``$F)QDB-A:`/``!(B40D"$R-
-MO?@```!FD$R)]^@`````2(G#2(M5``^W0#)FP>@%#[?`C02%``,``(F"<`$`
-M`$B+10`/MTLR@^$?N@$```!(B=9(T^:)L'0!```/MT,R2,'@`T@#A;`)``!(
-MQP``````#[=+,HG(9L'H!27_!P``@^$?2(G62-/F2(GQ]]$AC(6X"0``#[=+
-M,HG(9L'H!27_!P``@^$?2-/B]](A5(5L#[=S,DB+?"0(Z`````!!@*PD@P``
-M``%(@[N``````'0/2(VS@````$B)[^@`````2(N%^````$B)6`A(B0-,B7L(
-M2(F=^````$TY="0@#X44____08&EE````/___O]!QH0DZ`````1,B>Y,B>?H
-M`````+@!````2(/$*%M=05Q!74%>05_#D$B#[%A(B5PD*$B);"0P3(ED)#A,
-MB6PD0$R)="1(3(E\)%!(B50D$$B++TR+A3@1``!(A=(/A,8"```/M]9(:<*P
-M!```2HT,`/9!(0)T&$B-!-4`````2`.%L`D``$B+`,9`)`+K%DB-!-4`````
-M2`.%L`D``$B+`,9`)"%,C135`````$B+A;`)``!,`=!(BQ"+0C@E____`#WA
-M`1``#X2L`0``#[="(&8]A0!W$@^WP`^VA`5@"```//]U&69FD$R)T$@#A;`)
-M``!(BP#&0"0&Z;H(```/ML!(:<"8`0``3(N=.`D``$D!PX!\)!,`>6Y!#[93
-M2$B)T(/@!DB#^`9U(_;"`70>2(M%`(N06`$``(D5`````(72=`I(BT4`B9!8
-M`0``2(M%`(N`4`$``(D%`````(/(`DB+50")@E`!``!(BT4`BX`$`0``B04`
-M````@,S_2(M5`(F"!`$``&;W02`""`^$ZP```(!]0P`/A.$```"[`````$&Y
-M`````$6)R$$/MLD/MD<-2-/XJ`%T84&`^0-V*$B+10!(!=`!``"-%(T`````
-M2&/22`'0BP")!0````#!Z!2#X`'K)I!(BT4`2`70`0``C12-`````$ACTD@!
-MT(L`B04`````P>@4@^`!A,!T"K@!````2-/@"<-!@\$!08U``3A%0W>`A-MT
-M4CA?#75-B?!FP>@%)?\'``"+1(5LB?](T_BH`74R08"[Z`````)W"$'&
-M@^@````#3(G02`.%L`D``$B+,$R)W^@`````Z4`'``!!NP````#V1"03`0^$
-M+P<``$R)T$@#A;`)``!(BS#&1B0ABT8X)?___P`]X0$.``^$"P<``$B+E0@1
-M``!(@<)`"```00^V0W+!X`A(F$@!PHL"B04`````2(N5"!$``$B!PD0(``!!
-M#[9#`(2)A(
-M`<*+`HD%`````$B)[^@`````Z94&``!F9I!FD`^W]DB-'/4`````2(N%L`D`
-M`$@!V$B+$&:!>CCA`0^%#`$```^V>CI`@/\0#X=>!@``N`$```")^4C3X*G`
-M,```#X7,````J0```0!U5/;$@`^$.08``$AIQK`$``!*C0P`#[9!,XA")$B)
-MV$@#A;`)``!(BP#V0",$#X00!@``@'@D``^$!@8``$B+4%!(A=(/A/D%```/
-MMD$SB`+I[@4``$AIQK`$``!*C0P`3(UA*$B)V$@#A;`)``!(BQ!!#[9$)`*(
-M0B1(B=A(`X6P"0``2(L`2(-X2``/A+$%```/MKDA!```Z`````!(B=I(`Y6P
-M"0``2(L*BU$T.=`/1\*)PDB+>4A,B>;H`````.E]!0``2(G82`.%L`D``$B+
-M`,9`)`#I9P4``&9F9I!F9I!(B=A(`X6P"0``3(LH38M]:+C_____9D&!?2"%
-M`'<92(G82`.%L`D``$B+``^W0"`/MH0%8`@```^VP$AIP)@!``!,BZ4X"0``
-M20'$0<:$).@`````00^V5"1(2(G0@^`&2(/X!@^%EP$``/;"`0^$C@$``$'&
-M120`0?:%E@```"`/A-D$``!-A?\/A-`$``!!]H>Q`````@^$H0```$&+132%
-MP`^$E0```$F+OZ````!(A?]T#8G"28MU2.@`````ZWQ)@WU(`'1U28._N```
-M``!U"DF#O\``````=&%-BVU(28N'N````$B%P'0-2(G#0?:'L0````%T)DB+
-MM4`*``"Z`0```$R)_T'_E\````"[`````(7`=`=(BYU`"@``2(M["(L33(GN
-MZ`````"+`TD!Q8M#!$B#PQ"%P'3B2(N5"!$``$B!PD`(``!!#[9$)'+!X`A(
-MF$@!PHL"B04`````B<+!ZA!!B)>;````P>@89D&)AY````!(BY4($0``2('"
-M1`@``$$/MD0D6
-M````B=#!Z!`/ML!F08F'F````,'J&$&(EYH```!(BY4($0``2('"3`@``$$/
-MMD0D`P``2&G&L`0``$Z-
-M-`!!#[9&,X3`#X7,````2(G82`.%L`D``$B+`,9`)`!!]H66````$`^$)P,`
-M`$V%_P^$'@,``$$/MD8S08B'D@```$'VA[$````"#X0$`P``08-]-``/A/D"
-M``!)@[^X`````'4.28._P``````/A.$"``!-BV5(28N'N````$B%P'0-2(G#
-M0?:'L0````%T)DB+M4`*``"Z`0```$R)_T'_E\````"[`````(7`=`=(BYU`
-M"@``2(M["(L33(GFZ`````"+`TD!Q(M#!$B#PQ"%P`^%?`(``.O+_!P``
+M1(GA@^$?N`$```!(T^!!"825N`D``(M%."7___\`/>$!$`!U*4B-3"1`N@``
+M``!$B>9,B??H``````^V1"1#@^`?@\A`B$0D0^FD````9H%]..$!=3,/MD4Z
+M@^@1/`%W*$B+="083(GOZ`````!(C4PD0$B+1"08#[904$2)YDR)]^@`````
+MZVE(BW0D"$R)[^@`````2(U,)$!(BT0D"`^V4')$B>9,B??H`````$B+3"0(
+M#[912$B)T(/@!DB#^`9U+O;"`70I#[9$)$.#X!^#R&"(1"1##[91?H`````$B)PTB#
+M>'``=39(B>_H`````$B)0W!(A_H`````.G]````9F:09I`/
+MMW,X9H'^X0%U%0^V>SJ-1^\\`0^'[0```.L?9F9FD`^VPDB-%$!(C1202,'B
+M!4F)U4P#K3@)``#K!XU'_SP!=C9F@?F``'0O9H'^X0%FD'4+#[9#.H/H$3P!
+M=AM!]D5+!'44QD,D!DB)WDB)[^@`````Z8````!(B=Y(B>_H`````(/X`G<*
+M@_@!_H`````&9FD.M&2(.[
+M@`````!T#TB-LX````!(B>_H`````$B-E?@```!(BX7X````2(E8"$B)`TB)
+M4PA(B9WX````ZSA(B=Y(B>_H`````$PYI?@````/A3O^___K'@^VPDB-%$!(
+MC1202,'B!4F)U4P#K3@)``#I%O___TB#Q`A;74%<05W#2(/L2$B)7"082(EL
+M)"!,B60D*$R);"0P3(ET)#A,B7PD0$B)]4F)_4R+9U!-BS0D00^V1"0,J!!T
+M#,:'Z`````;IC`(```^VE^@```"`^@$/A((```"`^@%R&H#Z!`^$HP```(#Z
+M!@^%S0(``&9FD.E=`@``QH?H`````4B)_DR)]^@`````QD4D@4&`3"0,"$B#
+MO8``````=`](C;6`````3(GWZ`````!)BX;X````2(EH"$B)10!)C8;X````
+M2(E%"$F)KO@```!,B??H`````.EB`@``@^#W08A$)`R`A^L````!QH?H````
+M`,9&)`),B??H`````$R)]^@`````Z3,"``#&A^L`````2(.^@`````!T#TB-
+MMH````!,B??H`````$F+34!(A?H`````.FH`0``00^V1"0,@^#W@\@008A$
+M)`Q)BW582(7V=11!@'PD#@!U+.GE````9F9FD&9FD$$/MI6!````0;@`````
+MN0(```!,B>?H`````.E:`0``0;\`````QD0D%P!)C40D8$B)1"0(2(M\)`CH
+M`````$B)Q4F+1"1H28EL)&A(BU0D"$B)50!(B44(2(DH2(M50$B%TG0528NV
+M\`@``+\%````Z`````"`34P"2(GJO@8```!,B>?H`````("]@P````!T-D&-
+M7P%!@?]_EI@`=R9,B??H`````+\!````Z`````"`O8,`````=`N#PP&!^X&6
+MF`!UVD&)WX!$)!?H`````(#[_W4.3(GJ3(GF3(GWZ`````!,B??H
+M`````$B+7"082(ML)"!,BV0D*$R+;"0P3(MT)#A,BWPD0$B#Q$C#9F:005=!
+M5D%505154TB#["A(B?U)B?5(BX\X"0``N&">`0!F@7X@A0!W&P^W1B`/MH0'
+M8`@``$B-%$!(C1202(G02,'@!4R-)`%(BY4($0``2('"0`@``$$/MD0D\02(N5"!$``$B!PD`(``!!#[9$)'+!X`A(
+MF$@!PHM"!(D%`````(A$)!")PL'J"(A4)!'!Z!"(1"022(N5"!$``$B!PD`(
+M``!!#[9$)'+!X`A(F$@!PHM""(D%`````(A$)!.)PL'J"(A4)!3!Z!"(1"05
+MQD0D%@#&1"07`(M,)!!!B?9!P>X800^VWT2+1"041(GRB=Y(Q\<`````N```
+M``#H`````(G8@_`!B<*#X@%T%$6$_W0/0<9%)`"X`````.FH`@``08!])(%F
+M9I!U(4B-3"001(GRB=Y,B>_H`````$'&120"N`````#I?0(``$&+13@E____
+M`#WA`0X`=0]!QD4D(;@`````Z5X"``!!]H66`````74HA-)U)$&`?"1*_W0<
+M2(U,)!!$B?*)WDR)[^@`````N`````#I+`(``$R)YDB)[^@`````3(GF2(GO
+MZ`````!(BU4`00^W13)FP>@%#[?`C02%``,``(F"<`$``$B+10!!#[=-,H/A
+M'[H!````2(G32-/CB9AT`0``00^W13)(P>`#2`.%L`D``$C'``````!!#[=-
+M,HG(9L'H!27_!P``@^$?2(G62-/F2(GQ]]$AC(6X"0``00^W33*)R&;!Z`4E
+M_P<``(/A'TC3XO?2(52%;$F+50!)BT4(2(E""$B)$$$/MW4R2(V]H`\``.@`
+M````08"L)(,````!0<9%)(%)@[V``````'0/28VU@````$B)[^@`````28U$
+M)"!).40D(`^$"0$``$F)QDB-A:`/``!(B40D"$R-O?@```!F9F:09F:03(GW
+MZ`````!(B<-(BU4`#[=`,F;!Z`4/M\"-!(4``P``B8)P`0``2(M%``^W2S*#
+MX1^Z`0```$B)UDC3YHFP=`$```^W0S)(P>`#2`.%L`D``$C'```````/MTLR
+MB@%)?\'``"#X1](B=9(T^9(B?'WT2&,A;@)```/MTLRB@%)?\'
+M``"#X1](T^+WTB%4A6P/MW,R2(M\)`CH`````$&`K"2#`````4B#NX``````
+M=`](C;.`````2(GOZ`````!(BX7X````2(E8"$B)`TR)>PA(B9WX````33ET
+M)"`/A13___]!@:64````___^_T'&A"3H````!$R)[DR)Y^@`````N`$```!(
+M@\0H6UU!7$%=05Y!7\.02(/L6$B)7"0H2(EL)#!,B60D.$R);"1`3(ET)$A,
+MB7PD4$B)5"002(LO3(N%.!$``$B%T@^$Q@(```^WUDAIPK`$``!*C0P`]D$A
+M`G082(T$U0````!(`X6P"0``2(L`QD`D`NL62(T$U0````!(`X6P"0``2(L`
+MQD`D(4R-%-4`````2(N%L`D``$P!T$B+$(M"."7___\`/>$!$``/A+`!```/
+MMT(@9CV%`'<2#[?`#[:$!6`(```\_W499F:03(G02`.%L`D``$B+`,9`)`;I
+MR@@```^VP$B-%$!(C1202,'B!4R+G3@)``!)`=.`?"03`'EN00^V4TA(B="#
+MX`9(@_@&=2/VP@%T'DB+10"+D%@!``")%0````"%TG0*2(M%`(F06`$``$B+
+M10"+@%`!``")!0````"#R`)(BU4`B8)0`0``2(M%`(N`!`$``(D%`````(#,
+M_TB+50")@@0!``!F]T$@`@@/A.H```"`?4,`#X3@````NP````!!N0````!%
+MB@4@^`!ZR5(BT4`2`70`0``C12-`````$ACTD@!T(L`B04`
+M````P>@4@^`!A,!T"K@!````2-/@"<-!@\$!08U``3A%0W>!A-MT4CA?#75-
+MB?!FP>@%)?\'``"+1(5LB?](T_BH`74R08"[Z`````)W"$'&@^@````#
+M3(G02`.%L`D``$B+,$R)W^@`````Z4P'``!!NP````#V1"03`0^$.P<``$R)
+MT$@#A;`)``!(BS#&1B0ABT8X)?___P`]X0$.``^$%P<``$B+E0@1``!(@<)`
+M"```00^V0W+!X`A(F$@!PHL"B04`````2(N5"!$``$B!PD0(``!!#[9#`(2)A(`<*+`HD%
+M`````$B)[^@`````Z:$&``"0#[?V2(T<]0````!(BX6P"0``2`'82(L09H%Z
+M..$!#X4,`0``#[9Z.D"`_Q`/AVX&``"X`0```(GY2-/@J<`P```/A"0`#X06!@``2(M04$B%T@^$"08```^V03.(`NG^!0``
+M2&G&L`0``$J-#`!,C6$H2(G82`.%L`D``$B+$$$/MD0D`HA")$B)V$@#A;`)
+M``!(BP!(@WA(``^$P04```^VN2$$``#H`````$B)VD@#E;`)``!(BPJ+430Y
+MT`]'PHG"2(MY2$R)YN@`````Z8T%``!(B=A(`X6P"0``2(L`QD`D`.EW!0``
+M9F9FD&9FD$B)V$@#A;`)``!,BRA-BWUHN/____]F08%]((4`=QE(B=A(`X6P
+M"0``2(L`#[=`(`^VA`5@"```#[;`2(T40$B-%)!(P>(%3(NE.`D``$D!U$'&
+MA"3H`````$$/ME0D2$B)T(/@!DB#^`8/A9PB+$TR)[N@`````
+MBP-)`<6+0P1(@\,0A`(2)A(`<*+
+M`HD%`````(G"P>H008B7FP```,'H&&9!B8>0````2(N5"!$``$B!PD0(``!!
+M#[9$)'+!X`A(F$@!PHL2B14`````#[;"9D&)AY0````/ML9F08F'E@```(G0
+MP>@0#[;`9D&)AY@```#!ZAA!B)>:````2(N5"!$``$B!PDP(``!!#[9$)'+!
+MX`A(F$@!PHL"B04`````#[;`9D&)AY(```#I:0,``$AIQK`$``!.C30`00^V
+M1C.$P`^%T0```$B)V$@#A;`)``!(BP#&0"0`0?:%E@```!`/A#(#``!-A?\/
+MA"D#``!!#[9&,T&(AY(```!!]H>Q`````@^$#P,``$&#?30`#X0$`P``28._
+MN`````!U#DF#O\``````#X3L`@``38ME2$F+A[@```!(APB+$TR)YN@`````BP-)`<2+0P1(@\,0A<`/A8<"``#KW&9FD&:0/`(/A2@"
 M``!!#[9.0$&+1CB)1"0D#[94)"`(08G400G$@^%_@/EQ=CS&1"0-`$&#_`%V#$$/MD9!@^`/B$0D#<9$)`X`
 M08/\`G8)00^V3D*(3"0.08/\`W9F00^V1D.(1"0/ZV#&1"0-`$&#_`)V#$$/
@@ -338,4490 +340,1720 @@ MMDY"@^$/B$PD#<9$)`X`QD0D#P!!@_P'=CE!#[9
 M`$&#_`QV"4$/MD9,B$0D#D&#_`UV"T$/MDY-B$PD#^L%QD0D#P!(B=A(`X6P
 M"0``2(L`@'@P`'1(187D=$/&0"0@2(G82`.%L`D``$B+``^V0#`/MM!$..!$
 M#T+B2(G82`.%L`D``$B+`$B+>%!(A?]T'T2)XDF-=D#H`````.L12(G82`.%
-ML`D``$B+`,9`)"*`?"0-!'412(G82`.%L`D``$B+`,9`)`)).6TH#X0,`0``
-M387_#X0#`0``0?:%E@```!!T0$$/MD8S08B'D@```$'VA[$````"="I!#[9%
+ML`D``$B+`,9`)"*`?"0-!'412(G82`.%L`D``$B+`,9`)`)).6TH#X02`0``
+M387_#X0)`0``0?:%E@```!!T0$$/MD8S08B'D@```$'VA[$````"="I!#[9%
 M,$2)XD$XQ`]'T(32=!A)B[^H````2(7_=`P/MM))C79`Z`````"`?"0-"W=<
-M#[9$)`W_),4`````0<:'L@````'IF0```(!\)`X$=12`?"0/`G4-0<:'L@``
-M`!'I?@```$'&A[(````"ZW1!QH>R````$.MJ0<:'L@````OK8$'&A[(````&
-MZU9!QH>R````#>M,/"AU)T$/MH0D@P```(/H`4&(A"2"````2(G82`.%L`D`
-M`$B+`,9`)('K(3P(=0J_$"<``.@`````2(G82`.%L`D``$B+`,9`)"%FD$B+
-M7"0H2(ML)#!,BV0D.$R+;"1`3(MT)$A,BWPD4$B#Q%C#9F9FD&9FD&9FD&9F
-MD$%7059!54%455-(@^PH2(G[2(E\)!A$#[>GLA(``$B+!XN`0`$``(D%````
-M`&8E_P]FB8>R$@``9D0YX'5.2(L'B[!0`0``B34`````2(L'B;!0`0``N```
-M``#WQ@#__P`/A-T&``!(Q\<`````N`````#H`````$B+?"08Z`````"X`0``
-M`.FX!@``9H&_LA(``/\/#X45!@``Z3X&``!(B[,X$0``08/$`69$.Z.V$@``
-MN`````!$#T/@2(N3F!$``$B#P@1!#[?$BP2"08G`0<'H$$'VP`@/A+$```!(
-MBP.+D%`!``")%0````!(BP.)D%`!``#WP@#__P!T;8![0P!T9XG6]\8``0``
-M=3"_`````/?&```!`'1$ZR%FD`^WUXU*"$B)\$C3^*@!=12-2A!(B?!(T_BH
-M`74'ZR&_``````^WQTB-%(!(C1202(VLT\`!``!(A>UU'^L.9I"#QP$/MD-#
-M9CGX=[1(BWPD&.@`````Z54%``!(BWPD&.@`````B$4/Z4,%``!F9I")P6:!
-MX?\/#[?!2&G0L`0``$R+3!8@2(T\Q0````!(BX.P"0``2`'X2(LH2(7M#X0,
-M!0``0?;`(`^$?@$``(!])($/A5@!``#&120A#[=%,DC!X`-(`X.P"0``2,<`
-M``````^W33*)R&;!Z`4E_P<``(/A'[H!````2(G62-/F2(GQ]]$AC(.X"0``
-M#[=-,HG(9L'H!27_!P``@^$?2-/B]](A5(-L#[=U,DB+?"00Z`````!(@[V`
-M`````'0/2(VU@````$B)W^@`````#[=5(&:!^H4`#X?$````#[?"#[:$`V`(
-M```\_P^$L0```&:#^G]W'@^VP$AIP)@!``!(`X,X"0``2(M`4(!X"/\/E<#K
-M60^W12!F/8$`=R8/M\`/MH0#8`@``$AIP,@/``!(`X.("0``2(M`"(!X"/\/
-ME<#K*0^W12`/MH0#8`@``$B-!,!(P>`%2`.#8`D``$B+@(@```"`>`C_#Y7`
-MA,!T,$B)[DB)W^@`````2(N#^````$B):`A(B44`2(M$)`A(B44(2(FK^```
-M`.FA`P``D$F+5@A(C44028E&"$R)=1!(B5`(2(D"Z80#``")R&;!Z`4/M\")
-M1"0@2)@/M_&)\H/B'XE4)"2+1(-LB=%(T_BH`0^%6`,``$B)^$@#@[`)``!(
-MBP`/MU`@9H'ZA0`/A[4````/M\(/MH0#8`@``#S_#X2B````9H/Z?W<;#[;`
-M2&G`F`$``$@#@S@)``!(BT!0#[9`".MM2(GX2`.#L`D``$B+``^W0"!F/8$`
-M=R,/M\`/MH0#8`@``$AIP,@/``!(`X.("0``2(M`"`^V0`CK,TB)^$@#@[`)
-M``!(BP`/MT`@#[:$`V`(``!(C03`2,'@!4@#@V`)``!(BX"(````#[9`"#S_
-M=!`/MM!(8\*`O`/F"```_W4_2&-$)""+1(-L#[9,)"1(T_BH`0^%;@(``,9%
-M)`:^`````$B)[^@`````N@````!(B>Y(B=_H`````.E(`@``2&/"#[:$`^8(
-M``!(C12`2(T4D$B-O-/``0``387)=`U!]L`"N`````!,#T3(]D<*`@^$4@$`
-M`$R)RN@`````2&-$)""+1(-L#[9,)"1(T_BH`0^%\`$``(!])($/A9`````/
-MMT4R2,'@`T@#@[`)``!(QP``````#[=-,HG*9L'J!8'B_P<``(/A'[@!````
-M2-/@]]`AA).X"0``#[=U,DB+?"00Z`````!(B>Y(B=_H`````$B#O8``````
-M=`](C;6`````2(G?Z`````!(BX/X````2(EH"$B)10!(BW0D"$B)=0A(B:OX
-M````Z58!``!(BX,(`0``3#GP=%9!O0````!!@\4!2(L`23G&=?1%A.UT/T&_
-M`````$R)]^@`````2(U(\$F+5@A)B48(3(DP2(E0"$B)`D@YZ;@!````1`]$
-M^$&`[0%UT$6$_P^%]````$F+5@A(C44028E&"$R)=1!(B5`(2(D"2&-4)""X
-M`0````^V3"0D2-/@"823K````.F_````3(G*Z`````!(BX,(`0``3#GP=%)!
-MO0````!!@\4!2(L`23G&=?1%A.UT.T&_`````$R)]^@`````2(U(\$F+5@A)
-MB48(3(DP2(E0"$B)`D@YZ;@!````1`]$^$&`[0%UT$6$_W59@'TD@71328M6
-M"$B-11!)B48(3(EU$$B)4`A(B0)(8U0D(+@!````#[9,)"1(T^`)A).L````
-MZR&03(VW"`$``$B-MZ`/``!(B70D$$B-A_@```!(B40D")!F1#FCLA(```^%
-MPOG__TB-@P@!``!(.8,(`0``=$E(B<5(B>_H`````$B-H%
-M@>+_!P``@^$?N`$```!(T^#WT"&$DZP```"Z`````$B)W^@`````2#FK"`$`
-M`'6Z2(G?Z`````"X`0```$B#Q"A;74%<05U!7D%?PV9F9I!F9I!F9I!F9I!(
-M@^PH2(E<)`A(B6PD$$R)9"083(EL)"!(BY_P"```2(M#"$2+*$2)+0````!!
-M]\4```"0='I(BT,(1(DHZW&02('#>!0``$B+`XN04`$``(D5`````$B+`XF0
-M4`$``(72=#SWP@```!!T'$B+`\>`4`$``````!!(BP.+@%`!``")!0````!(
-MBP/'@%`!```!````2(G?Z`````!!`<2#Q0&#_0)UF>L79F9FD&9FD$&\````
-M`+T`````ZXIF9I!%A.0/ET/E<()T`^VP$B+7"0(2(ML)!!,BV0D&$R+
-M;"0@2(/$*,-F9I!F9I!!5T%6055!5%532(/L*$F)_$B+!XN04`$``(D5````
-M`$B+!XF04`$``&9F9I!F9I#WP@#__P`/A"@)``!!@'PD0P`/A!P)``#&1"00
-M`(G22(E4)`A$#[9L)!!!C4T(2(M$)`A(T_BH`74408U-$$B+1"0(2-/XJ`$/
-MA-$(``"`?"00`W8K28L$)$@%@`$``$*-%.T`````2&/22`'0BP")!0````#!
-MZ!.#X`'K*69FD$F+!"1(!8`!``!"C13M`````$ACTD@!T(L`B04`````P>@3
-M@^`!A,!T)DR)Y^@`````26/52(T$4DB-!()!@8S$Z!(`````"`!F9F:09F:0
-M28L4)(!\)!`#=B5"C03M`````$B82(V$`H`!``"+`(D%`````"4```$`ZR-F
-M9F:00HT$[0````!(F$B-A`*``0``BP")!0`````E```!`(7`=$&`?"00`W8=
-M0HT$[0````!(F$B-A`*``0``QP````$`Z1D(``!"C03M`````$B82(V$`H`!
-M``#'`````0#I_`<``$&`?"11`0^%J`8``(!\)!`#=BE)BP0D2`6``0``0HT4
-M[0````!(8])(`="+`(D%`````(/@`>LG9F9FD$F+!"1(!8`!``!"C13M````
-M`$ACTD@!T(L`B04`````@^`!A,`/A%4!``!)8\5(C1Q`2(T$#2HTT(8F6\!(``$C'A@`3````
-M````#[9$)!!(C11`2(T4D$F-E-2X$@``2(F6"!,``$F-M`SP$@``28M\)"CH
-M`````&9FD(!\)!`#=CU"C13M`````$ACTDF+!"1(!8`!``!(`="+`(D%````
-M`$F+!"1(!8`!``!(`<*+`HD%`````,'H!X/@`>L[0HT4[0````!(8]))BP0D
-M2`6``0``2`'0BP")!0````!)BP0D2`6``0``2`'"BP*)!0````#!Z`>#X`&$
-MP'1U@'PD$`-V-T*-#.T`````2&/)28L$)$@%A`$``$@!R(L`B04`````28L4
-M)$B!PH0!``!(`=$-```!`(D!ZSY"C0SM`````$ACR4F+!"1(!80!``!(`LO@'PD$`-V*$F+!"1(!8`!
-M``!"C13M`````$ACTD@!T(L`B04`````P>@2@^`!ZR9)BP0D2`6``0``0HT4
-M[0````!(8])(`="+`(D%`````,'H$H/@`83`#X0B`@``@'PD$`-V-T*-#.T`
-M````2&/)28L$)$@%@`$``$@!R(L`B04`````#0``!`!)BQ0D2('"@`$``$@!
-MT8D!ZS5"C0SM`````$ACR4F+!"1(!8`!``!(`$``
-M#X6B````Z80!``"`?"00`W9*0HT4[0````!(8]))BP0D2`6``0``2`'0BPB)
-M#0````!)BP0D2`6``0``2(T$`HD(28L$)$@%@`$``$@!PHL"B04`````Z=`#
-M``!"C13M`````$ACTDF+!"1(!8`!``!(`="+"(D-`````$F+!"1(!8`!``!(
-MC00"B0A)BP0D2`6``0``2`'"BP*)!0````#IA@,``&:02(M(0`^W04X/M]#V
-MQ@$/A=,```!(B.QX7`````
-M0$M,`$C'A=``````````2(FMV````$B-M<````!)BWPD*.@`````@'PD$`-V
-M,DF+!"1(!8`!```/ME0D$$C!X@.!XO@'``!(`="+`(D%`````,'H"(/@`>LP
-M9F:09F:028L$)$@%@`$```^V5"002,'B`X'B^`<``$@!T(L`B04`````P>@(
-M@^`!A,`/A!8!``"`?"00`W8L28L$)$@%@`$```^V5"002,'B`X'B^`<``$@!
-MT(L`B04`````@_`!@^`!ZRI)BP0D2`6``0``#[94)!!(P>(#@>+X!P``2`'0
-MBP")!0````"#\`&#X`&$P`^$L0````^V1"002(T40$B-%)!)C934L!(``$R-
-M>@A)BT<(2(7`#X2+````28G&2(UR0$F+?"0HZ`````!!@'X.`'110;T`````
-M28UN8)!(B>_H`````$B)PTB+10A(B5T(2(DK2(E#"$B)&$B+4T!(A=)T%DF+
-MM"3P"```OP4```#H`````(!+3`)!@\4!13AN#G>Z0<='.("$'@!)QT=(````
-M`$V)?U!)C7,#@>/X!P``
-M28L$)$@%@`$``$@!V(L0B14`````28L$)$@%@`$``$B-!`.)$$F+!"1(!8`!
-M``!(C00#BP")!0````!)BP0D2`4P`@``2(T$`\<``````+\0)P``Z`````!)
-MBP0D2`4T`@``2`'#BP.)!0````#K?0^V7"002,'C`X'C^`<``$F+!"1(!8`!
-M``!(`=B+$(D5`````$F+!"1(!8`!``!(C00#B1!)BP0D2`6``0``2(T$`XL`
-MB04`````28L$)$@%4`(``$B-!`/'``````"_$"<``.@`````28L$)$@%5`(`
-M`$@!PXL#B04`````@$0D$`$/MD0D$$$X1"1##X?P]O__28L$)(N04`$``(D5
-M`````$F+!"2)D%`!``#WP@#__P!T)NFE]O__9F:09I!)8]5(C0122(T$@D&!
-MC,3H$@`````!`.GH]___N`````!(@\0H6UU!7$%=05Y!7\-!5T%6055!5%53
-M2(/L:$F)_4"(="1+0`^VQHE$)$Q(F$B-%$!(C1202(T4UTR+NL`2```/MJKA
-M$@``2(L'0(#^`W8,QX!P`0``Q`$``.L*QX!P`0``J`$``$B)1"1@2`5T`0``
-M2(E$)%!(BU0D8(N"=`$``(D%`````(M,)$R#X0.[!P```-/C08G<00G$1(FB
-M=`$``+_H`P``Z`````#WTT0AXTB+3"1@B9ET`0``@'PD2P-V58M$)$S!X`)(
-MF$B-E`'0`0``BP*)!0````"#R`B)`HM<)$S!XP-(8]M(C809``(``,<`.```
-M`+\0)P``Z`````!(BU0D8$B-A!H$`@``QP``````ZUB+1"1,P>`"2)A(BTPD
-M8$B-E`'0`0``BP*)!0````"#R`B)`HM<)$S!XP-(8]M(C809``(``,<`.```
-M`+\0)P``Z`````!(BU0D8$B-A!H$`@``QP``````387_#X0V"```08!]0P!T
-M++L`````#[;+00^V1PU(T_BH`70/N@$```")SDR)[^@`````@\,!03A=0W?9
-M0?9'"@%T9TR)_DR)[^@`````BW0D3$R)[^@`````2&-$)$Q(C11`2(T4D$F-
-ME-70$@``BT(4J0``$`!T""7__^__B4(43(G^3(GOZ`````!(8T0D3$B-%$!(
-MC1202<>$U<`2````````Z94'``!!@']8`'0428N]L!```$R)_N@`````08!O
-M6`%(Q\#^____#[9,)$Q(T\!`(.B(1"1;#X2]`@``BW0D3$R)[^@`````2&-$
-M)$Q(C11`2(T4D$F-E-70$@``BT(4J0``$`!T""7__^__B4(4#[9$)%M!B$<-
-M08!]0P`/A.\!``#'1"1<``````^VT$B)5"0P2(M,)&!(@<$``@``2(E,)"A(
-MBT0D8$@%!`(``$B)1"0@#[94)%N)5"0<2(M,)&!(@<'0`0``2(E,)!!$#[9T
-M)%Q!#[;N2(M$)#")Z4C3^*@!#X1-`0``2&/%2(T40$B-%)`/MD0D6T&(A-7A
-M$@``08#^`P^&E0```(T<[0````!(8]M(BT0D*$@!V,<`.````+\0)P``Z```
-M``!(`UPD((M4)!R)$TB+3"1@QX%P`0``Q`$``$B+5"10BP*)!0````")Z8/A
-M`[L'````T^-!B=Q!"<1$B2*_Z`,``.@`````]]-$(>-(BTPD4(D9C12M````
-M`$ACTD@#5"00BP*)!0````"#R`B)`NF6````C1SM`````$ACVTB+1"0H2`'8
-MQP`X````OQ`G``#H`````$@#7"0@BT0D'(D#2(M4)&#'@G`!``"H`0``2(M,
-M)%"+`8D%`````(GI@^$#NP<```#3XT&)W$$)Q$B+1"101(D@O^@#``#H````
-M`/?302'<2(M4)%!$B2*-%*T`````2&/22`-4)!"+`HD%`````(/("(D"@T0D
-M7`%!C48!03A%0W8LZ8/^__](B=_H`````$B-<,A(BU,(2(E#"$B)&$B)4`A(
-MB0)(@WC8`'01ZPF^`````$F-7TA).5](=_H`````$B+#"1).4](#X4$_O__28U'8$DY1V`/A.\```"]`````$F)Q$R)
-MY^@`````2(G#@+B#`````'0ZC44!@?U_EI@`=@>)Q>LK9F:0B<5,B>_H````
-M`+\!````Z`````"`NX,`````=`N#Q0&!_8&6F`!UVDB+0T!(A_H`````$B+0T`/ME`"#[9P
-M`4C'QP````"X`````.@`````2(M30$F+M?`(``"_`0```.@`````2(M30$F+
-MM?`(``"_!@```.@`````2,=#0`````!!@&\.`4B)WDR)[^@`````33EG8`^%
-M&?___TR)_DR)[^@`````2&-$)$Q(C11`2(T4D$G'A-7`$@```````.EW_/__
-M0;\`````#[9$)%M(B40D0$B+5"1@2('"T`$``$B)5"0X18G^00^V[TB+1"1`
-MB>E(T_BH`74+1#A\)$L/A=4```!!@/X#=FA(BT0D8,>`<`$``,0!``!(BU0D
-M4(L"B04`````B>F#X0.-#$F[!P```-/C08G<00G$1(DBO^@#``#H`````/?3
-M1"'C2(M,)%")&8T4K0````!(8])(`U0D.(L"B04`````@\@(B0+K9TB+1"1@
-MQX!P`0``J`$``$B+5"10BP*)!0````")Z8/A`XT,2;L'````T^-!B=Q!"<1$
-MB2*_Z`,``.@`````]]-!(=Q(BTPD4$2)(8T4K0````!(8])(`U0D.(L"B04`
-M````@\@(B0)!@\_H`````(3`=%%,B>?H`````$B)QDB%P'1,2(M5:$B)16A(C45@2(D&2(E6
-M"$B),H!%#@%(B6Y0QD9(!<9&20#&AH$````/N0$```"Z`0```$B)[^@`````
-MZPL/MO-,B>?H`````%M=05S#9F:09I!!5D%505154TB)_4&)]40/MO9"C02U
-M`````$QCX+L`````OQ`G``#H`````$&`_0-V'DB+10!(!=`!``!,`>"+`(D%
-M`````,'H%(/@`>L=D$B+10!(!=`!``!)C00$BP")!0````#!Z!2#X`&$P'4*
-M@\,!9H'[+`%UJ$2)]DB)[^@`````2(GOZ`````!)8\9(C11`2(T4D$B-1-4`
-M]H#@$@```70/2(NPP!(``$B)[^@`````6UU!7$%=05[#9I!!5D%505154T&)
-M]4F)_$0/MO9)8\9(C11`2(T4D$B+K-?`$@``2(7M#X26`0``2,?`_O___T2)
-M\4C3P(1%#0^%@`$``$B-14A(.45(=15!O0````!(C5U@@'T.`'4CZ?,"``!`
-M#[;&2(T\0$B-/+A)C;S\N!(``.@`````Z=4"``!(B=_H`````$B)P4B+0PA(
-MB4L(2(D92(E!"$B)"(!Y20`/A0D!```/MT$X28.\Q&`$````=0M(@WE```^$
-MV0````^W03A)BX3$8`0``$B#N(``````#X2G````QH'H``````^V44A(B="#
-MX`9(@_@&=2WVP@%T*,9!2@7&04L$#[:1@0```$B+<5A(BWE0Z`````#IF```
-M`&9F9I!F9I`/ME%(2(G0@^`&2(/X!'4@]L(!=!O&04H#QD%+!$B)SDR)Y^@`
-M````ZV=F9I!F9I`/ME%(2(G0@^`&2(/X!G51]L(!=4S&04L&QD%*!6;'@<@`
-M`````$B)SDR)Y^@`````ZRY(BU%`28NT)/`(``"_!````.@`````ZQ8/MU$X
-M28NT)/`(``"_`@```.@`````08/%`40X;0X/AI@4@^`!ZQM)BP0D2`70`0``2`'HBP")!0````#!Z!2#X`&$P'4*@\,!9H'[
-M+`%UJD2)]DR)Y^@`````3(GGZ`````!)8\9(C11`2(T4D$F+K-3`$@``2(7M
-M#X3]````08!\)$,`="R[``````^VRP^V10U(T_BH`70/N@````")SDR)Y^@`
-M````@\,!03A<)$-WV4$/ML5(C11`2(T4D$F-E-2X$@``2(E5($B-14A(.45(
-M=3A(C45@2#E%8'4NZWMF9I!FD$B)W^@`````2(UPR$B+4PA(B4,(2(D82(E0
-M"$B)`DB#>-@`=!'K";X`````2(U=2$@Y74AURDB%]G1;QD9:`$&`?"1#`'1/
-MN0````"Z``````^V10U(T_BH`70.#[;"B$P&<(!&6@&#P@&#P0%!.$PD0W8B
-MZ]OV10H!=`U(B>Y,B>?H`````.L-O@````!(B>_H`````%M=05Q!74%>PY!(
-M@^P(3(L'1(M/,$$/MG!#0(3V=&))C8"X$@``N0````!(.?AU&NM/#[;!2(T4
-M0$B-%)!)C930N!(``$@Y^G0(@\$!0#CQ=>"`^0-V+TF+`$@%T`$``$B-%(T`
-M````@>+\`P``2`'0BP")!0````#!Z!2#X`'K+;D`````28L`2`70`0``2(T4
-MC0````"!XOP#``!(`="+`(D%`````,'H%(/@`83`=!`/MO%$B(````28LL)$'V1"0,$'0$QD=1!D$/MD91/`%T>3P!,"``!!@&0D#/=!@$92`4'&1E$`QD,D`DB)WDB)
-M[^@`````2(GOZ`````#IMP(``$$/MD0D#(/@]X/($$&(1"0,08N6"`$``(U"
-M`4&)A@@!``"#^@(/AP,!``!(@[N``````'0/2(VS@````$B)[^@`````2(V5
-M^````$B+A?@```!(B5@(2(D#2(E3"$B)G?@```!!@'Y"`'480;\`````38UL
-M)&!!@'PD#@!U'NF>````N@````"^`@```$R)Y^@`````9I#I&P(``$R)[^@`
-M````2(G#28M%"$F)70A,B2M(B4,(2(D82(M30$B%TG052(NU\`@``+\%````
-MZ`````"`2TP"2(G:O@8```!,B>?H`````("[@P````!T(F9F9I!F9I!(B>_H
-M`````+\!````Z`````"`NX,`````=>5!@\&"`$```````!(@[N``````'0/2(VS@````$B)[^@`
-M````2(V5^````$B+A?@```!(B5@(2(D#2(E3"$B)G?@```"Z`````+X&````
-M3(GGZ`````!)C40D8$DY1"1@='Q)B<5,B>_H`````$B)PTB+0$!(A_H`````$B+4T!(B[7P"```OP$`
-M``#H`````$B+4T!(B[7P"```OP8```#H`````$C'0T``````2(G>2(GOZ```
-M``!-.6PD8'6'3(GV2(GOZ`````!)QT0D0`````!(BT4`BY!8`0``B14`````
-MA=)T"DB+10")D%@!``!!]D0D"@%T:X!]0P!T++D`````0?9$)`T!=!7K'69F
-MD&9FD$$/MD0D#4C3^*@!=0^#P0$X34-WZ^L%N0`````/MMF)WDB)[^@`````
-M3(GF2(GOZ`````!(8]M(C01;2(T$@TC'A,7`$@```````&9FD&:02(/$"%M=
-M05Q!74%>05_#D$B#["A(B5PD"$B);"003(ED)!A,B6PD($B)\TB)_4R+;U!-
-MBV4`#[=.,HG(9L'H!0^W\$ACQD&+1(1L@^$?2-/XJ`$/A6<#``!)BQ0DC02U
-M``,``(F"<`$``$F+!"2+D'0!``")%0````#&0R0ABT,X)?___P`]X0$/`'4C
-MO@````!(B=_H`````+H`````2(G>3(GGZ`````#I$0,``)")T`^W2S*#X1](
-MT_BH`705O@$```!(B=_H`````$R)Y^@`````#[:%Z````#P$#X?<`@``#[;`
-M_R3%`````,:%Z`````&Z`0```$B)WDR)[^@`````Z;8"``#&A>@````"N@@`
-M``!(B=Y,B>_H`````.F:`@``QH7H`````TB)ZKXA````3(GOZ`````!(BW58
-M2(7V=!\/MI6!````0;@`````N0$```!,B>_H`````.E;`@``00^V=0VZ````
-M`$R)Y^@`````Z40"``#&A>@````$2(-]6`!T,TB)ZKXA````3(GOZ``````/
-MMI6!````2(MU6$&X`````+D"````3(GOZ`````#I`P(``+H`````OB$```!,
-MB>_H`````$$/MG4-N@$```!,B>?H`````.G:`0``@'U*_W052(GJO@8```!,
-MB>_H`````.F_`0``2(GJO@8```!,B>_H`````$B+34!(A9F:03(GGZ`````"_`0```.@`
-M````@+V#`````'7E2(-]6`!T&4B+51!(BT482(E""$B)$$B+15B`:%@!ZQE(
-MBU5@2(72=!`/MH6!````2,=$PE@`````2(M5`$B+10A(B4((2(D008!M#@%(
-MB[T@`0``2(7_=!$/MK4-`0``N@$```#H`````$B+?5A(A?]T$0^VM8$```"Z
-M`0```.@`````2(M%0$B%P'1R2,=`8`````!,B>?H`````$B+=4"Z`0```$R)
-MY^@`````2(M%0`^V4`(/MG`!2,?'`````+@`````Z`````!(BU5`28NT)/`(
-M``"_`0```.@`````2(M50$F+M"3P"```OP8```#H`````$C'14``````2(GN
-M3(GGZ`````!!@'T)_W14O0````!!@'T.`'0RO0````!)C5U@2(G?Z`````!(
-MBU,(2(E#"$B)&$B)4`A(B0*`>$K_=0F#Q0%!.&T.=]=!.&T.=Q!!QD4)_TR)
-M[DR)Y^@`````2(M<)`A(BVPD$$R+9"083(ML)"!(@\0HPV9F9I!F9I!!5T%6
-M055!5%532(/L&$F)_$R+OX@```!)BQ](BX.8$0``1(LH2(G^2(G?Z`````!!
-M@'PD4@%V!D'&1"11!$F-;"0H23EL)"@/A/\!``!(B>_H`````$F)QDF+1"0H
-M3(EP"$F)!DF);@A-B70D*&:#>V@`#X2T`0``O0````!(C8.@#P``2(E$)!!(
-MC;OX````2(E\)`@/M\5(P>`#2`.#L`D``$B+,$B%]@^$<`$```^W1B!F03E$
-M)$`/A6`!```/MY.R$@``03G5=$]F9F:0@\(!#[>#MA(``#G"N``````/0]"-
-M0@%(P>`"2`.#F!$``(L`J0``"`!U&V8E_P]F.>AU$DDY]G422(G?Z`````#I
-M-P$``$0YZG6U#[=&(&8]A0`/A_<````/M\"`O`-@"```_P^$Y@```$&`?U@`
-M#X7;````0?9'"@$/A-````!(BQ,/MT8R9L'H!0^WP(T$A0`#``")@G`!``!(
-MBP,/MTXR@^$?N@$```!(B==(T^>)N'0!```/MT8R2,'@`T@#@[`)``!(QP``
-M````#[=.,HG(9L'H!27_!P``@^$?2(G72-/G2(GY]]$AC(.X"0``#[=.,HG(
-M9L'H!27_!P``@^$?2-/B]](A5(-L3#GV="Q(BP9(BU8(2(E0"$B)`DB+@_@`
-M``!(B7`(2(D&2(M$)`A(B48(2(FS^`````^W=C)(BWPD$.@`````08!L)$4!
-M@\4!9CEK:`^':?[__T'V1PH!=!E)BQ9)BT8(2(E""$B)$$R)]DR)Y^@`````
-M2(/$&%M=05Q!74%>05_#9F9FD$%505154TB#[`A(B10D3(LG#[?V2,'F`TD#
-MM"2P"0``2(L>9H%[..$!=28/MD,Z@^@1/`%W&TB+;T!!O0````!(A=)U4L9%
-M40!!O0````#K1DF+E"0X"0``N&B6`0!F@7L@A0!W%`^W0R!!#[:$!&`(``!(
-M:<"8`0``3(TL`KT`````2(,\)`!U#4'&A>@`````O0````"`>R2!=02`9PSW
-M2(,\)``/A00!``#&0R0`]H.6````(`^$*@,``$B+0VA(A<`/A!T#``!(B<7V
-M@+$````"=!U(B[B@````2(7_=!%(BW-(2(7V=`B+4S3H`````$F+E"0($0``
-M2('"0`@``$$/MD5RP>`(2)A(`<*+`HD%`````(G"P>H0B)6;````P>@89HF%
-MD````$F+E"0($0``2('"1`@``$$/MD5RP>`(2)A(`<*+$HD5``````^VPF:)
-MA90````/ML9FB866````B=#!Z!`/ML!FB868````P>H8B)6:````28N4)`@1
-M``!(@<),"```00^V17+!X`A(F$@!PHL"B04`````#[;`9HF%D@```.DX`@``
-MD(![)(!U"L9#)"%F9I!F9I!(BS0D2,?'`````+@`````Z`````!F@7LXX0%U
-M&`^V0SJ#Z!$\`7<-2(GOZ`````#I\@$``$B)X0^V5"0#]L(!#X1]`0``BT,X
-M)?___P`]X0$.``^$:@$``$F+E"0($0``2('"0`@``$$/MD5RP>`(2)A(`<*+
-M,HDU`````$F+E"0($0``2('"1`@``$$/MD5RP>`(2)A(`<)$BP)$B04`````
-M28N4)`@1``!(@<)("```00^V17+!X`A(F$@!PHL*B0T`````]H.6````(`^$
-MX@```$B+>VC&A[(````0QD,D((GPP>@0B(>;````B?#!Z!AFB8>0````B4````BH0P>((1(G`
-MP>@0#[;``<)FB9>8````28N4)`@1``!(@<),"```00^V17+!X`A(F$@!PHLR
-MB34`````0`^V]F:)MY(````/MX^6````#[>7F`````^W]D0/MX>4````2,?'
-M`````+@`````Z`````!)BY0D"!$``$B!PD`(``!!#[9%?H`````.MDA-)Y($F+!"2+B%@!``")#0````"%R71,28L$
-M)(F(6`$``.M`@#D`>#N`>0<`>35)BQ0D#[=#,F;!Z`4/M\"-!(4``P``B8)P
-M`0``28L4)`^W2S*#X1^X`0```$C3X(F"=`$``$B#Q`A;74%<05W#9F9FD&9F
-M9I!F9I!F9I!(@^P(#[9&.$@Y?BAU2CP(=&4\*'1A/*AT73R(9F9FD'15/`IT
-M43PJ=$T\JF9F9I!T13R*=$%(BX?X````2(EP"$B)!DB-A_@```!(B48(2(FW
-M^````.L?2(N7``$``$B)MP`!``!(C8?X````2(D&2(E6"$B),N@`````2(/$
-M",-F9F:09F9FD&9F9I!F9I!(@^P(Z`````!(@\0(PV:04TB#[&!(B?M(C4PD
-M74B-5"1>2(UT)%\/MW\\2(U$)%)(B40D.$B-1"142(E$)#!(C40D3$B)1"0H
-M2(U$)$Y(B40D($B-1"182(E$)!A(C40D6DB)1"002(U$)%M(B40D"$B-1"16
-M2(D$)$R-3"1<3(U$)%#H``````^V5"1?#[9T)%Y(C7PD2.@`````#[94)%](
-M:=*8`0``2(MS($B-NQ@)``"Y`0```.@`````#[94)%U(C1322,'B!4B+2&G2R`\``$B+(#2(MS($B-NV@*``"Y`0```.@`````#[94)%P/MT0D4$@/K]!(C112
-M2,'B`DB+(#
-M2(MS($B-NS`+``"Y`0```.@`````#[=4)%A(`=)(BW,@2(V[>`\``+D!````
-MZ``````/ME0D7T@!TDB+(+2(MS($B-NZ@1``!!N`$```"Y"````.@`````2(MS($B-N]@1``!!
-MN`$```"Y"````+H```@`Z``````/MU0D5DAITHP!``!(BW,@2('#"!(``$&X
-M`0```+D(````2(G?Z`````"X`````$B#Q&!;PV9F9I!F9I!F9I!(@^PX2(E<
-M)`A(B6PD$$R)9"083(EL)"!,B70D*$R)?"0P28GW28G]2(L'2(D$)$R-9TA,
-MB>?H`````$B)PTR-<,A(BSPDZ`````!(B<5)BT5028E=4$V)9CA)B49`2(D8
-MN`$```!(A>UT>,9%..'&13D!QD4Z$(!-.P%)BX>@````2(E%:$B+17!,B7@H
-M28V'D````$B)15#&127,00^V1EMFB44@28M%`$B)12C'1320````3(E]2$C'
-MA:``````````2(U]6+X`````Z`````!(B>Y(BSPDZ`````"X`````$B+7"0(
-M2(ML)!!,BV0D&$R+;"0@3(MT)"A,BWPD,$B#Q#C#9F9FD&9FD&9FD$%7059!
-M54%455-(@^P82(G]2,=$)!``````2(M$)!`/MI0HY@@``(#Z_P^$Z@````^V
-MRDB-!(E(C02!2(V$Q<`!``!(B40D"`^V\DACQDB-%(!(C120@+S5S@$````/
-MA+8```!!O`````!(C02)2(T$@4C!X`-,C;0%(`(``$R-+"A(8\9(C12`2(T4
-MD$R-O-7``0``3(GWZ`````!(B<-)BX4H`@``28F=*`(``$R),TB)0PA(B1A(
-MBU-`2(72=!5(B[7P"```OP4```#H`````(!+3`)(B=J^`@```$B+?"0(Z```
-M``"`NX,`````=!M(B>_H`````+\!````Z`````"`NX,`````=>5!@\0!13AG
-M#@^'>____TB#1"00`4B#?"00!`^%[O[__TB)[^@`````2(/$&%M=05Q!74%>
-M05_#9F9FD&9FD&9FD&9FD$%7059!54%455-(@^QX2(G[QD=1`,9'4`#&1T\`
-MQH=I%````$B-E[@2``"X`````,8$$`!(@\`!2#V@`0``=?!(C8/X````2(F#
-M^````$B)@P`!``!(C8,(`0``2(F#"`$``$B)@Q`!``!,C:,8`0``3(FC&`$`
-M`$R)HR`!``!,C:LH`0``3(FK*`$``$R)JS`!``!(C8,X`0``2(E$)$A(B8,X
-M`0``2(F#0`$``$B-BT@!``!(B4PD4$B)BT@!``!(B8M0`0``3(VS:`$``$R)
-MLV@!``!,B;-P`0``2(VS>`$``$B)="1`2(FS>`$``$B)LX`!``!,C;M8`0``
-M3(F[6`$``$R)NV`!``!(C4PD;DB-5"1P2(UT)'$/MWL\2(U$)')(B40D.$B-
-M1"1T2(E$)#!(C40D9$B)1"0H2(U$)&I(B40D($B-1"1V2(E$)!A(C40D;$B)
-M1"002(U$)&U(B40D"$B-1"1H2(D$)$R-3"1O3(U$)&;H``````^V1"1QB$-&
-M#[9$)'"(0T(%2(72=!!(B`L``$B+DX`!``!(
-MB8.``0``2(M,)$!(B0A(B5`(2(D"@\4!#[9$)'%F.>AWPTB-NW@/``#H````
-M`$B)@Y@/``!(B8.@#P``#[=T)'9FB;.J#P``#[?V2(V[H`\``.@`````2(V[
-ML`\``.@`````2(F#T`\``$B)@]@/```/MG0D<6:)L^(/```/M_9(C;O8#P``
-MZ`````!(C;OH#P``Z`````!(B8,($```2(F#$!````^V="1N9HFS&A````^W
-M]DB-NQ`0``#H`````$B-NR`0``#H`````$B)@T`0``!(B8-($```#[9T)'!F
-MB;-2$```#[?V2(V[2!```.@`````2(V[6!```.@`````2(F#>!```$B)@X`0
-M```/MD,^9HF#BA````^V`A!QD`)`$B)F,`!``!!QD`.`,:`&`(```#&@.@!````QX!@`@``````
-M`$B-C!/P`0``2(F(\`$``$B)B/@!``!(C8P3"`(``$B)B`@"``!(B8@0`@``
-M2(V4$R`"``!(B9`@`@``2(F0*`(``$'&0`H"@\$`L@``````$C'A,M@!```````
-M`$B)T4@#BS@)``!(C4$@2(E!($@#DS@)``!(C4(@2(E"*(/&`0^V1"1Q9CGP
-M#X=T____9L>#[```````N`````!F9I!F9I#&A!A@"```_TB#P`%(/88```!U
-M[(!\)'``#X2]````O@`````/M\9(:<#(#P``2(N3B`D``,9$`E@`2(N3B`D`
-M`,9$$%D`2(N3B`D``$C'1!`0`````$B)P4@#BX@)``!(C5$82(E1&$B)P4@#
-MBX@)``!(C5$82(E1($B)P4@#BX@)``!(C5$H2(E1*$B)P4@#BX@)``!(C5$H
-M2(E1,$B+DX@)``!,B400"$B)P4@#BX@)``!(C5%(2(E12$@#@X@)``!(C5!(
-M2(E04(/&`0^V1"1P9CGP#X=(____QH/O````@(!\)&X`#X2"````O@`````/
-MM\9(C03`2,'@!4B+DV`)``!FQT0"3@0`2(N38`D``,9$$$(`2(N38`D``,9$
-M$$3_2(N38`D``,9$$%#_2(G!2`.+8`D``$B-42A(B5$H2(G!2`.+8`D``$B-
-M42A(B5$P2(N38`D``$R)A!"(````@\8!#[9$)&YF.?!W@\:#\````()(C;/@
-M$```2(V[N!```.@`````2(F#V!```$B-LQ`1``!(C;OH$```Z`````!(B8,(
-M$0``2(VS0!$``$B-NQ@1``#H`````$B)@S@1``!(C;-P$0``2(V[2!$``.@`
-M````2(F#:!$``$B-LZ`1``!(C;MX$0``Z`````!(B8.8$0``2(VST!$``$B-
-MNZ@1``#H`````$F)Q$B)@\@1``!(BZO0$0``@'PD;0!T4D&]`````$B+?"1(
-MZ`````!,B6`02(EH&$B+DT`!``!(B8-``0``2(MT)$A(B3!(B5`(2(D"28'$
-M``@``$B!Q0`(``!!@\4!#[9$)&UF1#GH=[1(C;,`$@``2(V[V!$``.@`````
-M28G$2(F#^!$``$B+JP`2``!!O0````!(BWPD4.@`````3(E@$$B):!A(BY-0
-M`0``2(F#4`$``$B+3"102(D(2(E0"$B)`DF!Q````0!(@<4```$`08/%`69!
-M@_T(=;A(C;,P$@``2(V["!(``.@`````2(F#*!(``$R+HS`2``!F@WPD:`!T
-M2$B)Q4&U`$R)_^@`````2(EH$$R)8!A(BY-@`0``2(F#8`$``$R).$B)4`A(
-MB0)(@<6,`0``28'$C`$``$&#Q0%F1#EL)&AWODB#Q'A;74%<05U!7D%?PV9F
-M9I!F9F:0055!5%532(/L"$F)_4F)]$B+GH@````/ME9'2(G^2(G?Z`````!(
-MB<5F08-,)$X008!]0P!T6;D`````]D,-`70-ZTP/MD,-2-/XJ`%U#8/!`4$/
-MMD5#9CG(=^AF@_D#=C-)BT4`2`70`0``2(T4C0````"!XOS_`P!(`="+`(D%
-M`````,'H%(/P`8/@`>LQN0````!)BT4`2`70`0``2(T4C0````"!XOS_`P!(
-M`="+`(D%`````,'H%(/P`8/@`83`=!`/MO%,B>_H`````.F7`0``2(U#8$@Y
-M0V`/A!D!``!(A>T/A!`!```/MH6!````2<=$Q%@`````2(M5`$B+10A(B4((
-M2(D02(GJO@8```!(B=_H`````("]@P````!T&TR)[^@`````OP$```#H````
-M`("]@P````!UY4B+14!(AY,B>_H`````$F+10"+D%@!``")%0````"%TG0*28M%`(F06`$`
-M`$'&1"1"`&9!@V0D3N]!@'PD.P!T*KH`````#[?"28M$Q%A(AM+3(GF
-M3(GOZ`````!FD.M*#[?%28M_H`````$F)QTF+1"0@3(EX"$F)!TF);PA-
-MB7PD(&:#>V@`#X0+`@``0;T`````2(VSH`\``$B)="002(V#^````$B)1"0(
-M00^WQ4C!X`-(`X.P"0``2(LH2(7M#X3#`0``#[=%(&9!.40D.`^%LP$```^W
-MD[(2``!!.=9T469FD&:0@\(!#[>#MA(``#G"N``````/0]"-0@%(P>`"2`.#
-MF!$``(L`J0``"`!U'&8E_P]F1#GH=1)).>]U$DB)W^@`````Z9D!``!$.?)U
-MM$B+="0@@'Y8``^%1P$```^W12!F/84`#X
Delivered-To: svn-src-all@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 ESMTPS id 994F294;
 Fri, 29 Aug 2014 13:41:22 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8271F1E98;
 Fri, 29 Aug 2014 13:41:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7TDfMWa062438;
 Fri, 29 Aug 2014 13:41:22 GMT (envelope-from pluknet@FreeBSD.org)
Received: (from pluknet@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7TDfMk7062434;
 Fri, 29 Aug 2014 13:41:22 GMT (envelope-from pluknet@FreeBSD.org)
Message-Id: <201408291341.s7TDfMk7062434@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: pluknet set sender to
 pluknet@FreeBSD.org using -f
From: Sergey Kandaurov 
Date: Fri, 29 Aug 2014 13:41:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270817 - stable/10/contrib/tzdata
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 13:41:22 -0000

Author: pluknet
Date: Fri Aug 29 13:41:21 2014
New Revision: 270817
URL: http://svnweb.freebsd.org/changeset/base/270817

Log:
  MFC r270728, tzdata2014f
  
  - Parts of Russia will change times on 2014-10-26.
  - Time zone name changes for Asia/Novokuznetsk and Xinjiang and Samoa
    and America/Metlakatla, new zones Asia/Chita and Asia/Srednekolymsk.
  - Australia will now use Axxx.
  - New zone tab data format.
  
  And lots of historical changes (See
  http://mm.icann.org/pipermail/tz-announce/2014-August/000023.html
  for the full details.)

Added:
  stable/10/contrib/tzdata/zone1970.tab
     - copied unchanged from r270728, head/contrib/tzdata/zone1970.tab
Modified:
  stable/10/contrib/tzdata/africa
  stable/10/contrib/tzdata/antarctica
  stable/10/contrib/tzdata/asia
  stable/10/contrib/tzdata/australasia
  stable/10/contrib/tzdata/backward
  stable/10/contrib/tzdata/etcetera
  stable/10/contrib/tzdata/europe
  stable/10/contrib/tzdata/factory
  stable/10/contrib/tzdata/leap-seconds.list   (contents, props changed)
  stable/10/contrib/tzdata/northamerica
  stable/10/contrib/tzdata/pacificnew
  stable/10/contrib/tzdata/southamerica
  stable/10/contrib/tzdata/systemv
  stable/10/contrib/tzdata/yearistype.sh
  stable/10/contrib/tzdata/zone.tab
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/tzdata/africa
==============================================================================
--- stable/10/contrib/tzdata/africa	Fri Aug 29 13:37:01 2014	(r270816)
+++ stable/10/contrib/tzdata/africa	Fri Aug 29 13:41:21 2014	(r270817)
@@ -1,4 +1,3 @@
-# 
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -35,13 +34,13 @@
 # Previous editions of this database used WAT, CAT, SAT, and EAT
 # for +0:00 through +3:00, respectively,
 # but Mark R V Murray reports that
-# `SAST' is the official abbreviation for +2:00 in the country of South Africa,
-# `CAT' is commonly used for +2:00 in countries north of South Africa, and
-# `WAT' is probably the best name for +1:00, as the common phrase for
-# the area that includes Nigeria is ``West Africa''.
-# He has heard of ``Western Sahara Time'' for +0:00 but can find no reference.
+# 'SAST' is the official abbreviation for +2:00 in the country of South Africa,
+# 'CAT' is commonly used for +2:00 in countries north of South Africa, and
+# 'WAT' is probably the best name for +1:00, as the common phrase for
+# the area that includes Nigeria is "West Africa".
+# He has heard of "Western Sahara Time" for +0:00 but can find no reference.
 #
-# To make things confusing, `WAT' seems to have been used for -1:00 long ago;
+# To make things confusing, 'WAT' seems to have been used for -1:00 long ago;
 # I'd guess that this was because people needed _some_ name for -1:00,
 # and at the time, far west Africa was the only major land area in -1:00.
 # This usage is now obsolete, as the last use of -1:00 on the African
@@ -54,7 +53,7 @@
 #	 2:00	SAST	South Africa Standard Time
 # and Murray suggests the following abbreviation:
 #	 1:00	WAT	West Africa Time
-# I realize that this leads to `WAT' being used for both -1:00 and 1:00
+# I realize that this leads to 'WAT' being used for both -1:00 and 1:00
 # for times before 1976, but this is the best I can think of
 # until we get more information.
 #
@@ -131,9 +130,7 @@ Zone	Africa/Gaborone	1:43:40 -	LMT	1885
 			2:00	-	CAT
 
 # Burkina Faso
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Africa/Ouagadougou	-0:06:04 -	LMT	1912
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Burundi
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -161,7 +158,7 @@ Zone	Africa/Bangui	1:14:20	-	LMT	1912
 
 # Chad
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Ndjamena	1:00:12 -	LMT	1912
+Zone	Africa/Ndjamena	1:00:12 -	LMT	1912 # N'Djamena
 			1:00	-	WAT	1979 Oct 14
 			1:00	1:00	WAST	1980 Mar  8
 			1:00	-	WAT
@@ -183,10 +180,20 @@ Zone Africa/Lubumbashi	1:49:52 -	LMT	189
 Zone Africa/Brazzaville	1:01:08 -	LMT	1912
 			1:00	-	WAT
 
-# Cote D'Ivoire
+# Côte D'Ivoire / Ivory Coast
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Abidjan	-0:16:08 -	LMT	1912
 			 0:00	-	GMT
+Link Africa/Abidjan Africa/Bamako	# Mali
+Link Africa/Abidjan Africa/Banjul	# Gambia
+Link Africa/Abidjan Africa/Conakry	# Guinea
+Link Africa/Abidjan Africa/Dakar	# Senegal
+Link Africa/Abidjan Africa/Freetown	# Sierra Leone
+Link Africa/Abidjan Africa/Lome		# Togo
+Link Africa/Abidjan Africa/Nouakchott	# Mauritania
+Link Africa/Abidjan Africa/Ouagadougou	# Burkina Faso
+Link Africa/Abidjan Africa/Sao_Tome	# São Tomé and Príncipe
+Link Africa/Abidjan Atlantic/St_Helena	# St Helena
 
 # Djibouti
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -231,13 +238,9 @@ Rule	Egypt	1990	1994	-	May	 1	1:00	1:00	
 # Egyptians would approve the cancellation."
 #
 # Egypt to cancel daylight saving time
-# 
 # http://www.almasryalyoum.com/en/node/407168
-# 
 # or
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_egypt04.html
-# 
 Rule	Egypt	1995	2010	-	Apr	lastFri	 0:00s	1:00	S
 Rule	Egypt	1995	2005	-	Sep	lastThu	24:00	0	-
 # From Steffen Thorsen (2006-09-19):
@@ -249,7 +252,7 @@ Rule	Egypt	2006	only	-	Sep	21	24:00	0	-
 # From Dirk Losch (2007-08-14):
 # I received a mail from an airline which says that the daylight
 # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07.
-# From Jesper Norgaard Welen (2007-08-15): [The following agree:]
+# From Jesper Nørgaard Welen (2007-08-15): [The following agree:]
 # http://www.nentjes.info/Bill/bill5.htm
 # http://www.timeanddate.com/worldclock/city.html?n=53
 # From Steffen Thorsen (2007-09-04): The official information...:
@@ -288,15 +291,9 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	24:00	
 #
 # timeanddate[2] and another site I've found[3] also support that.
 #
-# [1] 
-# https://bugzilla.redhat.com/show_bug.cgi?id=492263
-# 
-# [2] 
-# http://www.timeanddate.com/worldclock/clockchange.html?n=53
-# 
-# [3] 
-# http://wwp.greenwichmeantime.com/time-zone/africa/egypt/
-# 
+# [1] https://bugzilla.redhat.com/show_bug.cgi?id=492263
+# [2] http://www.timeanddate.com/worldclock/clockchange.html?n=53
+# [3] http://wwp.greenwichmeantime.com/time-zone/africa/egypt/
 
 # From Arthur David Olson (2009-04-20):
 # In 2009 (and for the next several years), Ramadan ends before the fourth
@@ -306,14 +303,10 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	24:00	
 # From Steffen Thorsen (2009-08-11):
 # We have been able to confirm the August change with the Egyptian Cabinet
 # Information and Decision Support Center:
-# 
 # http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html
-# 
 #
 # The Middle East News Agency
-# 
 # http://www.mena.org.eg/index.aspx
-# 
 # also reports "Egypt starts winter time on August 21"
 # today in article numbered "71, 11/08/2009 12:25 GMT."
 # Only the title above is available without a subscription to their service,
@@ -321,19 +314,14 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	24:00	
 # (at least today).
 
 # From Alexander Krivenyshev (2010-07-20):
-# According to News from Egypt -  Al-Masry Al-Youm Egypt's cabinet has
+# According to News from Egypt - Al-Masry Al-Youm Egypt's cabinet has
 # decided that Daylight Saving Time will not be used in Egypt during
 # Ramadan.
 #
 # Arabic translation:
-# "Clocks to go back during Ramadan--and then forward again"
-# 
+# "Clocks to go back during Ramadan - and then forward again"
 # http://www.almasryalyoum.com/en/news/clocks-go-back-during-ramadan-and-then-forward-again
-# 
-# or
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_egypt02.html
-# 
 
 # From Ahmad El-Dardiry (2014-05-07):
 # Egypt is to change back to Daylight system on May 15
@@ -433,10 +421,15 @@ Zone	Africa/Asmara	2:35:32 -	LMT	1870
 			3:00	-	EAT
 
 # Ethiopia
-# From Paul Eggert (2006-03-22):
-# Shanks & Pottenger write that Ethiopia had six narrowly-spaced time zones
-# between 1870 and 1890, and that they merged to 38E50 (2:35:20) in 1890.
-# We'll guess that 38E50 is for Adis Dera.
+# From Paul Eggert (2014-07-31):
+# Like the Swahili of Kenya and Tanzania, many Ethiopians keep a
+# 12-hour clock starting at our 06:00, so their "8 o'clock" is our
+# 02:00 or 14:00.  Keep this in mind when you ask the time in Amharic.
+#
+# Shanks & Pottenger write that Ethiopia had six narrowly-spaced time
+# zones between 1870 and 1890, that they merged to 38E50 (2:35:20) in
+# 1890, and that they switched to 3:00 on 1936-05-05.  Perhaps 38E50
+# was for Adis Dera.  Quite likely the Shanks data are wrong anyway.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Addis_Ababa	2:34:48 -	LMT	1870
 			2:35:20	-	ADMT	1936 May 5    # Adis Dera MT
@@ -448,28 +441,24 @@ Zone Africa/Libreville	0:37:48 -	LMT	191
 			1:00	-	WAT
 
 # Gambia
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Banjul	-1:06:36 -	LMT	1912
-			-1:06:36 -	BMT	1935	# Banjul Mean Time
-			-1:00	-	WAT	1964
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Ghana
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-# Whitman says DST was observed from 1931 to ``the present'';
-# go with Shanks & Pottenger.
-Rule	Ghana	1936	1942	-	Sep	 1	0:00	0:20	GHST
-Rule	Ghana	1936	1942	-	Dec	31	0:00	0	GMT
+# Whitman says DST was observed from 1931 to "the present";
+# Shanks & Pottenger say 1936 to 1942;
+# and September 1 to January 1 is given by:
+# Scott Keltie J, Epstein M (eds), The Statesman's Year-Book,
+# 57th ed. Macmillan, London (1920), OCLC 609408015, pp xxviii.
+# For lack of better info, assume DST was observed from 1920 to 1942.
+Rule	Ghana	1920	1942	-	Sep	 1	0:00	0:20	GHST
+Rule	Ghana	1920	1942	-	Dec	31	0:00	0	GMT
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Accra	-0:00:52 -	LMT	1918
 			 0:00	Ghana	%s
 
 # Guinea
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Conakry	-0:54:52 -	LMT	1912
-			 0:00	-	GMT	1934 Feb 26
-			-1:00	-	WAT	1960
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Guinea-Bissau
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -577,18 +566,8 @@ Zone	Africa/Blantyre	2:20:00 -	LMT	1903 
 			2:00	-	CAT
 
 # Mali
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Bamako	-0:32:00 -	LMT	1912
-			 0:00	-	GMT	1934 Feb 26
-			-1:00	-	WAT	1960 Jun 20
-			 0:00	-	GMT
-
 # Mauritania
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Africa/Nouakchott	-1:03:48 -	LMT	1912
-			 0:00	-	GMT	1934 Feb 26
-			-1:00	-	WAT	1960 Nov 28
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Mauritius
 
@@ -612,9 +591,7 @@ Zone Africa/Nouakchott	-1:03:48 -	LMT	19
 
 # From Steffen Thorsen (2008-07-10):
 # According to
-# 
 # http://www.lexpress.mu/display_article.php?news_id=111216
-# 
 # (in French), Mauritius will start and end their DST a few days earlier
 # than previously announced (2008-11-01 to 2009-03-31).  The new start
 # date is 2008-10-26 at 02:00 and the new end date is 2009-03-27 (no time
@@ -633,18 +610,13 @@ Zone Africa/Nouakchott	-1:03:48 -	LMT	19
 # published on Monday, June 30, 2008...
 #
 # I guess that article in French "Le gouvernement avance l'introduction
-# de l'heure d'ete" stating that DST in Mauritius starting on October 26
-# and ending on March 27, 2009 is the most recent one.
-# ...
-# 
+# de l'heure d'été" stating that DST in Mauritius starting on October 26
+# and ending on March 27, 2009 is the most recent one....
 # http://www.worldtimezone.com/dst_news/dst_news_mauritius02.html
-# 
 
 # From Riad M. Hossen Ally (2008-08-03):
 # The Government of Mauritius weblink
-# 
 # http://www.gov.mu/portal/site/pmosite/menuitem.4ca0efdee47462e7440a600248a521ca/?content_id=4728ca68b2a5b110VgnVCM1000000a04a8c0RCRD
-# 
 # Cabinet Decision of July 18th, 2008 states as follows:
 #
 # 4. ...Cabinet has agreed to the introduction into the National Assembly
@@ -654,33 +626,25 @@ Zone Africa/Nouakchott	-1:03:48 -	LMT	19
 # States of America. It will start at two o'clock in the morning on the
 # last Sunday of October and will end at two o'clock in the morning on
 # the last Sunday of March the following year. The summer time for the
-# year 2008 - 2009 will, therefore, be effective as from 26 October 2008
+# year 2008-2009 will, therefore, be effective as from 26 October 2008
 # and end on 29 March 2009.
 
 # From Ed Maste (2008-10-07):
 # THE TIME BILL (No. XXVII of 2008) Explanatory Memorandum states the
 # beginning / ending of summer time is 2 o'clock standard time in the
 # morning of the last Sunday of October / last Sunday of March.
-# 
 # http://www.gov.mu/portal/goc/assemblysite/file/bill2708.pdf
-# 
 
 # From Steffen Thorsen (2009-06-05):
 # According to several sources, Mauritius will not continue to observe
 # DST the coming summer...
 #
 # Some sources, in French:
-# 
 # http://www.defimedia.info/news/946/Rashid-Beebeejaun-:-%C2%AB-L%E2%80%99heure-d%E2%80%99%C3%A9t%C3%A9-ne-sera-pas-appliqu%C3%A9e-cette-ann%C3%A9e-%C2%BB
-# 
-# 
 # http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-%C3%A9conomie-d-%C3%A9nergie-de-l-heure-d-%C3%A9t%C3%A9-ont-%C3%A9t%C3%A9-atteints-
-# 
 #
 # Our wrap-up:
-# 
 # http://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html
-# 
 
 # From Arthur David Olson (2009-07-11):
 # The "mauritius-dst-will-not-repeat" wrapup includes this:
@@ -704,7 +668,7 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 			3:00	-	EAT
 
 # Morocco
-# See the `europe' file for Spanish Morocco (Africa/Ceuta).
+# See the 'europe' file for Spanish Morocco (Africa/Ceuta).
 
 # From Alex Krivenyshev (2008-05-09):
 # Here is an article that Morocco plan to introduce Daylight Saving Time between
@@ -712,60 +676,43 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 #
 # "... Morocco is to save energy by adjusting its clock during summer so it will
 # be one hour ahead of GMT between 1 June and 27 September, according to
-# Communication Minister and Gov ernment Spokesman, Khalid Naciri...."
+# Communication Minister and Government Spokesman, Khalid Naciri...."
 #
-# 
 # http://www.worldtimezone.net/dst_news/dst_news_morocco01.html
-# 
-# OR
-# 
 # http://en.afrik.com/news11892.html
-# 
 
 # From Alex Krivenyshev (2008-05-09):
 # The Morocco time change can be confirmed on Morocco web site Maghreb Arabe Presse:
-# 
 # http://www.map.ma/eng/sections/box3/morocco_shifts_to_da/view
-# 
 #
 # Morocco shifts to daylight time on June 1st through September 27, Govt.
 # spokesman.
 
 # From Patrice Scattolin (2008-05-09):
 # According to this article:
-# 
 # http://www.avmaroc.com/actualite/heure-dete-comment-a127896.html
-# 
-# (and republished here:
-# 
-# http://www.actu.ma/heure-dete-comment_i127896_0.html
-# 
-# )
-# the changes occurs at midnight:
-#
-# saturday night may 31st at midnight (which in french is to be
-# intrepreted as the night between saturday and sunday)
-# sunday night the 28th  at midnight
-#
-# Seeing that the 28th is monday, I am guessing that she intends to say
-# the midnight of the 28th which is the midnight between sunday and
-# monday, which jives with other sources that say that it's inclusive
-# june1st to sept 27th.
+# (and republished here: )
+# the changes occur at midnight:
+#
+# Saturday night May 31st at midnight (which in French is to be
+# interpreted as the night between Saturday and Sunday)
+# Sunday night the 28th at midnight
+#
+# Seeing that the 28th is Monday, I am guessing that she intends to say
+# the midnight of the 28th which is the midnight between Sunday and
+# Monday, which jives with other sources that say that it's inclusive
+# June 1st to Sept 27th.
 #
 # The decision was taken by decree *2-08-224 *but I can't find the decree
 # published on the web.
 #
 # It's also confirmed here:
-# 
 # http://www.maroc.ma/NR/exeres/FACF141F-D910-44B0-B7FA-6E03733425D1.htm
-# 
-# on a government portal as being  between june 1st and sept 27th (not yet
-# posted in english).
+# on a government portal as being between June 1st and Sept 27th (not yet
+# posted in English).
 #
-# The following google query will generate many relevant hits:
-# 
+# The following Google query will generate many relevant hits:
 # http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search
-# 
 
 # From Steffen Thorsen (2008-08-27):
 # Morocco will change the clocks back on the midnight between August 31
@@ -773,47 +720,32 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 # of September:
 #
 # One article about it (in French):
-# 
 # http://www.menara.ma/fr/Actualites/Maroc/Societe/ci.retour_a_l_heure_gmt_a_partir_du_dimanche_31_aout_a_minuit_officiel_.default
-# 
 #
 # We have some further details posted here:
-# 
 # http://www.timeanddate.com/news/time/morocco-ends-dst-early-2008.html
-# 
 
 # From Steffen Thorsen (2009-03-17):
 # Morocco will observe DST from 2009-06-01 00:00 to 2009-08-21 00:00 according
 # to many sources, such as
-# 
 # http://news.marweb.com/morocco/entertainment/morocco-daylight-saving.html
-# 
-# 
 # http://www.medi1sat.ma/fr/depeche.aspx?idp=2312
-# 
 # (French)
 #
 # Our summary:
-# 
 # http://www.timeanddate.com/news/time/morocco-starts-dst-2009.html
-# 
 
 # From Alexander Krivenyshev (2009-03-17):
 # Here is a link to official document from Royaume du Maroc Premier Ministre,
-# Ministere de la Modernisation des Secteurs Publics
+# Ministère de la Modernisation des Secteurs Publics
 #
 # Under Article 1 of Royal Decree No. 455-67 of Act 23 safar 1387 (2 june 1967)
 # concerning the amendment of the legal time, the Ministry of Modernization of
 # Public Sectors announced that the official time in the Kingdom will be
 # advanced 60 minutes from Sunday 31 May 2009 at midnight.
 #
-# 
 # http://www.mmsp.gov.ma/francais/Actualites_fr/PDF_Actualites_Fr/HeureEte_FR.pdf
-# 
-#
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_morocco03.html
-# 
 
 # From Steffen Thorsen (2010-04-13):
 # Several news media in Morocco report that the Ministry of Modernization
@@ -821,14 +753,10 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 # 2010-05-02 to 2010-08-08.
 #
 # Example:
-# 
 # http://www.lavieeco.com/actualites/4099-le-maroc-passera-a-l-heure-d-ete-gmt1-le-2-mai.html
-# 
 # (French)
 # Our page:
-# 
 # http://www.timeanddate.com/news/time/morocco-starts-dst-2010.html
-# 
 
 # From Dan Abitol (2011-03-30):
 # ...Rules for Africa/Casablanca are the following (24h format)
@@ -838,34 +766,20 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 # The change was broadcast on the FM Radio
 # I ve called ANRT (telecom regulations in Morocco) at
 # +212.537.71.84.00
-# 
 # http://www.anrt.net.ma/fr/
-# 
 # They said that
-# 
 # http://www.map.ma/fr/sections/accueil/l_heure_legale_au_ma/view
-# 
 # is the official publication to look at.
 # They said that the decision was already taken.
 #
 # More articles in the press
-# 
-# http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-lev
-# 
-# e.html
-# 
+# http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-leve.html
 # http://www.lematin.ma/Actualite/Express/Article.asp?id=148923
-# 
-# 
 # http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT%2B1-a-partir-de-dim
-# anche-prochain-5538.html
-# 
 
 # From Petr Machata (2011-03-30):
 # They have it written in English here:
-# 
 # http://www.map.ma/eng/sections/home/morocco_to_spring_fo/view
-# 
 #
 # It says there that "Morocco will resume its standard time on July 31,
 # 2011 at midnight." Now they don't say whether they mean midnight of
@@ -873,20 +787,16 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 # also been like that in the past.
 
 # From Alexander Krivenyshev (2012-03-09):
-# According to Infomédiaire web site from Morocco (infomediaire.ma),
-# on March 9, 2012, (in French) Heure légale:
-# Le Maroc adopte officiellement l'heure d'été
-# 
+# According to Infomédiaire web site from Morocco (infomediaire.ma),
+# on March 9, 2012, (in French) Heure légale:
+# Le Maroc adopte officiellement l'heure d'été
 # http://www.infomediaire.ma/news/maroc/heure-l%C3%A9gale-le-maroc-adopte-officiellement-lheure-d%C3%A9t%C3%A9
-# 
 # Governing Council adopted draft decree, that Morocco DST starts on
 # the last Sunday of March (March 25, 2012) and ends on
 # last Sunday of September (September 30, 2012)
 # except the month of Ramadan.
 # or (brief)
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_morocco06.html
-# 
 
 # From Arthur David Olson (2012-03-10):
 # The infomediaire.ma source indicates that the system is to be in
@@ -897,17 +807,13 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 
 # From Christophe Tropamer (2012-03-16):
 # Seen Morocco change again:
-# 
 # http://www.le2uminutes.com/actualite.php
-# 
-# "...à partir du dernier dimance d'avril et non fins mars,
-# comme annoncé précédemment."
+# "...à partir du dernier dimanche d'avril et non fins mars,
+# comme annoncé précédemment."
 
 # From Milamber Space Network (2012-07-17):
 # The official return to GMT is announced by the Moroccan government:
-# 
 # http://www.mmsp.gov.ma/fr/actualites.aspx?id=288 [in French]
-# 
 #
 # Google translation, lightly edited:
 # Back to the standard time of the Kingdom (GMT)
@@ -1052,7 +958,7 @@ Zone Africa/Casablanca	-0:30:20 -	LMT	19
 # Assume that this has been true since Western Sahara switched to GMT,
 # since most of it was then controlled by Morocco.
 
-Zone Africa/El_Aaiun	-0:52:48 -	LMT	1934 Jan
+Zone Africa/El_Aaiun	-0:52:48 -	LMT	1934 Jan # El Aaiún
 			-1:00	-	WAT	1976 Apr 14
 			 0:00	Morocco	WE%sT
 
@@ -1102,15 +1008,17 @@ Zone	Africa/Niamey	 0:08:28 -	LMT	1912
 Zone	Africa/Lagos	0:13:36 -	LMT	1919 Sep
 			1:00	-	WAT
 
-# Reunion
+# Réunion
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Indian/Reunion	3:41:52 -	LMT	1911 Jun	# Saint-Denis
-			4:00	-	RET	# Reunion Time
+			4:00	-	RET	# Réunion Time
 #
-# Scattered Islands (Iles Eparses) administered from Reunion are as follows.
+# Crozet Islands also observes Réunion time; see the 'antarctica' file.
+#
+# Scattered Islands (Îles Éparses) administered from Réunion are as follows.
 # The following information about them is taken from
-# Iles Eparses (www.outre-mer.gouv.fr/domtom/ile.htm, 1997-07-22, in French;
-# no longer available as of 1999-08-17).
+# Îles Éparses (, 1997-07-22,
+# in French; no longer available as of 1999-08-17).
 # We have no info about their time zone histories.
 #
 # Bassas da India - uninhabited
@@ -1125,28 +1033,17 @@ Zone	Africa/Kigali	2:00:16 -	LMT	1935 Ju
 			2:00	-	CAT
 
 # St Helena
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Atlantic/St_Helena	-0:22:48 -	LMT	1890		# Jamestown
-			-0:22:48 -	JMT	1951	# Jamestown Mean Time
-			 0:00	-	GMT
+# See Africa/Abidjan.
 # The other parts of the St Helena territory are similar:
 #	Tristan da Cunha: on GMT, say Whitman and the CIA
-#	Ascension: on GMT, says usno1995 and the CIA
+#	Ascension: on GMT, say the USNO (1995-12-21) and the CIA
 #	Gough (scientific station since 1955; sealers wintered previously):
 #		on GMT, says the CIA
-#	Inaccessible, Nightingale: no information, but probably GMT
-
-# Sao Tome and Principe
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Sao_Tome	 0:26:56 -	LMT	1884
-			-0:36:32 -	LMT	1912	# Lisbon Mean Time
-			 0:00	-	GMT
+#	Inaccessible, Nightingale: uninhabited
 
+# São Tomé and Príncipe
 # Senegal
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Dakar	-1:09:44 -	LMT	1912
-			-1:00	-	WAT	1941 Jun
-			 0:00	-	GMT
+# See Africa/Abidjan.
 
 # Seychelles
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1160,17 +1057,7 @@ Zone	Indian/Mahe	3:41:48 -	LMT	1906 Jun	
 # Possibly the islands were uninhabited.
 
 # Sierra Leone
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-# Whitman gives Mar 31 - Aug 31 for 1931 on; go with Shanks & Pottenger.
-Rule	SL	1935	1942	-	Jun	 1	0:00	0:40	SLST
-Rule	SL	1935	1942	-	Oct	 1	0:00	0	WAT
-Rule	SL	1957	1962	-	Jun	 1	0:00	1:00	SLST
-Rule	SL	1957	1962	-	Sep	 1	0:00	0	GMT
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Freetown	-0:53:00 -	LMT	1882
-			-0:53:00 -	FMT	1913 Jun # Freetown Mean Time
-			-1:00	SL	%s	1957
-			 0:00	SL	%s
+# See Africa/Abidjan.
 
 # Somalia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1193,9 +1080,9 @@ Zone Africa/Johannesburg 1:52:00 -	LMT	1
 
 # Sudan
 #
-# From 
-# Sudan News Agency (2000-01-13)
-# , also reported by Michael De Beukelaer-Dossche via Steffen Thorsen:
+# From 
+# Sudan News Agency (2000-01-13),
+# also reported by Michaël De Beukelaer-Dossche via Steffen Thorsen:
 # Clocks will be moved ahead for 60 minutes all over the Sudan as of noon
 # Saturday....  This was announced Thursday by Caretaker State Minister for
 # Manpower Abdul-Rahman Nur-Eddin.
@@ -1226,14 +1113,12 @@ Zone Africa/Dar_es_Salaam 2:37:08 -	LMT	
 			3:00	-	EAT
 
 # Togo
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Lome	0:04:52 -	LMT	1893
-			0:00	-	GMT
+# See Africa/Abidjan.
 
 # Tunisia
 
 # From Gwillim Law (2005-04-30):
-# My correspondent, Risto Nykanen, has alerted me to another adoption of DST,
+# My correspondent, Risto Nykänen, has alerted me to another adoption of DST,
 # this time in Tunisia.  According to Yahoo France News
 # , in a story attributed to AP
 # and dated 2005-04-26, "Tunisia has decided to advance its official time by
@@ -1242,7 +1127,7 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
 # Saturday."  (My translation)
 #
 # From Oscar van Vlijmen (2005-05-02):
-# LaPresse, the first national daily newspaper ...
+# La Presse, the first national daily newspaper ...
 # 
 # ... DST for 2005: on: Sun May 1 0h standard time, off: Fri Sept. 30,
 # 1h standard time.
@@ -1256,18 +1141,12 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
 # From Steffen Thorsen (2009-03-16):
 # According to several news sources, Tunisia will not observe DST this year.
 # (Arabic)
-# 
 # http://www.elbashayer.com/?page=viewn&nid=42546
-# 
-# 
 # http://www.babnet.net/kiwidetail-15295.asp
-# 
 #
 # We have also confirmed this with the US embassy in Tunisia.
 # We have a wrap-up about this on the following page:
-# 
 # http://www.timeanddate.com/news/time/tunisia-cancels-dst-2009.html
-# 
 
 # From Alexander Krivenyshev (2009-03-17):
 # Here is a link to Tunis Afrique Presse News Agency
@@ -1275,20 +1154,17 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
 # Standard time to be kept the whole year long (tap.info.tn):
 #
 # (in English)
-# 
 # http://www.tap.info.tn/en/index.php?option=com_content&task=view&id=26813&Itemid=157
-# 
 #
 # (in Arabic)
-# 
 # http://www.tap.info.tn/ar/index.php?option=com_content&task=view&id=61240&Itemid=1
-# 
 
-# From Arthur David Olson (2009--3-18):
-# The Tunis Afrique Presse News Agency notice contains this: "This measure is due to the fact
-# that the fasting month of ramadan coincides with the period concerned by summer time.
-# Therefore, the standard time will be kept unchanged the whole year long."
-# So foregoing DST seems to be an exception (albeit one that may be repeated in the  future).
+# From Arthur David Olson (2009-03-18):
+# The Tunis Afrique Presse News Agency notice contains this: "This measure is
+# due to the fact that the fasting month of Ramadan coincides with the period
+# concerned by summer time.  Therefore, the standard time will be kept
+# unchanged the whole year long."  So foregoing DST seems to be an exception
+# (albeit one that may be repeated in the future).
 
 # From Alexander Krivenyshev (2010-03-27):
 # According to some news reports Tunis confirmed not to use DST in 2010
@@ -1300,12 +1176,8 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
 # coincided with the month of Ramadan..."
 #
 # (in Arabic)
-# 
 # http://www.moheet.com/show_news.aspx?nid=358861&pg=1
-# 
 # http://www.almadenahnews.com/newss/news.php?c=118&id=38036
-# or
-# 
 # http://www.worldtimezone.com/dst_news/dst_news_tunis02.html
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S

Modified: stable/10/contrib/tzdata/antarctica
==============================================================================
--- stable/10/contrib/tzdata/antarctica	Fri Aug 29 13:37:01 2014	(r270816)
+++ stable/10/contrib/tzdata/antarctica	Fri Aug 29 13:41:21 2014	(r270817)
@@ -1,16 +1,13 @@
-# 
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
 # From Paul Eggert (1999-11-15):
 # To keep things manageable, we list only locations occupied year-round; see
-# 
 # COMNAP - Stations and Bases
-# 
+# 
 # and
-# 
 # Summary of the Peri-Antarctic Islands (1998-07-23)
-# 
+# 
 # for information.
 # Unless otherwise specified, we have no time zone information.
 #
@@ -55,19 +52,19 @@ Rule	ChileAQ	2012	max	-	Sep	Sun>=2	4:00u
 
 # Argentina - year-round bases
 # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05
-# Esperanza, San Martin Land, -6323-05659, since 1952-12-17
-# Jubany, Potter Peninsula, King George Island, -6414-0602320, since 1982-01
-# Marambio, Seymour I, -6414-05637, since 1969-10-29
+# Carlini, Potter Cove, King George Island, -6414-0602320, since 1982-01
+# Esperanza, Hope Bay, -6323-05659, since 1952-12-17
+# Marambio, -6414-05637, since 1969-10-29
 # Orcadas, Laurie I, -6016-04444, since 1904-02-22
-# San Martin, Debenham I, -6807-06708, since 1951-03-21
+# San Martín, Barry I, -6808-06706, since 1951-03-21
 #	(except 1960-03 / 1976-03-21)
 
 # Australia - territories
 # Heard Island, McDonald Islands (uninhabited)
 #	previously sealers and scientific personnel wintered
-#	
 #	Margaret Turner reports
-#	 (1999-09-30) that they're UTC+5, with no DST;
+#	
+#	(1999-09-30) that they're UTC+5, with no DST;
 #	presumably this is when they have visitors.
 #
 # year-round bases
@@ -84,14 +81,10 @@ Rule	ChileAQ	2012	max	-	Sep	Sun>=2	4:00u
 # The changes occurred on 2009-10-18 at 02:00 (local times).
 #
 # Government source: (Australian Antarctic Division)
-# 
 # http://www.aad.gov.au/default.asp?casid=37079
-# 
 #
 # We have more background information here:
-# 
 # http://www.timeanddate.com/news/time/antarctica-new-times.html
-# 
 
 # From Steffen Thorsen (2010-03-10):
 # We got these changes from the Australian Antarctic Division: ...
@@ -106,19 +99,17 @@ Rule	ChileAQ	2012	max	-	Sep	Sun>=2	4:00u
 # - Mawson station stays on UTC+5.
 #
 # Background:
-# 
 # http://www.timeanddate.com/news/time/antartica-time-changes-2010.html
-# 
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Antarctica/Casey	0	-	zzz	1969
-			8:00	-	WST	2009 Oct 18 2:00
-						# Western (Aus) Standard Time
+			8:00	-	AWST	2009 Oct 18 2:00
+						# Australian Western Std Time
 			11:00	-	CAST	2010 Mar 5 2:00
 						# Casey Time
-			8:00	-	WST	2011 Oct 28 2:00
+			8:00	-	AWST	2011 Oct 28 2:00
 			11:00	-	CAST	2012 Feb 21 17:00u
-			8:00	-	WST
+			8:00	-	AWST
 Zone Antarctica/Davis	0	-	zzz	1957 Jan 13
 			7:00	-	DAVT	1964 Nov # Davis Time
 			0	-	zzz	1969 Feb
@@ -132,24 +123,27 @@ Zone Antarctica/Mawson	0	-	zzz	1954 Feb 
 						# Mawson Time
 			5:00	-	MAWT
 # References:
-# 
 # Casey Weather (1998-02-26)
-# 
-# 
+# 
 # Davis Station, Antarctica (1998-02-26)
-# 
-# 
+# 
 # Mawson Station, Antarctica (1998-02-25)
-# 
+# 
+
+# Belgium - year-round base
+# Princess Elisabeth, Queen Maud Land, -713412+0231200, since 2007
 
 # Brazil - year-round base
-# Comandante Ferraz, King George Island, -6205+05824, since 1983/4
+# Ferraz, King George Island, -6205+05824, since 1983/4
+
+# Bulgaria - year-round base
+# St. Kliment Ohridski, Livingston Island, -623829-0602153, since 1988
 
 # Chile - year-round bases and towns
 # Escudero, South Shetland Is, -621157-0585735, since 1994
-# Presidente Eduadro Frei, King George Island, -6214-05848, since 1969-03-07
-# General Bernardo O'Higgins, Antarctic Peninsula, -6319-05704, since 1948-02
-# Capitan Arturo Prat, -6230-05941
+# Frei Montalva, King George Island, -6214-05848, since 1969-03-07
+# O'Higgins, Antarctic Peninsula, -6319-05704, since 1948-02
+# Prat, -6230-05941
 # Villa Las Estrellas (a town), around the Frei base, since 1984-04-09
 # These locations have always used Santiago time; use TZ='America/Santiago'.
 
@@ -157,31 +151,35 @@ Zone Antarctica/Mawson	0	-	zzz	1954 Feb 
 # Great Wall, King George Island, -6213-05858, since 1985-02-20
 # Zhongshan, Larsemann Hills, Prydz Bay, -6922+07623, since 1989-02-26
 
-# France - year-round bases
+# France - year-round bases (also see "France & Italy")
 #
 # From Antoine Leca (1997-01-20):
 # Time data are from Nicole Pailleau at the IFRTP
 # (French Institute for Polar Research and Technology).
-# She confirms that French Southern Territories and Terre Adelie bases
-# don't observe daylight saving time, even if Terre Adelie supplies came
+# She confirms that French Southern Territories and Terre Adélie bases
+# don't observe daylight saving time, even if Terre Adélie supplies came
 # from Tasmania.
 #
 # French Southern Territories with year-round inhabitants
 #
-# Martin-de-Vivies Base, Amsterdam Island, -374105+0773155, since 1950
-# Alfred-Faure Base, Crozet Islands, -462551+0515152, since 1964
-# Port-aux-Francais, Kerguelen Islands, -492110+0701303, since 1951;
+# Alfred Faure, Possession Island, Crozet Islands, -462551+0515152, since 1964;
+#	sealing & whaling stations operated variously 1802/1911+;
+#	see Indian/Reunion.
+#
+# Martin-de-Viviès, Amsterdam Island, -374105+0773155, since 1950
+# Port-aux-Français, Kerguelen Islands, -492110+0701303, since 1951;
 #	whaling & sealing station operated 1908/1914, 1920/1929, and 1951/1956
 #
 # St Paul Island - near Amsterdam, uninhabited
 #	fishing stations operated variously 1819/1931
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Indian/Kerguelen	0	-	zzz	1950	# Port-aux-Francais
+Zone Indian/Kerguelen	0	-	zzz	1950	# Port-aux-Français
 			5:00	-	TFT	# ISO code TF Time
 #
 # year-round base in the main continent
-# Dumont-d'Urville, Ile des Petrels, -6640+14001, since 1956-11
+# Dumont d'Urville, Île des Pétrels, -6640+14001, since 1956-11
+#  (2005-12-05)
 #
 # Another base at Port-Martin, 50km east, began operation in 1947.
 # It was destroyed by fire on 1952-01-14.
@@ -191,20 +189,22 @@ Zone Antarctica/DumontDUrville 0 -	zzz	1
 			10:00	-	PMT	1952 Jan 14 # Port-Martin Time
 			0	-	zzz	1956 Nov
 			10:00	-	DDUT	# Dumont-d'Urville Time
-# Reference:
-# 
-# Dumont d'Urville Station (2005-12-05)
-# 
+
+# France & Italy - year-round base
+# Concordia, -750600+1232000, since 2005
 
 # Germany - year-round base
-# Georg von Neumayer, -7039-00815
+# Neumayer III, -704080-0081602, since 2009
 
-# India - year-round base
-# Dakshin Gangotri, -7005+01200
+# India - year-round bases
+# Bharati, -692428+0761114, since 2012
+# Maitri, -704558+0114356, since 1989
+
+# Italy - year-round base (also see "France & Italy")
+# Zuchelli, Terra Nova Bay, -744140+1640647, since 1986
 
 # Japan - year-round bases
-# Dome Fuji, -7719+03942
-# Syowa, -690022+0393524
+# Syowa (also known as Showa), -690022+0393524, since 1957
 #
 # From Hideyuki Suzuki (1999-02-06):
 # In all Japanese stations, +0300 is used as the standard time.
@@ -216,11 +216,11 @@ Zone Antarctica/DumontDUrville 0 -	zzz	1
 Zone Antarctica/Syowa	0	-	zzz	1957 Jan 29
 			3:00	-	SYOT	# Syowa Time
 # See:
-# 
 # NIPR Antarctic Research Activities (1999-08-17)
-# 
+# 
 
 # S Korea - year-round base
+# Jang Bogo, Terra Nova Bay, -743700+1641205 since 2014
 # King Sejong, King George Island, -6213-05847, since 1988
 
 # New Zealand - claims
@@ -269,6 +269,9 @@ Zone Antarctica/Troll	0	-	zzz	2005 Feb 1
 # Poland - year-round base
 # Arctowski, King George Island, -620945-0582745, since 1977
 
+# Romania - year-bound base
+# Law-Racoviță, Larsemann Hills, -692319+0762251, since 1986
+
 # Russia - year-round bases
 # Bellingshausen, King George Island, -621159-0585337, since 1968-02-22
 # Mirny, Davis coast, -6633+09301, since 1956-02
@@ -278,8 +281,8 @@ Zone Antarctica/Troll	0	-	zzz	2005 Feb 1
 #	year-round from 1960/61 to 1992
 
 # Vostok, since 1957-12-16, temporarily closed 1994-02/1994-11
-# 
-# From Craig Mundell (1994-12-15):
+# From Craig Mundell (1994-12-15)
+# :
 # Vostok, which is one of the Russian stations, is set on the same
 # time as Moscow, Russia.
 #
@@ -294,7 +297,7 @@ Zone Antarctica/Troll	0	-	zzz	2005 Feb 1
 #
 # From Paul Eggert (2001-05-04):
 # This seems to be hopelessly confusing, so I asked Lee Hotz about it
-# in person.  He said that some Antartic locations set their local
+# in person.  He said that some Antarctic locations set their local
 # time so that noon is the warmest part of the day, and that this
 # changes during the year and does not necessarily correspond to mean
 # solar noon.  So the Vostok time might have been whatever the clocks
@@ -306,9 +309,12 @@ Zone Antarctica/Vostok	0	-	zzz	1957 Dec 
 
 # S Africa - year-round bases
 # Marion Island, -4653+03752
-# Sanae, -7141-00250
+# SANAE IV, Vesleskarvet, Queen Maud Land, -714022-0025026, since 1997
+
+# Ukraine - year-round base
+# Vernadsky (formerly Faraday), Galindez Island, -651445-0641526, since 1954
 
-# UK
+# United Kingdom
 #
 # British Antarctic Territories (BAT) claims
 # South Orkney Islands
@@ -364,7 +370,7 @@ Zone Antarctica/Palmer	0	-	zzz	1965
 # but that he found it more convenient to keep GMT+12
 # as supplies for the station were coming from McMurdo Sound,
 # which was on GMT+12 because New Zealand was on GMT+12 all year
-# at that time (1957).  (Source: Siple's book 90 degrees SOUTH.)
+# at that time (1957).  (Source: Siple's book 90 Degrees South.)
 #
 # From Susan Smith
 # http://www.cybertours.com/whs/pole10.html

Modified: stable/10/contrib/tzdata/asia
==============================================================================
--- stable/10/contrib/tzdata/asia	Fri Aug 29 13:37:01 2014	(r270816)
+++ stable/10/contrib/tzdata/asia	Fri Aug 29 13:41:21 2014	(r270817)
@@ -1,4 +1,3 @@
-# 
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -32,7 +31,7 @@
 # A reliable and entertaining source about time zones is
 # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
 #
-# I invented the abbreviations marked `*' in the following table;
+# I invented the abbreviations marked '*' in the following table;
 # the rest are from earlier versions of this file, or from other sources.
 # Corrections are welcome!
 #	     std  dst
@@ -47,13 +46,14 @@
 #	7:00 WIB	west Indonesia (Waktu Indonesia Barat)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 13:46:31 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 6B0DF2C1;
 Fri, 29 Aug 2014 13:46:31 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 55C5E1EDD;
 Fri, 29 Aug 2014 13:46:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7TDkVic063607;
 Fri, 29 Aug 2014 13:46:31 GMT (envelope-from pluknet@FreeBSD.org)
Received: (from pluknet@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7TDkVri063606;
 Fri, 29 Aug 2014 13:46:31 GMT (envelope-from pluknet@FreeBSD.org)
Message-Id: <201408291346.s7TDkVri063606@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: pluknet set sender to
 pluknet@FreeBSD.org using -f
From: Sergey Kandaurov 
Date: Fri, 29 Aug 2014 13:46:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270818 - stable/10/release/doc/en_US.ISO8859-1/relnotes
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 13:46:31 -0000

Author: pluknet
Date: Fri Aug 29 13:46:30 2014
New Revision: 270818
URL: http://svnweb.freebsd.org/changeset/base/270818

Log:
  Document r270817, tzdata2014f.

Modified:
  stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Fri Aug 29 13:41:21 2014	(r270817)
+++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Fri Aug 29 13:46:30 2014	(r270818)
@@ -1168,7 +1168,7 @@
 	has been updated to 8.14.9.
 
       The timezone database has been updated
-	to version tzdata2014e.
+	to version tzdata2014f.
 
       The &man.file.1; utility and
 	&man.libmagic.3; library have been updated to 5.19.

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 13:56:11 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 895E95C7;
 Fri, 29 Aug 2014 13:56:11 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 741A91FD5;
 Fri, 29 Aug 2014 13:56:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7TDuBdw068164;
 Fri, 29 Aug 2014 13:56:11 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7TDuBFG068163;
 Fri, 29 Aug 2014 13:56:11 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201408291356.s7TDuBFG068163@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber 
Date: Fri, 29 Aug 2014 13:56:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270819 - stable/10/release/doc/en_US.ISO8859-1/relnotes
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 13:56:11 -0000

Author: gjb
Date: Fri Aug 29 13:56:10 2014
New Revision: 270819
URL: http://svnweb.freebsd.org/changeset/base/270819

Log:
  Bump revision ID after r270817
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Fri Aug 29 13:46:30 2014	(r270818)
+++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Fri Aug 29 13:56:10 2014	(r270819)
@@ -1167,9 +1167,6 @@
       Sendmail
 	has been updated to 8.14.9.
 
-      The timezone database has been updated
-	to version tzdata2014f.
-
       The &man.file.1; utility and
 	&man.libmagic.3; library have been updated to 5.19.
 
@@ -1223,6 +1220,9 @@
       The lukemftpd
 	FTP server has been removed from the
 	&os; base system.
+
+      The timezone database has been updated
+	to version tzdata2014f.
     
 
     

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 14:38:57 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id A6E324EA;
 Fri, 29 Aug 2014 14:38:57 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 930AB1530;
 Fri, 29 Aug 2014 14:38:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7TEcvbe087457;
 Fri, 29 Aug 2014 14:38:57 GMT (envelope-from bz@FreeBSD.org)
Received: (from bz@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7TEcvse087456;
 Fri, 29 Aug 2014 14:38:57 GMT (envelope-from bz@FreeBSD.org)
Message-Id: <201408291438.s7TEcvse087456@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bz set sender to bz@FreeBSD.org
 using -f
From: "Bjoern A. Zeeb" 
Date: Fri, 29 Aug 2014 14:38:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270820 - head/sys/dev/ixl
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 14:38:57 -0000

Author: bz
Date: Fri Aug 29 14:38:57 2014
New Revision: 270820
URL: http://svnweb.freebsd.org/changeset/base/270820

Log:
  Try to also unbreak powerpc complaining about
  "cast from pointer to integer of different size".
  
  MFC after:	3 days
  X-MFC with:	r270755

Modified:
  head/sys/dev/ixl/i40e_common.c

Modified: head/sys/dev/ixl/i40e_common.c
==============================================================================
--- head/sys/dev/ixl/i40e_common.c	Fri Aug 29 13:56:10 2014	(r270819)
+++ head/sys/dev/ixl/i40e_common.c	Fri Aug 29 14:38:57 2014	(r270820)
@@ -4375,8 +4375,8 @@ enum i40e_status_code i40e_aq_alternate_
 
 	cmd_resp->address = CPU_TO_LE32(addr);
 	cmd_resp->length = CPU_TO_LE32(dw_count);
-	cmd_resp->addr_high = CPU_TO_LE32(I40E_HI_WORD((u64)buffer));
-	cmd_resp->addr_low = CPU_TO_LE32(I40E_LO_DWORD((u64)buffer));
+	cmd_resp->addr_high = CPU_TO_LE32(I40E_HI_WORD((u64)(uintptr_t)buffer));
+	cmd_resp->addr_low = CPU_TO_LE32(I40E_LO_DWORD((u64)(uintptr_t)buffer));
 
 	status = i40e_asq_send_command(hw, &desc, buffer,
 				       I40E_LO_DWORD(4*dw_count), NULL);
@@ -4458,8 +4458,8 @@ enum i40e_status_code i40e_aq_alternate_
 
 	cmd_resp->address = CPU_TO_LE32(addr);
 	cmd_resp->length = CPU_TO_LE32(dw_count);
-	cmd_resp->addr_high = CPU_TO_LE32(I40E_HI_DWORD((u64)buffer));
-	cmd_resp->addr_low = CPU_TO_LE32(I40E_LO_DWORD((u64)buffer));
+	cmd_resp->addr_high = CPU_TO_LE32(I40E_HI_DWORD((u64)(uintptr_t)buffer));
+	cmd_resp->addr_low = CPU_TO_LE32(I40E_LO_DWORD((u64)(uintptr_t)buffer));
 
 	status = i40e_asq_send_command(hw, &desc, buffer,
 				       I40E_LO_DWORD(4*dw_count), NULL);

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 14:47:05 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id D8625A61;
 Fri, 29 Aug 2014 14:47:05 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C3F85179F;
 Fri, 29 Aug 2014 14:47:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7TEl5WF092223;
 Fri, 29 Aug 2014 14:47:05 GMT (envelope-from bz@FreeBSD.org)
Received: (from bz@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7TEl5uD092222;
 Fri, 29 Aug 2014 14:47:05 GMT (envelope-from bz@FreeBSD.org)
Message-Id: <201408291447.s7TEl5uD092222@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bz set sender to bz@FreeBSD.org
 using -f
From: "Bjoern A. Zeeb" 
Date: Fri, 29 Aug 2014 14:47:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270821 - head/sys/ofed/drivers/infiniband/ulp/sdp
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 14:47:06 -0000

Author: bz
Date: Fri Aug 29 14:47:05 2014
New Revision: 270821
URL: http://svnweb.freebsd.org/changeset/base/270821

Log:
  Forward declare struct kiocb, which is only used for an unsued function
  argument but not actually defined anywhere.
  
  This fixes the compile complaining about
  "declaration of 'struct kiocb' will not be visible outside of this function".
  
  MFC after:	2 weeks
  X-MFC with:	whatever changed caused the breakage ;-)

Modified:
  head/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h

Modified: head/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h
==============================================================================
--- head/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h	Fri Aug 29 14:38:57 2014	(r270820)
+++ head/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h	Fri Aug 29 14:47:05 2014	(r270821)
@@ -703,6 +703,7 @@ void sdp_do_posts(struct sdp_sock *ssk);
 void sdp_rx_comp_full(struct sdp_sock *ssk);
 
 /* sdp_zcopy.c */
+struct kiocb;
 int sdp_sendmsg_zcopy(struct kiocb *iocb, struct socket *sk, struct iovec *iov);
 int sdp_handle_srcavail(struct sdp_sock *ssk, struct sdp_srcah *srcah);
 void sdp_handle_sendsm(struct sdp_sock *ssk, u32 mseq_ack);

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 14:51:18 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id F299BC75
 for ; Fri, 29 Aug 2014 14:51:18 +0000 (UTC)
Received: from freefall.freebsd.org (freefall.freebsd.org
 [IPv6:2001:1900:2254:206c::16:87])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D19E817E5
 for ; Fri, 29 Aug 2014 14:51:18 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
 by freefall.freebsd.org (8.14.9/8.14.9) with ESMTP id s7TEpIds032067
 for ; Fri, 29 Aug 2014 14:51:18 GMT
 (envelope-from bdrewery@freefall.freebsd.org)
Received: (from bdrewery@localhost)
 by freefall.freebsd.org (8.14.9/8.14.9/Submit) id s7TEpInu032065
 for svn-src-all@freebsd.org; Fri, 29 Aug 2014 14:51:18 GMT
 (envelope-from bdrewery)
Received: (qmail 51301 invoked from network); 29 Aug 2014 09:51:16 -0500
Received: from unknown (HELO ?10.10.0.24?) (freebsd@shatow.net@10.10.0.24)
 by sweb.xzibition.com with ESMTPA; 29 Aug 2014 09:51:16 -0500
Message-ID: <54009356.2090609@FreeBSD.org>
Date: Fri, 29 Aug 2014 09:51:02 -0500
From: Bryan Drewery 
Organization: FreeBSD
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64;
 rv:31.0) Gecko/20100101 Thunderbird/31.0
MIME-Version: 1.0
Subject: Re: svn commit: r270759 - in head/sys: cddl/compat/opensolaris/kern
 cddl/compat/opensolaris/sys cddl/contrib/opensolaris/uts/common/fs/zfs vm
References: <201408281950.s7SJo90I047213@svn.freebsd.org>
 <20140828211508.GK46031@over-yonder.net> <53FFAD79.7070106@rice.edu>
 <1617817.cOUOX4x8n2@overcee.wemm.org>
In-Reply-To: <1617817.cOUOX4x8n2@overcee.wemm.org>
OpenPGP: id=6E4697CF;
	url=http://www.shatow.net/bryan/bryan2.asc
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature";
 boundary="7FxVXCx2snGkCFjBLwG5NMppRfU88hT8L"
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 14:51:19 -0000

This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
--7FxVXCx2snGkCFjBLwG5NMppRfU88hT8L
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: quoted-printable

On 8/28/2014 6:22 PM, Peter Wemm wrote:
[...]
> vm_paging_needed(void)
> {
>     return (vm_cnt.v_free_count + vm_cnt.v_cache_count <
>         vm_pageout_wakeup_thresh);
> }

By the way there is a signed to unsigned comparison here.

--=20
Regards,
Bryan Drewery


--7FxVXCx2snGkCFjBLwG5NMppRfU88hT8L
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (MingW32)

iQEcBAEBAgAGBQJUAJNaAAoJEDXXcbtuRpfPJ0QH/3St87TwZ4d1/D5N+06Q6YiD
ZwLiL2GurfjlPy7Iv0tGf8O6FItF2Yb9fz2txlcuyPDFrYBB+EfIqgFthvizFMsN
4Vlue8GgSxJAGMIPo18Zhx2r7XBbIa5spRz+Opih7sVDA3m8CLUeAyJK2amP9kIp
sP1L45FFEkxpXg2Ti5fCFg0+ECI6FtGVyin8PHMDq0I2n/hjU6d4DRxeveOfPEah
/jJ/ZKEsB8N04ymPW12dVCM50ZiX2lmwUWqOZkjxvIYI8fsT8ZcH3ySJUlStIqPe
fFUY23lWF2rhf4u2xSYIxbpP1/Y2UNRM0B3w8r7ET1SHgRoclcBTSfHcO4ap/fs=
=fswd
-----END PGP SIGNATURE-----

--7FxVXCx2snGkCFjBLwG5NMppRfU88hT8L--

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 14:57:43 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 4492A257
 for ; Fri, 29 Aug 2014 14:57:43 +0000 (UTC)
Received: from freefall.freebsd.org (freefall.freebsd.org
 [IPv6:2001:1900:2254:206c::16:87])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 25CAF18CB
 for ; Fri, 29 Aug 2014 14:57:43 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
 by freefall.freebsd.org (8.14.9/8.14.9) with ESMTP id s7TEvh4u035196
 for ; Fri, 29 Aug 2014 14:57:43 GMT
 (envelope-from bdrewery@freefall.freebsd.org)
Received: (from bdrewery@localhost)
 by freefall.freebsd.org (8.14.9/8.14.9/Submit) id s7TEvgbU035194
 for svn-src-all@freebsd.org; Fri, 29 Aug 2014 14:57:42 GMT
 (envelope-from bdrewery)
Received: (qmail 20741 invoked from network); 29 Aug 2014 09:57:41 -0500
Received: from unknown (HELO ?10.10.0.24?) (freebsd@shatow.net@10.10.0.24)
 by sweb.xzibition.com with ESMTPA; 29 Aug 2014 09:57:41 -0500
Message-ID: <540094DB.5050307@FreeBSD.org>
Date: Fri, 29 Aug 2014 09:57:31 -0500
From: Bryan Drewery 
Organization: FreeBSD
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64;
 rv:31.0) Gecko/20100101 Thunderbird/31.0
MIME-Version: 1.0
To: Konstantin Belousov , src-committers@freebsd.org,
 svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject: Re: svn commit: r270803 - head/libexec/rtld-elf
References: <201408291044.s7TAiwmI077897@svn.freebsd.org>
In-Reply-To: <201408291044.s7TAiwmI077897@svn.freebsd.org>
OpenPGP: id=6E4697CF;
	url=http://www.shatow.net/bryan/bryan2.asc
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature";
 boundary="ackJmqinc8RTcismvILBwATfNxK5XgXWk"
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 14:57:43 -0000

This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
--ackJmqinc8RTcismvILBwATfNxK5XgXWk
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable

On 8/29/2014 5:44 AM, Konstantin Belousov wrote:
> Author: kib
> Date: Fri Aug 29 10:44:58 2014
> New Revision: 270803
> URL: http://svnweb.freebsd.org/changeset/base/270803
>=20
> Log:
>   Document the whole settings needed to build a debug version of rtld.
>  =20
>   Sponsored by:	The FreeBSD Foundation
>   MFC after:	3 days
>=20
> Modified:
>   head/libexec/rtld-elf/Makefile
>=20
> Modified: head/libexec/rtld-elf/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/libexec/rtld-elf/Makefile	Fri Aug 29 10:43:56 2014	(r270802)
> +++ head/libexec/rtld-elf/Makefile	Fri Aug 29 10:44:58 2014	(r270803)
> @@ -1,5 +1,9 @@
>  # $FreeBSD$
> =20
> +# Use the following command to build local debug version of dynamic
> +# linker:
> +# make DEBUG_FLAGS=3D-g DEBUG=3D-DDEBUG MK_TESTS=3Dno all
> +
>  .include 
>  MK_SSP=3D		no
> =20
>=20

How difficult would it be to allow DEBUG to be set during runtime like
GNU's can with LD_DEBUG? I have found GNU's LD_DEBUG to be very useful
for userland debugging, especially when using dlopen(3).

We have LD_DEBUG environment variable but it only prints if built with
-DDEBUG.

Is there a concern about performance by enabling this based only on
environment?

--=20
Regards,
Bryan Drewery


--ackJmqinc8RTcismvILBwATfNxK5XgXWk
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (MingW32)

iQEcBAEBAgAGBQJUAJTbAAoJEDXXcbtuRpfP3pMIAKta+m0oCFuEzhrAipaBDtrO
pYEkagtSQEhlYfn4Z08zkaw2MvDGTYaMLC7UVnz40oNKTXyGWfbMgMzCFXcxA4AY
UvAtWWE3QlTMbk1hL+CIT7Nr07nrv4w3vh4Ve0aDDdkI0dK1S6lRgFVL0cPEDwXF
Vybbqw3UvJx/2o5rmrfBOLHfW23sxD6bXe+ob/5WNjhtzPLRIltrzTkBEi11ghf4
wnrGOe2MvFGpMeQgOxDm2K7yRPe6r7Gstpoe0Hvv607hGb7fR+ur3pTwUyfoDOlb
md87NDyNKN7YtC2n0XoEyfQKv8NYKVpIQVYlrD+72ADgbFH1hUTk/jQZUryP2gw=
=79lZ
-----END PGP SIGNATURE-----

--ackJmqinc8RTcismvILBwATfNxK5XgXWk--

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 16:54:51 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id A3ADB694;
 Fri, 29 Aug 2014 16:54:51 +0000 (UTC)
Received: from pp2.rice.edu (proofpoint2.mail.rice.edu [128.42.201.101])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 63D541813;
 Fri, 29 Aug 2014 16:54:50 +0000 (UTC)
Received: from pps.filterd (pp2.rice.edu [127.0.0.1])
 by pp2.rice.edu (8.14.5/8.14.5) with SMTP id s7TGqhBa006590;
 Fri, 29 Aug 2014 11:54:44 -0500
Received: from mh11.mail.rice.edu (mh11.mail.rice.edu [128.42.199.30])
 by pp2.rice.edu with ESMTP id 1p2f3j8ar0-1;
 Fri, 29 Aug 2014 11:54:43 -0500
X-Virus-Scanned: by amavis-2.7.0 at mh11.mail.rice.edu, auth channel
Received: from 108-254-203-201.lightspeed.hstntx.sbcglobal.net
 (108-254-203-201.lightspeed.hstntx.sbcglobal.net [108.254.203.201])
 (using TLSv1 with cipher RC4-MD5 (128/128 bits))
 (No client certificate requested) (Authenticated sender: alc)
 by mh11.mail.rice.edu (Postfix) with ESMTPSA id 393254C0096;
 Fri, 29 Aug 2014 11:54:43 -0500 (CDT)
Message-ID: <5400B052.6030103@rice.edu>
Date: Fri, 29 Aug 2014 11:54:42 -0500
From: Alan Cox 
User-Agent: Mozilla/5.0 (X11; FreeBSD i386;
 rv:24.0) Gecko/20100101 Thunderbird/24.2.0
MIME-Version: 1.0
To: Steven Hartland , Peter Wemm 
Subject: Re: svn commit: r270759 - in head/sys: cddl/compat/opensolaris/kern
 cddl/compat/opensolaris/sys cddl/contrib/opensolaris/uts/common/fs/zfs vm
References: <201408281950.s7SJo90I047213@svn.freebsd.org>
 <20140828211508.GK46031@over-yonder.net> <53FFAD79.7070106@rice.edu>
 <1617817.cOUOX4x8n2@overcee.wemm.org>
 <4A4B2C2D36064FD9840E3603D39E58E0@multiplay.co.uk>
In-Reply-To: <4A4B2C2D36064FD9840E3603D39E58E0@multiplay.co.uk>
X-Enigmail-Version: 1.6
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0
 kscore.is_bulkscore=5.07927033766009e-14
 kscore.compositescore=6.83841872017865e-11 circleOfTrustscore=0
 compositescore=0.601496849000349 urlsuspect_oldscore=0.00149684900034924
 suspectscore=11 recipient_domain_to_sender_totalscore=0 phishscore=0
 bulkscore=0 kscore.is_spamscore=0 recipient_to_sender_totalscore=0
 recipient_domain_to_sender_domain_totalscore=0 rbsscore=0.601496849000349
 spamscore=0 recipient_to_sender_domain_totalscore=0 urlsuspectscore=0.9
 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=7.0.1-1402240000 definitions=main-1408290181
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org, Dmitry Morozovsky ,
 "Matthew D. Fuller" 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 16:54:51 -0000

On 08/29/2014 03:32, Steven Hartland wrote:
>> On Thursday 28 August 2014 17:30:17 Alan Cox wrote:
>> > On 08/28/2014 16:15, Matthew D. Fuller wrote:
>> > > On Thu, Aug 28, 2014 at 10:11:39PM +0100 I heard the voice of
>> > >
>> > > Steven Hartland, and lo! it spake thus:
>> > >> Its very likely applicable to stable/9 although I've never used 9
>> > >> myself, we jumped from 9 direct to 10.
>> > >
>> > > This is actually hitting two different issues from the two bugs:
>> > >
>> > > - 191510 is about "ARC isn't greedy enough" on huge-memory > >
>> machines,
>> > >
>> > >   and from the osreldate that bug was filed on 9.2, so presumably
>> > > is
>> > >   applicable.
>> > >
>> > > - 187594 is about "ARC is too greedy" (probably mostly on > >
>> not-so-huge
>> > >
>> > >   machines) and starves/drives the rest of the system into swap.
>> > > That
>> > >   I believe came about as a result of some unrelated change in the
>> > >   10.x stream that upset the previous balance between ARC and the
>> > > rest
>> > >   of the VM, so isn't a problem on 9.x.
>> >
>> > 10.0 had a bug in the page daemon that was fixed in 10-STABLE about
>> > three months ago (r265945).  The ARC was not the only thing
>> affected > by
>> this bug.
>>
>> I'm concerned about potential unintended consequences of this change.
>>
>> Before, arc reclaim was driven by vm_paging_needed(), which was:
>> vm_paging_needed(void)
>> {
>>     return (vm_cnt.v_free_count + vm_cnt.v_cache_count <
>>         vm_pageout_wakeup_thresh);
>> }
>>
>> Now it's ignoring the v_cache_count and looking exclusively at
>> v_free_count.
>> "cache" pages are free pages that just happen to have known contents.
>> If I
>> read this change right, zfs arc will now discard checksummed cache
>> pages to
>> make room for non-checksummed pages:
>
> That test is still there so if it needs to it will still trigger.
>
> However that often a lower level as vm_pageout_wakeup_thresh is only 110%
> of min free, where as zfs_arc_free_target is based of target free
> which is
> 4 * (min free + reserved).
>
>> +       if (kmem_free_count() < zfs_arc_free_target) {
>> +               return (1);
>> +       }
>> ...
>> +kmem_free_count(void)
>> +{
>> +       return (vm_cnt.v_free_count);
>> +}
>>
>> This seems like a pretty substantial behavior change.  I'm concerned
>> that it
>> doesn't appear to count all the forms of "free" pages.
>>
>> I haven't seen the problems with the over-aggressive ARC since the
>> page daemon
>> bug was fixed.  It's been working fine under pretty abusive loads in
>> the freebsd
>> cluster after that fix.
>
> Others have also confirmed that even with r265945 they can still trigger
> performance issue.
>
> In addition without it we still have loads of RAM sat their unused, in my
> particular experience we have 40GB of 192GB sitting their unused and that
> was with a stable build from last weekend.
>


The Solaris code only imposed this limit on 32-bit machines where the
available kernel virtual address space may be much less than the
available physical memory.  Previously, FreeBSD imposed this limit on
both 32-bit and 64-bit machines.  Now, it imposes it on neither.  Why
continue to do this differently from Solaris?


> With the patch we confirmed that both RAM usage and performance for those
> seeing that issue are resolved, with no reported regressions.
>
>> (I should know better than to fire a reply off before full fact
>> checking, but
>> this commit worries me..)
>
> Not a problem, its great to know people pay attention to changes, and
> raise
> their concerns. Always better to have a discussion about potential issues
> than to wait for a problem to occur.
>
> Hopefully the above gives you some piece of mind, but if you still
> have any
> concerns I'm all ears.
>


You didn't really address Peter's initial technical issue.  Peter
correctly observed that cache pages are just another flavor of free
pages.  Whenever the VM system is checking the number of free pages
against any of the thresholds, it always uses the sum of v_cache_count
and v_free_count.  So, to anyone familiar with the VM system, like
Peter, what you've done, which is to derive a threshold from
v_free_target but only compare v_free_count to that threshold, looks
highly suspect.

That said, I can easily believe that your patch works better than the
existing code, because it is closer in spirit to my interpretation of
what the Solaris code does.  Specifically, I believe that the Solaris
code starts trimming the ARC before the Solaris page daemon starts
writing dirty pages to secondary storage.  Now, you've made FreeBSD do
the same.  However, you've expressed it in a way that looks broken.

To wrap up, I think that you can easily write this in a way that
simultaneously behaves like Solaris and doesn't look wrong to a VM expert.


> Out of interest would it be possible to update machines in the cluster to
> see how their workload reacts to the change?
>
>    Regards
>    Steve
>
>


From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 17:14:58 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 89AE6F4B;
 Fri, 29 Aug 2014 17:14:58 +0000 (UTC)
Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 20F8E1A11;
 Fri, 29 Aug 2014 17:14:57 +0000 (UTC)
Received: from tom.home (kib@localhost [127.0.0.1])
 by kib.kiev.ua (8.14.9/8.14.9) with ESMTP id s7THEqCw020100
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
 Fri, 29 Aug 2014 20:14:52 +0300 (EEST)
 (envelope-from kostikbel@gmail.com)
DKIM-Filter: OpenDKIM Filter v2.9.2 kib.kiev.ua s7THEqCw020100
Received: (from kostik@localhost)
 by tom.home (8.14.9/8.14.9/Submit) id s7THEq4q020099;
 Fri, 29 Aug 2014 20:14:52 +0300 (EEST)
 (envelope-from kostikbel@gmail.com)
X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com
 using -f
Date: Fri, 29 Aug 2014 20:14:52 +0300
From: Konstantin Belousov 
To: "Bjoern A. Zeeb" 
Subject: Re: svn commit: r270806 - head/sys/dev/ixl
Message-ID: <20140829171452.GO2737@kib.kiev.ua>
References: <201408291240.s7TCe1OQ029986@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature"; boundary="W7QQkl7z0febBjsc"
Content-Disposition: inline
In-Reply-To: <201408291240.s7TCe1OQ029986@svn.freebsd.org>
User-Agent: Mutt/1.5.23 (2014-03-12)
X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00,
 DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no
 autolearn_force=no version=3.4.0
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on tom.home
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 17:14:58 -0000


--W7QQkl7z0febBjsc
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Fri, Aug 29, 2014 at 12:40:01PM +0000, Bjoern A. Zeeb wrote:
> Author: bz
> Date: Fri Aug 29 12:40:01 2014
> New Revision: 270806
> URL: http://svnweb.freebsd.org/changeset/base/270806
>=20
> Log:
>   Properly handle prefetch only for amd64 and i386 as we do elsewhere.
>  =20
>   In general theraven is right that we should factr this out and provide
>   a general and per-arch implementation that everything can use.
>  =20
>   MFC after:	3 days
>   X-MFC with:	r270755
>=20
> Modified:
>   head/sys/dev/ixl/i40e_osdep.h
>=20
> Modified: head/sys/dev/ixl/i40e_osdep.h
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/sys/dev/ixl/i40e_osdep.h	Fri Aug 29 11:18:54 2014	(r270805)
> +++ head/sys/dev/ixl/i40e_osdep.h	Fri Aug 29 12:40:01 2014	(r270806)
> @@ -137,11 +137,15 @@ struct i40e_spinlock {
> =20
>  #define le16_to_cpu=20
> =20
> +#if defined(__amd64__) || defined(i386)
>  static __inline
>  void prefetch(void *x)
>  {
>  	__asm volatile("prefetcht0 %0" :: "m" (*(unsigned long *)x));
>  }
This only fix the build failure, but the code is still somewhat wrong.

Availability of the prefetch instruction depends on the presence of SSE.
Althought it is probably impossible to find a machine where the intended
hardware can operate and which does not support SSE _currently_, I am
not sure that it is wise to hard-code SSE instructions in the i386
kernel.

Might be, a change of the compilation test from both amd64 and i386 to
just amd64 is due.  I doubt that anybody would use 40Gb with 32bit OS,
and even if somebody does, that the performace is at the stake in
this case.

> +#else
> +#define	prefetch(x)
> +#endif
> =20
>  struct i40e_osdep
>  {

--W7QQkl7z0febBjsc
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBAgAGBQJUALULAAoJEJDCuSvBvK1BIhEP+wTTEARsI1gCxSSxmnsadlqb
A3atej9Di98tnZ9mFo4EJxRZ0GiYR2b1ksbAWhSC05uZBQA2p3SZnfNchnvV0xuJ
//BJiJ2br2Bldv++FZ37kf/HRl4i3lfVpENiDZtaiUGBRUKYQ/rIjMXhhi7rGEgZ
Iyio9BXGIBHi+xtB/VQ27cmeyvTLpl7mzj8pPl59n5tGN0UnHcyovYFdKnol8nKz
Ho4U7RzJrR/sBgAzxL4Qns+lByWl2lWN4PWJ2nQxFxjQlD7q5xUgmfJJYatq8V60
YyxnosHV0NlWyEzMJYS90SpAEpojamgx1GH/ui50OewekcC3zudXph9rbGIRfSQE
BPJOyh0KzXRtn/ljqhPWYse3bvLAcISO1k0CuYXQVz9qjPduq9Ew9nGpUo6uPLju
zP6fwwTcYnybCRwHpOA+oJYT20TbHMFRcD2EvSouEBL046qWWSCOyBnWmB7i95ei
p/CCLwbB5ML+Kj7bqMX2lCsHT9Si1P2OWOtLLtrv+zJ9tQUceUTkxuYUIT8OM7IN
GZUF68VRLFZtcofssC+WERi/KnDwrZYSJDaLEstHVz34OnHeIWSJkSjeVSLEw/s9
vWAFJLSQPNIaNxmN9fyNwEbreLhtFYc25RQXNl6vhXWjDmVMIQ6FqXuWDwA2ymC7
FDEtMKBn8w6hTdVRx2ba
=d5nb
-----END PGP SIGNATURE-----

--W7QQkl7z0febBjsc--

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 17:22:28 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 132CA22B;
 Fri, 29 Aug 2014 17:22:28 +0000 (UTC)
Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1])
 (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DDD3E1AEB;
 Fri, 29 Aug 2014 17:22:27 +0000 (UTC)
Received: from ralph.baldwin.cx (pool-173-70-85-31.nwrknj.fios.verizon.net
 [173.70.85.31])
 by bigwig.baldwin.cx (Postfix) with ESMTPSA id E89AFB91C;
 Fri, 29 Aug 2014 13:22:25 -0400 (EDT)
From: John Baldwin 
To: Mateusz Guzik 
Subject: Re: svn commit: r270745 - in head: bin/ps sys/compat/freebsd32
 sys/kern sys/sys
Date: Fri, 29 Aug 2014 13:17:45 -0400
Message-ID: <4953508.c8Quuai1Ky@ralph.baldwin.cx>
User-Agent: KMail/4.10.5 (FreeBSD/10.0-STABLE; KDE/4.10.5; amd64; ; )
In-Reply-To: <201408280841.s7S8fC6X012986@svn.freebsd.org>
References: <201408280841.s7S8fC6X012986@svn.freebsd.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7
 (bigwig.baldwin.cx); Fri, 29 Aug 2014 13:22:26 -0400 (EDT)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 17:22:28 -0000

On Thursday, August 28, 2014 08:41:12 AM Mateusz Guzik wrote:
> Author: mjg
> Date: Thu Aug 28 08:41:11 2014
> New Revision: 270745
> URL: http://svnweb.freebsd.org/changeset/base/270745
> 
> Log:
>   Return real parent pid in kinfo (used by e.g. ps)
> 
>   Add a separate field which exports tracer pid and add a new keyword
>   ("tracer") for ps to display it.
> 
>   This is a follow up to r270444.

Note that proctree_lock is now needed in several more places such as dtrace 
(which uses fill_kinfo_proc()) and the ELF coredump code 
(elf(N)_note_procstat_proc() calls kern_proc_out()).

-- 
John Baldwin

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 17:23:17 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 254DF386;
 Fri, 29 Aug 2014 17:23:17 +0000 (UTC)
Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9ECC31AF8;
 Fri, 29 Aug 2014 17:23:16 +0000 (UTC)
Received: from tom.home (kib@localhost [127.0.0.1])
 by kib.kiev.ua (8.14.9/8.14.9) with ESMTP id s7THNBvx022344
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
 Fri, 29 Aug 2014 20:23:11 +0300 (EEST)
 (envelope-from kostikbel@gmail.com)
DKIM-Filter: OpenDKIM Filter v2.9.2 kib.kiev.ua s7THNBvx022344
Received: (from kostik@localhost)
 by tom.home (8.14.9/8.14.9/Submit) id s7THNBPn022343;
 Fri, 29 Aug 2014 20:23:11 +0300 (EEST)
 (envelope-from kostikbel@gmail.com)
X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com
 using -f
Date: Fri, 29 Aug 2014 20:23:11 +0300
From: Konstantin Belousov 
To: Bryan Drewery 
Subject: Re: svn commit: r270803 - head/libexec/rtld-elf
Message-ID: <20140829172311.GP2737@kib.kiev.ua>
References: <201408291044.s7TAiwmI077897@svn.freebsd.org>
 <540094DB.5050307@FreeBSD.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature"; boundary="ySXqf0m0EduKBqw5"
Content-Disposition: inline
In-Reply-To: <540094DB.5050307@FreeBSD.org>
User-Agent: Mutt/1.5.23 (2014-03-12)
X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00,
 DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no
 autolearn_force=no version=3.4.0
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on tom.home
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 17:23:17 -0000


--ySXqf0m0EduKBqw5
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Fri, Aug 29, 2014 at 09:57:31AM -0500, Bryan Drewery wrote:
> On 8/29/2014 5:44 AM, Konstantin Belousov wrote:
> > Author: kib
> > Date: Fri Aug 29 10:44:58 2014
> > New Revision: 270803
> > URL: http://svnweb.freebsd.org/changeset/base/270803
> >=20
> > Log:
> >   Document the whole settings needed to build a debug version of rtld.
> >  =20
> >   Sponsored by:	The FreeBSD Foundation
> >   MFC after:	3 days
> >=20
> > Modified:
> >   head/libexec/rtld-elf/Makefile
> >=20
> > Modified: head/libexec/rtld-elf/Makefile
> > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D
> > --- head/libexec/rtld-elf/Makefile	Fri Aug 29 10:43:56 2014	(r270802)
> > +++ head/libexec/rtld-elf/Makefile	Fri Aug 29 10:44:58 2014	(r270803)
> > @@ -1,5 +1,9 @@
> >  # $FreeBSD$
> > =20
> > +# Use the following command to build local debug version of dynamic
> > +# linker:
> > +# make DEBUG_FLAGS=3D-g DEBUG=3D-DDEBUG MK_TESTS=3Dno all
> > +
> >  .include 
> >  MK_SSP=3D		no
> > =20
> >=20
>=20
> How difficult would it be to allow DEBUG to be set during runtime like
> GNU's can with LD_DEBUG? I have found GNU's LD_DEBUG to be very useful
> for userland debugging, especially when using dlopen(3).
>=20
> We have LD_DEBUG environment variable but it only prints if built with
> -DDEBUG.
>=20
> Is there a concern about performance by enabling this based only on
> environment?

I am sure that nobody evaluated the performance consequences of
unconditionally compiling the debugging stuff in. I am sure that the
ld-elf.so.1 size will increase.

The reason why nobody cares to evaluate and enable this stuff by default
is that the debugging output is very ad-hoc. I found it almost useless
in both the content and amount of data it outputs. The reason why I
enable it for my work on ld-elf is that I insert my own dbg() calls for
debugging (and usually remove them before the commit since they add even
more verbosity useless for general public consumption).

I find the combination of the ELF dumping tools like readelf and
objdump, together with gdb (-g) and custom dbg() statement (slighly
glorified printf debugging) most adequate combination to debug rtld.

After the long preamble. What use do you have for LD_DEBUG ? If it is
possible to formalize and tailor the debugging output for real users
needs, I am all for making it available unconditionally from LD_DEBUG
knob. The significants part of the current dbg() statements would be
removed or require more agressive settings to become active.


--ySXqf0m0EduKBqw5
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBAgAGBQJUALb+AAoJEJDCuSvBvK1BC4EP/3/LubvaSkjSokh9C/AiHNNG
8FtJdYCCWbxBRh+DpLu2lA6OKHAC6WcEUIeACIo1tPIF2fAvFpyL+sNaAqh5RYxZ
BpN6HBRy1BA1AjqdRw0nWc2aTIUmyOCLZYbKvarlytNTNtD3un2+yN6ImQBWR2W3
V8Q9xb0ujzwD6JhrzJ2IDXkxUA3n5eSY4N6m1nycSJJI7E/Fh+VIwFRCddPTQP4M
KNii+XjH7HtwMDUUXjmMyeVSDOCYe2TkjBms332dS9PGuqTutmxWBp6sjakFraqm
uZX2xKaCmiuMm2pY/bK5m7Q/I9+5nnVpYiiyFOlizFLU5niM5EFgK/+yhG1VFi9N
+JXVn3+Sw9tnDSOwtNMl3ze3UbvmHJvH969ygb/ge1XQZnJwaHkfl1ud0wCBOElX
QLc6s2xPtX5eHOfP5y7CJrwsqEMffmR2COtmcoQvgqk7LebQLi8T+ekAbtVXxg2z
a0oLD/UI65cv388EwKh2AGrMTiNkjUIAx21TbetK3MPTZ3e7/PejyIYhyG6uKYGi
dA9zKv+bciGQnLWG97kLOyKMju7ZiDGxKuMvfvMxlgqTuLJIMUNo0YuB45QBvvtB
Uk7EDGDwsV379ERXcbzBJG4+Yhq4lvleW3Zl/nYMePLPa7jEUHyg7+vYGI991fuw
kcNQiI8mswAdRd+mx1ck
=lPk6
-----END PGP SIGNATURE-----

--ySXqf0m0EduKBqw5--

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 17:30:38 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 0BB6783B;
 Fri, 29 Aug 2014 17:30:38 +0000 (UTC)
Received: from mail-wg0-x22f.google.com (mail-wg0-x22f.google.com
 [IPv6:2a00:1450:400c:c00::22f])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 08EE01B6F;
 Fri, 29 Aug 2014 17:30:36 +0000 (UTC)
Received: by mail-wg0-f47.google.com with SMTP id z12so2481953wgg.30
 for ; Fri, 29 Aug 2014 10:30:35 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=date:from:to:cc:subject:message-id:references:mime-version
 :content-type:content-disposition:in-reply-to:user-agent;
 bh=n10HTL3h9l1EIaX6+wvpPjOYM9n+OcYb0Um1r5RPw2Q=;
 b=IEAK0xAQZjbTk0TZ44wAUR/mmhLD30zKsouWkjDX7/7if6/B/PjgxSWCsRNG3ESIUt
 WA8Jr+9yFUTdkfMQLN2Ki245c546/9J/rVuSQZ0bBIzdsPw1RZczBFCon+uaWl9vW41J
 Kfp9NeErWjREh1JcTSF2MquEAgkp0VhoF3/3CzRwgDED9EiJQOs9kPv+8gd2J2DCkdnz
 exJCIAH/GZlDMBi86yO7iwkCnmQxMc/P+d4ADNX8B7P7goUBQ9pxKWWcNa1I27hX0VwE
 Yqt/Y6vQUyPC2tAxJd8D5uUYqDUC+4ozUcFwdvvL/JWTNh2z7Eh1+q97DzicJkmLGCcw
 rQxA==
X-Received: by 10.194.108.41 with SMTP id hh9mr14800822wjb.68.1409333435176;
 Fri, 29 Aug 2014 10:30:35 -0700 (PDT)
Received: from dft-labs.eu (n1x0n-1-pt.tunnel.tserv5.lon1.ipv6.he.net.
 [2001:470:1f08:1f7::2])
 by mx.google.com with ESMTPSA id pn5sm1473297wjc.4.2014.08.29.10.30.33
 for 
 (version=TLSv1.2 cipher=RC4-SHA bits=128/128);
 Fri, 29 Aug 2014 10:30:34 -0700 (PDT)
Date: Fri, 29 Aug 2014 19:30:31 +0200
From: Mateusz Guzik 
To: John Baldwin 
Subject: Re: svn commit: r270745 - in head: bin/ps sys/compat/freebsd32
 sys/kern sys/sys
Message-ID: <20140829173031.GA21347@dft-labs.eu>
References: <201408280841.s7S8fC6X012986@svn.freebsd.org>
 <4953508.c8Quuai1Ky@ralph.baldwin.cx>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <4953508.c8Quuai1Ky@ralph.baldwin.cx>
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org, Mateusz Guzik 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 17:30:38 -0000

On Fri, Aug 29, 2014 at 01:17:45PM -0400, John Baldwin wrote:
> On Thursday, August 28, 2014 08:41:12 AM Mateusz Guzik wrote:
> > Author: mjg
> > Date: Thu Aug 28 08:41:11 2014
> > New Revision: 270745
> > URL: http://svnweb.freebsd.org/changeset/base/270745
> > 
> > Log:
> >   Return real parent pid in kinfo (used by e.g. ps)
> > 
> >   Add a separate field which exports tracer pid and add a new keyword
> >   ("tracer") for ps to display it.
> > 
> >   This is a follow up to r270444.
> 
> Note that proctree_lock is now needed in several more places such as dtrace 
> (which uses fill_kinfo_proc()) and the ELF coredump code 
> (elf(N)_note_procstat_proc() calls kern_proc_out()).

Weird, I was sure I checked all callers. Indeed missed them, will fix
that up later.

Maybe we should reconsider an incomplete approach with storing the
pointer, which would require only proc lock (i.e. what was required
prior to any changes)

The hack I had was:
https://people.freebsd.org/~mjg/patches/ptrace-hack.diff

-- 
Mateusz Guzik 

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 17:31:35 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 8D05699D;
 Fri, 29 Aug 2014 17:31:35 +0000 (UTC)
Received: from mx1.sbone.de (mx1.sbone.de [IPv6:2a01:4f8:130:3ffc::401:25])
 (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
 (Client CN "mx1.sbone.de", Issuer "SBone.DE" (not verified))
 by mx1.freebsd.org (Postfix) with ESMTPS id 1E17E1B96;
 Fri, 29 Aug 2014 17:31:35 +0000 (UTC)
Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:31::2013:587])
 (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.sbone.de (Postfix) with ESMTPS id B778625D387C;
 Fri, 29 Aug 2014 17:31:32 +0000 (UTC)
Received: from content-filter.sbone.de (content-filter.sbone.de
 [IPv6:fde9:577b:c1a9:31::2013:2742])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mail.sbone.de (Postfix) with ESMTPS id 7A085C77087;
 Fri, 29 Aug 2014 17:31:31 +0000 (UTC)
X-Virus-Scanned: amavisd-new at sbone.de
Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:31::2013:587])
 by content-filter.sbone.de (content-filter.sbone.de
 [fde9:577b:c1a9:31::2013:2742]) (amavisd-new, port 10024)
 with ESMTP id RjTt8ZWQSQQz; Fri, 29 Aug 2014 17:31:29 +0000 (UTC)
Received: from [IPv6:fde9:577b:c1a9:4410:bd32:216a:c6e2:8d] (unknown
 [IPv6:fde9:577b:c1a9:4410:bd32:216a:c6e2:8d])
 (using TLSv1 with cipher AES128-SHA (128/128 bits))
 (No client certificate requested)
 by mail.sbone.de (Postfix) with ESMTPSA id 32580C77086;
 Fri, 29 Aug 2014 17:31:27 +0000 (UTC)
Content-Type: text/plain; charset=windows-1252
Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\))
Subject: Re: svn commit: r270806 - head/sys/dev/ixl
From: "Bjoern A. Zeeb" 
In-Reply-To: <20140829171452.GO2737@kib.kiev.ua>
Date: Fri, 29 Aug 2014 17:31:21 +0000
Content-Transfer-Encoding: quoted-printable
Message-Id: 
References: <201408291240.s7TCe1OQ029986@svn.freebsd.org>
 <20140829171452.GO2737@kib.kiev.ua>
To: Konstantin Belousov 
X-Mailer: Apple Mail (2.1878.6)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 17:31:35 -0000


On 29 Aug 2014, at 17:14 , Konstantin Belousov  =
wrote:

> On Fri, Aug 29, 2014 at 12:40:01PM +0000, Bjoern A. Zeeb wrote:
>> Author: bz
>> Date: Fri Aug 29 12:40:01 2014
>> New Revision: 270806
>> URL: http://svnweb.freebsd.org/changeset/base/270806
>>=20
>> Log:
>>  Properly handle prefetch only for amd64 and i386 as we do elsewhere.
>>=20
>>  In general theraven is right that we should factr this out and =
provide
>>  a general and per-arch implementation that everything can use.
>>=20
>>  MFC after:	3 days
>>  X-MFC with:	r270755
>>=20
>> Modified:
>>  head/sys/dev/ixl/i40e_osdep.h
>>=20
>> Modified: head/sys/dev/ixl/i40e_osdep.h
>> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
>> --- head/sys/dev/ixl/i40e_osdep.h	Fri Aug 29 11:18:54 2014	=
(r270805)
>> +++ head/sys/dev/ixl/i40e_osdep.h	Fri Aug 29 12:40:01 2014	=
(r270806)
>> @@ -137,11 +137,15 @@ struct i40e_spinlock {
>>=20
>> #define le16_to_cpu=20
>>=20
>> +#if defined(__amd64__) || defined(i386)
>> static __inline
>> void prefetch(void *x)
>> {
>> 	__asm volatile("prefetcht0 %0" :: "m" (*(unsigned long *)x));
>> }
> This only fix the build failure, but the code is still somewhat wrong.
>=20
> Availability of the prefetch instruction depends on the presence of =
SSE.

We have quite a few of these as-are in the tree already;  I guess they =
all need fixing.


> Althought it is probably impossible to find a machine where the =
intended
> hardware can operate and which does not support SSE _currently_, I am
> not sure that it is wise to hard-code SSE instructions in the i386
> kernel.
>=20
> Might be, a change of the compilation test from both amd64 and i386 to
> just amd64 is due.  I doubt that anybody would use 40Gb with 32bit OS,
> and even if somebody does, that the performace is at the stake in
> this case.
>=20

I think going with David=92s suggestion to do the right thing and =
centralise them somewhere so everything can use it is the proper way =
forward.  I think there=92s also a __builtin_prefetch().


>> +#else
>> +#define	prefetch(x)
>> +#endif
>>=20
>> struct i40e_osdep
>> {

=97=20
Bjoern A. Zeeb             "Come on. Learn, goddamn it.", WarGames, 1983


From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 17:49:56 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 94FF44BA;
 Fri, 29 Aug 2014 17:49:56 +0000 (UTC)
Received: from mail-vc0-x22c.google.com (mail-vc0-x22c.google.com
 [IPv6:2607:f8b0:400c:c03::22c])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 1CAA61DB5;
 Fri, 29 Aug 2014 17:49:56 +0000 (UTC)
Received: by mail-vc0-f172.google.com with SMTP id ij19so2875439vcb.17
 for ; Fri, 29 Aug 2014 10:49:55 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:in-reply-to:references:date:message-id:subject:from:to
 :cc:content-type;
 bh=5S2sxciuK1cmZV5+gpVG10FcsM62YToJkjLO2Whxy3o=;
 b=v4KgptPKfMKJjBjGX7ZoDKl3dMzajr6BG1a/M1lvHdJ2yRg+d6PW1Bchgg0/I0LqnX
 BqtFw048+ti/KVscSxf+S6qxzCBJG6LnjNsdOkCKQSHnUetenfR7I3wHjmvVZKKQCCQm
 +0elK2vui0gcPWJ3ZBT7V8FPBZjREGSAKkRaAEaQ3aB31bldLtyar7UvTVmjBAkObJTT
 +uiApCdFwWMf6CGkmQyepQvNacCIELkyrZqclVwU5TPFo56q1+pZSO/W5RH56B2ITmIv
 vO5zpfVmdb2mSi2ILOiD6HZFnNyneewwX3pb7DCH0/6+q8+n7jFZj68rdvUYxQwbsvNs
 9T6g==
MIME-Version: 1.0
X-Received: by 10.53.10.65 with SMTP id dy1mr47451vdd.92.1409334595152; Fri,
 29 Aug 2014 10:49:55 -0700 (PDT)
Received: by 10.221.20.199 with HTTP; Fri, 29 Aug 2014 10:49:55 -0700 (PDT)
In-Reply-To: <20140829171452.GO2737@kib.kiev.ua>
References: <201408291240.s7TCe1OQ029986@svn.freebsd.org>
 <20140829171452.GO2737@kib.kiev.ua>
Date: Fri, 29 Aug 2014 10:49:55 -0700
Message-ID: 
Subject: Re: svn commit: r270806 - head/sys/dev/ixl
From: Jack Vogel 
To: Konstantin Belousov 
Content-Type: text/plain; charset=ISO-8859-1
X-Content-Filtered-By: Mailman/MimeDel 2.1.18-1
Cc: "svn-src-head@freebsd.org" ,
 "svn-src-all@freebsd.org" ,
 "Bjoern A. Zeeb" ,
 "src-committers@freebsd.org" 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 17:49:56 -0000

I certainly agree that it would be a bit ridiculous to do 40G in a 32bit
environment :)

Jack



On Fri, Aug 29, 2014 at 10:14 AM, Konstantin Belousov 
wrote:

> On Fri, Aug 29, 2014 at 12:40:01PM +0000, Bjoern A. Zeeb wrote:
> > Author: bz
> > Date: Fri Aug 29 12:40:01 2014
> > New Revision: 270806
> > URL: http://svnweb.freebsd.org/changeset/base/270806
> >
> > Log:
> >   Properly handle prefetch only for amd64 and i386 as we do elsewhere.
> >
> >   In general theraven is right that we should factr this out and provide
> >   a general and per-arch implementation that everything can use.
> >
> >   MFC after:  3 days
> >   X-MFC with: r270755
> >
> > Modified:
> >   head/sys/dev/ixl/i40e_osdep.h
> >
> > Modified: head/sys/dev/ixl/i40e_osdep.h
> >
> ==============================================================================
> > --- head/sys/dev/ixl/i40e_osdep.h     Fri Aug 29 11:18:54 2014
> (r270805)
> > +++ head/sys/dev/ixl/i40e_osdep.h     Fri Aug 29 12:40:01 2014
> (r270806)
> > @@ -137,11 +137,15 @@ struct i40e_spinlock {
> >
> >  #define le16_to_cpu
> >
> > +#if defined(__amd64__) || defined(i386)
> >  static __inline
> >  void prefetch(void *x)
> >  {
> >       __asm volatile("prefetcht0 %0" :: "m" (*(unsigned long *)x));
> >  }
> This only fix the build failure, but the code is still somewhat wrong.
>
> Availability of the prefetch instruction depends on the presence of SSE.
> Althought it is probably impossible to find a machine where the intended
> hardware can operate and which does not support SSE _currently_, I am
> not sure that it is wise to hard-code SSE instructions in the i386
> kernel.
>
> Might be, a change of the compilation test from both amd64 and i386 to
> just amd64 is due.  I doubt that anybody would use 40Gb with 32bit OS,
> and even if somebody does, that the performace is at the stake in
> this case.
>
> > +#else
> > +#define      prefetch(x)
> > +#endif
> >
> >  struct i40e_osdep
> >  {
>

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 17:52:18 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id CCAED6A5;
 Fri, 29 Aug 2014 17:52:18 +0000 (UTC)
Received: from mail-wi0-x233.google.com (mail-wi0-x233.google.com
 [IPv6:2a00:1450:400c:c05::233])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id E10631E5B;
 Fri, 29 Aug 2014 17:52:17 +0000 (UTC)
Received: by mail-wi0-f179.google.com with SMTP id q5so2944453wiv.12
 for ; Fri, 29 Aug 2014 10:52:16 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject
 :references:in-reply-to:content-type:content-transfer-encoding;
 bh=eEgoVDpk74fapCMcMXMPZ2ZDYqZynWR1jpwew2RxqYA=;
 b=JV2dbAZKXq+Ys2ZDNEP7iV+Xh4X3ZcT07IG9G99ztN8GUHLFu8BLiyQ4TrFqQPkurK
 AiW4pXMzu+SkS92M1mcR0ReRICpun6hRVbPcgxDPpbtGg3wl72VsdK25BJ9NjR1UVSsT
 hdAxIsi8uugzc1TXjzn08LxGN9ECkMcqz8E1PtSGQ9FucWGsRgRwSXEbLWJbZi+JlELS
 59Qvm5to+T3Kfa0Gp/h0S18spGWgwP/8roRcteXiutw0uEuevVAFpx3jNfhUXsDjhUoh
 ijhtgDxOcBjcnWP8w+cpZsf0VFE9tEtP4vpy8rGEtDjE9jczeOpO3T9GehcyhSSePhPz
 LO7A==
X-Received: by 10.180.37.241 with SMTP id b17mr5447989wik.70.1409334736031;
 Fri, 29 Aug 2014 10:52:16 -0700 (PDT)
Received: from [172.16.1.30] (124.Red-83-33-238.dynamicIP.rima-tde.net.
 [83.33.238.124])
 by mx.google.com with ESMTPSA id ll20sm2055708wic.14.2014.08.29.10.52.14
 for 
 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
 Fri, 29 Aug 2014 10:52:15 -0700 (PDT)
Sender: =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= 
Message-ID: <5400BDC7.7020902@FreeBSD.org>
Date: Fri, 29 Aug 2014 19:52:07 +0200
From: =?windows-1252?Q?Roger_Pau_Monn=E9?= 
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9;
 rv:31.0) Gecko/20100101 Thunderbird/31.0
MIME-Version: 1.0
To: Alexander Motin , 
 John-Mark Gurney 
Subject: Re: svn commit: r269814 - head/sys/dev/xen/blkfront
References: <53e8e31e.2179.30c1c657@svn.freebsd.org>
 <53FF7386.3050804@FreeBSD.org> <20140828184515.GV71691@funkthat.com>
 <53FF7BC4.6050801@FreeBSD.org>
In-Reply-To: <53FF7BC4.6050801@FreeBSD.org>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 17:52:18 -0000

El 28/08/14 a les 20.58, Alexander Motin ha escrit:
> On 28.08.2014 21:45, John-Mark Gurney wrote:
>> Alexander Motin wrote this message on Thu, Aug 28, 2014 at 21:23 +0300:
>>> Hi, Roger.
>>>
>>> It looks to me like this commit does not work as it should. I got
>>> problem when I just tried `newfs /dev/ada0 ; mount /dev/ada0 /mnt`.
>>> Somehow newfs does not produce valid filesystem. Problem is reliably
>>> repeatable and reverting this commit fixes it.
>>>
>>> I found at least one possible cause there: If original data buffer is
>>> unmapped, misaligned and not physically contiguous, then present x86
>>> bus_dmamap_load_bio() implementation will process each physically
>>> contiguous segment separately. Due to the misalignment first and last
>>> physical segments may have size not multiple to 512 bytes. Since each
>>> segment processed separately, they are not joined together, and
>>> xbd_queue_cb() is getting segments not multiple to 512 bytes. Attempt to
>>> convert them to exact number of sectors in the driver cause data corruption.
>>
>> Are you sure this isn't a problem w/ the tag not properly specifying
>> the correct alignement? 
> 
> I don't know how to specify it stronger then this:
>         error = bus_dma_tag_create(
>             bus_get_dma_tag(sc->xbd_dev),       /* parent */
>             512, PAGE_SIZE,                     /* algnmnt, boundary */
>             BUS_SPACE_MAXADDR,                  /* lowaddr */
>             BUS_SPACE_MAXADDR,                  /* highaddr */
>             NULL, NULL,                         /* filter, filterarg */
>             sc->xbd_max_request_size,
>             sc->xbd_max_request_segments,
>             PAGE_SIZE,                          /* maxsegsize */
>             BUS_DMA_ALLOCNOW,                   /* flags */
>             busdma_lock_mutex,                  /* lockfunc */
>             &sc->xbd_io_lock,                   /* lockarg */
>             &sc->xbd_io_dmat);
> 
>> Also, I don't think there is a way for busdma
>> to say that you MUST have a segment be a multiple of 512, though you
>> could use a 512 boundary, but that would force all segments to only be
>> 512 bytes...
> 
> As I understand, that is mandatory requirement for this "hardware".
> Alike 4K alignment requirement also exist at least for SDHCI, and IIRC
> UHCI/OHCI hardware. Even AHCI requires both segment addresses and
> lengths to be even.
> 
> I may be wrong, but I think it is quite likely that hardware that
> requires segment address alignment quite likely will have the same
> requirements for segments length.

I've been able to trigger it quite easily by adding the following 
KASSERTs and got a "panic: Invalid segment size 2080". I will try to 
look into it tomorrow, or else revert the commit. Thanks for noticing.

Roger.

---
diff --git a/sys/dev/xen/blkfront/blkfront.c b/sys/dev/xen/blkfront/blkfront.c
index 7a1c974..6226534 100644
--- a/sys/dev/xen/blkfront/blkfront.c
+++ b/sys/dev/xen/blkfront/blkfront.c
@@ -199,6 +199,13 @@ xbd_queue_cb(void *arg, bus_dma_segment_t *segs, int nsegs, int error)
        while (1) {

                while (sg < last_block_sg) {
+
+                       KASSERT((segs->ds_len % 512) == 0,
+                           ("Invalid segment size %u", segs->ds_len));
+                       KASSERT((segs->ds_addr % 512) == 0,
+                           ("Invalid segment alignment ds_addr: %jx",
+                           (uintmax_t) segs->ds_addr));
+
                        buffer_ma = segs->ds_addr;
                        fsect = (buffer_ma & PAGE_MASK) >> XBD_SECTOR_SHFT;
                        lsect = fsect + (segs->ds_len  >> XBD_SECTOR_SHFT) - 1;

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 18:03:00 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id F22BAA3F;
 Fri, 29 Aug 2014 18:02:59 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DC6941F5D;
 Fri, 29 Aug 2014 18:02:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7TI2xbV089147;
 Fri, 29 Aug 2014 18:02:59 GMT (envelope-from melifaro@FreeBSD.org)
Received: (from melifaro@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7TI2wdE089142;
 Fri, 29 Aug 2014 18:02:58 GMT (envelope-from melifaro@FreeBSD.org)
Message-Id: <201408291802.s7TI2wdE089142@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: melifaro set sender to
 melifaro@FreeBSD.org using -f
From: "Alexander V. Chernikov" 
Date: Fri, 29 Aug 2014 18:02:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270822 - in head: sbin/ifconfig sys/dev/ixgbe sys/net
 sys/sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 18:03:00 -0000

Author: melifaro
Date: Fri Aug 29 18:02:58 2014
New Revision: 270822
URL: http://svnweb.freebsd.org/changeset/base/270822

Log:
  * Add SIOCGI2C driver ioctl used to retrieve i2c info.
  * Convert ixgbe to use this ioctl
  * Convert ifconfig to use generic i2c handler for  "ix" interfaces.
  
  Approved by:	Eric Joyner (ixgbe part)
  MFC after:	2 weeks
  Sponsored by:	Yandex LLC

Modified:
  head/sbin/ifconfig/sfp.c
  head/sys/dev/ixgbe/ixgbe.c
  head/sys/dev/ixgbe/ixgbe.h
  head/sys/net/if.h
  head/sys/sys/sockio.h

Modified: head/sbin/ifconfig/sfp.c
==============================================================================
--- head/sbin/ifconfig/sfp.c	Fri Aug 29 14:47:05 2014	(r270821)
+++ head/sbin/ifconfig/sfp.c	Fri Aug 29 18:02:58 2014	(r270822)
@@ -624,55 +624,43 @@ get_qsfp_tx_power(struct i2c_info *ii, c
 	convert_sff_power(ii, buf, size, xbuf);
 }
 
-/* Intel ixgbe-specific structures and handlers */
-struct ixgbe_i2c_req {
-	uint8_t dev_addr;
-	uint8_t	offset;
-	uint8_t len;
-	uint8_t data[8];
-};
-#define	SIOCGI2C	SIOCGIFGENERIC
-
+/* Generic handler */
 static int
-read_i2c_ixgbe(struct i2c_info *ii, uint8_t addr, uint8_t off, uint8_t len,
+read_i2c_generic(struct i2c_info *ii, uint8_t addr, uint8_t off, uint8_t len,
     caddr_t buf)
 {
-	struct ixgbe_i2c_req ixreq;
-	int i;
+	struct ifi2creq req;
+	int i, l;
 
 	if (ii->error != 0)
 		return (ii->error);
 
-	ii->ifr->ifr_data = (caddr_t)&ixreq;
-
-	memset(&ixreq, 0, sizeof(ixreq));
-	ixreq.dev_addr = addr;
-
-	for (i = 0; i < len; i += 1) {
-		ixreq.offset = off + i;
-		ixreq.len = 1;
-		ixreq.data[0] = '\0';
+	ii->ifr->ifr_data = (caddr_t)&req;
 
+	i = 0;
+	l = 0;
+	memset(&req, 0, sizeof(req));
+	req.dev_addr = addr;
+	req.offset = off;
+	req.len = len;
+
+	while (len > 0) {
+		l = (len > sizeof(req.data)) ? sizeof(req.data) : len;
+		req.len = l;
 		if (ioctl(ii->s, SIOCGI2C, ii->ifr) != 0) {
 			ii->error = errno;
 			return (errno);
 		}
-		memcpy(&buf[i], ixreq.data, 1);
+
+		memcpy(&buf[i], req.data, l);
+		len -= l;
+		i += l;
+		req.offset += l;
 	}
 
 	return (0);
 }
 
-/* Generic handler */
-static int
-read_i2c_generic(struct i2c_info *ii, uint8_t addr, uint8_t off, uint8_t len,
-    caddr_t buf)
-{
-
-	ii->error = EINVAL;
-	return (-1);
-}
-
 static void
 print_qsfp_status(struct i2c_info *ii, int verbose)
 {
@@ -766,6 +754,7 @@ sfp_status(int s, struct ifreq *ifr, int
 {
 	struct i2c_info ii;
 
+	memset(&ii, 0, sizeof(ii));
 	/* Prepare necessary into to pass to NIC handler */
 	ii.s = s;
 	ii.ifr = ifr;
@@ -774,9 +763,8 @@ sfp_status(int s, struct ifreq *ifr, int
 	 * Check if we have i2c support for particular driver.
 	 * TODO: Determine driver by original name.
 	 */
-	memset(&ii, 0, sizeof(ii));
 	if (strncmp(ifr->ifr_name, "ix", 2) == 0) {
-		ii.f = read_i2c_ixgbe;
+		ii.f = read_i2c_generic;
 		print_sfp_status(&ii, verbose);
 	} else if (strncmp(ifr->ifr_name, "cxl", 3) == 0) {
 		ii.port_id = atoi(&ifr->ifr_name[3]);

Modified: head/sys/dev/ixgbe/ixgbe.c
==============================================================================
--- head/sys/dev/ixgbe/ixgbe.c	Fri Aug 29 14:47:05 2014	(r270821)
+++ head/sys/dev/ixgbe/ixgbe.c	Fri Aug 29 18:02:58 2014	(r270822)
@@ -1068,17 +1068,24 @@ ixgbe_ioctl(struct ifnet * ifp, u_long c
 	}
 	case SIOCGI2C:
 	{
-		struct ixgbe_i2c_req	i2c;
+		struct ifi2creq i2c;
+		int i;
 		IOCTL_DEBUGOUT("ioctl: SIOCGI2C (Get I2C Data)");
 		error = copyin(ifr->ifr_data, &i2c, sizeof(i2c));
-		if (error)
+		if (error != 0)
 			break;
-		if ((i2c.dev_addr != 0xA0) || (i2c.dev_addr != 0xA2)){
+		if (i2c.dev_addr != 0xA0 && i2c.dev_addr != 0xA2) {
 			error = EINVAL;
 			break;
 		}
-		hw->phy.ops.read_i2c_byte(hw, i2c.offset,
-		    i2c.dev_addr, i2c.data);
+		if (i2c.len > sizeof(i2c.data)) {
+			error = EINVAL;
+			break;
+		}
+
+		for (i = 0; i < i2c.len; i++)
+			hw->phy.ops.read_i2c_byte(hw, i2c.offset + i,
+			    i2c.dev_addr, &i2c.data[i]);
 		error = copyout(&i2c, ifr->ifr_data, sizeof(i2c));
 		break;
 	}

Modified: head/sys/dev/ixgbe/ixgbe.h
==============================================================================
--- head/sys/dev/ixgbe/ixgbe.h	Fri Aug 29 14:47:05 2014	(r270821)
+++ head/sys/dev/ixgbe/ixgbe.h	Fri Aug 29 18:02:58 2014	(r270822)
@@ -197,9 +197,6 @@
 #define IXGBE_BR_SIZE			4096
 #define IXGBE_QUEUE_MIN_FREE		32
 
-/* IOCTL define to gather SFP+ Diagnostic data */
-#define SIOCGI2C	SIOCGIFGENERIC
-
 /* Offload bits in mbuf flag */
 #if __FreeBSD_version >= 800000
 #define CSUM_OFFLOAD		(CSUM_IP|CSUM_TCP|CSUM_UDP|CSUM_SCTP)
@@ -233,15 +230,6 @@ typedef struct _ixgbe_vendor_info_t {
 	unsigned int    index;
 } ixgbe_vendor_info_t;
 
-
-/* This is used to get SFP+ module data */
-struct ixgbe_i2c_req {
-        u8 dev_addr;
-        u8 offset;
-        u8 len;
-        u8 data[8];
-};
-
 struct ixgbe_tx_buf {
 	union ixgbe_adv_tx_desc	*eop;
 	struct mbuf	*m_head;

Modified: head/sys/net/if.h
==============================================================================
--- head/sys/net/if.h	Fri Aug 29 14:47:05 2014	(r270821)
+++ head/sys/net/if.h	Fri Aug 29 18:02:58 2014	(r270822)
@@ -510,6 +510,19 @@ struct ifgroupreq {
 #define ifgr_groups	ifgr_ifgru.ifgru_groups
 };
 
+/*
+ * Structure used to request i2c data
+ * from interface transceivers.
+ */
+struct ifi2creq {
+	uint8_t dev_addr;	/* i2c address (0xA0, 0xA2) */
+	uint8_t offset;		/* read offset */
+	uint8_t len;		/* read length */
+	uint8_t spare0;
+	uint32_t spare1;
+	uint8_t data[8];	/* read buffer */
+}; 
+
 #endif /* __BSD_VISIBLE */
 
 #ifdef _KERNEL

Modified: head/sys/sys/sockio.h
==============================================================================
--- head/sys/sys/sockio.h	Fri Aug 29 14:47:05 2014	(r270821)
+++ head/sys/sys/sockio.h	Fri Aug 29 18:02:58 2014	(r270822)
@@ -96,6 +96,7 @@
 
 #define	SIOCGIFSTATUS	_IOWR('i', 59, struct ifstat)	/* get IF status */
 #define	SIOCSIFLLADDR	 _IOW('i', 60, struct ifreq)	/* set linklevel addr */
+#define	SIOCGI2C	_IOWR('i', 61, struct ifstat)	/* get I2C data  */
 
 #define	SIOCSIFPHYADDR	 _IOW('i', 70, struct ifaliasreq) /* set gif addres */
 #define	SIOCGIFPSRCADDR	_IOWR('i', 71, struct ifreq)	/* get gif psrc addr */

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 18:13:53 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id CF7AA1A9;
 Fri, 29 Aug 2014 18:13:53 +0000 (UTC)
Received: from mail-vc0-x234.google.com (mail-vc0-x234.google.com
 [IPv6:2607:f8b0:400c:c03::234])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 543991142;
 Fri, 29 Aug 2014 18:13:53 +0000 (UTC)
Received: by mail-vc0-f180.google.com with SMTP id lf12so2818341vcb.25
 for ; Fri, 29 Aug 2014 11:13:52 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:in-reply-to:references:date:message-id:subject:from:to
 :cc:content-type;
 bh=yF0C0osERl25I5ajeI8hltOXk2RKyq2C/TW4R1Ue2S8=;
 b=im6sk2N/nXiPmq+uAItxyF+rqtSgt95FkLsR27TrkYjYIsSUxr2hNSS52y2E+Zznws
 h8mnv4HboFpFba3XN8xJQ5EEXPDFIOdhyetL3a1e6mwWBE7Alr6X/X9+xqBouZTIS4Om
 UzyRzYQszL0AtowLZUcRsNrgZmDx3RMPV+5TZV2NFhjtePy+2XwH30Ey7qKb+wFjnfJ9
 udYq8B3W7a0zknlEz+QD679ibguiAbqFGlSBb6Hz5lt4zoqNrQ1TOcgY5G1SKgWuG4pp
 mtGJClJSJzLNnZ40KxqgvANtsBiLP7mzBATBix3tDYFNohr40PcGVfpHaXjC9EYbflQQ
 7PkA==
MIME-Version: 1.0
X-Received: by 10.52.61.136 with SMTP id p8mr9842686vdr.15.1409336032435; Fri,
 29 Aug 2014 11:13:52 -0700 (PDT)
Received: by 10.221.20.199 with HTTP; Fri, 29 Aug 2014 11:13:52 -0700 (PDT)
In-Reply-To: 
References: <201408291240.s7TCe1OQ029986@svn.freebsd.org>
 <20140829171452.GO2737@kib.kiev.ua>
 
Date: Fri, 29 Aug 2014 11:13:52 -0700
Message-ID: 
Subject: Re: svn commit: r270806 - head/sys/dev/ixl
From: Jack Vogel 
To: Konstantin Belousov 
Content-Type: text/plain; charset=ISO-8859-1
X-Content-Filtered-By: Mailman/MimeDel 2.1.18-1
Cc: "svn-src-head@freebsd.org" ,
 "svn-src-all@freebsd.org" ,
 "Bjoern A. Zeeb" ,
 "src-committers@freebsd.org" 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 18:13:53 -0000

OH, and I just asked the team here, and found out we explicitly do NOT
support any 32 bit environment for this driver.

Jack



On Fri, Aug 29, 2014 at 10:49 AM, Jack Vogel  wrote:

> I certainly agree that it would be a bit ridiculous to do 40G in a 32bit
> environment :)
>
> Jack
>
>
>
> On Fri, Aug 29, 2014 at 10:14 AM, Konstantin Belousov  > wrote:
>
>> On Fri, Aug 29, 2014 at 12:40:01PM +0000, Bjoern A. Zeeb wrote:
>> > Author: bz
>> > Date: Fri Aug 29 12:40:01 2014
>> > New Revision: 270806
>> > URL: http://svnweb.freebsd.org/changeset/base/270806
>> >
>> > Log:
>> >   Properly handle prefetch only for amd64 and i386 as we do elsewhere.
>> >
>> >   In general theraven is right that we should factr this out and provide
>> >   a general and per-arch implementation that everything can use.
>> >
>> >   MFC after:  3 days
>> >   X-MFC with: r270755
>> >
>> > Modified:
>> >   head/sys/dev/ixl/i40e_osdep.h
>> >
>> > Modified: head/sys/dev/ixl/i40e_osdep.h
>> >
>> ==============================================================================
>> > --- head/sys/dev/ixl/i40e_osdep.h     Fri Aug 29 11:18:54 2014
>> (r270805)
>> > +++ head/sys/dev/ixl/i40e_osdep.h     Fri Aug 29 12:40:01 2014
>> (r270806)
>> > @@ -137,11 +137,15 @@ struct i40e_spinlock {
>> >
>> >  #define le16_to_cpu
>> >
>> > +#if defined(__amd64__) || defined(i386)
>> >  static __inline
>> >  void prefetch(void *x)
>> >  {
>> >       __asm volatile("prefetcht0 %0" :: "m" (*(unsigned long *)x));
>> >  }
>> This only fix the build failure, but the code is still somewhat wrong.
>>
>> Availability of the prefetch instruction depends on the presence of SSE.
>> Althought it is probably impossible to find a machine where the intended
>> hardware can operate and which does not support SSE _currently_, I am
>> not sure that it is wise to hard-code SSE instructions in the i386
>> kernel.
>>
>> Might be, a change of the compilation test from both amd64 and i386 to
>> just amd64 is due.  I doubt that anybody would use 40Gb with 32bit OS,
>> and even if somebody does, that the performace is at the stake in
>> this case.
>>
>> > +#else
>> > +#define      prefetch(x)
>> > +#endif
>> >
>> >  struct i40e_osdep
>> >  {
>>
>
>

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 18:18:30 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 410AE573;
 Fri, 29 Aug 2014 18:18:30 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 228A311FE;
 Fri, 29 Aug 2014 18:18:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7TIITYM094969;
 Fri, 29 Aug 2014 18:18:29 GMT (envelope-from jhb@FreeBSD.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7TIITKp094968;
 Fri, 29 Aug 2014 18:18:29 GMT (envelope-from jhb@FreeBSD.org)
Message-Id: <201408291818.s7TIITKp094968@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jhb set sender to jhb@FreeBSD.org
 using -f
From: John Baldwin 
Date: Fri, 29 Aug 2014 18:18:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270823 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 18:18:30 -0000

Author: jhb
Date: Fri Aug 29 18:18:29 2014
New Revision: 270823
URL: http://svnweb.freebsd.org/changeset/base/270823

Log:
  Use a unit number allocator to provide suitable st_dev and st_ino values
  for POSIX shared memory descriptors.  The implementation is similar to
  that used for pipes.
  
  MFC after:	1 week

Modified:
  head/sys/kern/uipc_shm.c

Modified: head/sys/kern/uipc_shm.c
==============================================================================
--- head/sys/kern/uipc_shm.c	Fri Aug 29 18:02:58 2014	(r270822)
+++ head/sys/kern/uipc_shm.c	Fri Aug 29 18:18:29 2014	(r270823)
@@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$");
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -101,6 +102,8 @@ static LIST_HEAD(, shm_mapping) *shm_dic
 static struct sx shm_dict_lock;
 static struct mtx shm_timestamp_lock;
 static u_long shm_hash;
+static struct unrhdr *shm_ino_unr;
+static dev_t shm_dev_ino;
 
 #define	SHM_HASH(fnv)	(&shm_dictionary[(fnv) & shm_hash])
 
@@ -408,6 +411,8 @@ shm_stat(struct file *fp, struct stat *s
 	sb->st_uid = shmfd->shm_uid;
 	sb->st_gid = shmfd->shm_gid;
 	mtx_unlock(&shm_timestamp_lock);
+	sb->st_dev = shm_dev_ino;
+	sb->st_ino = shmfd->shm_ino;
 
 	return (0);
 }
@@ -539,6 +544,7 @@ static struct shmfd *
 shm_alloc(struct ucred *ucred, mode_t mode)
 {
 	struct shmfd *shmfd;
+	int ino;
 
 	shmfd = malloc(sizeof(*shmfd), M_SHMFD, M_WAITOK | M_ZERO);
 	shmfd->shm_size = 0;
@@ -555,6 +561,11 @@ shm_alloc(struct ucred *ucred, mode_t mo
 	vfs_timestamp(&shmfd->shm_birthtime);
 	shmfd->shm_atime = shmfd->shm_mtime = shmfd->shm_ctime =
 	    shmfd->shm_birthtime;
+	ino = alloc_unr(shm_ino_unr);
+	if (ino == -1)
+		shmfd->shm_ino = 0;
+	else
+		shmfd->shm_ino = ino;
 	refcount_init(&shmfd->shm_refs, 1);
 	mtx_init(&shmfd->shm_mtx, "shmrl", NULL, MTX_DEF);
 	rangelock_init(&shmfd->shm_rl);
@@ -585,6 +596,8 @@ shm_drop(struct shmfd *shmfd)
 		rangelock_destroy(&shmfd->shm_rl);
 		mtx_destroy(&shmfd->shm_mtx);
 		vm_object_deallocate(shmfd->shm_object);
+		if (shmfd->shm_ino != 0)
+			free_unr(shm_ino_unr, shmfd->shm_ino);
 		free(shmfd, M_SHMFD);
 	}
 }
@@ -617,14 +630,18 @@ shm_access(struct shmfd *shmfd, struct u
  * the mappings in a hash table.
  */
 static void
-shm_dict_init(void *arg)
+shm_init(void *arg)
 {
 
 	mtx_init(&shm_timestamp_lock, "shm timestamps", NULL, MTX_DEF);
 	sx_init(&shm_dict_lock, "shm dictionary");
 	shm_dictionary = hashinit(1024, M_SHMFD, &shm_hash);
+	shm_ino_unr = new_unrhdr(1, INT32_MAX, NULL);
+	KASSERT(shm_ino_unr != NULL, ("shm fake inodes not initialized"));
+	shm_dev_ino = devfs_alloc_cdp_inode();
+	KASSERT(shm_dev_ino > 0, ("shm dev inode not initialized"));
 }
-SYSINIT(shm_dict_init, SI_SUB_SYSV_SHM, SI_ORDER_ANY, shm_dict_init, NULL);
+SYSINIT(shm_init, SI_SUB_SYSV_SHM, SI_ORDER_ANY, shm_init, NULL);
 
 static struct shmfd *
 shm_lookup(char *path, Fnv32_t fnv)

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 18:26:56 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id C2C46A6F;
 Fri, 29 Aug 2014 18:26:56 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AD26A1316;
 Fri, 29 Aug 2014 18:26:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7TIQuVq099440;
 Fri, 29 Aug 2014 18:26:56 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7TIQu7W099436;
 Fri, 29 Aug 2014 18:26:56 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201408291826.s7TIQu7W099436@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper 
Date: Fri, 29 Aug 2014 18:26:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270824 - in stable/10: . sbin/atm/atmconfig
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 18:26:56 -0000

Author: ngie
Date: Fri Aug 29 18:26:55 2014
New Revision: 270824
URL: http://svnweb.freebsd.org/changeset/base/270824

Log:
  MFC r270027:
  
  tmconfig compilation when MK_ATM == yes and MK_BSNMP == no
  
   Makefile.inc1:
   Always compile gensnmptree with bootstrap-tools when MK_BSNMP != no
   instead of depending on a potentially stale tool installed on the build host
  
   sbin/atm/atmconfig/Makefile:
   - Always remove oid.h to avoid cluttering up the build/src tree.
   - Consolidate all of the RESCUE/MK_BSNMP != no logic under one
   conditional to improve readability
   - Remove unnecessary ${.OBJDIR} prefixing for oid.h and use ${.TARGET} instead
     of spelling out oid.h
   - Add a missing DPADD for ${LIBCRYPTO} when compiled MK_BSNMP == yes and
     MK_OPENSSL == yes and not compiling for /rescue/rescue
  
   sbin/atm/atmconfig/main.c:
   Change #ifndef RESCUE to #ifdef WITH_BSNMP in main.c to make it
   clear that we're compiling bsnmp support into atmconfig

Modified:
  stable/10/Makefile.inc1
  stable/10/sbin/atm/atmconfig/Makefile
  stable/10/sbin/atm/atmconfig/main.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/Makefile.inc1
==============================================================================
--- stable/10/Makefile.inc1	Fri Aug 29 18:18:29 2014	(r270823)
+++ stable/10/Makefile.inc1	Fri Aug 29 18:26:55 2014	(r270824)
@@ -1257,7 +1257,7 @@ _lex=		usr.bin/lex
 _awk=		usr.bin/awk
 .endif
 
-.if ${MK_BSNMP} != "no" && !exists(/usr/sbin/gensnmptree)
+.if ${MK_BSNMP} != "no"
 _gensnmptree=	usr.sbin/bsnmpd/gensnmptree
 .endif
 

Modified: stable/10/sbin/atm/atmconfig/Makefile
==============================================================================
--- stable/10/sbin/atm/atmconfig/Makefile	Fri Aug 29 18:18:29 2014	(r270823)
+++ stable/10/sbin/atm/atmconfig/Makefile	Fri Aug 29 18:26:55 2014	(r270824)
@@ -8,29 +8,24 @@
 .include 
 
 PROG=	atmconfig
-.ifndef RESCUE
-SRCS=	${.OBJDIR}/oid.h
-.endif
-SRCS+=	main.c diag.c natm.c
-.ifndef RESCUE
-SRCS+=	atmconfig_device.c
-.endif
+SRCS=	main.c diag.c natm.c
 MAN=	atmconfig.8
 # CFLAGS+= -DPATH_HELP='".:/usr/share/doc/atm:/usr/local/share/doc/atm"'
 
 CFLAGS+= -I${.OBJDIR}
 
-.ifndef RESCUE
-DPADD=	${LIBBSNMP}
-LDADD=	-lbsnmp
+.if !defined(RESCUE) && ${MK_BSNMP} != "no"
+CFLAGS+=	-DWITH_BSNMP
+SRCS+=	oid.h atmconfig_device.c
+DPADD+=	${LIBBSNMP}
+LDADD+=	-lbsnmp
 . if ${MK_DYNAMICROOT} == "no" && ${MK_OPENSSL} != "no"
+DPADD+=	${LIBCRYPTO}
 LDADD+= -lcrypto
 . endif
 .endif
 
-.ifndef RESCUE
 CLEANFILES+= oid.h
-.endif
 
 # XXX - this is verboten
 .if ${MACHINE_CPUARCH} == "arm"
@@ -43,8 +38,8 @@ FILESDIR= /usr/share/doc/atm
 SNMP_ATM_DEF= ${.CURDIR}/../../../contrib/ngatm/snmp_atm/atm_tree.def	\
 	${.CURDIR}/../../../usr.sbin/bsnmpd/modules/snmp_atm/atm_freebsd.def
 
-${.OBJDIR}/oid.h: atm_oid.list ${SNMP_ATM_DEF}
+oid.h: atm_oid.list ${SNMP_ATM_DEF}
 	cat ${SNMP_ATM_DEF} | gensnmptree -e `tail -n +2 ${.CURDIR}/atm_oid.list` \
-		> ${.OBJDIR}/oid.h
+		> ${.TARGET}
 
 .include 

Modified: stable/10/sbin/atm/atmconfig/main.c
==============================================================================
--- stable/10/sbin/atm/atmconfig/main.c	Fri Aug 29 18:18:29 2014	(r270823)
+++ stable/10/sbin/atm/atmconfig/main.c	Fri Aug 29 18:26:55 2014	(r270824)
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
-#ifndef RESCUE
+#ifdef WITH_BSNMP
 #include 
 #include 
 #include 
@@ -444,7 +444,7 @@ help_func(int argc, char *argv[])
 	exit(1);
 }
 
-#ifndef RESCUE
+#ifdef WITH_BSNMP
 /*
  * Parse a server specification
  *
@@ -527,16 +527,16 @@ main(int argc, char *argv[])
 	int opt, i;
 	const struct cmdtab *match, *cc, *tab;
 
-#ifndef RESCUE
+#ifdef WITH_BSNMP
 	snmp_client_init(&snmp_client);
 	snmp_client.trans = SNMP_TRANS_LOC_STREAM;
 	snmp_client_set_host(&snmp_client, PATH_ILMI_SOCK);
 #endif
 
-#ifdef RESCUE
-#define OPTSTR	"htv"
-#else
+#ifdef WITH_BSNMP
 #define	OPTSTR	"htvs:"
+#else
+#define OPTSTR	"htv"
 #endif
 
 	while ((opt = getopt(argc, argv, OPTSTR)) != -1)
@@ -545,7 +545,7 @@ main(int argc, char *argv[])
 		  case 'h':
 			help_func(0, argv);
 
-#ifndef RESCUE
+#ifdef WITH_BSNMP
 		  case 's':
 			parse_server(optarg);
 			break;
@@ -570,7 +570,7 @@ main(int argc, char *argv[])
 		err(1, NULL);
 	memcpy(main_tab, static_main_tab, sizeof(static_main_tab));
 
-#ifndef RESCUE
+#ifdef WITH_BSNMP
 	/* XXX while this is compiled in */
 	device_register();
 #endif

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 19:27:03 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 468C7F29;
 Fri, 29 Aug 2014 19:27:03 +0000 (UTC)
Received: from smtp2.wemm.org (smtp2.wemm.org [IPv6:2001:470:67:39d::78])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "smtp2.wemm.org",
 Issuer "StartCom Class 1 Primary Intermediate Server CA" (not verified))
 by mx1.freebsd.org (Postfix) with ESMTPS id 10C2A1ADB;
 Fri, 29 Aug 2014 19:27:03 +0000 (UTC)
Received: from overcee.wemm.org (canning.wemm.org [192.203.228.65])
 by smtp2.wemm.org (Postfix) with ESMTP id 24706D6;
 Fri, 29 Aug 2014 12:27:02 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wemm.org;
 s=m20140428; t=1409340422;
 bh=8daikglGZEkyD+1yO3wy9bd+2YukM5wJrpkhA/S+918=;
 h=From:To:Cc:Subject:Date:In-Reply-To:References;
 b=LGUEw9J8t+TNbaShtpD4b+brnPbP/FlrPkRrL9paD1LhmIVPcM3oUYRtqTaMgEXHr
 FGihXTCatHtiYf0PziwevBSlzZTONAUWQy6O9TNTK9itziUDM18jS36HuM0NkAbRJY
 dZyH0IE2VU0uVHQDuCud+qWXkRJIUyE72qpq4ljs=
From: Peter Wemm 
To: Alan Cox 
Subject: Re: svn commit: r270759 - in head/sys: cddl/compat/opensolaris/kern
 cddl/compat/opensolaris/sys cddl/contrib/opensolaris/uts/common/fs/zfs vm
Date: Fri, 29 Aug 2014 12:26:57 -0700
Message-ID: <1592506.xpuae4IYcM@overcee.wemm.org>
User-Agent: KMail/4.12.5 (FreeBSD/11.0-CURRENT; KDE/4.12.5; amd64; ; )
In-Reply-To: <5400B052.6030103@rice.edu>
References: <201408281950.s7SJo90I047213@svn.freebsd.org>
 <4A4B2C2D36064FD9840E3603D39E58E0@multiplay.co.uk>
 <5400B052.6030103@rice.edu>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="nextPart3473061.QZNGgrCJeQ";
 micalg="pgp-sha1"; protocol="application/pgp-signature"
Cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
 Dmitry Morozovsky ,
 "Matthew D. Fuller" , svn-src-head@freebsd.org,
 Steven Hartland 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 19:27:03 -0000


--nextPart3473061.QZNGgrCJeQ
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset="us-ascii"

On Friday 29 August 2014 11:54:42 Alan Cox wrote:
> On 08/29/2014 03:32, Steven Hartland wrote:
> >> On Thursday 28 August 2014 17:30:17 Alan Cox wrote:
> >> > On 08/28/2014 16:15, Matthew D. Fuller wrote:
> >> > > On Thu, Aug 28, 2014 at 10:11:39PM +0100 I heard the voice of
> >> > >=20
> >> > > Steven Hartland, and lo! it spake thus:
> >> > >> Its very likely applicable to stable/9 although I've never us=
ed 9
> >> > >> myself, we jumped from 9 direct to 10.
> >> > >=20
> >> > > This is actually hitting two different issues from the two bug=
s:
> >> > >=20
> >> > > - 191510 is about "ARC isn't greedy enough" on huge-memory > >=

> >>=20
> >> machines,
> >>=20
> >> > >   and from the osreldate that bug was filed on 9.2, so presuma=
bly
> >> > >=20
> >> > > is
> >> > >=20
> >> > >   applicable.
> >> > >=20
> >> > > - 187594 is about "ARC is too greedy" (probably mostly on > >
> >>=20
> >> not-so-huge
> >>=20
> >> > >   machines) and starves/drives the rest of the system into swa=
p.
> >> > >=20
> >> > > That
> >> > >=20
> >> > >   I believe came about as a result of some unrelated change in=
 the
> >> > >   10.x stream that upset the previous balance between ARC and =
the
> >> > >=20
> >> > > rest
> >> > >=20
> >> > >   of the VM, so isn't a problem on 9.x.
> >> >=20
> >> > 10.0 had a bug in the page daemon that was fixed in 10-STABLE ab=
out
> >> > three months ago (r265945).  The ARC was not the only thing
> >>=20
> >> affected > by
> >> this bug.
> >>=20
> >> I'm concerned about potential unintended consequences of this chan=
ge.
> >>=20
> >> Before, arc reclaim was driven by vm_paging_needed(), which was:
> >> vm_paging_needed(void)
> >> {
> >>=20
> >>     return (vm_cnt.v_free_count + vm_cnt.v_cache_count <
> >>    =20
> >>         vm_pageout_wakeup_thresh);
> >>=20
> >> }
> >>=20
> >> Now it's ignoring the v_cache_count and looking exclusively at
> >> v_free_count.
> >> "cache" pages are free pages that just happen to have known conten=
ts.
> >> If I
> >> read this change right, zfs arc will now discard checksummed cache=

> >> pages to
> >=20
> >> make room for non-checksummed pages:
> > That test is still there so if it needs to it will still trigger.
> >=20
> > However that often a lower level as vm_pageout_wakeup_thresh is onl=
y 110%
> > of min free, where as zfs_arc_free_target is based of target free
> > which is
> > 4 * (min free + reserved).
> >=20
> >> +       if (kmem_free_count() < zfs_arc_free_target) {
> >> +               return (1);
> >> +       }
> >> ...
> >> +kmem_free_count(void)
> >> +{
> >> +       return (vm_cnt.v_free_count);
> >> +}
> >>=20
> >> This seems like a pretty substantial behavior change.  I'm concern=
ed
> >> that it
> >> doesn't appear to count all the forms of "free" pages.
> >>=20
> >> I haven't seen the problems with the over-aggressive ARC since the=

> >> page daemon
> >> bug was fixed.  It's been working fine under pretty abusive loads =
in
> >> the freebsd
> >> cluster after that fix.
> >=20
> > Others have also confirmed that even with r265945 they can still tr=
igger
> > performance issue.
> >=20
> > In addition without it we still have loads of RAM sat their unused,=
 in my
> > particular experience we have 40GB of 192GB sitting their unused an=
d that
> > was with a stable build from last weekend.
>=20
> The Solaris code only imposed this limit on 32-bit machines where the=

> available kernel virtual address space may be much less than the
> available physical memory.  Previously, FreeBSD imposed this limit on=

> both 32-bit and 64-bit machines.  Now, it imposes it on neither.  Why=

> continue to do this differently from Solaris?

Since the question was asked below, we don't have zfs machines in the c=
luster=20
running i386.  We can barely get them to boot as it is due to kva press=
ure. =20
We have to reduce/cap physical memory and change the user/kernel virtua=
l split=20
from=203:1 to 2.5:1.5.=20

We do run zfs on small amd64 machines with 2G of ram, but I can't imagi=
ne it=20
working on the 10G i386 PAE machines that we have.


> > With the patch we confirmed that both RAM usage and performance for=
 those
> > seeing that issue are resolved, with no reported regressions.
> >=20
> >> (I should know better than to fire a reply off before full fact
> >> checking, but
> >> this commit worries me..)
> >=20
> > Not a problem, its great to know people pay attention to changes, a=
nd
> > raise
> > their concerns. Always better to have a discussion about potential =
issues
> > than to wait for a problem to occur.
> >=20
> > Hopefully the above gives you some piece of mind, but if you still
> > have any
> > concerns I'm all ears.
>=20
> You didn't really address Peter's initial technical issue.  Peter
> correctly observed that cache pages are just another flavor of free
> pages.  Whenever the VM system is checking the number of free pages
> against any of the thresholds, it always uses the sum of v_cache_coun=
t
> and v_free_count.  So, to anyone familiar with the VM system, like
> Peter, what you've done, which is to derive a threshold from
> v_free_target but only compare v_free_count to that threshold, looks
> highly suspect.

I think I'd like to see something like this:

Index: cddl/compat/opensolaris/kern/opensolaris_kmem.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- cddl/compat/opensolaris/kern/opensolaris_kmem.c=09(revision 270824)=

+++ cddl/compat/opensolaris/kern/opensolaris_kmem.c=09(working copy)
@@ -152,7 +152,8 @@
 kmem_free_count(void)
 {
=20
=2D=09return (vm_cnt.v_free_count);
+=09/* "cache" is just a flavor of free pages in FreeBSD */
+=09return (vm_cnt.v_free_count + vm_cnt.v_cache_count);
 }
=20
 u_int


The rest of the system looks at the "big picture" it would be happy to =
let the=20
"free" pool run quite a way down so long as there's "cache" pages avail=
able to=20
satisfy the free space requirements.  This would lead ZFS to mistakenly=
=20
sacrifice ARC for no reason.  I'm not sure how big a deal this is, but =
I can't=20
imagine many scenarios where I want ARC to be discarded in order to sav=
e some=20
effectively free pages.

> That said, I can easily believe that your patch works better than the=

> existing code, because it is closer in spirit to my interpretation of=

> what the Solaris code does.  Specifically, I believe that the Solaris=

> code starts trimming the ARC before the Solaris page daemon starts
> writing dirty pages to secondary storage.  Now, you've made FreeBSD d=
o
> the same.  However, you've expressed it in a way that looks broken.
>=20
> To wrap up, I think that you can easily write this in a way that
> simultaneously behaves like Solaris and doesn't look wrong to a VM ex=
pert.
>=20
> > Out of interest would it be possible to update machines in the clus=
ter to
> > see how their workload reacts to the change?
> >=20
> >    Regards
> >    Steve

I'd like to see the free vs cache thing resolved first but it's going t=
o be=20
tricky to get a comparison.

For the first few months of the year, things were really troublesome.  =
It was=20
quite easy to overtax the machines and run them into the ground.

This is not the case now - things are working pretty well under pressur=
e=20
(prior to the commit).  Its got to the point that we feel comfortable=20=

thrashing the machines really hard again.  Getting a comparison when it=
=20
already works well is going to be tricky.

We don't have large memory machines that aren't already tuned for=20
vfs.zfs.arc_max caps for tmpfs use.

For context to the wider audience, we do not run -release or -pN in the=
=20
freebsd cluster.  We mostly run -current, and some -stable.   I am well=
 aware=20
that there is significant discomfort in 10.0-R with zfs but we already =
have the=20
fixes for that.
=2D-=20
Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com; KI=
6FJV
UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246
--nextPart3473061.QZNGgrCJeQ
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part.
Content-Transfer-Encoding: 7Bit

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQEcBAABAgAGBQJUANQFAAoJEDXWlwnsgJ4Ej54H/i3fKVW4nwYRZW4rQdRQp4k3
yXAHOptr8jh2BU3OLkB9BFHj2OTllfGxMNo2wiephc3Hg2NelKrNQyGVTMCXVU7p
m5DTboznV1xPA5oawVnkuJglPPuV+cID2AgUCaZVrUheWN5Yrs0b+S1TWHXrPoU2
CXAj5u8fd0YlMRVGc8PPBBIWCthbqb7B+GHRoFGfjRJ2gMFvuqi/ls8U5rvmHmwI
NYPzgc6zE+RaLIRR0yRlfAz3eWRQ35WFBG4W0jWxdV/o6oPsbma2w6qOysSJB9Rn
IZGVgYa+SwiZa2wPvUdm4E+oky1Y+SnACdHbIptynIWEczVAuLY9fGS0yk1bZVk=
=6Njw
-----END PGP SIGNATURE-----

--nextPart3473061.QZNGgrCJeQ--


From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 19:46:08 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 8E335A8A
 for ; Fri, 29 Aug 2014 19:46:08 +0000 (UTC)
Received: from freefall.freebsd.org (freefall.freebsd.org
 [IPv6:2001:1900:2254:206c::16:87])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6AD061D02
 for ; Fri, 29 Aug 2014 19:46:08 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
 by freefall.freebsd.org (8.14.9/8.14.9) with ESMTP id s7TJk8jo030070
 for ; Fri, 29 Aug 2014 19:46:08 GMT
 (envelope-from bdrewery@freefall.freebsd.org)
Received: (from bdrewery@localhost)
 by freefall.freebsd.org (8.14.9/8.14.9/Submit) id s7TJk8nS030067
 for svn-src-all@freebsd.org; Fri, 29 Aug 2014 19:46:08 GMT
 (envelope-from bdrewery)
Received: (qmail 83247 invoked from network); 29 Aug 2014 14:46:05 -0500
Received: from unknown (HELO ?10.10.0.24?) (freebsd@shatow.net@10.10.0.24)
 by sweb.xzibition.com with ESMTPA; 29 Aug 2014 14:46:05 -0500
Message-ID: <5400D873.70707@FreeBSD.org>
Date: Fri, 29 Aug 2014 14:45:55 -0500
From: Bryan Drewery 
Organization: FreeBSD
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64;
 rv:31.0) Gecko/20100101 Thunderbird/31.0
MIME-Version: 1.0
To: Konstantin Belousov 
Subject: Re: svn commit: r270803 - head/libexec/rtld-elf
References: <201408291044.s7TAiwmI077897@svn.freebsd.org>
 <540094DB.5050307@FreeBSD.org> <20140829172311.GP2737@kib.kiev.ua>
In-Reply-To: <20140829172311.GP2737@kib.kiev.ua>
OpenPGP: id=6E4697CF;
	url=http://www.shatow.net/bryan/bryan2.asc
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature";
 boundary="Xw3mDU01mQ6XERfTtjnuEU2AticK7S1We"
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 19:46:08 -0000

This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
--Xw3mDU01mQ6XERfTtjnuEU2AticK7S1We
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: quoted-printable

On 8/29/2014 12:23 PM, Konstantin Belousov wrote:
> On Fri, Aug 29, 2014 at 09:57:31AM -0500, Bryan Drewery wrote:
>> On 8/29/2014 5:44 AM, Konstantin Belousov wrote:
>>> Author: kib
>>> Date: Fri Aug 29 10:44:58 2014
>>> New Revision: 270803
>>> URL: http://svnweb.freebsd.org/changeset/base/270803
>>>
>>> Log:
>>>   Document the whole settings needed to build a debug version of rtld=
=2E
>>>  =20
>>>   Sponsored by:	The FreeBSD Foundation
>>>   MFC after:	3 days
>>>
>>> Modified:
>>>   head/libexec/rtld-elf/Makefile
>>>
>>> Modified: head/libexec/rtld-elf/Makefile
>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D
>>> --- head/libexec/rtld-elf/Makefile	Fri Aug 29 10:43:56 2014	(r270802)=

>>> +++ head/libexec/rtld-elf/Makefile	Fri Aug 29 10:44:58 2014	(r270803)=

>>> @@ -1,5 +1,9 @@
>>>  # $FreeBSD$
>>> =20
>>> +# Use the following command to build local debug version of dynamic
>>> +# linker:
>>> +# make DEBUG_FLAGS=3D-g DEBUG=3D-DDEBUG MK_TESTS=3Dno all
>>> +
>>>  .include 
>>>  MK_SSP=3D		no
>>> =20
>>>
>>
>> How difficult would it be to allow DEBUG to be set during runtime like=

>> GNU's can with LD_DEBUG? I have found GNU's LD_DEBUG to be very useful=

>> for userland debugging, especially when using dlopen(3).
>>
>> We have LD_DEBUG environment variable but it only prints if built with=

>> -DDEBUG.
>>
>> Is there a concern about performance by enabling this based only on
>> environment?
>=20
> I am sure that nobody evaluated the performance consequences of
> unconditionally compiling the debugging stuff in. I am sure that the
> ld-elf.so.1 size will increase.
>=20
> The reason why nobody cares to evaluate and enable this stuff by defaul=
t
> is that the debugging output is very ad-hoc. I found it almost useless
> in both the content and amount of data it outputs. The reason why I
> enable it for my work on ld-elf is that I insert my own dbg() calls for=

> debugging (and usually remove them before the commit since they add eve=
n
> more verbosity useless for general public consumption).

Ah.

>=20
> I find the combination of the ELF dumping tools like readelf and
> objdump, together with gdb (-g) and custom dbg() statement (slighly
> glorified printf debugging) most adequate combination to debug rtld.
>=20
> After the long preamble. What use do you have for LD_DEBUG ? If it is
> possible to formalize and tailor the debugging output for real users
> needs, I am all for making it available unconditionally from LD_DEBUG
> knob. The significants part of the current dbg() statements would be
> removed or require more agressive settings to become active.
>=20

My only uses so far have been observing which file is loaded for a
library with dlopen(3) and where symbols are resolved from. Seeing where
symbols are resolved from is useful for both dlopen(3)/dlsym(3) usage
and LD_PRELOAD.

I've written an application that "optionally" allows using some
libraries such as libtcl to be used without requiring the library at
build time or startup. At build time the library's headers are used to
generate wrapper functions for every symbol needed. The library is not
linked in. When the binary is ran it starts up fine if libtcl is
missing. At runtime if TCL is enabled then it will attempt to
dlopen(libtcl.so.VER) using the VER its symbols was compiled against. If
it cannot find it then the feature is disabled. It uses dlsym(3) to load
all symbols into a table and the wrapper functions use that table via
hash table lookups.

This all pretty convoluted and only done to avoid requiring a library at
startup. The application is distributed pre-compiled for specific OS
releases and not intended to be compiled manually.

Anyway some examples from GNU's rtld:

> # env LD_DEBUG=3Dhelp ./app
> Valid options for the LD_DEBUG environment variable are:
>=20
>   libs        display library search paths
>   reloc       display relocation processing
>   files       display progress for input file
>   symbols     display symbol table processing
>   bindings    display information about symbol binding
>   versions    display version dependencies
>   all         all previous options combined
>   statistics  display relocation statistics
>   unused      determined unused DSOs
>   help        display this help message and exit
>=20
> To direct the debugging output into a file instead of standard output
> a filename can be specified using the LD_DEBUG_OUTPUT environment varia=
ble.

With libs:

> # env LD_DEBUG=3Dlibs ./app
> ...
>       9328:     find library=3Dlibtcl.so [0]; searching
>       9328:      search cache=3D/etc/ld.so.cache
>       9328:      search path=3D/lib64/tls/x86_64:/lib64/tls:/lib64/x86_=
64:/lib64:/usr/lib64/tls/x86_64:/usr/lib64/tls:/usr/lib64/x86_64:/usr/lib=
64                (system search path)
>       9328:       trying file=3D/lib64/tls/x86_64/libtcl.so
>       9328:       trying file=3D/lib64/tls/libtcl.so
>       9328:       trying file=3D/lib64/x86_64/libtcl.so
>       9328:       trying file=3D/lib64/libtcl.so
>       9328:       trying file=3D/usr/lib64/tls/x86_64/libtcl.so
>       9328:       trying file=3D/usr/lib64/tls/libtcl.so
>       9328:       trying file=3D/usr/lib64/x86_64/libtcl.so
>       9328:       trying file=3D/usr/lib64/libtcl.so
>       9328:
>       9328:     find library=3Dlibpthread.so.0 [0]; searching
>       9328:      search path=3D/usr/lib64         (system search path)
>       9328:       trying file=3D/usr/lib64/libpthread.so.0
>       9328:      search cache=3D/etc/ld.so.cache
>       9328:       trying file=3D/lib64/libpthread.so.0
>       9328:
>       9328:
>       9328:     calling init: /lib64/libpthread.so.0
>       9328:
>       9328:
>       9328:     calling init: /usr/lib64/libtcl.so
>       9328:
>       9328:     find library=3Dlibnss_compat.so.2 [0]; searching
>       9328:      search cache=3D/etc/ld.so.cache
>       9328:       trying file=3D/lib64/libnss_compat.so.2
>       9328:
>       9328:     find library=3Dlibnsl.so.1 [0]; searching
>       9328:      search cache=3D/etc/ld.so.cache
>       9328:       trying file=3D/lib64/libnsl.so.1
>       9328:
>       9328:
>       9328:     calling init: /lib64/libnsl.so.1
>       9328:
>       9328:
>       9328:     calling init: /lib64/libnss_compat.so.2
>       9328:
>       9328:     find library=3Dlibnss_nis.so.2 [0]; searching
>       9328:      search cache=3D/etc/ld.so.cache
>       9328:       trying file=3D/lib64/libnss_nis.so.2
>       9328:
>       9328:     find library=3Dlibnss_files.so.2 [0]; searching
>       9328:      search cache=3D/etc/ld.so.cache
>       9328:       trying file=3D/lib64/libnss_files.so.2
>       9328:
>       9328:
>       9328:     calling init: /lib64/libnss_files.so.2
>       9328:
>       9328:
>       9328:     calling init: /lib64/libnss_nis.so.2
> ^C
>       9328:     calling fini: /usr/lib64/libtcl.so [0]
>       9328:
>       9328:
>       9328:     calling fini: /lib64/libm.so.6 [0]
>       9328:
>       9328:
>       9328:     calling fini: /lib64/libdl.so.2 [0]
>       9328:
>       9328:
>       9328:     calling fini: /lib64/libpthread.so.0 [0]
>       9328:
>       9328:
>       9328:     calling fini: /lib64/libnss_compat.so.2 [0]
>       9328:
>       9328:
>       9328:     calling fini: /lib64/libnss_nis.so.2 [0]
>       9328:
>       9328:
>       9328:     calling fini: /lib64/libnsl.so.1 [0]
>       9328:
>       9328:
>       9328:     calling fini: /lib64/libnss_files.so.2 [0]
>       9328:
>       9328:
>       9328:     calling fini: /lib64/libc.so.6 [0]

With symbols:

> # LD_DEBUG=3Dsymbols ./app
> ...
>       9355:     symbol=3DTcl_SetObjResult;  lookup in file=3D/lib64/lib=
dl.so.2 [0]
>       9355:     symbol=3DTcl_SetObjResult;  lookup in file=3D/usr/lib/g=
cc/x86_64-pc-linux-gnu/4.8.2/libstdc++.so.6 [0]
>       9355:     symbol=3DTcl_SetObjResult;  lookup in file=3D/lib64/lib=
m.so.6 [0]
>       9355:     symbol=3DTcl_SetObjResult;  lookup in file=3D/usr/lib/g=
cc/x86_64-pc-linux-gnu/4.8.2/libgcc_s.so.1 [0]
>       9355:     symbol=3DTcl_SetObjResult;  lookup in file=3D/lib64/lib=
c.so.6 [0]
>       9355:     symbol=3DTcl_SetObjResult;  lookup in file=3D/lib64/ld-=
linux-x86-64.so.2 [0]
>       9355:     symbol=3DTcl_SetObjResult;  lookup in file=3D/usr/lib64=
/libcrypto.so.1.0.0 [0]
>       9355:     symbol=3DTcl_SetObjResult;  lookup in file=3D/lib64/lib=
z.so.1 [0]
>       9355:     symbol=3DTcl_SetObjResult;  lookup in file=3D/usr/lib64=
/libtcl.so [0]
>       9355:     symbol=3DTcl_GetObjResult;  lookup in file=3D./netplay =
[0]
>       9355:     symbol=3DTcl_GetObjResult;  lookup in file=3D/lib64/lib=
dl.so.2 [0]
>       9355:     symbol=3DTcl_GetObjResult;  lookup in file=3D/usr/lib/g=
cc/x86_64-pc-linux-gnu/4.8.2/libstdc++.so.6 [0]
>       9355:     symbol=3DTcl_GetObjResult;  lookup in file=3D/lib64/lib=
m.so.6 [0]
>       9355:     symbol=3DTcl_GetObjResult;  lookup in file=3D/usr/lib/g=
cc/x86_64-pc-linux-gnu/4.8.2/libgcc_s.so.1 [0]
>       9355:     symbol=3DTcl_GetObjResult;  lookup in file=3D/lib64/lib=
c.so.6 [0]
>       9355:     symbol=3DTcl_GetObjResult;  lookup in file=3D/lib64/ld-=
linux-x86-64.so.2 [0]
>       9355:     symbol=3DTcl_GetObjResult;  lookup in file=3D/usr/lib64=
/libcrypto.so.1.0.0 [0]
>       9355:     symbol=3DTcl_GetObjResult;  lookup in file=3D/lib64/lib=
z.so.1 [0]
>       9355:     symbol=3DTcl_GetObjResult;  lookup in file=3D/usr/lib64=
/libtcl.so [0]


I would love to work on adding such a feature to ours, especially if it
can assist with debugging rtld itself. I would think with some
predict_false() checks we could avoid much of the performance penalties.

As a side note I think I may have found an rtld issue (on 8.4) with -32
handling. Being a production machine I don't want to attempt installing
a DEBUG rtld to figure out the problem. Having LD_DEBUG would have been
useful on this as well.

The issue I ran into with -32 was from converting a i386 system to
amd64. I have hundreds of out-of-ports binaries that need to be manually
recompiled. To allow delaying this task for a bit I copied all of the
libraries from /usr/local/lib from the old i386 system to
/usr/local/lib32/compat/system and added all of the paths in there to
ldconfig:

> [~] # ldconfig -32 -r|head -n3
> /var/run/ld-elf32.so.hints:
>         search directories: /usr/lib32:/usr/local/lib32/compat/system:/=
usr/local/lib32/compat/system/mysql:/usr/local/lib32/compat/system/gnutls=
3:/usr/local/lib32/compat/system/pth:/usr/local/lib32/compat/system/qt4:/=
usr/local/lib32/compat/system/tdom0.8.3:/usr/local/lib32/compat/system/gc=
c46:/usr/local/lib32/compat/system/gcc47:/usr/local/lib32/compat/system/g=
cc48:/usr/local/lib32/compat/system/gcc49:/usr/local/lib32/compat/system/=
event2:/usr/local/lib32/compat/pkg:/usr/local/lib32/compat

It worked for 90% of the system but then I ran into some libraries that
refused to find their own dependencies. The issue seemingly is that
dependencies for libraries that are also in the -32 path are not looked u=
p.

For example:

> [~] # ldd -a /usr/local/lib32/compat/system/libssl.so
> /usr/local/lib32/compat/system/libssl.so:
>         libcrypto.so.8 =3D> not found (0x0)
>         libthr.so.3 =3D> /usr/lib32/libthr.so.3 (0x310fb000)
>         libc.so.7 =3D> /usr/lib32/libc.so.7 (0x29165000)
> /usr/lib32/libthr.so.3:
>         libc.so.7 =3D> /usr/lib32/libc.so.7 (0x29165000)
> [~] # ldconfig -32 -r|grep libcrypto.so.8
>         105:-lcrypto.8 =3D> /usr/local/lib32/compat/system/libcrypto.so=
=2E8
> [~] # readelf -a /usr/local/lib32/compat/system/libssl.so|egrep "(path|=
NEEDED)"
>  0x00000001 (NEEDED)                     Shared library: [libcrypto.so.=
8]
>  0x00000001 (NEEDED)                     Shared library: [libthr.so.3]
>  0x00000001 (NEEDED)                     Shared library: [libc.so.7]
>  0x0000000f (RPATH)                      Library rpath: [/usr/local/lib=
]

My guess is it is the RPATH. I am not sure without a simple debug ability=
=2E

--=20
Regards,
Bryan Drewery


--Xw3mDU01mQ6XERfTtjnuEU2AticK7S1We
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (MingW32)

iQEcBAEBAgAGBQJUANhzAAoJEDXXcbtuRpfPmf4H/1gcuAe+7veKWq+jBEBmvxmF
qOvhRdoUuLqJ6p+i12EECaOKX8ocoLn+6WutZRbYFJ+/TzKRxyflvmEwRC7JAPkY
U2AbmrFmuk8T8MzPHdK26z5A1i4hiqfmlFJ0sDTWUW2pl0JjK7DuyezwLaQtLEO4
pkghihI7KmLFF4AZ1WrYdqEFhH4aYvOwT9vvBKcOD/mZhn8IM9/HMpzHbmXNEQCe
qHdCNyu5dVJd/CXvpQ75Sf950P1mzoxvJFATBVh1mcDa1DAAVTOpVzrycSrpvVmb
TBF51VLjMpbUVR5T2qhZSsJPgZfObg47XKteRPIUQ4ft8MnxtIffTn5YE5VOdAc=
=QlIM
-----END PGP SIGNATURE-----

--Xw3mDU01mQ6XERfTtjnuEU2AticK7S1We--

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 19:57:33 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 87A24BC;
 Fri, 29 Aug 2014 19:57:33 +0000 (UTC)
Received: from smtp1.multiplay.co.uk (smtp1.multiplay.co.uk [85.236.96.35])
 by mx1.freebsd.org (Postfix) with ESMTP id 13D231E3F;
 Fri, 29 Aug 2014 19:57:32 +0000 (UTC)
Received: by smtp1.multiplay.co.uk (Postfix, from userid 65534)
 id D6DE820E7088A; Fri, 29 Aug 2014 19:51:07 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
 smtp1.multiplay.co.uk
X-Spam-Level: 
X-Spam-Status: No, score=0.8 required=8.0 tests=AWL,BAYES_00,DOS_OE_TO_MX,
 FSL_HELO_NON_FQDN_1,RDNS_DYNAMIC,STOX_REPLY_TYPE autolearn=no version=3.3.1
Received: from r2d2 (82-69-141-170.dsl.in-addr.zen.co.uk [82.69.141.170])
 by smtp1.multiplay.co.uk (Postfix) with ESMTP id 194B620E70885;
 Fri, 29 Aug 2014 19:51:06 +0000 (UTC)
Message-ID: <5A300D962A1B458B951D521EA2BE35E8@multiplay.co.uk>
From: "Steven Hartland" 
To: "Peter Wemm" ,
	"Alan Cox" 
References: <201408281950.s7SJo90I047213@svn.freebsd.org>
 <4A4B2C2D36064FD9840E3603D39E58E0@multiplay.co.uk>
 <5400B052.6030103@rice.edu> <1592506.xpuae4IYcM@overcee.wemm.org>
Subject: Re: svn commit: r270759 - in head/sys: cddl/compat/opensolaris/kern
 cddl/compat/opensolaris/sys cddl/contrib/opensolaris/uts/common/fs/zfs vm
Date: Fri, 29 Aug 2014 20:51:03 +0100
MIME-Version: 1.0
Content-Type: text/plain; format=flowed; charset="iso-8859-1";
 reply-type=original
Content-Transfer-Encoding: 7bit
X-Priority: 3
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook Express 6.00.2900.5931
X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.6157
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org, Dmitry Morozovsky ,
 "Matthew D. Fuller" 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 19:57:33 -0000

> On Friday 29 August 2014 11:54:42 Alan Cox wrote:
snip...

> > > Others have also confirmed that even with r265945 they can still 
> > > trigger
> > > performance issue.
> > >
> > > In addition without it we still have loads of RAM sat their 
> > > unused, in my
> > > particular experience we have 40GB of 192GB sitting their unused 
> > > and that
> > > was with a stable build from last weekend.
> >
> > The Solaris code only imposed this limit on 32-bit machines where 
> > the
> > available kernel virtual address space may be much less than the
> > available physical memory.  Previously, FreeBSD imposed this limit 
> > on
> > both 32-bit and 64-bit machines.  Now, it imposes it on neither. 
> > Why
> > continue to do this differently from Solaris?

My understanding is these limits where totally different on Solaris see 
the
#ifdef sun block in arc_reclaim_needed() for details. I actually started 
at
matching the Solaris flow but this had already been tested and proved 
not
to work as well as the current design.

> Since the question was asked below, we don't have zfs machines in the 
> cluster
> running i386.  We can barely get them to boot as it is due to kva 
> pressure.
> We have to reduce/cap physical memory and change the user/kernel 
> virtual split
> from 3:1 to 2.5:1.5.
>
> We do run zfs on small amd64 machines with 2G of ram, but I can't 
> imagine it
> working on the 10G i386 PAE machines that we have.
>
>
> > > With the patch we confirmed that both RAM usage and performance 
> > > for those
> > > seeing that issue are resolved, with no reported regressions.
> > >
> > >> (I should know better than to fire a reply off before full fact
> > >> checking, but
> > >> this commit worries me..)
> > >
> > > Not a problem, its great to know people pay attention to changes, 
> > > and
> > > raise
> > > their concerns. Always better to have a discussion about potential 
> > > issues
> > > than to wait for a problem to occur.
> > >
> > > Hopefully the above gives you some piece of mind, but if you still
> > > have any
> > > concerns I'm all ears.
> >
> > You didn't really address Peter's initial technical issue.  Peter
> > correctly observed that cache pages are just another flavor of free
> > pages.  Whenever the VM system is checking the number of free pages
> > against any of the thresholds, it always uses the sum of 
> > v_cache_count
> > and v_free_count.  So, to anyone familiar with the VM system, like
> > Peter, what you've done, which is to derive a threshold from
> > v_free_target but only compare v_free_count to that threshold, looks
> > highly suspect.
>
> I think I'd like to see something like this:
>
> Index: cddl/compat/opensolaris/kern/opensolaris_kmem.c
> ===================================================================
> --- cddl/compat/opensolaris/kern/opensolaris_kmem.c (revision 270824)
> +++ cddl/compat/opensolaris/kern/opensolaris_kmem.c (working copy)
> @@ -152,7 +152,8 @@
>  kmem_free_count(void)
>  {
>
> - return (vm_cnt.v_free_count);
> + /* "cache" is just a flavor of free pages in FreeBSD */
> + return (vm_cnt.v_free_count + vm_cnt.v_cache_count);
>  }
>
>  u_int

This has apparently already been tried and the response from Karl was:

- No, because memory in "cache" is subject to being either reallocated 
or freed.
- When I was developing this patch that was my first impression as well 
and how
- I originally coded it, and it turned out to be wrong.
-
- The issue here is that you have two parts of the system contending for 
RAM --
- the VM system generally, and the ARC cache.  If the ARC cache frees 
space before
- the VM system activates and starts pruning then you wind up with the 
ARC pinned
- at the minimum after some period of time, because it releases "early."

I've asked him if he would retest just to be sure.

> The rest of the system looks at the "big picture" it would be happy to 
> let the
> "free" pool run quite a way down so long as there's "cache" pages 
> available to
> satisfy the free space requirements.  This would lead ZFS to 
> mistakenly
> sacrifice ARC for no reason.  I'm not sure how big a deal this is, but 
> I can't
> imagine many scenarios where I want ARC to be discarded in order to 
> save some
> effectively free pages.

>From Karl's response from the original PR (above) it seems like this 
causes
unexpected behaviour due to the two systems being seperate.

> > That said, I can easily believe that your patch works better than 
> > the
> > existing code, because it is closer in spirit to my interpretation 
> > of
> > what the Solaris code does.  Specifically, I believe that the 
> > Solaris
> > code starts trimming the ARC before the Solaris page daemon starts
> > writing dirty pages to secondary storage.  Now, you've made FreeBSD 
> > do
> > the same.  However, you've expressed it in a way that looks broken.
> >
> > To wrap up, I think that you can easily write this in a way that
> > simultaneously behaves like Solaris and doesn't look wrong to a VM 
> > expert.
> >
> > > Out of interest would it be possible to update machines in the 
> > > cluster to
> > > see how their workload reacts to the change?
> > >
>
> I'd like to see the free vs cache thing resolved first but it's going 
> to be
> tricky to get a comparison.

Does Karl's explaination as to why this doesn't work above change your 
mind?

> For the first few months of the year, things were really troublesome. 
> It was
> quite easy to overtax the machines and run them into the ground.
>
> This is not the case now - things are working pretty well under 
> pressure
> (prior to the commit).  Its got to the point that we feel comfortable
> thrashing the machines really hard again.  Getting a comparison when 
> it
> already works well is going to be tricky.
>
> We don't have large memory machines that aren't already tuned for
> vfs.zfs.arc_max caps for tmpfs use.
>
> For context to the wider audience, we do not run -release or -pN in 
> the
> freebsd cluster.  We mostly run -current, and some -stable.   I am 
> well aware
> that there is significant discomfort in 10.0-R with zfs but we already 
> have the
> fixes for that. 


From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 19:59:00 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id C137B250;
 Fri, 29 Aug 2014 19:59:00 +0000 (UTC)
Received: from smtp1.multiplay.co.uk (smtp1.multiplay.co.uk [85.236.96.35])
 by mx1.freebsd.org (Postfix) with ESMTP id 804EA1E56;
 Fri, 29 Aug 2014 19:59:00 +0000 (UTC)
Received: by smtp1.multiplay.co.uk (Postfix, from userid 65534)
 id AE28820E7088A; Fri, 29 Aug 2014 19:58:59 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
 smtp1.multiplay.co.uk
X-Spam-Level: 
X-Spam-Status: No, score=0.9 required=8.0 tests=AWL,BAYES_00,DOS_OE_TO_MX,
 FSL_HELO_NON_FQDN_1,RDNS_DYNAMIC,STOX_REPLY_TYPE autolearn=no version=3.3.1
Received: from r2d2 (82-69-141-170.dsl.in-addr.zen.co.uk [82.69.141.170])
 by smtp1.multiplay.co.uk (Postfix) with ESMTP id 19DBA20E70885;
 Fri, 29 Aug 2014 19:58:58 +0000 (UTC)
Message-ID: <93F9465BF50A428BA687DD1EA4A7B455@multiplay.co.uk>
From: "Steven Hartland" 
To: "Alan Cox" ,
	"Peter Wemm" 
References: <201408281950.s7SJo90I047213@svn.freebsd.org>
 <20140828211508.GK46031@over-yonder.net> <53FFAD79.7070106@rice.edu>
 <1617817.cOUOX4x8n2@overcee.wemm.org>
 <4A4B2C2D36064FD9840E3603D39E58E0@multiplay.co.uk>
 <5400B052.6030103@rice.edu>
Subject: Re: svn commit: r270759 - in head/sys: cddl/compat/opensolaris/kern
 cddl/compat/opensolaris/sys cddl/contrib/opensolaris/uts/common/fs/zfs vm
Date: Fri, 29 Aug 2014 20:58:55 +0100
MIME-Version: 1.0
Content-Type: text/plain; format=flowed; charset="iso-8859-1";
 reply-type=original
Content-Transfer-Encoding: 7bit
X-Priority: 3
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook Express 6.00.2900.5931
X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.6157
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org, Dmitry Morozovsky ,
 "Matthew D. Fuller" 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 19:59:00 -0000

----- Original Message ----- 
From: "Alan Cox" 

> You didn't really address Peter's initial technical issue.  Peter
> correctly observed that cache pages are just another flavor of free
> pages.  Whenever the VM system is checking the number of free pages
> against any of the thresholds, it always uses the sum of v_cache_count
> and v_free_count.  So, to anyone familiar with the VM system, like
> Peter, what you've done, which is to derive a threshold from
> v_free_target but only compare v_free_count to that threshold, looks
> highly suspect.
>
> That said, I can easily believe that your patch works better than the
> existing code, because it is closer in spirit to my interpretation of
> what the Solaris code does.  Specifically, I believe that the Solaris
> code starts trimming the ARC before the Solaris page daemon starts
> writing dirty pages to secondary storage.  Now, you've made FreeBSD do
> the same.  However, you've expressed it in a way that looks broken.
>
> To wrap up, I think that you can easily write this in a way that
> simultaneously behaves like Solaris and doesn't look wrong to a VM 
> expert.

More details in my last reply on this but in short it seems this has
already been tried and it didn't work.

I'd be interested in what domain experts think about why that is?

In the mean time I've asked Karl to see if he could retest with
this change to confirm counting cache pages along with free does
indeed still cause a problem.

For those that want to catch up on what has already tested see the
original PR:
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=187594

    Regards
    Steve 


From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 20:05:14 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id C2AFD5A1;
 Fri, 29 Aug 2014 20:05:14 +0000 (UTC)
Received: from mail-ie0-x22e.google.com (mail-ie0-x22e.google.com
 [IPv6:2607:f8b0:4001:c03::22e])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 76CC91F1B;
 Fri, 29 Aug 2014 20:05:14 +0000 (UTC)
Received: by mail-ie0-f174.google.com with SMTP id at20so3384628iec.33
 for ; Fri, 29 Aug 2014 13:05:13 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:in-reply-to:references:date:message-id:subject:from:to
 :cc:content-type;
 bh=VfXkKpXNIYxp8D9qyrwdvy4xZhUXrkcFVjXfaRQFY4U=;
 b=qw2mMG1HUtSLHzVkoOWscWxheQEkLvpskBPlFS12UT1wNuoLVSU9myBTTOouO4BeCf
 14pbg2lJbjZv7pwkSTQO/5tlUZu9Qcr2TUL99kby2VdP+eBZ1akFUGxEghAEyB2WdfZM
 ry7+oaMfjdsAOcivvi96TuNsNxBDV2AodTFgLrP3FtCs3695m+L6TJy3STaQCe9KGxn1
 xvyrNGhEj5SeAeFSp1hxaXe9w2GdKZgPtA1BKnZ/2ut9GVmo1pr/w7bBj/x8SLIUr8qp
 zGmhCoXDfvgbvRXeVS/l32yLM6enA1pjjAH6Lj235vmoPUjeT1E2t9pxqsVzwfHqc0Ih
 j2Xg==
MIME-Version: 1.0
X-Received: by 10.42.63.129 with SMTP id c1mr3488201ici.82.1409342713309; Fri,
 29 Aug 2014 13:05:13 -0700 (PDT)
Received: by 10.50.72.69 with HTTP; Fri, 29 Aug 2014 13:05:13 -0700 (PDT)
In-Reply-To: <201408291818.s7TIITKp094968@svn.freebsd.org>
References: <201408291818.s7TIITKp094968@svn.freebsd.org>
Date: Fri, 29 Aug 2014 13:05:13 -0700
Message-ID: 
Subject: Re: svn commit: r270823 - head/sys/kern
From: Garrett Cooper 
To: John Baldwin 
Content-Type: text/plain; charset=UTF-8
Cc: "svn-src-head@freebsd.org" ,
 "svn-src-all@freebsd.org" ,
 "src-committers@freebsd.org" 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 20:05:14 -0000

On Fri, Aug 29, 2014 at 11:18 AM, John Baldwin  wrote:
> Author: jhb
> Date: Fri Aug 29 18:18:29 2014
> New Revision: 270823
> URL: http://svnweb.freebsd.org/changeset/base/270823
>
> Log:
>   Use a unit number allocator to provide suitable st_dev and st_ino values
>   for POSIX shared memory descriptors.  The implementation is similar to
>   that used for pipes.

Hi John,
    This broke the build according to Jenkins:
https://jenkins.freebsd.org/jenkins/job/FreeBSD_HEAD/1342/ .
Thanks!
-Garrett

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 20:28:05 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id C84893AE;
 Fri, 29 Aug 2014 20:28:05 +0000 (UTC)
Received: from smtp1.multiplay.co.uk (smtp1.multiplay.co.uk [85.236.96.35])
 by mx1.freebsd.org (Postfix) with ESMTP id 3ACFE12AD;
 Fri, 29 Aug 2014 20:28:04 +0000 (UTC)
Received: by smtp1.multiplay.co.uk (Postfix, from userid 65534)
 id D2BDA20E7088A; Fri, 29 Aug 2014 20:28:03 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
 smtp1.multiplay.co.uk
X-Spam-Level: **
X-Spam-Status: No, score=2.0 required=8.0 tests=AWL,BAYES_00,DOS_OE_TO_MX,
 FSL_HELO_NON_FQDN_1,RDNS_DYNAMIC autolearn=no version=3.3.1
Received: from r2d2 (82-69-141-170.dsl.in-addr.zen.co.uk [82.69.141.170])
 by smtp1.multiplay.co.uk (Postfix) with ESMTPS id 0E24D20E70885;
 Fri, 29 Aug 2014 20:28:02 +0000 (UTC)
Message-ID: <4264EDE767E54F8D8E2FFDCE4AD70CD8@multiplay.co.uk>
From: "Steven Hartland" 
To: "Steven Hartland" , "Alan Cox" ,
 "Peter Wemm" 
References: <201408281950.s7SJo90I047213@svn.freebsd.org>
 <20140828211508.GK46031@over-yonder.net> <53FFAD79.7070106@rice.edu>
 <1617817.cOUOX4x8n2@overcee.wemm.org>
 <4A4B2C2D36064FD9840E3603D39E58E0@multiplay.co.uk>
 <5400B052.6030103@rice.edu>
 <93F9465BF50A428BA687DD1EA4A7B455@multiplay.co.uk>
Subject: Re: svn commit: r270759 - in head/sys: cddl/compat/opensolaris/kern
 cddl/compat/opensolaris/sys cddl/contrib/opensolaris/uts/common/fs/zfs vm
Date: Fri, 29 Aug 2014 21:27:56 +0100
MIME-Version: 1.0
Content-Type: text/plain; format=flowed; charset="iso-8859-1";
 reply-type=response
Content-Transfer-Encoding: 7bit
X-Priority: 3
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook Express 6.00.2900.5931
X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.6157
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org, Dmitry Morozovsky ,
 "Matthew D. Fuller" 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 20:28:05 -0000

----- Original Message ----- 
From: "Steven Hartland" 


> ----- Original Message ----- 
> From: "Alan Cox" 
>
>> You didn't really address Peter's initial technical issue.  Peter
>> correctly observed that cache pages are just another flavor of free
>> pages.  Whenever the VM system is checking the number of free pages
>> against any of the thresholds, it always uses the sum of 
>> v_cache_count
>> and v_free_count.  So, to anyone familiar with the VM system, like
>> Peter, what you've done, which is to derive a threshold from
>> v_free_target but only compare v_free_count to that threshold, looks
>> highly suspect.
>>
>> That said, I can easily believe that your patch works better than the
>> existing code, because it is closer in spirit to my interpretation of
>> what the Solaris code does.  Specifically, I believe that the Solaris
>> code starts trimming the ARC before the Solaris page daemon starts
>> writing dirty pages to secondary storage.  Now, you've made FreeBSD 
>> do
>> the same.  However, you've expressed it in a way that looks broken.
>>
>> To wrap up, I think that you can easily write this in a way that
>> simultaneously behaves like Solaris and doesn't look wrong to a VM 
>> expert.
>
> More details in my last reply on this but in short it seems this has
> already been tried and it didn't work.
>
> I'd be interested in what domain experts think about why that is?
>
> In the mean time I've asked Karl to see if he could retest with
> this change to confirm counting cache pages along with free does
> indeed still cause a problem.
>
> For those that want to catch up on what has already tested see the
> original PR:
> https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=187594

Copying in Karl's response from the PR for easy access:

I can give it a shot on my test system but I will note that for my 
production
machine right now that would be a no-op as there are no cache pages in 
use.
Getting that on the production system with a high level of load over the
holiday is rather unlikely due to it being Labor Day, so all I will have 
are my
synthetics.  I do have some time over the long weekend to run that test 
and
should be able to do so if you think it's useful, but I am wary of that
approach being correct in the general case due to my previous 
experience.

My commentary on that discussion point and reasoning originally is here
(http://lists.freebsd.org/pipermail/freebsd-fs/2014-March/019084.html); 
along
that thread you'll see a vmstat output with the current paradigm showing 
that
cache doesn't grow without boundary, as many suggested it would if I 
didn't
include those pages as "free" and thus available for ARC to attempt to 
invade
(effectively trying to force the VM system to evict them from the cache 
list by
having it wake up first.)  Indeed, up at comment #31 is the patch on 
that
production system that has been up for about four months and you can see 
only a
few pages are in the cached state.  That is fairly typical.

What is the expected reason for concern about including them in the free 
count
for ARC (when they're not in terms of what wakes up the VM system as a 
whole.)
If the expected area of concern is that cache pages will grow without 
boundary
(or close to it) the evidence from both my production machine and others
strongly suggests that's incorrect.

My work suggests strongly that the most-likely to be correct behavior 
for the
majority of workloads is achieved when both the ARC paring routine and 
VM
page-cleaning system wake up at the same time.  That occurs when
vm_cnt.v_free_count is invaded.  Attempting to bias the outcome to force 
either
the VM system or the ARC cache to do something first appears to increase 
the
circumstances under which bad behavior occurs.



From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 20:33:20 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id A54C169B;
 Fri, 29 Aug 2014 20:33:20 +0000 (UTC)
Received: from smtp2.wemm.org (smtp2.wemm.org [IPv6:2001:470:67:39d::78])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "smtp2.wemm.org",
 Issuer "StartCom Class 1 Primary Intermediate Server CA" (not verified))
 by mx1.freebsd.org (Postfix) with ESMTPS id 6EC141381;
 Fri, 29 Aug 2014 20:33:20 +0000 (UTC)
Received: from overcee.wemm.org (canning.wemm.org [192.203.228.65])
 by smtp2.wemm.org (Postfix) with ESMTP id 0494C12A;
 Fri, 29 Aug 2014 13:33:19 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wemm.org;
 s=m20140428; t=1409344399;
 bh=MlNSuTEy85DmCFa5YMVZk0KbtO+uSkH1xmaXUgRw4ok=;
 h=From:To:Cc:Subject:Date:In-Reply-To:References;
 b=F7HHL2IfogIRWHOm5A7MP4LBamK/hweFKbXU4chvddRnhPAgysYvp6UJw7p8XO9bt
 jWk3DWKRABFvqbYqqVEaObitnyvjzPwx4rapL0dSgqsnyn9K5Vxlf4TS0YGJlKNCfS
 2FMgFFiCwB7ZNtv1wA8Et5jmKXpq7/S3BAnn64yE=
From: Peter Wemm 
To: Steven Hartland 
Subject: Re: svn commit: r270759 - in head/sys: cddl/compat/opensolaris/kern
 cddl/compat/opensolaris/sys cddl/contrib/opensolaris/uts/common/fs/zfs vm
Date: Fri, 29 Aug 2014 13:33:14 -0700
Message-ID: <64121723.0IFfex9X4X@overcee.wemm.org>
User-Agent: KMail/4.12.5 (FreeBSD/11.0-CURRENT; KDE/4.12.5; amd64; ; )
In-Reply-To: <5A300D962A1B458B951D521EA2BE35E8@multiplay.co.uk>
References: <201408281950.s7SJo90I047213@svn.freebsd.org>
 <1592506.xpuae4IYcM@overcee.wemm.org>
 <5A300D962A1B458B951D521EA2BE35E8@multiplay.co.uk>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="nextPart1802697.MTHLGv2zuo";
 micalg="pgp-sha1"; protocol="application/pgp-signature"
Cc: src-committers@freebsd.org, Alan Cox ,
 svn-src-all@freebsd.org, Dmitry Morozovsky ,
 "Matthew D. Fuller" , svn-src-head@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 20:33:20 -0000


--nextPart1802697.MTHLGv2zuo
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset="us-ascii"

On Friday 29 August 2014 20:51:03 Steven Hartland wrote:
> > On Friday 29 August 2014 11:54:42 Alan Cox wrote:
> snip...
> > > > With the patch we confirmed that both RAM usage and performance=

> > > > for those
> > > > seeing that issue are resolved, with no reported regressions.
> > > >=20
> > > >> (I should know better than to fire a reply off before full fac=
t
> > > >> checking, but
> > > >> this commit worries me..)
> > > >=20
> > > > Not a problem, its great to know people pay attention to change=
s,
> > > > and
> > > > raise
> > > > their concerns. Always better to have a discussion about potent=
ial
> > > > issues
> > > > than to wait for a problem to occur.
> > > >=20
> > > > Hopefully the above gives you some piece of mind, but if you st=
ill
> > > > have any
> > > > concerns I'm all ears.
> > >=20
> > > You didn't really address Peter's initial technical issue.  Peter=

> > > correctly observed that cache pages are just another flavor of fr=
ee
> > > pages.  Whenever the VM system is checking the number of free pag=
es
> > > against any of the thresholds, it always uses the sum of
> > > v_cache_count
> > > and v_free_count.  So, to anyone familiar with the VM system, lik=
e
> > > Peter, what you've done, which is to derive a threshold from
> > > v_free_target but only compare v_free_count to that threshold, lo=
oks
> > > highly suspect.
> >=20
> > I think I'd like to see something like this:
> >=20
> > Index: cddl/compat/opensolaris/kern/opensolaris_kmem.c
> > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> > --- cddl/compat/opensolaris/kern/opensolaris_kmem.c (revision 27082=
4)
> > +++ cddl/compat/opensolaris/kern/opensolaris_kmem.c (working copy)
> > @@ -152,7 +152,8 @@
> >=20
> >  kmem_free_count(void)
> >  {
> >=20
> > - return (vm_cnt.v_free_count);
> > + /* "cache" is just a flavor of free pages in FreeBSD */
> > + return (vm_cnt.v_free_count + vm_cnt.v_cache_count);
> >=20
> >  }
> > =20
> >  u_int
>=20
> This has apparently already been tried and the response from Karl was=
:
>=20
> - No, because memory in "cache" is subject to being either reallocate=
d
> or freed.
> - When I was developing this patch that was my first impression as we=
ll
> and how
> - I originally coded it, and it turned out to be wrong.
> -
> - The issue here is that you have two parts of the system contending =
for
> RAM --
> - the VM system generally, and the ARC cache.  If the ARC cache frees=

> space before
> - the VM system activates and starts pruning then you wind up with th=
e
> ARC pinned
> - at the minimum after some period of time, because it releases "earl=
y."
>=20
> I've asked him if he would retest just to be sure.
>=20
> > The rest of the system looks at the "big picture" it would be happy=
 to
> > let the
> > "free" pool run quite a way down so long as there's "cache" pages
> > available to
> > satisfy the free space requirements.  This would lead ZFS to
> > mistakenly
> > sacrifice ARC for no reason.  I'm not sure how big a deal this is, =
but
> > I can't
> > imagine many scenarios where I want ARC to be discarded in order to=

> > save some
> > effectively free pages.
>=20
> From Karl's response from the original PR (above) it seems like this
> causes
> unexpected behaviour due to the two systems being seperate.
>=20
> > > That said, I can easily believe that your patch works better than=

> > > the
> > > existing code, because it is closer in spirit to my interpretatio=
n
> > > of
> > > what the Solaris code does.  Specifically, I believe that the
> > > Solaris
> > > code starts trimming the ARC before the Solaris page daemon start=
s
> > > writing dirty pages to secondary storage.  Now, you've made FreeB=
SD
> > > do
> > > the same.  However, you've expressed it in a way that looks broke=
n.
> > >=20
> > > To wrap up, I think that you can easily write this in a way that
> > > simultaneously behaves like Solaris and doesn't look wrong to a V=
M
> > > expert.
> > >=20
> > > > Out of interest would it be possible to update machines in the
> > > > cluster to
> > > > see how their workload reacts to the change?
> >=20
> > I'd like to see the free vs cache thing resolved first but it's goi=
ng
> > to be
> > tricky to get a comparison.
>=20
> Does Karl's explaination as to why this doesn't work above change you=
r
> mind?

Actually no, I would expect the code as committed would *cause* the=20
undesirable behavior that Karl described.

ie: access a few large files and cause them to reside in cache.  Say 50=
GB or so=20
on a 200G ram machine.  We now have the state where:

v_cache =3D 50GB
v_free =3D 1MB

The rest of the vm system looks at vm_paging_needed(), which is:  do we=
 have=20
enough "v_cache + v_free"?  Since there's 50.001GB free, the answer is =
no. =20
It'll let v_free run right down to v_free_min because of the giant pool=
 of=20
v_cache just sitting there, waiting to be used.

The zfs change, as committed will ignore all the free memory in the for=
m of=20
v_cache.. and will be freaking out about how low v_free is getting and =
will be=20
sacrificing ARC in order to put more memory into the v_free pool.

As long as ARC keeps sacrificing itself this way, the free pages in the=
 v_cache=20
pool won't get used.  When ARC finally runs out of pages to give up to =
v_free,=20
the kernel will start using the free pages from v_cache.  Eventually it=
'll run=20
down that v_cache free pool and arc will be in a bare minimum state whi=
le this=20
is happening.

Meanwhile, ZFS ARC will be crippled.  This has consequences - it does R=
CU like=20
things from ARC to keep fragmentation under control.  With ARC crippled=
,=20
fragmentation will increase because there's less opportunistic gatherin=
g of=20
data from ARC.

Granted, you have to get things freed from active/inactive to the cache=
 state,=20
but once it's there, depending on the worlkload, it'll mess with ARC.

=2D-=20
Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com; KI=
6FJV
UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246
--nextPart1802697.MTHLGv2zuo
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part.
Content-Transfer-Encoding: 7Bit

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQEcBAABAgAGBQJUAOOOAAoJEDXWlwnsgJ4EqMsIAIv9XuSgFOzCDXM/OA51a6+j
tLdbq2+uROIC1ptgnxSFpSYED164ZqfMHKl0NJo4ph9pOGepeAiCBz7OZ4pCxYrq
P/jeDho4IlQ788RehfQ4gz5olY4enREXjpJ5cMuSnWjbAMV6wJMUitNWdaFwxNuf
QcEkqTQ7rkIttWyL838/83YHuiGLxvcNscGUzLKkIq0tcWluJDbJ1NRrVPUKowJQ
SMUg6aK7q1JZ2S+ZMwFVQKl93PvJQW4YqhtEEYcDuR9AZvLHjvgoh1qCZheK3ep3
Ai+7CX3ngsEZ/jAp16R2H4DsvloaHYiQqhCY9hOFpbMWrmvuhbnx1HbsjDO3nUo=
=M2wJ
-----END PGP SIGNATURE-----

--nextPart1802697.MTHLGv2zuo--


From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 20:42:20 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 9F214A60;
 Fri, 29 Aug 2014 20:42:20 +0000 (UTC)
Received: from smtp1.multiplay.co.uk (smtp1.multiplay.co.uk [85.236.96.35])
 by mx1.freebsd.org (Postfix) with ESMTP id 5F298150E;
 Fri, 29 Aug 2014 20:42:20 +0000 (UTC)
Received: by smtp1.multiplay.co.uk (Postfix, from userid 65534)
 id A4C4120E7088B; Fri, 29 Aug 2014 20:42:19 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
 smtp1.multiplay.co.uk
X-Spam-Level: **
X-Spam-Status: No, score=2.2 required=8.0 tests=AWL,BAYES_00,DOS_OE_TO_MX,
 FSL_HELO_NON_FQDN_1,RDNS_DYNAMIC,STOX_REPLY_TYPE autolearn=no version=3.3.1
Received: from r2d2 (82-69-141-170.dsl.in-addr.zen.co.uk [82.69.141.170])
 by smtp1.multiplay.co.uk (Postfix) with ESMTPS id 966A220E70885;
 Fri, 29 Aug 2014 20:42:17 +0000 (UTC)
Message-ID: <0B77E782B5004AEBA77E6A5D16924D83@multiplay.co.uk>
From: "Steven Hartland" 
To: "Peter Wemm" 
References: <201408281950.s7SJo90I047213@svn.freebsd.org>
 <1592506.xpuae4IYcM@overcee.wemm.org>
 <5A300D962A1B458B951D521EA2BE35E8@multiplay.co.uk>
 <64121723.0IFfex9X4X@overcee.wemm.org>
Subject: Re: svn commit: r270759 - in head/sys: cddl/compat/opensolaris/kern
 cddl/compat/opensolaris/sys cddl/contrib/opensolaris/uts/common/fs/zfs vm
Date: Fri, 29 Aug 2014 21:42:15 +0100
MIME-Version: 1.0
Content-Type: text/plain; format=flowed; charset="iso-8859-1";
 reply-type=original
Content-Transfer-Encoding: 7bit
X-Priority: 3
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook Express 6.00.2900.5931
X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.6157
Cc: src-committers@freebsd.org, Alan Cox ,
 svn-src-all@freebsd.org, Dmitry Morozovsky ,
 "Matthew D. Fuller" , svn-src-head@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 20:42:20 -0000


----- Original Message ----- 
From: "Peter Wemm" 
> On Friday 29 August 2014 20:51:03 Steven Hartland wrote:
snip..

> > Does Karl's explaination as to why this doesn't work above change 
> > your
> > mind?
>
> Actually no, I would expect the code as committed would *cause* the
> undesirable behavior that Karl described.
>
> ie: access a few large files and cause them to reside in cache.  Say 
> 50GB or so
> on a 200G ram machine.  We now have the state where:
>
> v_cache = 50GB
> v_free = 1MB
>
> The rest of the vm system looks at vm_paging_needed(), which is:  do 
> we have
> enough "v_cache + v_free"?  Since there's 50.001GB free, the answer is 
> no.
> It'll let v_free run right down to v_free_min because of the giant 
> pool of
> v_cache just sitting there, waiting to be used.
>
> The zfs change, as committed will ignore all the free memory in the 
> form of
> v_cache.. and will be freaking out about how low v_free is getting and 
> will be
> sacrificing ARC in order to put more memory into the v_free pool.
>
> As long as ARC keeps sacrificing itself this way, the free pages in 
> the v_cache
> pool won't get used.  When ARC finally runs out of pages to give up to 
> v_free,
> the kernel will start using the free pages from v_cache.  Eventually 
> it'll run
> down that v_cache free pool and arc will be in a bare minimum state 
> while this
> is happening.
>
> Meanwhile, ZFS ARC will be crippled.  This has consequences - it does 
> RCU like
> things from ARC to keep fragmentation under control.  With ARC 
> crippled,
> fragmentation will increase because there's less opportunistic 
> gathering of
> data from ARC.
>
> Granted, you have to get things freed from active/inactive to the 
> cache state,
> but once it's there, depending on the worlkload, it'll mess with ARC.

There's already a vm_paging_needed() check in there below so this will 
already
be dealt with will it not?

    Regards
    Steve 


From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 20:50:50 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 2DA03CC4;
 Fri, 29 Aug 2014 20:50:50 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 064461756;
 Fri, 29 Aug 2014 20:50:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7TKonVR069968;
 Fri, 29 Aug 2014 20:50:49 GMT (envelope-from jhb@FreeBSD.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7TKon56069967;
 Fri, 29 Aug 2014 20:50:49 GMT (envelope-from jhb@FreeBSD.org)
Message-Id: <201408292050.s7TKon56069967@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jhb set sender to jhb@FreeBSD.org
 using -f
From: John Baldwin 
Date: Fri, 29 Aug 2014 20:50:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270825 - head/sys/sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 20:50:50 -0000

Author: jhb
Date: Fri Aug 29 20:50:49 2014
New Revision: 270825
URL: http://svnweb.freebsd.org/changeset/base/270825

Log:
  Add the new shm_ino field to struct shmfd.  Missed in 270823.
  
  Reported by:	peter
  Pointy hat to:	jhb

Modified:
  head/sys/sys/mman.h

Modified: head/sys/sys/mman.h
==============================================================================
--- head/sys/sys/mman.h	Fri Aug 29 18:26:55 2014	(r270824)
+++ head/sys/sys/mman.h	Fri Aug 29 20:50:49 2014	(r270825)
@@ -219,6 +219,7 @@ struct shmfd {
 	struct timespec	shm_mtime;
 	struct timespec	shm_ctime;
 	struct timespec	shm_birthtime;
+	ino_t		shm_ino;
 
 	struct label	*shm_label;		/* MAC label */
 	const char	*shm_path;

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 21:08:41 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 2D58C361;
 Fri, 29 Aug 2014 21:08:41 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 198BD18B0;
 Fri, 29 Aug 2014 21:08:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7TL8eZD077735;
 Fri, 29 Aug 2014 21:08:40 GMT (envelope-from jhb@FreeBSD.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7TL8ela077734;
 Fri, 29 Aug 2014 21:08:40 GMT (envelope-from jhb@FreeBSD.org)
Message-Id: <201408292108.s7TL8ela077734@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jhb set sender to jhb@FreeBSD.org
 using -f
From: John Baldwin 
Date: Fri, 29 Aug 2014 21:08:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270826 - head/sys/i386/i386
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 21:08:41 -0000

Author: jhb
Date: Fri Aug 29 21:08:40 2014
New Revision: 270826
URL: http://svnweb.freebsd.org/changeset/base/270826

Log:
  MFamd64: Add a machdep.bootmethod sysctl to inform the installer which
  firmware method was used for booting.  This is hardcoded to BIOS on i386.
  
  PR:		192962
  Reviewed by:	nwhitehorn
  MFC after:	1 week

Modified:
  head/sys/i386/i386/machdep.c

Modified: head/sys/i386/i386/machdep.c
==============================================================================
--- head/sys/i386/i386/machdep.c	Fri Aug 29 20:50:49 2014	(r270825)
+++ head/sys/i386/i386/machdep.c	Fri Aug 29 21:08:40 2014	(r270826)
@@ -1639,6 +1639,10 @@ u_long bootdev;		/* not a struct cdev *-
 SYSCTL_ULONG(_machdep, OID_AUTO, guessed_bootdev,
 	CTLFLAG_RD, &bootdev, 0, "Maybe the Boot device (not in struct cdev *format)");
 
+static char bootmethod[16] = "BIOS";
+SYSCTL_STRING(_machdep, OID_AUTO, bootmethod, CTLFLAG_RD, bootmethod, 0,
+    "System firmware boot method");
+
 /*
  * Initialize 386 and configure to run kernel
  */

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 21:20:36 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id B7CAC7F9;
 Fri, 29 Aug 2014 21:20:36 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A408A19FA;
 Fri, 29 Aug 2014 21:20:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7TLKaAV082900;
 Fri, 29 Aug 2014 21:20:36 GMT (envelope-from jhb@FreeBSD.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7TLKaMS082899;
 Fri, 29 Aug 2014 21:20:36 GMT (envelope-from jhb@FreeBSD.org)
Message-Id: <201408292120.s7TLKaMS082899@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jhb set sender to jhb@FreeBSD.org
 using -f
From: John Baldwin 
Date: Fri, 29 Aug 2014 21:20:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270827 - head/sys/vm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 21:20:36 -0000

Author: jhb
Date: Fri Aug 29 21:20:36 2014
New Revision: 270827
URL: http://svnweb.freebsd.org/changeset/base/270827

Log:
  Fix a typo.

Modified:
  head/sys/vm/vm_page.c

Modified: head/sys/vm/vm_page.c
==============================================================================
--- head/sys/vm/vm_page.c	Fri Aug 29 21:08:40 2014	(r270826)
+++ head/sys/vm/vm_page.c	Fri Aug 29 21:20:36 2014	(r270827)
@@ -2501,7 +2501,7 @@ vm_page_cache(vm_page_t m)
 	    (object->type == OBJT_SWAP &&
 	    !vm_pager_has_page(object, m->pindex, NULL, NULL))) {
 		/*
-		 * Hypothesis: A cache-elgible page belonging to a
+		 * Hypothesis: A cache-eligible page belonging to a
 		 * default object or swap object but without a backing
 		 * store must be zero filled.
 		 */

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 21:20:49 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id B442E935;
 Fri, 29 Aug 2014 21:20:49 +0000 (UTC)
Received: from smtp2.wemm.org (smtp2.wemm.org [192.203.228.78])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "smtp2.wemm.org",
 Issuer "StartCom Class 1 Primary Intermediate Server CA" (not verified))
 by mx1.freebsd.org (Postfix) with ESMTPS id 935E21A00;
 Fri, 29 Aug 2014 21:20:49 +0000 (UTC)
Received: from overcee.wemm.org (canning.wemm.org [192.203.228.65])
 by smtp2.wemm.org (Postfix) with ESMTP id 2349F156;
 Fri, 29 Aug 2014 14:20:49 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wemm.org;
 s=m20140428; t=1409347249;
 bh=XehHGiwOYYeilCDF/Uo5jBv5qvLbuDMhmTxUjY3mTBU=;
 h=From:To:Cc:Subject:Date:In-Reply-To:References;
 b=gFC0WzADCwkudjc+AcIUJvjp/tX4pBAWnVLC4FekaZy2H6Vlsr+STnTHb7F2bal5l
 GyWCOxLBhMqyMB0aAkbsFRbuUP2XtyHHwWh7hPsQRbhmXNT/jowwMIR7SoBAsoHilS
 Zgd0CQF9bKLwRlDuQgsklYphlAUBnwB4gF15bQQI=
From: Peter Wemm 
To: Steven Hartland 
Subject: Re: svn commit: r270759 - in head/sys: cddl/compat/opensolaris/kern
 cddl/compat/opensolaris/sys cddl/contrib/opensolaris/uts/common/fs/zfs vm
Date: Fri, 29 Aug 2014 14:20:44 -0700
Message-ID: <2714752.cWQfguSlQD@overcee.wemm.org>
User-Agent: KMail/4.12.5 (FreeBSD/11.0-CURRENT; KDE/4.12.5; amd64; ; )
In-Reply-To: <0B77E782B5004AEBA77E6A5D16924D83@multiplay.co.uk>
References: <201408281950.s7SJo90I047213@svn.freebsd.org>
 <64121723.0IFfex9X4X@overcee.wemm.org>
 <0B77E782B5004AEBA77E6A5D16924D83@multiplay.co.uk>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="nextPart15720028.E9rAG9uuRh";
 micalg="pgp-sha1"; protocol="application/pgp-signature"
Cc: src-committers@freebsd.org, Alan Cox ,
 svn-src-all@freebsd.org, Dmitry Morozovsky ,
 "Matthew D. Fuller" , svn-src-head@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 21:20:49 -0000


--nextPart15720028.E9rAG9uuRh
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset="us-ascii"

On Friday 29 August 2014 21:42:15 Steven Hartland wrote:
> ----- Original Message -----
> From: "Peter Wemm" 
>=20
> > On Friday 29 August 2014 20:51:03 Steven Hartland wrote:
> snip..
>=20
> > > Does Karl's explaination as to why this doesn't work above change=

> > > your
> > > mind?
> >=20
> > Actually no, I would expect the code as committed would *cause* the=

> > undesirable behavior that Karl described.
> >=20
> > ie: access a few large files and cause them to reside in cache.  Sa=
y
> > 50GB or so
> > on a 200G ram machine.  We now have the state where:
> >=20
> > v_cache =3D 50GB
> > v_free =3D 1MB
> >=20
> > The rest of the vm system looks at vm_paging_needed(), which is:  d=
o
> > we have
> > enough "v_cache + v_free"?  Since there's 50.001GB free, the answer=
 is
> > no.
> > It'll let v_free run right down to v_free_min because of the giant
> > pool of
> > v_cache just sitting there, waiting to be used.
> >=20
> > The zfs change, as committed will ignore all the free memory in the=

> > form of
> > v_cache.. and will be freaking out about how low v_free is getting =
and
> > will be
> > sacrificing ARC in order to put more memory into the v_free pool.
> >=20
> > As long as ARC keeps sacrificing itself this way, the free pages in=

> > the v_cache
> > pool won't get used.  When ARC finally runs out of pages to give up=
 to
> > v_free,
> > the kernel will start using the free pages from v_cache.  Eventuall=
y
> > it'll run
> > down that v_cache free pool and arc will be in a bare minimum state=

> > while this
> > is happening.
> >=20
> > Meanwhile, ZFS ARC will be crippled.  This has consequences - it do=
es
> > RCU like
> > things from ARC to keep fragmentation under control.  With ARC
> > crippled,
> > fragmentation will increase because there's less opportunistic
> > gathering of
> > data from ARC.
> >=20
> > Granted, you have to get things freed from active/inactive to the
> > cache state,
> > but once it's there, depending on the worlkload, it'll mess with AR=
C.
>=20
> There's already a vm_paging_needed() check in there below so this wil=
l
> already
> be dealt with will it not?

No.

If you read the code that you changed, you won't get that far. The v_fr=
ee test=20
comes before vm_paging_needed(), and if the v_free test triggers then A=
RC will=20
return pages and not look at the rest of the function.

If this function returns non-zerp, ARC is given back:

static int
arc_reclaim_needed(void)
{
        if (kmem_free_count() < zfs_arc_free_target) {
                return (1);
        }
         /*
         * Cooperate with pagedaemon when it's time for it to scan
         * and reclaim some pages.
         */
        if (vm_paging_needed()) {
                return (1);
        }

ie: if v_free (ignoring v_cache free pages) gets below the threshold, s=
top=20
evertyhing and discard ARC pages.=20

The vm_paging_needed() code is a NO-OP at this point. It can never retu=
rn=20
true.  Consider:
        vm_cnt.v_free_target =3D 4 * vm_cnt.v_free_min + vm_cnt.v_free_=
reserved;
vs
        vm_pageout_wakeup_thresh =3D (vm_cnt.v_free_min / 10) * 11;

zfs_arc_free_target defaults to vm_cnt.v_free_target, which is 400% of=20=

v_free_min, and compares it against the smaller v_free pool.

vm_paging_needed() compares the total free pool (v_free + v_cache) agai=
nst the=20
smaller wakeup threshold - 110% of v_free_min.

Comparing a larger value against a smaller target than the previous tes=
t will=20
never succeed unless you manually change the arc_free_target sysctl.


Also, what about the magic numbers here:
u_int zfs_arc_free_target =3D (1 << 19); /* default before pagedaemon i=
nit only=20
*/

That's half a million pages, or 2GB of physical ram on a 4K page size s=
ystem =20
How is this going to work on early boot in the machines in the cluster =
with=20
less than 2GB of ram?

=2D-=20
Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com; KI=
6FJV
UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246
--nextPart15720028.E9rAG9uuRh
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part.
Content-Transfer-Encoding: 7Bit

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQEcBAABAgAGBQJUAO6wAAoJEDXWlwnsgJ4EWGsH/25GwipkDGNwf9n3q5+CK8ri
jLK2Bs5kXAlz9w6lnd5QxlxHmOT4s/X2BTleepYZkDdDCSyyBftHBrOzzLzQ9Sh5
T/ZZWcC2ofkY6ih7QTrE6asgG8E1VZtOo70fCLwJ/b9kmWqI/TnEov/aVafu76cx
RJXTMHVju8pdbUzTSG77PHuCwCfl78T3MnW45tJgQrbLFHlUrR4ICT404fq0jbUA
gxNKj1ONUZJApS/sesPqI+ueLtBwaJbNwtKM03zXc29FTmJmg393SAlG9nrfVWvZ
J8Jhv809XhsRt2x0sAnyIlIdGy2mQ67cK17FYiaXQWJEjt5oTIGOghve8C7IqFU=
=T44y
-----END PGP SIGNATURE-----

--nextPart15720028.E9rAG9uuRh--


From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 21:25:49 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 59C1CABD;
 Fri, 29 Aug 2014 21:25:49 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4466D1AAC;
 Fri, 29 Aug 2014 21:25:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7TLPnbf086906;
 Fri, 29 Aug 2014 21:25:49 GMT (envelope-from jhb@FreeBSD.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7TLPmtQ086899;
 Fri, 29 Aug 2014 21:25:48 GMT (envelope-from jhb@FreeBSD.org)
Message-Id: <201408292125.s7TLPmtQ086899@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jhb set sender to jhb@FreeBSD.org
 using -f
From: John Baldwin 
Date: Fri, 29 Aug 2014 21:25:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270828 - in head: sbin/sysctl sys/amd64/amd64
 sys/amd64/include/pc sys/i386/i386 sys/i386/include/pc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 21:25:49 -0000

Author: jhb
Date: Fri Aug 29 21:25:47 2014
New Revision: 270828
URL: http://svnweb.freebsd.org/changeset/base/270828

Log:
  - Add a new structure type for the ACPI 3.0 SMAP entry that includes the
    optional attributes field.
  - Add a 'machdep.smap' sysctl that exports the SMAP table of the running
    system as an array of the ACPI 3.0 structure.  (On older systems, the
    attributes are given a value of zero.)  Note that the sysctl only
    exports the SMAP table if it is available via the metadata passed from
    the loader to the kernel.  If an SMAP is not available, an empty array
    is returned.
  - Add a format handler for the ACPI 3.0 SMAP structure to the sysctl(8)
    binary to format the SMAP structures in a readable format similar to
    the format found in boot messages.
  
  MFC after:	2 weeks

Modified:
  head/sbin/sysctl/sysctl.c
  head/sys/amd64/amd64/machdep.c
  head/sys/amd64/include/pc/bios.h
  head/sys/i386/i386/machdep.c
  head/sys/i386/include/pc/bios.h

Modified: head/sbin/sysctl/sysctl.c
==============================================================================
--- head/sbin/sysctl/sysctl.c	Fri Aug 29 21:20:36 2014	(r270827)
+++ head/sbin/sysctl/sysctl.c	Fri Aug 29 21:25:47 2014	(r270828)
@@ -48,6 +48,10 @@ static const char rcsid[] =
 #include 
 #include 
 
+#if defined(__amd64__) || defined(__i386__)
+#include 
+#endif
+
 #include 
 #include 
 #include 
@@ -541,6 +545,27 @@ S_vmtotal(int l2, void *p)
 	return (0);
 }
 
+#if defined(__amd64__) || defined(__i386__)
+static int
+S_bios_smap_xattr(int l2, void *p)
+{
+	struct bios_smap_xattr *smap, *end;
+
+	if (l2 % sizeof(*smap) != 0) {
+		warnx("S_bios_smap_xattr %d is not a multiple of %zu", l2,
+		    sizeof(*smap));
+		return (1);
+	}
+
+	end = (struct bios_smap_xattr *)((char *)p + l2);
+	for (smap = p; smap < end; smap++)
+		printf("\nSMAP type=%02x, xattr=%02x, base=%016jx, len=%016jx",
+		    smap->type, smap->xattr, (uintmax_t)smap->base,
+		    (uintmax_t)smap->length);
+	return (0);
+}
+#endif
+
 static int
 set_IK(const char *str, int *val)
 {
@@ -793,6 +818,10 @@ show_var(int *oid, int nlen)
 			func = S_loadavg;
 		else if (strcmp(fmt, "S,vmtotal") == 0)
 			func = S_vmtotal;
+#if defined(__amd64__) || defined(__i386__)
+		else if (strcmp(fmt, "S,bios_smap_xattr") == 0)
+			func = S_bios_smap_xattr;
+#endif
 		else
 			func = NULL;
 		if (func) {

Modified: head/sys/amd64/amd64/machdep.c
==============================================================================
--- head/sys/amd64/amd64/machdep.c	Fri Aug 29 21:20:36 2014	(r270827)
+++ head/sys/amd64/amd64/machdep.c	Fri Aug 29 21:25:47 2014	(r270828)
@@ -2090,6 +2090,42 @@ cpu_pcpu_init(struct pcpu *pcpu, int cpu
 	pcpu->pc_acpi_id = 0xffffffff;
 }
 
+static int
+smap_sysctl_handler(SYSCTL_HANDLER_ARGS)
+{
+	struct bios_smap *smapbase;
+	struct bios_smap_xattr smap;
+	caddr_t kmdp;
+	uint32_t *smapattr;
+	int count, error, i;
+
+	/* Retrieve the system memory map from the loader. */
+	kmdp = preload_search_by_type("elf kernel");
+	if (kmdp == NULL)
+		kmdp = preload_search_by_type("elf64 kernel");
+	smapbase = (struct bios_smap *)preload_search_info(kmdp,
+	    MODINFO_METADATA | MODINFOMD_SMAP);
+	if (smapbase == NULL)
+		return (0);
+	smapattr = (uint32_t *)preload_search_info(kmdp,
+	    MODINFO_METADATA | MODINFOMD_SMAP_XATTR);
+	count = *((uint32_t *)smapbase - 1) / sizeof(*smapbase);
+	error = 0;
+	for (i = 0; i < count; i++) {
+		smap.base = smapbase[i].base;
+		smap.length = smapbase[i].length;
+		smap.type = smapbase[i].type;
+		if (smapattr != NULL)
+			smap.xattr = smapattr[i];
+		else
+			smap.xattr = 0;
+		error = SYSCTL_OUT(req, &smap, sizeof(smap));
+	}
+	return (error);
+}
+SYSCTL_PROC(_machdep, OID_AUTO, smap, CTLTYPE_OPAQUE|CTLFLAG_RD, NULL, 0,
+    smap_sysctl_handler, "S,bios_smap_xattr", "Raw BIOS SMAP data");
+
 void
 spinlock_enter(void)
 {

Modified: head/sys/amd64/include/pc/bios.h
==============================================================================
--- head/sys/amd64/include/pc/bios.h	Fri Aug 29 21:20:36 2014	(r270827)
+++ head/sys/amd64/include/pc/bios.h	Fri Aug 29 21:25:47 2014	(r270828)
@@ -51,6 +51,14 @@ struct bios_smap {
     u_int32_t	type;
 } __packed;
 
+/* Structure extended to include extended attribute field in ACPI 3.0. */
+struct bios_smap_xattr {
+    u_int64_t	base;
+    u_int64_t	length;
+    u_int32_t	type;
+    u_int32_t	xattr;
+} __packed;
+	
 /*
  * System Management BIOS
  */

Modified: head/sys/i386/i386/machdep.c
==============================================================================
--- head/sys/i386/i386/machdep.c	Fri Aug 29 21:20:36 2014	(r270827)
+++ head/sys/i386/i386/machdep.c	Fri Aug 29 21:25:47 2014	(r270828)
@@ -3122,6 +3122,42 @@ cpu_pcpu_init(struct pcpu *pcpu, int cpu
 	pcpu->pc_acpi_id = 0xffffffff;
 }
 
+static int
+smap_sysctl_handler(SYSCTL_HANDLER_ARGS)
+{
+	struct bios_smap *smapbase;
+	struct bios_smap_xattr smap;
+	caddr_t kmdp;
+	uint32_t *smapattr;
+	int count, error, i;
+
+	/* Retrieve the system memory map from the loader. */
+	kmdp = preload_search_by_type("elf kernel");
+	if (kmdp == NULL)
+		kmdp = preload_search_by_type("elf32 kernel");
+	smapbase = (struct bios_smap *)preload_search_info(kmdp,
+	    MODINFO_METADATA | MODINFOMD_SMAP);
+	if (smapbase == NULL)
+		return (0);
+	smapattr = (uint32_t *)preload_search_info(kmdp,
+	    MODINFO_METADATA | MODINFOMD_SMAP_XATTR);
+	count = *((u_int32_t *)smapbase - 1) / sizeof(*smapbase);
+	error = 0;
+	for (i = 0; i < count; i++) {
+		smap.base = smapbase[i].base;
+		smap.length = smapbase[i].length;
+		smap.type = smapbase[i].type;
+		if (smapattr != NULL)
+			smap.xattr = smapattr[i];
+		else
+			smap.xattr = 0;
+		error = SYSCTL_OUT(req, &smap, sizeof(smap));
+	}
+	return (error);
+}
+SYSCTL_PROC(_machdep, OID_AUTO, smap, CTLTYPE_OPAQUE|CTLFLAG_RD, NULL, 0,
+    smap_sysctl_handler, "S,bios_smap_xattr", "Raw BIOS SMAP data");
+
 void
 spinlock_enter(void)
 {

Modified: head/sys/i386/include/pc/bios.h
==============================================================================
--- head/sys/i386/include/pc/bios.h	Fri Aug 29 21:20:36 2014	(r270827)
+++ head/sys/i386/include/pc/bios.h	Fri Aug 29 21:25:47 2014	(r270828)
@@ -221,6 +221,14 @@ struct bios_smap {
     u_int32_t	type;
 } __packed;
 
+/* Structure extended to include extended attribute field in ACPI 3.0. */
+struct bios_smap_xattr {
+    u_int64_t	base;
+    u_int64_t	length;
+    u_int32_t	type;
+    u_int32_t	xattr;
+} __packed;
+
 /*
  * System Management BIOS
  */

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 21:45:07 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 4EB92680;
 Fri, 29 Aug 2014 21:45:07 +0000 (UTC)
Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1])
 (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2502C1CC4;
 Fri, 29 Aug 2014 21:45:07 +0000 (UTC)
Received: from ralph.baldwin.cx (pool-173-70-85-31.nwrknj.fios.verizon.net
 [173.70.85.31])
 by bigwig.baldwin.cx (Postfix) with ESMTPSA id 0861AB980;
 Fri, 29 Aug 2014 17:45:06 -0400 (EDT)
From: John Baldwin 
To: src-committers@freebsd.org
Subject: Re: svn commit: r270828 - in head: sbin/sysctl sys/amd64/amd64
 sys/amd64/include/pc sys/i386/i386 sys/i386/include/pc
Date: Fri, 29 Aug 2014 17:29:11 -0400
Message-ID: <1655468.zo60SDJKHb@ralph.baldwin.cx>
User-Agent: KMail/4.10.5 (FreeBSD/10.0-STABLE; KDE/4.10.5; amd64; ; )
In-Reply-To: <201408292125.s7TLPmtQ086899@svn.freebsd.org>
References: <201408292125.s7TLPmtQ086899@svn.freebsd.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7
 (bigwig.baldwin.cx); Fri, 29 Aug 2014 17:45:06 -0400 (EDT)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 21:45:07 -0000

On Friday, August 29, 2014 09:25:48 PM John Baldwin wrote:
> Author: jhb
> Date: Fri Aug 29 21:25:47 2014
> New Revision: 270828
> URL: http://svnweb.freebsd.org/changeset/base/270828
> 
> Log:
>   - Add a new structure type for the ACPI 3.0 SMAP entry that includes the
>     optional attributes field.
>   - Add a 'machdep.smap' sysctl that exports the SMAP table of the running
>     system as an array of the ACPI 3.0 structure.  (On older systems, the
>     attributes are given a value of zero.)  Note that the sysctl only
>     exports the SMAP table if it is available via the metadata passed from
>     the loader to the kernel.  If an SMAP is not available, an empty array
>     is returned.
>   - Add a format handler for the ACPI 3.0 SMAP structure to the sysctl(8)
>     binary to format the SMAP structures in a readable format similar to
>     the format found in boot messages.
> 
>   MFC after:	2 weeks

Sample output:

machdep.smap: 
SMAP type=01, xattr=00, base=0000000000000000, len=000000000009d800
SMAP type=02, xattr=00, base=000000000009d800, len=0000000000002800
SMAP type=02, xattr=00, base=00000000000e0000, len=0000000000020000
SMAP type=01, xattr=00, base=0000000000100000, len=00000000ba89f000
SMAP type=02, xattr=00, base=00000000ba99f000, len=0000000000500000
SMAP type=04, xattr=00, base=00000000bae9f000, len=0000000000100000
SMAP type=03, xattr=00, base=00000000baf9f000, len=0000000000060000
...

I also have a sysctl for amd64 to export the UEFI memory map blob as well, but 
haven't written the parsing bits for sysctl(8) yet.  (And I don't currently 
have a system set up with UEFI booting to test it.)

-- 
John Baldwin

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 21:50:32 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id DB71DAB3;
 Fri, 29 Aug 2014 21:50:32 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C73E71D1D;
 Fri, 29 Aug 2014 21:50:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7TLoWPT098347;
 Fri, 29 Aug 2014 21:50:32 GMT (envelope-from andreast@FreeBSD.org)
Received: (from andreast@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7TLoWWD098346;
 Fri, 29 Aug 2014 21:50:32 GMT (envelope-from andreast@FreeBSD.org)
Message-Id: <201408292150.s7TLoWWD098346@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: andreast set sender to
 andreast@FreeBSD.org using -f
From: Andreas Tobler 
Date: Fri, 29 Aug 2014 21:50:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270829 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 21:50:33 -0000

Author: andreast
Date: Fri Aug 29 21:50:32 2014
New Revision: 270829
URL: http://svnweb.freebsd.org/changeset/base/270829

Log:
  Rename shm_dict_init to shm_init to fix a compiler warning.
  
  Reviewed by:	jhb

Modified:
  head/sys/kern/uipc_shm.c

Modified: head/sys/kern/uipc_shm.c
==============================================================================
--- head/sys/kern/uipc_shm.c	Fri Aug 29 21:25:47 2014	(r270828)
+++ head/sys/kern/uipc_shm.c	Fri Aug 29 21:50:32 2014	(r270829)
@@ -109,7 +109,7 @@ static dev_t shm_dev_ino;
 
 static int	shm_access(struct shmfd *shmfd, struct ucred *ucred, int flags);
 static struct shmfd *shm_alloc(struct ucred *ucred, mode_t mode);
-static void	shm_dict_init(void *arg);
+static void	shm_init(void *arg);
 static void	shm_drop(struct shmfd *shmfd);
 static struct shmfd *shm_hold(struct shmfd *shmfd);
 static void	shm_insert(char *path, Fnv32_t fnv, struct shmfd *shmfd);

From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 22:01:48 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 4ED8324D;
 Fri, 29 Aug 2014 22:01:48 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3B8441ECC;
 Fri, 29 Aug 2014 22:01:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7TM1mih007061;
 Fri, 29 Aug 2014 22:01:48 GMT (envelope-from jhb@FreeBSD.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7TM1mjO007060;
 Fri, 29 Aug 2014 22:01:48 GMT (envelope-from jhb@FreeBSD.org)
Message-Id: <201408292201.s7TM1mjO007060@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jhb set sender to jhb@FreeBSD.org
 using -f
From: John Baldwin 
Date: Fri, 29 Aug 2014 22:01:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270830 - head/sys/dev/if_ndis
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Fri, 29 Aug 2014 22:01:48 -0000

Author: jhb
Date: Fri Aug 29 22:01:47 2014
New Revision: 270830
URL: http://svnweb.freebsd.org/changeset/base/270830

Log:
  When anouncing link state changes on an 802.11 interface with a vap,
  announce the change on the vap's ifnet instead of the main ifnet.  This
  matches the behavior of other wireless drivers in the tree and allows the
  default devd configuration to correctly start dhclient automatically after
  an ndis wireless device associates.
  
  MFC after:	2 weeks

Modified:
  head/sys/dev/if_ndis/if_ndis.c

Modified: head/sys/dev/if_ndis/if_ndis.c
==============================================================================
--- head/sys/dev/if_ndis/if_ndis.c	Fri Aug 29 21:50:32 2014	(r270829)
+++ head/sys/dev/if_ndis/if_ndis.c	Fri Aug 29 22:01:47 2014	(r270830)
@@ -1710,23 +1710,26 @@ ndis_ticktask(d, xsc)
 	if (sc->ndis_link == 0 &&
 	    sc->ndis_sts == NDIS_STATUS_MEDIA_CONNECT) {
 		sc->ndis_link = 1;
-		NDIS_UNLOCK(sc);
 		if ((sc->ndis_80211 != 0) && (vap != NULL)) {
+			NDIS_UNLOCK(sc);
 			ndis_getstate_80211(sc);
 			ieee80211_new_state(vap, IEEE80211_S_RUN, -1);
-		}
-		NDIS_LOCK(sc);
-		if_link_state_change(sc->ifp, LINK_STATE_UP);
+			NDIS_LOCK(sc);
+			if_link_state_change(vap->iv_ifp, LINK_STATE_UP);
+		} else
+			if_link_state_change(sc->ifp, LINK_STATE_UP);
 	}
 
 	if (sc->ndis_link == 1 &&
 	    sc->ndis_sts == NDIS_STATUS_MEDIA_DISCONNECT) {
 		sc->ndis_link = 0;
-		NDIS_UNLOCK(sc);
-		if ((sc->ndis_80211 != 0) && (vap != NULL))
+		if ((sc->ndis_80211 != 0) && (vap != NULL)) {
+			NDIS_UNLOCK(sc);
 			ieee80211_new_state(vap, IEEE80211_S_SCAN, 0);
-		NDIS_LOCK(sc);
-		if_link_state_change(sc->ifp, LINK_STATE_DOWN);
+			NDIS_LOCK(sc);
+			if_link_state_change(vap->iv_ifp, LINK_STATE_DOWN);
+		} else
+			if_link_state_change(sc->ifp, LINK_STATE_DOWN);
 	}
 
 	NDIS_UNLOCK(sc);

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 00:07:53 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 6D9712A9;
 Sat, 30 Aug 2014 00:07:53 +0000 (UTC)
Received: from mail-qc0-x22f.google.com (mail-qc0-x22f.google.com
 [IPv6:2607:f8b0:400d:c01::22f])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id EF8411D23;
 Sat, 30 Aug 2014 00:07:52 +0000 (UTC)
Received: by mail-qc0-f175.google.com with SMTP id c9so3152034qcz.6
 for ; Fri, 29 Aug 2014 17:07:52 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:date:message-id:subject
 :from:to:cc:content-type;
 bh=qFjLm4wHIrP7Rosy7lMn84OL49kPnfj0qEpLSPnoVhs=;
 b=yL77YM2H+3SbKB1owtUJTfBQMML8xUzW6EYQWqLZlkkgEjqyMxBl4wb2aOdrOHjN6Y
 ir0eiei++dBz5c6ud7ul9SY1FUrqj8zlZqv+28UB94/vRPNjIgfgedwndhwWTstw2YHa
 E+osIwnDX2hbnELztv0xrsBecOGtjH9OztA+Vjjd1NDIicRQQSdwtp3UoRV9H/5/CuBa
 ZGTxavg8xF1q7P+pSrC+OUdO/S68fTUOSYN33t+TQqGIoqRqubzYRogmPWOB5Y+I9eTh
 YrnzZ1+QP/W/dNiZD7eoBoiT4sNcqUpFbnQeitlESysQP2HV6Mxum1pbMyl56sfrT85k
 F2fg==
MIME-Version: 1.0
X-Received: by 10.140.31.75 with SMTP id e69mr3220198qge.2.1409357272042; Fri,
 29 Aug 2014 17:07:52 -0700 (PDT)
Sender: adrian.chadd@gmail.com
Received: by 10.224.39.139 with HTTP; Fri, 29 Aug 2014 17:07:51 -0700 (PDT)
In-Reply-To: <201408280841.s7S8fC6X012986@svn.freebsd.org>
References: <201408280841.s7S8fC6X012986@svn.freebsd.org>
Date: Fri, 29 Aug 2014 17:07:51 -0700
X-Google-Sender-Auth: sex9n4z8qsZEpLsuaF-H-Z1S3EQ
Message-ID: 
Subject: Re: svn commit: r270745 - in head: bin/ps sys/compat/freebsd32
 sys/kern sys/sys
From: Adrian Chadd 
To: Mateusz Guzik 
Content-Type: text/plain; charset=UTF-8
Cc: "svn-src-head@freebsd.org" ,
 "svn-src-all@freebsd.org" ,
 "src-committers@freebsd.org" 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 00:07:53 -0000

Hi!

So I'm now getting panics in the process coredump path on -HEAD. The
proctree lock isn't held.

Assertion : proctree not locked @ kern_proc.c:795

path:

sigexit() -> elf64_coredump() -> elf64_note_procstat_proc() ->
kern_proc_out() -> fill_kinfo_proc() -> panic.

What did you peeps do this time? :P



-a


On 28 August 2014 01:41, Mateusz Guzik  wrote:
> Author: mjg
> Date: Thu Aug 28 08:41:11 2014
> New Revision: 270745
> URL: http://svnweb.freebsd.org/changeset/base/270745
>
> Log:
>   Return real parent pid in kinfo (used by e.g. ps)
>
>   Add a separate field which exports tracer pid and add a new keyword
>   ("tracer") for ps to display it.
>
>   This is a follow up to r270444.
>
>   Reviewed by:  kib
>   MFC after:    1 week
>   Relnotes:     yes
>
> Modified:
>   head/bin/ps/keyword.c
>   head/bin/ps/ps.1
>   head/sys/compat/freebsd32/freebsd32.h
>   head/sys/kern/kern_proc.c
>   head/sys/sys/user.h
>
> Modified: head/bin/ps/keyword.c
> ==============================================================================
> --- head/bin/ps/keyword.c       Thu Aug 28 08:25:15 2014        (r270744)
> +++ head/bin/ps/keyword.c       Thu Aug 28 08:41:11 2014        (r270745)
> @@ -157,6 +157,7 @@ static VAR var[] = {
>         {"tdnam", "TDNAM", NULL, LJUST, tdnam, 0, CHAR, NULL, 0},
>         {"time", "TIME", NULL, USER, cputime, 0, CHAR, NULL, 0},
>         {"tpgid", "TPGID", NULL, 0, kvar, KOFF(ki_tpgid), UINT, PIDFMT, 0},
> +       {"tracer", "TRACER", NULL, 0, kvar, KOFF(ki_tracer), UINT, PIDFMT, 0},
>         {"tsid", "TSID", NULL, 0, kvar, KOFF(ki_tsid), UINT, PIDFMT, 0},
>         {"tsiz", "TSIZ", NULL, 0, kvar, KOFF(ki_tsize), PGTOK, "ld", 0},
>         {"tt", "TT ", NULL, 0, tname, 0, CHAR, NULL, 0},
>
> Modified: head/bin/ps/ps.1
> ==============================================================================
> --- head/bin/ps/ps.1    Thu Aug 28 08:25:15 2014        (r270744)
> +++ head/bin/ps/ps.1    Thu Aug 28 08:41:11 2014        (r270745)
> @@ -29,7 +29,7 @@
>  .\"     @(#)ps.1       8.3 (Berkeley) 4/18/94
>  .\" $FreeBSD$
>  .\"
> -.Dd August 7, 2014
> +.Dd August 27, 2014
>  .Dt PS 1
>  .Os
>  .Sh NAME
> @@ -665,6 +665,8 @@ accumulated CPU time, user + system (ali
>  .Cm cputime )
>  .It Cm tpgid
>  control terminal process group ID
> +.It Cm tracer
> +tracer process ID
>  .\".It Cm trss
>  .\"text resident set size (in Kbytes)
>  .It Cm tsid
>
> Modified: head/sys/compat/freebsd32/freebsd32.h
> ==============================================================================
> --- head/sys/compat/freebsd32/freebsd32.h       Thu Aug 28 08:25:15 2014        (r270744)
> +++ head/sys/compat/freebsd32/freebsd32.h       Thu Aug 28 08:41:11 2014        (r270745)
> @@ -343,6 +343,7 @@ struct kinfo_proc32 {
>         char    ki_loginclass[LOGINCLASSLEN+1];
>         char    ki_sparestrings[50];
>         int     ki_spareints[KI_NSPARE_INT];
> +       int     ki_tracer;
>         int     ki_flag2;
>         int     ki_fibnum;
>         u_int   ki_cr_flags;
>
> Modified: head/sys/kern/kern_proc.c
> ==============================================================================
> --- head/sys/kern/kern_proc.c   Thu Aug 28 08:25:15 2014        (r270744)
> +++ head/sys/kern/kern_proc.c   Thu Aug 28 08:41:11 2014        (r270745)
> @@ -791,6 +791,8 @@ fill_kinfo_proc_only(struct proc *p, str
>         struct ucred *cred;
>         struct sigacts *ps;
>
> +       /* For proc_realparent. */
> +       sx_assert(&proctree_lock, SX_LOCKED);
>         PROC_LOCK_ASSERT(p, MA_OWNED);
>         bzero(kp, sizeof(*kp));
>
> @@ -920,7 +922,9 @@ fill_kinfo_proc_only(struct proc *p, str
>         kp->ki_acflag = p->p_acflag;
>         kp->ki_lock = p->p_lock;
>         if (p->p_pptr)
> -               kp->ki_ppid = p->p_pptr->p_pid;
> +               kp->ki_ppid = proc_realparent(p)->p_pid;
> +       if (p->p_flag & P_TRACED)
> +               kp->ki_tracer = p->p_pptr->p_pid;
>  }
>
>  /*
> @@ -1166,6 +1170,7 @@ freebsd32_kinfo_proc_out(const struct ki
>         bcopy(ki->ki_comm, ki32->ki_comm, COMMLEN + 1);
>         bcopy(ki->ki_emul, ki32->ki_emul, KI_EMULNAMELEN + 1);
>         bcopy(ki->ki_loginclass, ki32->ki_loginclass, LOGINCLASSLEN + 1);
> +       CP(*ki, *ki32, ki_tracer);
>         CP(*ki, *ki32, ki_flag2);
>         CP(*ki, *ki32, ki_fibnum);
>         CP(*ki, *ki32, ki_cr_flags);
> @@ -1287,10 +1292,11 @@ sysctl_kern_proc(SYSCTL_HANDLER_ARGS)
>                 error = sysctl_wire_old_buffer(req, 0);
>                 if (error)
>                         return (error);
> +               sx_slock(&proctree_lock);
>                 error = pget((pid_t)name[0], PGET_CANSEE, &p);
> -               if (error != 0)
> -                       return (error);
> -               error = sysctl_out_proc(p, req, flags, 0);
> +               if (error == 0)
> +                       error = sysctl_out_proc(p, req, flags, 0);
> +               sx_sunlock(&proctree_lock);
>                 return (error);
>         }
>
> @@ -1318,6 +1324,7 @@ sysctl_kern_proc(SYSCTL_HANDLER_ARGS)
>         error = sysctl_wire_old_buffer(req, 0);
>         if (error != 0)
>                 return (error);
> +       sx_slock(&proctree_lock);
>         sx_slock(&allproc_lock);
>         for (doingzomb=0 ; doingzomb < 2 ; doingzomb++) {
>                 if (!doingzomb)
> @@ -1422,11 +1429,13 @@ sysctl_kern_proc(SYSCTL_HANDLER_ARGS)
>                         error = sysctl_out_proc(p, req, flags, doingzomb);
>                         if (error) {
>                                 sx_sunlock(&allproc_lock);
> +                               sx_sunlock(&proctree_lock);
>                                 return (error);
>                         }
>                 }
>         }
>         sx_sunlock(&allproc_lock);
> +       sx_sunlock(&proctree_lock);
>         return (0);
>  }
>
>
> Modified: head/sys/sys/user.h
> ==============================================================================
> --- head/sys/sys/user.h Thu Aug 28 08:25:15 2014        (r270744)
> +++ head/sys/sys/user.h Thu Aug 28 08:41:11 2014        (r270745)
> @@ -84,7 +84,7 @@
>   * it in two places: function fill_kinfo_proc in sys/kern/kern_proc.c and
>   * function kvm_proclist in lib/libkvm/kvm_proc.c .
>   */
> -#define        KI_NSPARE_INT   7
> +#define        KI_NSPARE_INT   6
>  #define        KI_NSPARE_LONG  12
>  #define        KI_NSPARE_PTR   6
>
> @@ -187,6 +187,7 @@ struct kinfo_proc {
>          */
>         char    ki_sparestrings[50];    /* spare string space */
>         int     ki_spareints[KI_NSPARE_INT];    /* spare room for growth */
> +       int     ki_tracer;              /* Pid of tracing process */
>         int     ki_flag2;               /* P2_* flags */
>         int     ki_fibnum;              /* Default FIB number */
>         u_int   ki_cr_flags;            /* Credential flags */
>

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 00:50:47 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id A3DE39A2;
 Sat, 30 Aug 2014 00:50:47 +0000 (UTC)
Received: from thebighonker.lerctr.org (thebighonker.lerctr.org
 [IPv6:2001:470:1f0f:3ad:223:7dff:fe9e:6e8a])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "thebighonker.lerctr.org",
 Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 761C910FE;
 Sat, 30 Aug 2014 00:50:44 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lerctr.org;
 s=lerami; 
 h=In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To:From:Date;
 bh=6EC47cKnKe072+LcPj27NdRcmvGcwc1YYU8GRxJQfNs=; 
 b=eH3F7pLKEx6+DTOQ94xbdB0RQPaJ1lcGQF2oZiGuGUTjrTUrjHRlSi8nsS+4a//S3EQ3mih9Ta2QqHNt3J8IQ20x22By9UjFaILYST13VNu3MUVI8A9k9uWBbq/CMTH2+laChaTcrofTB/erPeYdZDXizp7S+lytdM+pLHBdREI=;
Received: from 104-54-221-134.lightspeed.austtx.sbcglobal.net
 ([104.54.221.134]:49012 helo=borg.lerctr.org)
 by thebighonker.lerctr.org with esmtpsa
 (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.84 (FreeBSD))
 (envelope-from )
 id 1XNWsK-000FwD-42; Fri, 29 Aug 2014 19:50:43 -0500
Date: Fri, 29 Aug 2014 19:50:28 -0500
From: Larry Rosenman 
To: Adrian Chadd 
Subject: Re: svn commit: r270745 - in head: bin/ps sys/compat/freebsd32
 sys/kern sys/sys
Message-ID: <20140830005028.GA1881@borg.lerctr.org>
References: <201408280841.s7S8fC6X012986@svn.freebsd.org>
 
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: 
User-Agent: Mutt/1.5.23 (2014-03-12)
X-Spam-Score: -2.9 (--)
X-LERCTR-Spam-Score: -2.9 (--)
X-Spam-Report: SpamScore (-2.9/5.0) ALL_TRUSTED=-1, BAYES_00=-1.9,
 TVD_RCVD_IP=0.001
X-LERCTR-Spam-Report: SpamScore (-2.9/5.0) ALL_TRUSTED=-1, BAYES_00=-1.9,
 TVD_RCVD_IP=0.001
Cc: svn-src-all@freebsd.org, svn-committers-src@freebsd.org, mjg@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 00:50:47 -0000

On Fri, Aug 29, 2014 at 05:07:51PM -0700, Adrian Chadd wrote:
> Hi!
> 
> So I'm now getting panics in the process coredump path on -HEAD. The
> proctree lock isn't held.
> 
> Assertion : proctree not locked @ kern_proc.c:795
> 
> path:
> 
> sigexit() -> elf64_coredump() -> elf64_note_procstat_proc() ->
> kern_proc_out() -> fill_kinfo_proc() -> panic.
> 
> What did you peeps do this time? :P
> 
> 
> 
> -a
Here's my similar one...

borg.lerctr.org dumped core - see /var/crash/vmcore.0

Fri Aug 29 18:34:26 CDT 2014

FreeBSD borg.lerctr.org 11.0-CURRENT FreeBSD 11.0-CURRENT #1 r270811M: Fri Aug 29 16:33:32 CDT 2014     root@borg.lerctr.org:/usr/obj/usr/src/sys/VT-LER  amd64

panic: Lock proctree not locked @ /usr/src/sys/kern/kern_proc.c:795

GNU gdb 6.1.1 [FreeBSD]
Copyright 2004 Free Software Foundation, Inc.
GDB is free software, covered by the GNU General Public License, and you are
welcome to change it and/or distribute copies of it under certain conditions.
Type "show copying" to see the conditions.
There is absolutely no warranty for GDB.  Type "show warranty" for details.
This GDB was configured as "amd64-marcel-freebsd"...

Unread portion of the kernel message buffer:
panic: Lock proctree not locked @ /usr/src/sys/kern/kern_proc.c:795

cpuid = 0
KDB: stack backtrace:
db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xfffffe100c63fd50
kdb_backtrace() at kdb_backtrace+0x39/frame 0xfffffe100c63fe00
vpanic() at vpanic+0x189/frame 0xfffffe100c63fe80
panic() at panic+0x43/frame 0xfffffe100c63fee0
_sx_assert() at _sx_assert+0x137/frame 0xfffffe100c63fef0
fill_kinfo_proc() at fill_kinfo_proc+0x3c/frame 0xfffffe100c63ff30
kern_proc_out() at kern_proc_out+0x67/frame 0xfffffe100c6406c0
elf32_note_procstat_proc() at elf32_note_procstat_proc+0x79/frame 0xfffffe100c640700
elf32_coredump() at elf32_coredump+0x9e2/frame 0xfffffe100c640810
sigexit() at sigexit+0xadb/frame 0xfffffe100c640ac0
postsig() at postsig+0x3c8/frame 0xfffffe100c640bb0
ast() at ast+0x327/frame 0xfffffe100c640bf0
doreti_ast() at doreti_ast+0x1f/frame 0xffffccd0
Uptime: 2m50s
Dumping 2545 out of 64456 MB: (CTRL-C to abort) ..1%..11%..21%..31%..41%..51%..61%..71%..81%..91%

Reading symbols from /boot/kernel/linux.ko.symbols...done.
Loaded symbols for /boot/kernel/linux.ko.symbols
Reading symbols from /boot/kernel/if_lagg.ko.symbols...done.
Loaded symbols for /boot/kernel/if_lagg.ko.symbols
Reading symbols from /boot/kernel/snd_envy24ht.ko.symbols...done.
Loaded symbols for /boot/kernel/snd_envy24ht.ko.symbols
Reading symbols from /boot/kernel/snd_spicds.ko.symbols...done.
Loaded symbols for /boot/kernel/snd_spicds.ko.symbols
Reading symbols from /boot/kernel/coretemp.ko.symbols...done.
Loaded symbols for /boot/kernel/coretemp.ko.symbols
Reading symbols from /boot/kernel/ichsmb.ko.symbols...done.
Loaded symbols for /boot/kernel/ichsmb.ko.symbols
Reading symbols from /boot/kernel/smbus.ko.symbols...done.
Loaded symbols for /boot/kernel/smbus.ko.symbols
Reading symbols from /boot/kernel/ichwd.ko.symbols...done.
Loaded symbols for /boot/kernel/ichwd.ko.symbols
Reading symbols from /boot/kernel/cpuctl.ko.symbols...done.
Loaded symbols for /boot/kernel/cpuctl.ko.symbols
Reading symbols from /boot/kernel/crypto.ko.symbols...done.
Loaded symbols for /boot/kernel/crypto.ko.symbols
Reading symbols from /boot/kernel/cryptodev.ko.symbols...done.
Loaded symbols for /boot/kernel/cryptodev.ko.symbols
Reading symbols from /boot/kernel/dtraceall.ko.symbols...done.
Loaded symbols for /boot/kernel/dtraceall.ko.symbols
Reading symbols from /boot/kernel/profile.ko.symbols...done.
Loaded symbols for /boot/kernel/profile.ko.symbols
Reading symbols from /boot/kernel/cyclic.ko.symbols...done.
Loaded symbols for /boot/kernel/cyclic.ko.symbols
Reading symbols from /boot/kernel/dtrace.ko.symbols...done.
Loaded symbols for /boot/kernel/dtrace.ko.symbols
Reading symbols from /boot/kernel/systrace_freebsd32.ko.symbols...done.
Loaded symbols for /boot/kernel/systrace_freebsd32.ko.symbols
Reading symbols from /boot/kernel/systrace.ko.symbols...done.
Loaded symbols for /boot/kernel/systrace.ko.symbols
Reading symbols from /boot/kernel/sdt.ko.symbols...done.
Loaded symbols for /boot/kernel/sdt.ko.symbols
Reading symbols from /boot/kernel/lockstat.ko.symbols...done.
Loaded symbols for /boot/kernel/lockstat.ko.symbols
Reading symbols from /boot/kernel/fasttrap.ko.symbols...done.
Loaded symbols for /boot/kernel/fasttrap.ko.symbols
Reading symbols from /boot/kernel/fbt.ko.symbols...done.
Loaded symbols for /boot/kernel/fbt.ko.symbols
Reading symbols from /boot/kernel/dtnfscl.ko.symbols...done.
Loaded symbols for /boot/kernel/dtnfscl.ko.symbols
Reading symbols from /boot/kernel/dtmalloc.ko.symbols...done.
Loaded symbols for /boot/kernel/dtmalloc.ko.symbols
Reading symbols from /boot/modules/vboxdrv.ko...done.
Loaded symbols for /boot/modules/vboxdrv.ko
Reading symbols from /boot/modules/nvidia.ko...done.
Loaded symbols for /boot/modules/nvidia.ko
Reading symbols from /boot/kernel/ipmi.ko.symbols...done.
Loaded symbols for /boot/kernel/ipmi.ko.symbols
Reading symbols from /boot/kernel/ipmi_linux.ko.symbols...done.
Loaded symbols for /boot/kernel/ipmi_linux.ko.symbols
Reading symbols from /boot/kernel/radeonkms.ko.symbols...done.
Loaded symbols for /boot/kernel/radeonkms.ko.symbols
Reading symbols from /boot/kernel/iicbb.ko.symbols...done.
Loaded symbols for /boot/kernel/iicbb.ko.symbols
Reading symbols from /boot/kernel/iicbus.ko.symbols...done.
Loaded symbols for /boot/kernel/iicbus.ko.symbols
Reading symbols from /boot/kernel/iic.ko.symbols...done.
Loaded symbols for /boot/kernel/iic.ko.symbols
Reading symbols from /boot/kernel/drm2.ko.symbols...done.
Loaded symbols for /boot/kernel/drm2.ko.symbols
Reading symbols from /boot/kernel/radeonkmsfw_R100_cp.ko.symbols...done.
Loaded symbols for /boot/kernel/radeonkmsfw_R100_cp.ko.symbols
Reading symbols from /boot/kernel/fdescfs.ko.symbols...done.
Loaded symbols for /boot/kernel/fdescfs.ko.symbols
Reading symbols from /boot/kernel/uhid.ko.symbols...done.
Loaded symbols for /boot/kernel/uhid.ko.symbols
Reading symbols from /boot/modules/vboxnetflt.ko...done.
Loaded symbols for /boot/modules/vboxnetflt.ko
Reading symbols from /boot/kernel/netgraph.ko.symbols...done.
Loaded symbols for /boot/kernel/netgraph.ko.symbols
Reading symbols from /boot/kernel/ng_ether.ko.symbols...done.
Loaded symbols for /boot/kernel/ng_ether.ko.symbols
Reading symbols from /boot/modules/vboxnetadp.ko...done.
Loaded symbols for /boot/modules/vboxnetadp.ko
#0  doadump (textdump=1) at pcpu.h:219
219	pcpu.h: No such file or directory.
	in pcpu.h
(kgdb) #0  doadump (textdump=1) at pcpu.h:219
#1  0xffffffff80a15227 in kern_reboot (howto=260)
    at /usr/src/sys/kern/kern_shutdown.c:447
#2  0xffffffff80a157c8 in vpanic (fmt=, 
    ap=) at /usr/src/sys/kern/kern_shutdown.c:746
#3  0xffffffff80a15813 in panic (fmt=0x0)
    at /usr/src/sys/kern/kern_shutdown.c:675
#4  0xffffffff80a1ce47 in _sx_assert (sx=0x0, what=, 
    file=0x0, line=0) at /usr/src/sys/kern/kern_sx.c:1086
#5  0xffffffff80a0611c in fill_kinfo_proc (p=0xfffff80257916000, 
    kp=0xfffffe100c640250) at /usr/src/sys/kern/kern_proc.c:795
#6  0xffffffff80a06cc7 in kern_proc_out (p=0xfffff80257916000, 
    sb=0xfffff800241c8400, flags=2) at /usr/src/sys/kern/kern_proc.c:1205
#7  0xffffffff809c0709 in elf32_note_procstat_proc (
    arg=, sb=, 
    sizep=0xfffff80024267dd8) at imgact_elf.c:1787
#8  0xffffffff809bea02 in elf32_coredump (td=, 
    vp=0xfffff802708f9000, limit=, flags=0)
    at imgact_elf.c:1618
#9  0xffffffff80a18c4b in sigexit (td=0xfffff80270e5d000, sig=11)
    at /usr/src/sys/kern/kern_sig.c:3297
#10 0xffffffff80a19318 in postsig (sig=)
    at /usr/src/sys/kern/kern_sig.c:2837
#11 0xffffffff80a60727 in ast (framep=)
    at /usr/src/sys/kern/subr_trap.c:275
#12 0xffffffff80e08e09 in doreti_ast ()
    at /usr/src/sys/amd64/amd64/exception.S:676
#13 0x000000000814f470 in ?? ()
#14 0x000000000814f430 in ?? ()
#15 0x0000000000000000 in ?? ()
Current language:  auto; currently minimal
(kgdb) 


-- 
Larry Rosenman                     http://www.lerctr.org/~ler
Phone: +1 214-642-9640                 E-Mail: ler@lerctr.org
US Mail: 108 Turvey Cove, Hutto, TX 78634-5688

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 01:03:50 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 6BE63B13;
 Sat, 30 Aug 2014 01:03:50 +0000 (UTC)
Received: from smtp1.multiplay.co.uk (smtp1.multiplay.co.uk [85.236.96.35])
 by mx1.freebsd.org (Postfix) with ESMTP id ED55D12B1;
 Sat, 30 Aug 2014 01:03:49 +0000 (UTC)
Received: by smtp1.multiplay.co.uk (Postfix, from userid 65534)
 id 885C720E7088B; Sat, 30 Aug 2014 01:03:47 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
 smtp1.multiplay.co.uk
X-Spam-Level: 
X-Spam-Status: No, score=0.9 required=8.0 tests=AWL,BAYES_00,DOS_OE_TO_MX,
 FSL_HELO_NON_FQDN_1,RDNS_DYNAMIC,STOX_REPLY_TYPE autolearn=no version=3.3.1
Received: from r2d2 (82-69-141-170.dsl.in-addr.zen.co.uk [82.69.141.170])
 by smtp1.multiplay.co.uk (Postfix) with ESMTP id A40BA20E70885;
 Sat, 30 Aug 2014 01:03:44 +0000 (UTC)
Message-ID: 
From: "Steven Hartland" 
To: "Peter Wemm" 
References: <201408281950.s7SJo90I047213@svn.freebsd.org>
 <64121723.0IFfex9X4X@overcee.wemm.org>
 <0B77E782B5004AEBA77E6A5D16924D83@multiplay.co.uk>
 <2714752.cWQfguSlQD@overcee.wemm.org>
Subject: Re: svn commit: r270759 - in head/sys: cddl/compat/opensolaris/kern
 cddl/compat/opensolaris/sys cddl/contrib/opensolaris/uts/common/fs/zfs vm
Date: Sat, 30 Aug 2014 02:03:42 +0100
MIME-Version: 1.0
Content-Type: text/plain; format=flowed; charset="iso-8859-1";
 reply-type=original
Content-Transfer-Encoding: 7bit
X-Priority: 3
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook Express 6.00.2900.5931
X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.6157
Cc: src-committers@freebsd.org, Alan Cox ,
 svn-src-all@freebsd.org, Dmitry Morozovsky ,
 "Matthew D. Fuller" , svn-src-head@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 01:03:50 -0000


----- Original Message ----- 
From: "Peter Wemm" 
> On Friday 29 August 2014 21:42:15 Steven Hartland wrote:
> > ----- Original Message -----
> > From: "Peter Wemm" 
> >
> > > On Friday 29 August 2014 20:51:03 Steven Hartland wrote:
> > snip..
> >
> > > > Does Karl's explaination as to why this doesn't work above 
> > > > change
> > > > your
> > > > mind?
> > >
> > > Actually no, I would expect the code as committed would *cause* 
> > > the
> > > undesirable behavior that Karl described.
> > >
> > > ie: access a few large files and cause them to reside in cache. 
> > > Say
> > > 50GB or so
> > > on a 200G ram machine.  We now have the state where:
> > >
> > > v_cache = 50GB
> > > v_free = 1MB
> > >
> > > The rest of the vm system looks at vm_paging_needed(), which is: 
> > > do
> > > we have
> > > enough "v_cache + v_free"?  Since there's 50.001GB free, the 
> > > answer is
> > > no.
> > > It'll let v_free run right down to v_free_min because of the giant
> > > pool of
> > > v_cache just sitting there, waiting to be used.
> > >
> > > The zfs change, as committed will ignore all the free memory in 
> > > the
> > > form of
> > > v_cache.. and will be freaking out about how low v_free is getting 
> > > and
> > > will be
> > > sacrificing ARC in order to put more memory into the v_free pool.
> > >
> > > As long as ARC keeps sacrificing itself this way, the free pages 
> > > in
> > > the v_cache
> > > pool won't get used.  When ARC finally runs out of pages to give 
> > > up to
> > > v_free,
> > > the kernel will start using the free pages from v_cache. 
> > > Eventually
> > > it'll run
> > > down that v_cache free pool and arc will be in a bare minimum 
> > > state
> > > while this
> > > is happening.
> > >
> > > Meanwhile, ZFS ARC will be crippled.  This has consequences - it 
> > > does
> > > RCU like
> > > things from ARC to keep fragmentation under control.  With ARC
> > > crippled,
> > > fragmentation will increase because there's less opportunistic
> > > gathering of
> > > data from ARC.
> > >
> > > Granted, you have to get things freed from active/inactive to the
> > > cache state,
> > > but once it's there, depending on the worlkload, it'll mess with 
> > > ARC.
> >
> > There's already a vm_paging_needed() check in there below so this 
> > will
> > already be dealt with will it not?
>
> No.
>
> If you read the code that you changed, you won't get that far. The 
> v_free test
> comes before vm_paging_needed(), and if the v_free test triggers then 
> ARC will
> return pages and not look at the rest of the function.

Sorry I should have phrased that question better, prior to the change
vm_paging_needed() was the top test, ignoring needfeed, but it still 
causing
performance issues.

Surely with all other return 1 cases triggering at what should be a 
higher level
of free memory we should never have seen the performance issues, but 
users where
reporting it lots. So there's still some mystery surrounding why was 
this
happening?

> If this function returns non-zerp, ARC is given back:
>
> static int
> arc_reclaim_needed(void)
> {
>         if (kmem_free_count() < zfs_arc_free_target) {
>                 return (1);
>         }
>          /*
>          * Cooperate with pagedaemon when it's time for it to scan
>          * and reclaim some pages.
>          */
>         if (vm_paging_needed()) {
>                 return (1);
>         }
>
> ie: if v_free (ignoring v_cache free pages) gets below the threshold, 
> stop
> evertyhing and discard ARC pages.
>
> The vm_paging_needed() code is a NO-OP at this point. It can never 
> return
> true.  Consider:
>         vm_cnt.v_free_target = 4 * vm_cnt.v_free_min + 
> vm_cnt.v_free_reserved;
> vs
>         vm_pageout_wakeup_thresh = (vm_cnt.v_free_min / 10) * 11;
>
> zfs_arc_free_target defaults to vm_cnt.v_free_target, which is 400% of
> v_free_min, and compares it against the smaller v_free pool.
>
> vm_paging_needed() compares the total free pool (v_free + v_cache) 
> against the
> smaller wakeup threshold - 110% of v_free_min.
>
> Comparing a larger value against a smaller target than the previous 
> test will
> never succeed unless you manually change the arc_free_target sysctl.

I'm aware of the values involved, and as I said what you're proposing
was more akin to where I started, but I was informed that it had already
been tested and didn't work well.

So as I'm sure you'll appreciate given that information I opted to trust
the real life tests.

Now its totally possible there could be something in the tests that
was skewing the result, but as it still indicated the performance issue
was still there, where as using the current values it wasn't, I opted
for that vs. what I believed was the more technically correct value.

Now you've confirmed what I initially thought should be the correct 
values
are indeed so; I've asked Karl to retest, so we can confirm that any of
changes that went into stable/10 after that point haven't changed this
behaviour.

Hope that makes sense?

> Also, what about the magic numbers here:
> u_int zfs_arc_free_target = (1 << 19); /* default before pagedaemon
> init only */

That is just a total fall back case and should never be triggered unless
as the comment states the pagedaemon isn't initialised.

> That's half a million pages, or 2GB of physical ram on a 4K page size 
> system
> How is this going to work on early boot in the machines in the cluster 
> with
> less than 2GB of ram?

Its there to ensure that ARC doesn't run wild ARC for the few 
milliseconds
/ seconds before pagedaemon is initalised.

We can change the value no problem, what would you suggest 1<<16 aka
256MB?

Thanks for all the feedback, its great to have my understanding of
how things work in this area confirmed by those who know.

Hopefully we'll be able to get to the bottom of this with everyones
help and get a solid fix for these issues that have plaged 10 into
10.1 :)


From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 02:12:59 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 678A8228;
 Sat, 30 Aug 2014 02:12:59 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 533E5196B;
 Sat, 30 Aug 2014 02:12:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7U2Cxev022959;
 Sat, 30 Aug 2014 02:12:59 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7U2Cxs2022958;
 Sat, 30 Aug 2014 02:12:59 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201408300212.s7U2Cxs2022958@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh 
Date: Sat, 30 Aug 2014 02:12:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270831 - head/bin/dd
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 02:12:59 -0000

Author: imp
Date: Sat Aug 30 02:12:58 2014
New Revision: 270831
URL: http://svnweb.freebsd.org/changeset/base/270831

Log:
  Update the date for last example.
  
  Sponsored by: Netflix

Modified:
  head/bin/dd/dd.1

Modified: head/bin/dd/dd.1
==============================================================================
--- head/bin/dd/dd.1	Fri Aug 29 22:01:47 2014	(r270830)
+++ head/bin/dd/dd.1	Sat Aug 30 02:12:58 2014	(r270831)
@@ -32,7 +32,7 @@
 .\"     @(#)dd.1	8.2 (Berkeley) 1/13/94
 .\" $FreeBSD$
 .\"
-.Dd April 2, 2014
+.Dd August 28, 2014
 .Dt DD 1
 .Os
 .Sh NAME

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 02:13:05 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 0996C360;
 Sat, 30 Aug 2014 02:13:05 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E9A90196E;
 Sat, 30 Aug 2014 02:13:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7U2D4rq023038;
 Sat, 30 Aug 2014 02:13:04 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7U2D4aF023036;
 Sat, 30 Aug 2014 02:13:04 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201408300213.s7U2D4aF023036@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh 
Date: Sat, 30 Aug 2014 02:13:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270832 - in head/sys: cam/ata sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 02:13:05 -0000

Author: imp
Date: Sat Aug 30 02:13:04 2014
New Revision: 270832
URL: http://svnweb.freebsd.org/changeset/base/270832

Log:
  Add a few defines and packet types for SATA 3.2 and FPDMA (First Party
  DMA).
  
  Sponsored by: Netflix

Modified:
  head/sys/cam/ata/ata_all.c
  head/sys/sys/ata.h

Modified: head/sys/cam/ata/ata_all.c
==============================================================================
--- head/sys/cam/ata/ata_all.c	Sat Aug 30 02:12:58 2014	(r270831)
+++ head/sys/cam/ata/ata_all.c	Sat Aug 30 02:13:04 2014	(r270832)
@@ -108,6 +108,9 @@ ata_op_string(struct ata_cmd *cmd)
 	case 0x51: return ("CONFIGURE_STREAM");
 	case 0x60: return ("READ_FPDMA_QUEUED");
 	case 0x61: return ("WRITE_FPDMA_QUEUED");
+	case 0x63: return ("NCQ_NON_DATA");
+	case 0x64: return ("SEND_FPDMA_QUEUED");
+	case 0x65: return ("RECEIVE_FPDMA_QUEUED");
 	case 0x67:
 		if (cmd->features == 0xec)
 			return ("SEP_ATTN IDENTIFY");

Modified: head/sys/sys/ata.h
==============================================================================
--- head/sys/sys/ata.h	Sat Aug 30 02:12:58 2014	(r270831)
+++ head/sys/sys/ata.h	Sat Aug 30 02:13:04 2014	(r270832)
@@ -370,6 +370,7 @@ struct ata_params {
 #define ATA_READ_LOG_DMA_EXT            0x47    /* read log DMA ext - PIO Data-In */
 #define ATA_READ_FPDMA_QUEUED           0x60    /* read DMA NCQ */
 #define ATA_WRITE_FPDMA_QUEUED          0x61    /* write DMA NCQ */
+#define ATA_NCQ_NON_DATA		0x63	/* NCQ non-data command */
 #define ATA_SEND_FPDMA_QUEUED           0x64    /* send DMA NCQ */
 #define ATA_RECV_FPDMA_QUEUED           0x65    /* recieve DMA NCQ */
 #define ATA_SEP_ATTN                    0x67    /* SEP request */

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 02:13:10 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id F00A4497;
 Sat, 30 Aug 2014 02:13:09 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DC5691970;
 Sat, 30 Aug 2014 02:13:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7U2D9cb023103;
 Sat, 30 Aug 2014 02:13:09 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7U2D95I023102;
 Sat, 30 Aug 2014 02:13:09 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201408300213.s7U2D95I023102@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh 
Date: Sat, 30 Aug 2014 02:13:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270833 - head/sys/dev/ahci
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 02:13:10 -0000

Author: imp
Date: Sat Aug 30 02:13:09 2014
New Revision: 270833
URL: http://svnweb.freebsd.org/changeset/base/270833

Log:
  We were returning 20 bytes as the FIS size to send, but only
  initializing 16. Initialize all 20 so we don't send garbage in the
  Auxiliary register. The SATA standard mandates a 5 dword length for
  the Host to Device FIS.
  
  Sponsored by: Netflix

Modified:
  head/sys/dev/ahci/ahci.c

Modified: head/sys/dev/ahci/ahci.c
==============================================================================
--- head/sys/dev/ahci/ahci.c	Sat Aug 30 02:13:04 2014	(r270832)
+++ head/sys/dev/ahci/ahci.c	Sat Aug 30 02:13:09 2014	(r270833)
@@ -2764,7 +2764,7 @@ ahci_setup_fis(device_t dev, struct ahci
 	struct ahci_channel *ch = device_get_softc(dev);
 	u_int8_t *fis = &ctp->cfis[0];
 
-	bzero(ctp->cfis, 16);
+	bzero(fis, 20);
 	fis[0] = 0x27;  		/* host to device */
 	fis[1] = (ccb->ccb_h.target_id & 0x0f);
 	if (ccb->ccb_h.func_code == XPT_SCSI_IO) {

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 03:10:57 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 03529D97;
 Sat, 30 Aug 2014 03:10:57 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E24281EF4;
 Sat, 30 Aug 2014 03:10:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7U3Auue051085;
 Sat, 30 Aug 2014 03:10:56 GMT (envelope-from mjg@FreeBSD.org)
Received: (from mjg@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7U3Au8G051081;
 Sat, 30 Aug 2014 03:10:56 GMT (envelope-from mjg@FreeBSD.org)
Message-Id: <201408300310.s7U3Au8G051081@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: mjg set sender to mjg@FreeBSD.org
 using -f
From: Mateusz Guzik 
Date: Sat, 30 Aug 2014 03:10:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270834 - in head/sys:
 cddl/contrib/opensolaris/uts/common/dtrace compat/linprocfs kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 03:10:57 -0000

Author: mjg
Date: Sat Aug 30 03:10:55 2014
New Revision: 270834
URL: http://svnweb.freebsd.org/changeset/base/270834

Log:
  Add missing proctree locking to fill_kinfo_proc consumers.
  
  This fixes r270444.
  
  Pointy hat:	mjg
  Reported by:	many
  MFC after:	1 week

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
  head/sys/compat/linprocfs/linprocfs.c
  head/sys/kern/imgact_elf.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c	Sat Aug 30 02:13:09 2014	(r270833)
+++ head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c	Sat Aug 30 03:10:55 2014	(r270834)
@@ -2311,9 +2311,11 @@ fasttrap_ioctl(struct cdev *dev, u_long 
 			 * Report an error if the process doesn't exist
 			 * or is actively being birthed.
 			 */
+			sx_slock(&proctree_lock);
 			p = pfind(pid);
 			if (p)
 				fill_kinfo_proc(p, &kp);
+			sx_sunlock(&proctree_lock);
 			if (p == NULL || kp.ki_stat == SIDL) {
 #if defined(sun)
 				mutex_exit(&pidlock);
@@ -2377,9 +2379,11 @@ err:
 			 * Report an error if the process doesn't exist
 			 * or is actively being birthed.
 			 */
+			sx_slock(&proctree_lock);
 			p = pfind(pid);
 			if (p)
 				fill_kinfo_proc(p, &kp);
+			sx_sunlock(&proctree_lock);
 			if (p == NULL || kp.ki_stat == SIDL) {
 #if defined(sun)
 				mutex_exit(&pidlock);

Modified: head/sys/compat/linprocfs/linprocfs.c
==============================================================================
--- head/sys/compat/linprocfs/linprocfs.c	Sat Aug 30 02:13:09 2014	(r270833)
+++ head/sys/compat/linprocfs/linprocfs.c	Sat Aug 30 03:10:55 2014	(r270834)
@@ -645,8 +645,10 @@ linprocfs_doprocstat(PFS_FILL_ARGS)
 	static int ratelimit = 0;
 	vm_offset_t startcode, startdata;
 
+	sx_slock(&proctree_lock);
 	PROC_LOCK(p);
 	fill_kinfo_proc(p, &kp);
+	sx_sunlock(&proctree_lock);
 	if (p->p_vmspace) {
 	   startcode = (vm_offset_t)p->p_vmspace->vm_taddr;
 	   startdata = (vm_offset_t)p->p_vmspace->vm_daddr;
@@ -722,9 +724,11 @@ linprocfs_doprocstatm(PFS_FILL_ARGS)
 	struct kinfo_proc kp;
 	segsz_t lsize;
 
+	sx_slock(&proctree_lock);
 	PROC_LOCK(p);
 	fill_kinfo_proc(p, &kp);
 	PROC_UNLOCK(p);
+	sx_sunlock(&proctree_lock);
 
 	/*
 	 * See comments in linprocfs_doprocstatus() regarding the
@@ -757,6 +761,7 @@ linprocfs_doprocstatus(PFS_FILL_ARGS)
 	struct sigacts *ps;
 	int i;
 
+	sx_slock(&proctree_lock);
 	PROC_LOCK(p);
 	td2 = FIRST_THREAD_IN_PROC(p); /* XXXKSE pretend only one thread */
 
@@ -795,6 +800,8 @@ linprocfs_doprocstatus(PFS_FILL_ARGS)
 	}
 
 	fill_kinfo_proc(p, &kp);
+	sx_sunlock(&proctree_lock);
+
 	sbuf_printf(sb, "Name:\t%s\n",		p->p_comm); /* XXX escape */
 	sbuf_printf(sb, "State:\t%s\n",		state);
 

Modified: head/sys/kern/imgact_elf.c
==============================================================================
--- head/sys/kern/imgact_elf.c	Sat Aug 30 02:13:09 2014	(r270833)
+++ head/sys/kern/imgact_elf.c	Sat Aug 30 03:10:55 2014	(r270834)
@@ -1783,8 +1783,10 @@ __elfN(note_procstat_proc)(void *arg, st
 		KASSERT(*sizep == size, ("invalid size"));
 		structsize = sizeof(elf_kinfo_proc_t);
 		sbuf_bcat(sb, &structsize, sizeof(structsize));
+		sx_slock(&proctree_lock);
 		PROC_LOCK(p);
 		kern_proc_out(p, sb, ELF_KERN_PROC_MASK);
+		sx_sunlock(&proctree_lock);
 	}
 	*sizep = size;
 }

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 03:11:52 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id D1489ED8;
 Sat, 30 Aug 2014 03:11:52 +0000 (UTC)
Received: from mail-wi0-x229.google.com (mail-wi0-x229.google.com
 [IPv6:2a00:1450:400c:c05::229])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id CD5821F00;
 Sat, 30 Aug 2014 03:11:51 +0000 (UTC)
Received: by mail-wi0-f169.google.com with SMTP id n3so97190wiv.0
 for ; Fri, 29 Aug 2014 20:11:50 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=date:from:to:cc:subject:message-id:references:mime-version
 :content-type:content-disposition:in-reply-to:user-agent;
 bh=NHISo8JSD0NZC/Z/Ty8uHpUSzCqSq98VLrcmLI5rxpM=;
 b=1G5wzrIaMCHMvNjXDl0Il5M+lKBJeY7Su51lxtC2Cv2EX+bqsJq3Ap6t/OfUSLFaFi
 aAOo5e1IrJjycHEUfeCiaeG29ZXFFm+Apa3JueIam0fqhlHqXv1w2bZ8d2mwvEQfmhaE
 ew7b3jx4Or5y81wxqCUzftLVB9LoPMyeIoc4aHTf3SCAZGepKSE376lb88AcIJ5lpH2R
 zpHMuwIi0lRN73yiZepX+gJxMS7TljuC6/FNkY+L4tWzTHpXG+wHF4MupyOaJ3TzZ3pN
 f1771MGMjzTVbRJaHoMgsQa2ss9dCKUcFxgyynfnsBWPpO/5miTGbB8xei/dDDtt2uGU
 blEg==
X-Received: by 10.180.80.105 with SMTP id q9mr7857232wix.39.1409368310014;
 Fri, 29 Aug 2014 20:11:50 -0700 (PDT)
Received: from dft-labs.eu (n1x0n-1-pt.tunnel.tserv5.lon1.ipv6.he.net.
 [2001:470:1f08:1f7::2])
 by mx.google.com with ESMTPSA id w20sm2663900wie.7.2014.08.29.20.11.48
 for 
 (version=TLSv1.2 cipher=RC4-SHA bits=128/128);
 Fri, 29 Aug 2014 20:11:49 -0700 (PDT)
Date: Sat, 30 Aug 2014 05:11:46 +0200
From: Mateusz Guzik 
To: Larry Rosenman 
Subject: Re: svn commit: r270745 - in head: bin/ps sys/compat/freebsd32
 sys/kern sys/sys
Message-ID: <20140830031146.GB21347@dft-labs.eu>
References: <201408280841.s7S8fC6X012986@svn.freebsd.org>
 
 <20140830005028.GA1881@borg.lerctr.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <20140830005028.GA1881@borg.lerctr.org>
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: jhb@freebsd.org, Adrian Chadd , svn-src-all@freebsd.org,
 mjg@freebsd.org, svn-committers-src@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 03:11:52 -0000

On Fri, Aug 29, 2014 at 07:50:28PM -0500, Larry Rosenman wrote:
> On Fri, Aug 29, 2014 at 05:07:51PM -0700, Adrian Chadd wrote:
> > Hi!
> > 
> > So I'm now getting panics in the process coredump path on -HEAD. The
> > proctree lock isn't held.
> > 
> > Assertion : proctree not locked @ kern_proc.c:795
> > 
> > path:
> > 
> > sigexit() -> elf64_coredump() -> elf64_note_procstat_proc() ->
> > kern_proc_out() -> fill_kinfo_proc() -> panic.
> > 
> > What did you peeps do this time? :P
> > 
> > 
> > 
> > -a
> Here's my similar one...
> 
[snip]

Sorry guys, fixed in r270834.

-- 
Mateusz Guzik 

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 03:41:48 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 031621DD;
 Sat, 30 Aug 2014 03:41:48 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E28BC125C;
 Sat, 30 Aug 2014 03:41:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7U3flr6065280;
 Sat, 30 Aug 2014 03:41:47 GMT (envelope-from alc@FreeBSD.org)
Received: (from alc@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7U3flrI065279;
 Sat, 30 Aug 2014 03:41:47 GMT (envelope-from alc@FreeBSD.org)
Message-Id: <201408300341.s7U3flrI065279@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: alc set sender to alc@FreeBSD.org
 using -f
From: Alan Cox 
Date: Sat, 30 Aug 2014 03:41:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270835 - stable/10/sys/ia64/ia64
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 03:41:48 -0000

Author: alc
Date: Sat Aug 30 03:41:47 2014
New Revision: 270835
URL: http://svnweb.freebsd.org/changeset/base/270835

Log:
  Update an assertion to reflect the changes made in r270439.  This is a
  direct commit to stable/10 because ia64 is no longer supported by HEAD.
  
  Reported by:	marcel
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  stable/10/sys/ia64/ia64/pmap.c

Modified: stable/10/sys/ia64/ia64/pmap.c
==============================================================================
--- stable/10/sys/ia64/ia64/pmap.c	Sat Aug 30 03:10:55 2014	(r270834)
+++ stable/10/sys/ia64/ia64/pmap.c	Sat Aug 30 03:41:47 2014	(r270835)
@@ -1713,8 +1713,8 @@ pmap_enter(pmap_t pmap, vm_offset_t va, 
 
 	va &= ~PAGE_MASK;
  	KASSERT(va <= VM_MAX_KERNEL_ADDRESS, ("pmap_enter: toobig"));
-	KASSERT((m->oflags & VPO_UNMANAGED) != 0 || vm_page_xbusied(m),
-	    ("pmap_enter: page %p is not busy", m));
+	if ((m->oflags & VPO_UNMANAGED) == 0 && !vm_page_xbusied(m))
+		VM_OBJECT_ASSERT_LOCKED(m->object);
 
 	/*
 	 * Find (or create) a pte for the given mapping.

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 07:08:10 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id C9FC7396;
 Sat, 30 Aug 2014 07:08:10 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B655F15C8;
 Sat, 30 Aug 2014 07:08:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7U78Aqk057191;
 Sat, 30 Aug 2014 07:08:10 GMT (envelope-from hrs@FreeBSD.org)
Received: (from hrs@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7U78AHY057190;
 Sat, 30 Aug 2014 07:08:10 GMT (envelope-from hrs@FreeBSD.org)
Message-Id: <201408300708.s7U78AHY057190@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: hrs set sender to hrs@FreeBSD.org
 using -f
From: Hiroki Sato 
Date: Sat, 30 Aug 2014 07:08:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270836 - head/etc/rc.d
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 07:08:10 -0000

Author: hrs
Date: Sat Aug 30 07:08:10 2014
New Revision: 270836
URL: http://svnweb.freebsd.org/changeset/base/270836

Log:
  Use ipv6_prefer when at least one ifconfig_IF_ipv6 is configured.
  
  Discussed on:	-net@

Modified:
  head/etc/rc.d/ip6addrctl

Modified: head/etc/rc.d/ip6addrctl
==============================================================================
--- head/etc/rc.d/ip6addrctl	Sat Aug 30 03:41:47 2014	(r270835)
+++ head/etc/rc.d/ip6addrctl	Sat Aug 30 07:08:10 2014	(r270836)
@@ -75,6 +75,8 @@ ip6addrctl_start()
 		else
 			if checkyesno ipv6_activate_all_interfaces; then
 				ip6addrctl_prefer_ipv6
+			elif [ -n "$(list_vars ifconfig_\*_ipv6)" ]; then
+				ip6addrctl_prefer_ipv6
 			else
 				ip6addrctl_prefer_ipv4
 			fi

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 09:55:39 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 82861F8C;
 Sat, 30 Aug 2014 09:55:39 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6DCD216B3;
 Sat, 30 Aug 2014 09:55:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7U9tdpr035657;
 Sat, 30 Aug 2014 09:55:39 GMT (envelope-from ume@FreeBSD.org)
Received: (from ume@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7U9tdmC035655;
 Sat, 30 Aug 2014 09:55:39 GMT (envelope-from ume@FreeBSD.org)
Message-Id: <201408300955.s7U9tdmC035655@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ume set sender to ume@FreeBSD.org
 using -f
From: Hajimu UMEMOTO 
Date: Sat, 30 Aug 2014 09:55:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270837 - in stable/10/lib/libc: . md
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 09:55:39 -0000

Author: ume
Date: Sat Aug 30 09:55:38 2014
New Revision: 270837
URL: http://svnweb.freebsd.org/changeset/base/270837

Log:
  MFC r269865:
  Bring the md5 functions into libc for internal use only.
  It is required to support ID randomization for our stub
  resolver.

Added:
  stable/10/lib/libc/md/
     - copied from r269865, head/lib/libc/md/
Modified:
  stable/10/lib/libc/Makefile
  stable/10/lib/libc/md/Makefile.inc
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libc/Makefile
==============================================================================
--- stable/10/lib/libc/Makefile	Sat Aug 30 07:08:10 2014	(r270836)
+++ stable/10/lib/libc/Makefile	Sat Aug 30 09:55:38 2014	(r270837)
@@ -74,6 +74,7 @@ NOASM=
 .include "${.CURDIR}/inet/Makefile.inc"
 .include "${.CURDIR}/isc/Makefile.inc"
 .include "${.CURDIR}/locale/Makefile.inc"
+.include "${.CURDIR}/md/Makefile.inc"
 .include "${.CURDIR}/nameser/Makefile.inc"
 .include "${.CURDIR}/net/Makefile.inc"
 .include "${.CURDIR}/nls/Makefile.inc"

Modified: stable/10/lib/libc/md/Makefile.inc
==============================================================================
--- head/lib/libc/md/Makefile.inc	Tue Aug 12 12:25:56 2014	(r269865)
+++ stable/10/lib/libc/md/Makefile.inc	Sat Aug 30 09:55:38 2014	(r270837)
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-.PATH: ${LIBC_SRCTOP}/../libmd
+.PATH: ${.CURDIR}/../libmd
 
 SRCS+=	md5c.c

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 10:16:30 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id AFA2F525;
 Sat, 30 Aug 2014 10:16:30 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 97BDF19B0;
 Sat, 30 Aug 2014 10:16:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7UAGUVF045411;
 Sat, 30 Aug 2014 10:16:30 GMT (envelope-from ume@FreeBSD.org)
Received: (from ume@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7UAGPLb045366;
 Sat, 30 Aug 2014 10:16:25 GMT (envelope-from ume@FreeBSD.org)
Message-Id: <201408301016.s7UAGPLb045366@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ume set sender to ume@FreeBSD.org
 using -f
From: Hajimu UMEMOTO 
Date: Sat, 30 Aug 2014 10:16:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270838 - in stable/10: include include/arpa
 lib/libc/include lib/libc/include/isc lib/libc/inet lib/libc/isc
 lib/libc/nameser lib/libc/resolv
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 10:16:30 -0000

Author: ume
Date: Sat Aug 30 10:16:25 2014
New Revision: 270838
URL: http://svnweb.freebsd.org/changeset/base/270838

Log:
  MFC r269867:
  Update our stub resolver to final version of libbind
  (libbind-6.0).
  
  Obtained from:  ISC

Modified:
  stable/10/include/arpa/inet.h
  stable/10/include/arpa/nameser.h
  stable/10/include/arpa/nameser_compat.h
  stable/10/include/res_update.h
  stable/10/include/resolv.h
  stable/10/lib/libc/include/isc/eventlib.h
  stable/10/lib/libc/include/isc/list.h
  stable/10/lib/libc/include/port_before.h
  stable/10/lib/libc/inet/inet_addr.c
  stable/10/lib/libc/inet/inet_cidr_ntop.c
  stable/10/lib/libc/inet/inet_cidr_pton.c
  stable/10/lib/libc/inet/inet_net_ntop.c
  stable/10/lib/libc/inet/inet_net_pton.c
  stable/10/lib/libc/inet/inet_neta.c
  stable/10/lib/libc/inet/inet_ntoa.c
  stable/10/lib/libc/inet/inet_ntop.c
  stable/10/lib/libc/inet/inet_pton.c
  stable/10/lib/libc/inet/nsap_addr.c
  stable/10/lib/libc/isc/ev_streams.c
  stable/10/lib/libc/isc/ev_timers.c
  stable/10/lib/libc/isc/eventlib_p.h
  stable/10/lib/libc/nameser/Symbol.map
  stable/10/lib/libc/nameser/ns_name.c
  stable/10/lib/libc/nameser/ns_netint.c
  stable/10/lib/libc/nameser/ns_parse.c
  stable/10/lib/libc/nameser/ns_print.c
  stable/10/lib/libc/nameser/ns_samedomain.c
  stable/10/lib/libc/nameser/ns_ttl.c
  stable/10/lib/libc/resolv/Makefile.inc
  stable/10/lib/libc/resolv/Symbol.map
  stable/10/lib/libc/resolv/herror.c
  stable/10/lib/libc/resolv/res_comp.c
  stable/10/lib/libc/resolv/res_data.c
  stable/10/lib/libc/resolv/res_debug.c
  stable/10/lib/libc/resolv/res_findzonecut.c
  stable/10/lib/libc/resolv/res_init.c
  stable/10/lib/libc/resolv/res_mkquery.c
  stable/10/lib/libc/resolv/res_mkupdate.c
  stable/10/lib/libc/resolv/res_query.c
  stable/10/lib/libc/resolv/res_send.c
  stable/10/lib/libc/resolv/res_update.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/include/arpa/inet.h
==============================================================================
--- stable/10/include/arpa/inet.h	Sat Aug 30 09:55:38 2014	(r270837)
+++ stable/10/include/arpa/inet.h	Sat Aug 30 10:16:25 2014	(r270838)
@@ -51,7 +51,7 @@
 
 /*%
  *	@(#)inet.h	8.1 (Berkeley) 6/2/93
- *	$Id: inet.h,v 1.2.18.1 2005/04/27 05:00:50 sra Exp $
+ *	$Id: inet.h,v 1.3 2005/04/27 04:56:16 sra Exp $
  * $FreeBSD$
  */
 

Modified: stable/10/include/arpa/nameser.h
==============================================================================
--- stable/10/include/arpa/nameser.h	Sat Aug 30 09:55:38 2014	(r270837)
+++ stable/10/include/arpa/nameser.h	Sat Aug 30 10:16:25 2014	(r270838)
@@ -1,7 +1,24 @@
 /*
+ * Portions Copyright (C) 2004, 2005, 2008, 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 1996-2003  Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/*
  * Copyright (c) 1983, 1989, 1993
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +30,7 @@
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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
@@ -28,24 +45,7 @@
  */
 
 /*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996-1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- *	$Id: nameser.h,v 1.7.18.2 2008/04/03 23:15:15 marka Exp $
+ *	$Id: nameser.h,v 1.16 2009/03/03 01:52:48 each Exp $
  * $FreeBSD$
  */
 
@@ -68,15 +68,18 @@
  * contains a new enough lib/nameser/ to support the feature you need.
  */
 
-#define __NAMESER	19991006	/*%< New interface version stamp. */
+#define __NAMESER	20090302	/*%< New interface version stamp. */
 /*
  * Define constants based on RFC0883, RFC1034, RFC 1035
  */
 #define NS_PACKETSZ	512	/*%< default UDP packet size */
-#define NS_MAXDNAME	1025	/*%< maximum domain name */
+#define NS_MAXDNAME	1025	/*%< maximum domain name (presentation format)*/
 #define NS_MAXMSG	65535	/*%< maximum message size */
 #define NS_MAXCDNAME	255	/*%< maximum compressed domain name */
 #define NS_MAXLABEL	63	/*%< maximum length of domain label */
+#define NS_MAXLABELS	128	/*%< theoretical max #/labels per domain name */
+#define NS_MAXNNAME	256	/*%< maximum uncompressed (binary) domain name*/
+#define	NS_MAXPADDR	(sizeof "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")
 #define NS_HFIXEDSZ	12	/*%< #/bytes of fixed data in header */
 #define NS_QFIXEDSZ	4	/*%< #/bytes of fixed data in query */
 #define NS_RRFIXEDSZ	10	/*%< #/bytes of fixed data in r record */
@@ -103,6 +106,18 @@ typedef enum __ns_sect {
 } ns_sect;
 
 /*%
+ * Network name (compressed or not) type.  Equivilent to a pointer when used
+ * in a function prototype.  Can be const'd.
+ */
+typedef u_char ns_nname[NS_MAXNNAME];
+typedef const u_char *ns_nname_ct;
+typedef u_char *ns_nname_t;
+
+struct ns_namemap { ns_nname_ct base; int len; };
+typedef struct ns_namemap *ns_namemap_t;
+typedef const struct ns_namemap *ns_namemap_ct;
+
+/*%
  * This is a message handle.  It is caller allocated and has no dynamic data.
  * This structure is intended to be opaque to all but ns_parse.c, thus the
  * leading _'s on the member names.  Use the accessor functions, not the _'s.
@@ -116,6 +131,17 @@ typedef struct __ns_msg {
 	const u_char	*_msg_ptr;
 } ns_msg;
 
+/*
+ * This is a newmsg handle, used when constructing new messages with
+ * ns_newmsg_init, et al.
+ */
+struct ns_newmsg {
+	ns_msg		msg;
+	const u_char	*dnptrs[25];
+	const u_char	**lastdnptr;
+};
+typedef struct ns_newmsg ns_newmsg;
+
 /* Private data structure - do not use from outside library. */
 struct _ns_flagdata {  int mask, shift;  };
 extern struct _ns_flagdata _ns_flagdata[];
@@ -140,8 +166,23 @@ typedef	struct __ns_rr {
 	const u_char *	rdata;
 } ns_rr;
 
+/*
+ * Same thing, but using uncompressed network binary names, and real C types.
+ */
+typedef	struct __ns_rr2 {
+	ns_nname	nname;
+	size_t		nnamel;
+	int		type;
+	int		rr_class;
+	u_int		ttl;
+	int		rdlength;
+	const u_char *	rdata;
+} ns_rr2;
+
 /* Accessor macros - this is part of the public interface. */
 #define ns_rr_name(rr)	(((rr).name[0] != '\0') ? (rr).name : ".")
+#define ns_rr_nname(rr)	((const ns_nname_t)(rr).nname)
+#define ns_rr_nnamel(rr) ((rr).nnamel + 0)
 #define ns_rr_type(rr)	((ns_type)((rr).type + 0))
 #define ns_rr_class(rr)	((ns_class)((rr).rr_class + 0))
 #define ns_rr_ttl(rr)	((rr).ttl + 0)
@@ -216,9 +257,9 @@ typedef enum __ns_update_operation {
  * This structure is used for TSIG authenticated messages
  */
 struct ns_tsig_key {
-        char name[NS_MAXDNAME], alg[NS_MAXDNAME];
-        unsigned char *data;
-        int len;
+	char name[NS_MAXDNAME], alg[NS_MAXDNAME];
+	unsigned char *data;
+	int len;
 };
 typedef struct ns_tsig_key ns_tsig_key;
 
@@ -274,7 +315,7 @@ typedef enum __ns_type {
 	ns_t_key = 25,		/*%< Security key. */
 	ns_t_px = 26,		/*%< X.400 mail mapping. */
 	ns_t_gpos = 27,		/*%< Geographical position (withdrawn). */
-	ns_t_aaaa = 28,		/*%< Ip6 Address. */
+	ns_t_aaaa = 28,		/*%< IPv6 Address. */
 	ns_t_loc = 29,		/*%< Location Information. */
 	ns_t_nxt = 30,		/*%< Next domain (security). */
 	ns_t_eid = 31,		/*%< Endpoint identifier. */
@@ -284,11 +325,22 @@ typedef enum __ns_type {
 	ns_t_naptr = 35,	/*%< Naming Authority PoinTeR */
 	ns_t_kx = 36,		/*%< Key Exchange */
 	ns_t_cert = 37,		/*%< Certification record */
-	ns_t_a6 = 38,		/*%< IPv6 address (deprecates AAAA) */
-	ns_t_dname = 39,	/*%< Non-terminal DNAME (for IPv6) */
+	ns_t_a6 = 38,		/*%< IPv6 address (experimental) */
+	ns_t_dname = 39,	/*%< Non-terminal DNAME */
 	ns_t_sink = 40,		/*%< Kitchen sink (experimentatl) */
 	ns_t_opt = 41,		/*%< EDNS0 option (meta-RR) */
 	ns_t_apl = 42,		/*%< Address prefix list (RFC3123) */
+	ns_t_ds = 43,		/*%< Delegation Signer */
+	ns_t_sshfp = 44,	/*%< SSH Fingerprint */
+	ns_t_ipseckey = 45,	/*%< IPSEC Key */
+	ns_t_rrsig = 46,	/*%< RRset Signature */
+	ns_t_nsec = 47,		/*%< Negative security */
+	ns_t_dnskey = 48,	/*%< DNS Key */
+	ns_t_dhcid = 49,	/*%< Dynamic host configuratin identifier */
+	ns_t_nsec3 = 50,	/*%< Negative security type 3 */
+	ns_t_nsec3param = 51,	/*%< Negative security type 3 parameters */
+	ns_t_hip = 55,		/*%< Host Identity Protocol */
+	ns_t_spf = 99,		/*%< Sender Policy Framework */
 	ns_t_tkey = 249,	/*%< Transaction key */
 	ns_t_tsig = 250,	/*%< Transaction signature. */
 	ns_t_ixfr = 251,	/*%< Incremental zone transfer. */
@@ -297,6 +349,7 @@ typedef enum __ns_type {
 	ns_t_maila = 254,	/*%< Transfer mail agent records. */
 	ns_t_any = 255,		/*%< Wildcard match. */
 	ns_t_zxfr = 256,	/*%< BIND-specific, nonstandard. */
+	ns_t_dlv = 32769,	/*%< DNSSEC look-aside validatation. */
 	ns_t_max = 65536
 } ns_type;
 
@@ -475,6 +528,7 @@ typedef enum __ns_cert_types {
 #define ns_initparse		__ns_initparse
 #define ns_skiprr		__ns_skiprr
 #define ns_parserr		__ns_parserr
+#define ns_parserr2		__ns_parserr2
 #define	ns_sprintrr		__ns_sprintrr
 #define	ns_sprintrrf		__ns_sprintrrf
 #define	ns_format_ttl		__ns_format_ttl
@@ -485,12 +539,19 @@ typedef enum __ns_cert_types {
 #define	ns_name_ntol		__ns_name_ntol
 #define	ns_name_ntop		__ns_name_ntop
 #define	ns_name_pton		__ns_name_pton
+#define	ns_name_pton2		__ns_name_pton2
 #define	ns_name_unpack		__ns_name_unpack
+#define	ns_name_unpack2		__ns_name_unpack2
 #define	ns_name_pack		__ns_name_pack
 #define	ns_name_compress	__ns_name_compress
 #define	ns_name_uncompress	__ns_name_uncompress
 #define	ns_name_skip		__ns_name_skip
 #define	ns_name_rollback	__ns_name_rollback
+#define	ns_name_length		__ns_name_length
+#define	ns_name_eq		__ns_name_eq
+#define	ns_name_owned		__ns_name_owned
+#define	ns_name_map		__ns_name_map
+#define	ns_name_labels		__ns_name_labels
 #if 0
 #define	ns_sign			__ns_sign
 #define	ns_sign2		__ns_sign2
@@ -508,6 +569,16 @@ typedef enum __ns_cert_types {
 #endif
 #define	ns_makecanon		__ns_makecanon
 #define	ns_samename		__ns_samename
+#define	ns_newmsg_init		__ns_newmsg_init
+#define	ns_newmsg_copy		__ns_newmsg_copy
+#define	ns_newmsg_id		__ns_newmsg_id
+#define	ns_newmsg_flag		__ns_newmsg_flag
+#define	ns_newmsg_q		__ns_newmsg_q
+#define	ns_newmsg_rr		__ns_newmsg_rr
+#define	ns_newmsg_done		__ns_newmsg_done
+#define	ns_rdata_unpack		__ns_rdata_unpack
+#define	ns_rdata_equal		__ns_rdata_equal
+#define	ns_rdata_refers		__ns_rdata_refers
 
 __BEGIN_DECLS
 int		ns_msg_getflag(ns_msg, int);
@@ -518,6 +589,7 @@ void		ns_put32(u_long, u_char *);
 int		ns_initparse(const u_char *, int, ns_msg *);
 int		ns_skiprr(const u_char *, const u_char *, ns_sect, int);
 int		ns_parserr(ns_msg *, ns_sect, int, ns_rr *);
+int		ns_parserr2(ns_msg *, ns_sect, int, ns_rr2 *);
 int		ns_sprintrr(const ns_msg *, const ns_rr *,
 			    const char *, const char *, char *, size_t);
 int		ns_sprintrrf(const u_char *, size_t, const char *,
@@ -532,8 +604,12 @@ u_int32_t	ns_datetosecs(const char *cp, 
 int		ns_name_ntol(const u_char *, u_char *, size_t);
 int		ns_name_ntop(const u_char *, char *, size_t);
 int		ns_name_pton(const char *, u_char *, size_t);
+int		ns_name_pton2(const char *, u_char *, size_t, size_t *);
 int		ns_name_unpack(const u_char *, const u_char *,
 			       const u_char *, u_char *, size_t);
+int		ns_name_unpack2(const u_char *, const u_char *,
+				const u_char *, u_char *, size_t,
+				size_t *);
 int		ns_name_pack(const u_char *, u_char *, int,
 			     const u_char **, const u_char **);
 int		ns_name_uncompress(const u_char *, const u_char *,
@@ -543,6 +619,11 @@ int		ns_name_compress(const char *, u_ch
 int		ns_name_skip(const u_char **, const u_char *);
 void		ns_name_rollback(const u_char *, const u_char **,
 				 const u_char **);
+ssize_t		ns_name_length(ns_nname_ct, size_t);
+int		ns_name_eq(ns_nname_ct, size_t, ns_nname_ct, size_t);
+int		ns_name_owned(ns_namemap_ct, int, ns_namemap_ct, int);
+int		ns_name_map(ns_nname_ct, size_t, ns_namemap_t, int);
+int		ns_name_labels(ns_nname_ct, size_t);
 #if 0
 int		ns_sign(u_char *, int *, int, int, void *,
 			const u_char *, int, u_char *, int *, time_t);
@@ -570,6 +651,25 @@ int		ns_subdomain(const char *, const ch
 #endif
 int		ns_makecanon(const char *, char *, size_t);
 int		ns_samename(const char *, const char *);
+int		ns_newmsg_init(u_char *buffer, size_t bufsiz, ns_newmsg *);
+int		ns_newmsg_copy(ns_newmsg *, ns_msg *);
+void		ns_newmsg_id(ns_newmsg *handle, u_int16_t id);
+void		ns_newmsg_flag(ns_newmsg *handle, ns_flag flag, u_int value);
+int		ns_newmsg_q(ns_newmsg *handle, ns_nname_ct qname,
+			    ns_type qtype, ns_class qclass);
+int		ns_newmsg_rr(ns_newmsg *handle, ns_sect sect,
+			     ns_nname_ct name, ns_type type,
+			     ns_class rr_class, u_int32_t ttl,
+			     u_int16_t rdlen, const u_char *rdata);
+size_t		ns_newmsg_done(ns_newmsg *handle);
+ssize_t		ns_rdata_unpack(const u_char *, const u_char *, ns_type,
+				const u_char *, size_t, u_char *, size_t);
+int		ns_rdata_equal(ns_type,
+			       const u_char *, size_t,
+			       const u_char *, size_t);
+int		ns_rdata_refers(ns_type,
+				const u_char *, size_t,
+				const u_char *);
 __END_DECLS
 
 #ifdef BIND_4_COMPAT

Modified: stable/10/include/arpa/nameser_compat.h
==============================================================================
--- stable/10/include/arpa/nameser_compat.h	Sat Aug 30 09:55:38 2014	(r270837)
+++ stable/10/include/arpa/nameser_compat.h	Sat Aug 30 10:16:25 2014	(r270838)
@@ -28,7 +28,7 @@
 
 /*%
  *      from nameser.h	8.1 (Berkeley) 6/2/93
- *	$Id: nameser_compat.h,v 1.5.18.3 2006/05/19 02:36:00 marka Exp $
+ *	$Id: nameser_compat.h,v 1.8 2006/05/19 02:33:40 marka Exp $
  * $FreeBSD$
  */
 

Modified: stable/10/include/res_update.h
==============================================================================
--- stable/10/include/res_update.h	Sat Aug 30 09:55:38 2014	(r270837)
+++ stable/10/include/res_update.h	Sat Aug 30 10:16:25 2014	(r270838)
@@ -16,7 +16,7 @@
  */
 
 /*
- *	$Id: res_update.h,v 1.2.18.1 2005/04/27 05:00:49 sra Exp $
+ *	$Id: res_update.h,v 1.3 2005/04/27 04:56:15 sra Exp $
  * $FreeBSD$
  */
 

Modified: stable/10/include/resolv.h
==============================================================================
--- stable/10/include/resolv.h	Sat Aug 30 09:55:38 2014	(r270837)
+++ stable/10/include/resolv.h	Sat Aug 30 10:16:25 2014	(r270838)
@@ -1,7 +1,24 @@
 /*
+ * Portions Copyright (C) 2004, 2005, 2008, 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 1995-2003  Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/*
  * Copyright (c) 1983, 1987, 1989
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +30,7 @@
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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
@@ -27,26 +44,9 @@
  * SUCH DAMAGE.
  */
 
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (c) 1996-1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
 /*%
  *	@(#)resolv.h	8.1 (Berkeley) 6/2/93
- *	$Id: resolv.h,v 1.19.18.4 2008/04/03 23:15:15 marka Exp $
+ *	$Id: resolv.h,v 1.30 2009/03/03 01:52:48 each Exp $
  * $FreeBSD$
  */
 
@@ -68,7 +68,7 @@
  * is new enough to contain a certain feature.
  */
 
-#define	__RES	20030124
+#define	__RES	20090302
 
 /*%
  * This used to be defined in res_query.c, now it's in herror.c.
@@ -179,7 +179,7 @@ struct __res_state {
 	u_int	_pad;			/*%< make _u 64 bit aligned */
 	union {
 		/* On an 32-bit arch this means 512b total. */
-		char	pad[72 - 4*sizeof (int) - 2*sizeof (void *)];
+		char	pad[72 - 4*sizeof (int) - 3*sizeof (void *)];
 		struct {
 			u_int16_t		nscount;
 			u_int16_t		nstimes[MAXNS];	/*%< ms. */
@@ -187,6 +187,7 @@ struct __res_state {
 			struct __res_state_ext *ext;	/*%< extension for IPv6 */
 		} _ext;
 	} _u;
+	u_char	*_rnd;			/*%< PRIVATE: random state */
 };
 
 typedef struct __res_state *res_state;
@@ -320,7 +321,7 @@ __END_DECLS
 #if !defined(SHARED_LIBBIND) || defined(LIB)
 /*
  * If libbind is a shared object (well, DLL anyway)
- * these externs break the linker when resolv.h is 
+ * these externs break the linker when resolv.h is
  * included by a lib client (like named)
  * Make them go away if a client is including this
  *
@@ -378,7 +379,9 @@ extern const struct res_sym __p_rcode_sy
 #define res_nisourserver	__res_nisourserver
 #define res_ownok		__res_ownok
 #define res_queriesmatch	__res_queriesmatch
+#define res_rndinit		__res_rndinit
 #define res_randomid		__res_randomid
+#define res_nrandomid		__res_nrandomid
 #define sym_ntop		__sym_ntop
 #define sym_ntos		__sym_ntos
 #define sym_ston		__sym_ston
@@ -441,7 +444,9 @@ int		dn_count_labels(const char *);
 int		dn_comp(const char *, u_char *, int, u_char **, u_char **);
 int		dn_expand(const u_char *, const u_char *, const u_char *,
 			  char *, int);
+void		res_rndinit(res_state);
 u_int		res_randomid(void);
+u_int		res_nrandomid(res_state);
 int		res_nameinquery(const char *, int, int, const u_char *,
 				const u_char *);
 int		res_queriesmatch(const u_char *, const u_char *,

Modified: stable/10/lib/libc/include/isc/eventlib.h
==============================================================================
--- stable/10/lib/libc/include/isc/eventlib.h	Sat Aug 30 09:55:38 2014	(r270837)
+++ stable/10/lib/libc/include/isc/eventlib.h	Sat Aug 30 10:16:25 2014	(r270838)
@@ -1,24 +1,24 @@
 /*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1995-1999 by Internet Software Consortium
+ * Copyright (C) 2004, 2005, 2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1995-1999, 2001, 2003  Internet Software Consortium.
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
  */
 
 /* eventlib.h - exported interfaces for eventlib
  * vix 09sep95 [initial]
  *
- * $Id: eventlib.h,v 1.3.18.3 2008/01/23 02:12:01 marka Exp $
+ * $Id: eventlib.h,v 1.7 2008/11/14 02:36:51 marka Exp $
  */
 
 #ifndef _EVENTLIB_H

Modified: stable/10/lib/libc/include/isc/list.h
==============================================================================
--- stable/10/lib/libc/include/isc/list.h	Sat Aug 30 09:55:38 2014	(r270837)
+++ stable/10/lib/libc/include/isc/list.h	Sat Aug 30 10:16:25 2014	(r270838)
@@ -38,7 +38,8 @@
 	} while (0)
 #define INIT_LINK(elt, link) \
 	INIT_LINK_TYPE(elt, link, void)
-#define LINKED(elt, link) ((void *)((elt)->link.prev) != (void *)(-1))
+#define LINKED(elt, link) ((void *)((elt)->link.prev) != (void *)(-1) && \
+			   (void *)((elt)->link.next) != (void *)(-1))
 
 #define HEAD(list) ((list).head)
 #define TAIL(list) ((list).tail)

Modified: stable/10/lib/libc/include/port_before.h
==============================================================================
--- stable/10/lib/libc/include/port_before.h	Sat Aug 30 09:55:38 2014	(r270837)
+++ stable/10/lib/libc/include/port_before.h	Sat Aug 30 10:16:25 2014	(r270838)
@@ -6,6 +6,7 @@
 #define _LIBC		1
 #define DO_PTHREADS	1
 #define USE_KQUEUE	1
+#define HAVE_MD5	1
 
 #define ISC_SOCKLEN_T	socklen_t
 #define ISC_FORMAT_PRINTF(fmt, args) \

Modified: stable/10/lib/libc/inet/inet_addr.c
==============================================================================
--- stable/10/lib/libc/inet/inet_addr.c	Sat Aug 30 09:55:38 2014	(r270837)
+++ stable/10/lib/libc/inet/inet_addr.c	Sat Aug 30 10:16:25 2014	(r270838)
@@ -66,7 +66,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)inet_addr.c	8.1 (Berkeley) 6/17/93";
-static const char rcsid[] = "$Id: inet_addr.c,v 1.4.18.1 2005/04/27 05:00:52 sra Exp $";
+static const char rcsid[] = "$Id: inet_addr.c,v 1.5 2005/04/27 04:56:19 sra Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include 
 __FBSDID("$FreeBSD$");

Modified: stable/10/lib/libc/inet/inet_cidr_ntop.c
==============================================================================
--- stable/10/lib/libc/inet/inet_cidr_ntop.c	Sat Aug 30 09:55:38 2014	(r270837)
+++ stable/10/lib/libc/inet/inet_cidr_ntop.c	Sat Aug 30 10:16:25 2014	(r270838)
@@ -16,8 +16,10 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_cidr_ntop.c,v 1.4.18.3 2006/10/11 02:32:47 marka Exp $";
+static const char rcsid[] = "$Id: inet_cidr_ntop.c,v 1.7 2006/10/11 02:18:18 marka Exp $";
 #endif
+#include 
+__FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 

Modified: stable/10/lib/libc/inet/inet_cidr_pton.c
==============================================================================
--- stable/10/lib/libc/inet/inet_cidr_pton.c	Sat Aug 30 09:55:38 2014	(r270837)
+++ stable/10/lib/libc/inet/inet_cidr_pton.c	Sat Aug 30 10:16:25 2014	(r270838)
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_cidr_pton.c,v 1.5.18.1 2005/04/27 05:00:53 sra Exp $";
+static const char rcsid[] = "$Id: inet_cidr_pton.c,v 1.6 2005/04/27 04:56:19 sra Exp $";
 #endif
 #include 
 __FBSDID("$FreeBSD$");

Modified: stable/10/lib/libc/inet/inet_net_ntop.c
==============================================================================
--- stable/10/lib/libc/inet/inet_net_ntop.c	Sat Aug 30 09:55:38 2014	(r270837)
+++ stable/10/lib/libc/inet/inet_net_ntop.c	Sat Aug 30 10:16:25 2014	(r270838)
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_net_ntop.c,v 1.3.18.2 2006/06/20 02:51:32 marka Exp $";
+static const char rcsid[] = "$Id: inet_net_ntop.c,v 1.5 2006/06/20 02:50:14 marka Exp $";
 #endif
 #include 
 __FBSDID("$FreeBSD$");

Modified: stable/10/lib/libc/inet/inet_net_pton.c
==============================================================================
--- stable/10/lib/libc/inet/inet_net_pton.c	Sat Aug 30 09:55:38 2014	(r270837)
+++ stable/10/lib/libc/inet/inet_net_pton.c	Sat Aug 30 10:16:25 2014	(r270838)
@@ -1,22 +1,22 @@
 /*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996,1999 by Internet Software Consortium.
+ * Copyright (C) 2004, 2005, 2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1996, 1998, 1999, 2001, 2003  Internet Software Consortium.
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_net_pton.c,v 1.7.18.2 2008/08/26 04:42:43 marka Exp $";
+static const char rcsid[] = "$Id: inet_net_pton.c,v 1.10 2008/11/14 02:36:51 marka Exp $";
 #endif
 #include 
 __FBSDID("$FreeBSD$");

Modified: stable/10/lib/libc/inet/inet_neta.c
==============================================================================
--- stable/10/lib/libc/inet/inet_neta.c	Sat Aug 30 09:55:38 2014	(r270837)
+++ stable/10/lib/libc/inet/inet_neta.c	Sat Aug 30 10:16:25 2014	(r270838)
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_neta.c,v 1.2.18.1 2005/04/27 05:00:53 sra Exp $";
+static const char rcsid[] = "$Id: inet_neta.c,v 1.3 2005/04/27 04:56:20 sra Exp $";
 #endif
 #include 
 __FBSDID("$FreeBSD$");

Modified: stable/10/lib/libc/inet/inet_ntoa.c
==============================================================================
--- stable/10/lib/libc/inet/inet_ntoa.c	Sat Aug 30 09:55:38 2014	(r270837)
+++ stable/10/lib/libc/inet/inet_ntoa.c	Sat Aug 30 10:16:25 2014	(r270838)
@@ -29,7 +29,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)inet_ntoa.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: inet_ntoa.c,v 1.1.352.1 2005/04/27 05:00:54 sra Exp $";
+static const char rcsid[] = "$Id: inet_ntoa.c,v 1.2 2005/04/27 04:56:21 sra Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include 
 __FBSDID("$FreeBSD$");

Modified: stable/10/lib/libc/inet/inet_ntop.c
==============================================================================
--- stable/10/lib/libc/inet/inet_ntop.c	Sat Aug 30 09:55:38 2014	(r270837)
+++ stable/10/lib/libc/inet/inet_ntop.c	Sat Aug 30 10:16:25 2014	(r270838)
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_ntop.c,v 1.3.18.2 2005/11/03 23:02:22 marka Exp $";
+static const char rcsid[] = "$Id: inet_ntop.c,v 1.5 2005/11/03 22:59:52 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include 
 __FBSDID("$FreeBSD$");

Modified: stable/10/lib/libc/inet/inet_pton.c
==============================================================================
--- stable/10/lib/libc/inet/inet_pton.c	Sat Aug 30 09:55:38 2014	(r270837)
+++ stable/10/lib/libc/inet/inet_pton.c	Sat Aug 30 10:16:25 2014	(r270838)
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_pton.c,v 1.3.18.2 2005/07/28 07:38:07 marka Exp $";
+static const char rcsid[] = "$Id: inet_pton.c,v 1.5 2005/07/28 06:51:47 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include 
 __FBSDID("$FreeBSD$");

Modified: stable/10/lib/libc/inet/nsap_addr.c
==============================================================================
--- stable/10/lib/libc/inet/nsap_addr.c	Sat Aug 30 09:55:38 2014	(r270837)
+++ stable/10/lib/libc/inet/nsap_addr.c	Sat Aug 30 10:16:25 2014	(r270838)
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: nsap_addr.c,v 1.3.18.2 2005/07/28 07:38:08 marka Exp $";
+static const char rcsid[] = "$Id: nsap_addr.c,v 1.5 2005/07/28 06:51:48 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include 
 __FBSDID("$FreeBSD$");

Modified: stable/10/lib/libc/isc/ev_streams.c
==============================================================================
--- stable/10/lib/libc/isc/ev_streams.c	Sat Aug 30 09:55:38 2014	(r270837)
+++ stable/10/lib/libc/isc/ev_streams.c	Sat Aug 30 10:16:25 2014	(r270838)
@@ -20,7 +20,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: ev_streams.c,v 1.4.18.1 2005/04/27 05:01:06 sra Exp $";
+static const char rcsid[] = "$Id: ev_streams.c,v 1.5 2005/04/27 04:56:36 sra Exp $";
 #endif
 #include 
 __FBSDID("$FreeBSD$");

Modified: stable/10/lib/libc/isc/ev_timers.c
==============================================================================
--- stable/10/lib/libc/isc/ev_timers.c	Sat Aug 30 09:55:38 2014	(r270837)
+++ stable/10/lib/libc/isc/ev_timers.c	Sat Aug 30 10:16:25 2014	(r270838)
@@ -20,7 +20,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: ev_timers.c,v 1.5.18.1 2005/04/27 05:01:06 sra Exp $";
+static const char rcsid[] = "$Id: ev_timers.c,v 1.6 2005/04/27 04:56:36 sra Exp $";
 #endif
 #include 
 __FBSDID("$FreeBSD$");

Modified: stable/10/lib/libc/isc/eventlib_p.h
==============================================================================
--- stable/10/lib/libc/isc/eventlib_p.h	Sat Aug 30 09:55:38 2014	(r270837)
+++ stable/10/lib/libc/isc/eventlib_p.h	Sat Aug 30 10:16:25 2014	(r270838)
@@ -19,7 +19,7 @@
  * \brief private interfaces for eventlib
  * \author vix 09sep95 [initial]
  *
- * $Id: eventlib_p.h,v 1.5.18.4 2006/03/10 00:20:08 marka Exp $
+ * $Id: eventlib_p.h,v 1.9 2006/03/09 23:57:56 marka Exp $
  * $FreeBSD$
  */
 

Modified: stable/10/lib/libc/nameser/Symbol.map
==============================================================================
--- stable/10/lib/libc/nameser/Symbol.map	Sat Aug 30 09:55:38 2014	(r270837)
+++ stable/10/lib/libc/nameser/Symbol.map	Sat Aug 30 10:16:25 2014	(r270838)
@@ -29,3 +29,24 @@ FBSD_1.0 {
 	__ns_format_ttl;
 	__ns_parse_ttl;
 };
+
+FBSD_1.4 {
+	__ns_parserr2;
+	__ns_name_pton2;
+	__ns_name_unpack2;
+	__ns_name_length;
+	__ns_name_eq;
+	__ns_name_owned;
+	__ns_name_map;
+	__ns_name_labels;
+	__ns_newmsg_init;
+	__ns_newmsg_copy;
+	__ns_newmsg_id;
+	__ns_newmsg_flag;
+	__ns_newmsg_q;
+	__ns_newmsg_rr;
+	__ns_newmsg_done;
+	__ns_rdata_unpack;
+	__ns_rdata_equal;
+	__ns_rdata_refers;
+};

Modified: stable/10/lib/libc/nameser/ns_name.c
==============================================================================
--- stable/10/lib/libc/nameser/ns_name.c	Sat Aug 30 09:55:38 2014	(r270837)
+++ stable/10/lib/libc/nameser/ns_name.c	Sat Aug 30 10:16:25 2014	(r270838)
@@ -16,8 +16,10 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: ns_name.c,v 1.8.18.2 2005/04/27 05:01:08 sra Exp $";
+static const char rcsid[] = "$Id: ns_name.c,v 1.11 2009/01/23 19:59:16 each Exp $";
 #endif
+#include 
+__FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 
@@ -121,7 +123,7 @@ ns_name_ntop(const u_char *src, char *ds
 		}
 		if ((l = labellen(cp - 1)) < 0) {
 			errno = EMSGSIZE; /*%< XXX */
-			return(-1);
+			return (-1);
 		}
 		if (dn + l >= eom) {
 			errno = EMSGSIZE;
@@ -133,12 +135,12 @@ ns_name_ntop(const u_char *src, char *ds
 			if (n != DNS_LABELTYPE_BITSTRING) {
 				/* XXX: labellen should reject this case */
 				errno = EINVAL;
-				return(-1);
+				return (-1);
 			}
 			if ((m = decode_bitstring(&cp, dn, eom)) < 0)
 			{
 				errno = EMSGSIZE;
-				return(-1);
+				return (-1);
 			}
 			dn += m; 
 			continue;
@@ -197,10 +199,25 @@ ns_name_ntop(const u_char *src, char *ds
  * notes:
  *\li	Enforces label and domain length limits.
  */
+int
+ns_name_pton(const char *src, u_char *dst, size_t dstsiz) {
+	return (ns_name_pton2(src, dst, dstsiz, NULL));
+}
 
+/*
+ * ns_name_pton2(src, dst, dstsiz, *dstlen)
+ *	Convert a ascii string into an encoded domain name as per RFC1035.
+ * return:
+ *	-1 if it fails
+ *	1 if string was fully qualified
+ *	0 is string was not fully qualified
+ * side effects:
+ *	fills in *dstlen (if non-NULL)
+ * notes:
+ *	Enforces label and domain length limits.
+ */
 int
-ns_name_pton(const char *src, u_char *dst, size_t dstsiz)
-{
+ns_name_pton2(const char *src, u_char *dst, size_t dstsiz, size_t *dstlen) {
 	u_char *label, *bp, *eom;
 	int c, n, escaped, e = 0;
 	char *cp;
@@ -215,13 +232,13 @@ ns_name_pton(const char *src, u_char *ds
 			if (c == '[') { /*%< start a bit string label */
 				if ((cp = strchr(src, ']')) == NULL) {
 					errno = EINVAL; /*%< ??? */
-					return(-1);
+					return (-1);
 				}
 				if ((e = encode_bitsring(&src, cp + 2,
 							 &label, &bp, eom))
 				    != 0) {
 					errno = e;
-					return(-1);
+					return (-1);
 				}
 				escaped = 0;
 				label = bp++;
@@ -229,7 +246,7 @@ ns_name_pton(const char *src, u_char *ds
 					goto done;
 				else if (c != '.') {
 					errno = EINVAL;
-					return(-1);
+					return	(-1);
 				}
 				continue;
 			}
@@ -281,6 +298,8 @@ ns_name_pton(const char *src, u_char *ds
 					errno = EMSGSIZE;
 					return (-1);
 				}
+				if (dstlen != NULL)
+					*dstlen = (bp - dst);
 				return (1);
 			}
 			if (c == 0 || *src == '.') {
@@ -318,6 +337,8 @@ ns_name_pton(const char *src, u_char *ds
 		errno = EMSGSIZE;
 		return (-1);
 	}
+	if (dstlen != NULL)
+		*dstlen = (bp - dst);
 	return (0);
 }
 
@@ -365,7 +386,7 @@ ns_name_ntol(const u_char *src, u_char *
 		}
 		for ((void)NULL; l > 0; l--) {
 			c = *cp++;
-			if (isupper(c))
+			if (isascii(c) && isupper(c))
 				*dn++ = tolower(c);
 			else
 				*dn++ = c;
@@ -385,6 +406,21 @@ int
 ns_name_unpack(const u_char *msg, const u_char *eom, const u_char *src,
 	       u_char *dst, size_t dstsiz)
 {
+	return (ns_name_unpack2(msg, eom, src, dst, dstsiz, NULL));
+}
+
+/*
+ * ns_name_unpack2(msg, eom, src, dst, dstsiz, *dstlen)
+ *	Unpack a domain name from a message, source may be compressed.
+ * return:
+ *	-1 if it fails, or consumed octets if it succeeds.
+ * side effect:
+ *	fills in *dstlen (if non-NULL).
+ */
+int
+ns_name_unpack2(const u_char *msg, const u_char *eom, const u_char *src,
+		u_char *dst, size_t dstsiz, size_t *dstlen)
+{
 	const u_char *srcp, *dstlim;
 	u_char *dstp;
 	int n, len, checked, l;
@@ -407,7 +443,7 @@ ns_name_unpack(const u_char *msg, const 
 			/* Limit checks. */
 			if ((l = labellen(srcp - 1)) < 0) {
 				errno = EMSGSIZE;
-				return(-1);
+				return (-1);
 			}
 			if (dstp + l + 1 >= dstlim || srcp + l >= eom) {
 				errno = EMSGSIZE;
@@ -449,7 +485,9 @@ ns_name_unpack(const u_char *msg, const 
 			return (-1);			/*%< flag error */
 		}
 	}
-	*dstp = '\0';
+	*dstp++ = 0;
+	if (dstlen != NULL)
+		*dstlen = dstp - dst;
 	if (len < 0)
 		len = srcp - src;
 	return (len);
@@ -508,7 +546,7 @@ ns_name_pack(const u_char *src, u_char *
 		}
 		if ((l0 = labellen(srcp)) < 0) {
 			errno = EINVAL;
-			return(-1);
+			return (-1);
 		}
 		l += l0 + 1;
 		if (l > MAXCDNAME) {
@@ -655,7 +693,7 @@ ns_name_skip(const u_char **ptrptr, cons
 		case NS_TYPE_ELT: /*%< EDNS0 extended label */
 			if ((l = labellen(cp - 1)) < 0) {
 				errno = EMSGSIZE; /*%< XXX */
-				return(-1);
+				return (-1);
 			}
 			cp += l;
 			continue;
@@ -676,6 +714,150 @@ ns_name_skip(const u_char **ptrptr, cons
 	return (0);
 }
 
+/* Find the number of octets an nname takes up, including the root label.
+ * (This is basically ns_name_skip() without compression-pointer support.)
+ * ((NOTE: can only return zero if passed-in namesiz argument is zero.))
+ */
+ssize_t
+ns_name_length(ns_nname_ct nname, size_t namesiz) {
+	ns_nname_ct orig = nname;
+	u_int n;
+
+	while (namesiz-- > 0 && (n = *nname++) != 0) {
+		if ((n & NS_CMPRSFLGS) != 0) {
+			errno = EISDIR;
+			return (-1);
+		}
+		if (n > namesiz) {
+			errno = EMSGSIZE;
+			return (-1);
+		}
+		nname += n;
+		namesiz -= n;
+	}
+	return (nname - orig);
+}
+
+/* Compare two nname's for equality.  Return -1 on error (setting errno).
+ */
+int
+ns_name_eq(ns_nname_ct a, size_t as, ns_nname_ct b, size_t bs) {
+	ns_nname_ct ae = a + as, be = b + bs;
+	int ac, bc;
+
+	while (ac = *a, bc = *b, ac != 0 && bc != 0) {
+		if ((ac & NS_CMPRSFLGS) != 0 || (bc & NS_CMPRSFLGS) != 0) {
+			errno = EISDIR;
+			return (-1);
+		}
+		if (a + ac >= ae || b + bc >= be) {
+			errno = EMSGSIZE;
+			return (-1);
+		}
+		if (ac != bc || strncasecmp((const char *) ++a,
+					    (const char *) ++b, ac) != 0)
+			return (0);
+		a += ac, b += bc;
+	}
+	return (ac == 0 && bc == 0);
+}
+
+/* Is domain "A" owned by (at or below) domain "B"?
+ */
+int
+ns_name_owned(ns_namemap_ct a, int an, ns_namemap_ct b, int bn) {
+	/* If A is shorter, it cannot be owned by B. */
+	if (an < bn)
+		return (0);
+
+	/* If they are unequal before the length of the shorter, A cannot... */
+	while (bn > 0) {
+		if (a->len != b->len ||
+		    strncasecmp((const char *) a->base,
+				(const char *) b->base, a->len) != 0)
+			return (0);
+		a++, an--;
+		b++, bn--;
+	}
+
+	/* A might be longer or not, but either way, B owns it. */
+	return (1);
+}
+
+/* Build an array of  tuples from an nname, top-down order.
+ * Return the number of tuples (labels) thus discovered.
+ */
+int
+ns_name_map(ns_nname_ct nname, size_t namelen, ns_namemap_t map, int mapsize) {
+	u_int n;
+	int l;
+
+	n = *nname++;
+	namelen--;
+
+	/* Root zone? */
+	if (n == 0) {
+		/* Extra data follows name? */
+		if (namelen > 0) {
+			errno = EMSGSIZE;
+			return (-1);
+		}
+		return (0);
+	}
+
+	/* Compression pointer? */
+	if ((n & NS_CMPRSFLGS) != 0) {
+		errno = EISDIR;
+		return (-1);
+	}
+
+	/* Label too long? */
+	if (n > namelen) {
+		errno = EMSGSIZE;
+		return (-1);
+	}
+

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 10:25:42 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 2373C907;
 Sat, 30 Aug 2014 10:25:42 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0E9B91A93;
 Sat, 30 Aug 2014 10:25:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7UAPfva050024;
 Sat, 30 Aug 2014 10:25:41 GMT (envelope-from ume@FreeBSD.org)
Received: (from ume@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7UAPfvX050023;
 Sat, 30 Aug 2014 10:25:41 GMT (envelope-from ume@FreeBSD.org)
Message-Id: <201408301025.s7UAPfvX050023@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ume set sender to ume@FreeBSD.org
 using -f
From: Hajimu UMEMOTO 
Date: Sat, 30 Aug 2014 10:25:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270839 - stable/10/lib/libc/nameser
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 10:25:42 -0000

Author: ume
Date: Sat Aug 30 10:25:41 2014
New Revision: 270839
URL: http://svnweb.freebsd.org/changeset/base/270839

Log:
  MFC r269873:
  Fix broken pointer overflow check ns_name_unpack()
  
  Many compilers may optimize away the overflow check `msg + l < msg',
  where `msg' is a pointer and `l' is an integer, because pointer
  overflow is undefined behavior in C.
  
  Use a safe precondition test `l >= eom - msg' instead.
  
  Reference:
  https://android-review.googlesource.com/#/c/50570/
  
  Requested by:	pfg
  Obtained from:	NetBSD (CVS rev. 1.10)

Modified:
  stable/10/lib/libc/nameser/ns_name.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libc/nameser/ns_name.c
==============================================================================
--- stable/10/lib/libc/nameser/ns_name.c	Sat Aug 30 10:16:25 2014	(r270838)
+++ stable/10/lib/libc/nameser/ns_name.c	Sat Aug 30 10:25:41 2014	(r270839)
@@ -463,11 +463,12 @@ ns_name_unpack2(const u_char *msg, const
 			}
 			if (len < 0)
 				len = srcp - src + 1;
-			srcp = msg + (((n & 0x3f) << 8) | (*srcp & 0xff));
-			if (srcp < msg || srcp >= eom) {  /*%< Out of range. */
+			l = ((n & 0x3f) << 8) | (*srcp & 0xff);
+			if (l >= eom - msg) {  /*%< Out of range. */
 				errno = EMSGSIZE;
 				return (-1);
 			}
+			srcp = msg + l;
 			checked += 2;
 			/*
 			 * Check for loops in the compressed name;

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 10:29:47 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id AD7AEC7B;
 Sat, 30 Aug 2014 10:29:47 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 989611ABD;
 Sat, 30 Aug 2014 10:29:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7UATlq8050561;
 Sat, 30 Aug 2014 10:29:47 GMT (envelope-from ume@FreeBSD.org)
Received: (from ume@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7UATlKB050560;
 Sat, 30 Aug 2014 10:29:47 GMT (envelope-from ume@FreeBSD.org)
Message-Id: <201408301029.s7UATlKB050560@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ume set sender to ume@FreeBSD.org
 using -f
From: Hajimu UMEMOTO 
Date: Sat, 30 Aug 2014 10:29:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270840 - stable/10/lib/libc/nameser
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 10:29:47 -0000

Author: ume
Date: Sat Aug 30 10:29:47 2014
New Revision: 270840
URL: http://svnweb.freebsd.org/changeset/base/270840

Log:
  MFC r270215: Add missing break.

Modified:
  stable/10/lib/libc/nameser/ns_print.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libc/nameser/ns_print.c
==============================================================================
--- stable/10/lib/libc/nameser/ns_print.c	Sat Aug 30 10:25:41 2014	(r270839)
+++ stable/10/lib/libc/nameser/ns_print.c	Sat Aug 30 10:29:47 2014	(r270840)
@@ -911,6 +911,7 @@ ns_sprintrrf(const u_char *msg, size_t m
 			if (len > 15)
 				T(addstr(" )", 2, &buf, &buflen));
 		}
+		break;
 	}
 
 	case ns_t_ipseckey: {

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 13:28:11 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 3CDDEBC9;
 Sat, 30 Aug 2014 13:28:11 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 282651AFA;
 Sat, 30 Aug 2014 13:28:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7UDSB3F033665;
 Sat, 30 Aug 2014 13:28:11 GMT (envelope-from rmacklem@FreeBSD.org)
Received: (from rmacklem@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7UDSB1b033664;
 Sat, 30 Aug 2014 13:28:11 GMT (envelope-from rmacklem@FreeBSD.org)
Message-Id: <201408301328.s7UDSB1b033664@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: rmacklem set sender to
 rmacklem@FreeBSD.org using -f
From: Rick Macklem 
Date: Sat, 30 Aug 2014 13:28:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r270841 - stable/9/sys/fs/nfsserver
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 13:28:11 -0000

Author: rmacklem
Date: Sat Aug 30 13:28:10 2014
New Revision: 270841
URL: http://svnweb.freebsd.org/changeset/base/270841

Log:
  MFC: r269771
  Change the NFS server's printf related to hitting
  the DRC cache's flood level so that it suggests
  increasing vfs.nfsd.tcphighwater.

Modified:
  stable/9/sys/fs/nfsserver/nfs_nfsdsocket.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/fs/   (props changed)

Modified: stable/9/sys/fs/nfsserver/nfs_nfsdsocket.c
==============================================================================
--- stable/9/sys/fs/nfsserver/nfs_nfsdsocket.c	Sat Aug 30 10:29:47 2014	(r270840)
+++ stable/9/sys/fs/nfsserver/nfs_nfsdsocket.c	Sat Aug 30 13:28:10 2014	(r270841)
@@ -675,10 +675,9 @@ nfsrvd_compound(struct nfsrv_descript *n
 		if (i == 0 && nd->nd_rp->rc_refcnt == 0 &&
 		    (nfsrv_mallocmget_limit() ||
 		     nfsrc_tcpsavedreplies > nfsrc_floodlevel)) {
-			if (nfsrc_tcpsavedreplies > nfsrc_floodlevel) {
-				printf("nfsd server cache flooded, try to");
-				printf(" increase nfsrc_floodlevel\n");
-			}
+			if (nfsrc_tcpsavedreplies > nfsrc_floodlevel)
+				printf("nfsd server cache flooded, try "
+				    "increasing vfs.nfsd.tcphighwater\n");
 			nd->nd_repstat = NFSERR_RESOURCE;
 			*repp = nfsd_errmap(nd);
 			if (op == NFSV4OP_SETATTR) {

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 13:47:06 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 2031CFF8;
 Sat, 30 Aug 2014 13:47:06 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0B7571CA9;
 Sat, 30 Aug 2014 13:47:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7UDl5hC042828;
 Sat, 30 Aug 2014 13:47:05 GMT (envelope-from brueffer@FreeBSD.org)
Received: (from brueffer@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7UDl5Cw042825;
 Sat, 30 Aug 2014 13:47:05 GMT (envelope-from brueffer@FreeBSD.org)
Message-Id: <201408301347.s7UDl5Cw042825@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: brueffer set sender to
 brueffer@FreeBSD.org using -f
From: Christian Brueffer 
Date: Sat, 30 Aug 2014 13:47:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270842 - in head: share/man/man4 sys/conf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 13:47:06 -0000

Author: brueffer
Date: Sat Aug 30 13:47:05 2014
New Revision: 270842
URL: http://svnweb.freebsd.org/changeset/base/270842

Log:
  Allow the iwn(4) fw 100 to be compiled into the kernel and update the
  relevant manpages.

Modified:
  head/share/man/man4/iwn.4
  head/share/man/man4/iwnfw.4
  head/sys/conf/files

Modified: head/share/man/man4/iwn.4
==============================================================================
--- head/share/man/man4/iwn.4	Sat Aug 30 13:28:10 2014	(r270841)
+++ head/share/man/man4/iwn.4	Sat Aug 30 13:47:05 2014	(r270842)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 14, 2014
+.Dd August 30, 2014
 .Dt IWN 4
 .Os
 .Sh NAME
@@ -46,6 +46,7 @@ You also need to select a firmware for y
 Choose one from:
 .Bd -ragged -offset indent
 .Cd "device iwn1000fw"
+.Cd "device iwn100fw"
 .Cd "device iwn105fw"
 .Cd "device iwn135fw"
 .Cd "device iwn2000fw"
@@ -72,6 +73,7 @@ module at boot time, place the following
 .Bd -literal -offset indent
 if_iwn_load="YES"
 iwn1000fw_load="YES"
+iwn100fw_load="YES"
 iwn105fw_load="YES"
 iwn135fw_load="YES"
 iwn2000fw_load="YES"

Modified: head/share/man/man4/iwnfw.4
==============================================================================
--- head/share/man/man4/iwnfw.4	Sat Aug 30 13:28:10 2014	(r270841)
+++ head/share/man/man4/iwnfw.4	Sat Aug 30 13:47:05 2014	(r270842)
@@ -22,7 +22,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 14, 2014
+.Dd August 30, 2014
 .Dt IWNFW 4
 .Os
 .Sh NAME
@@ -43,6 +43,7 @@ If you want to pick only the firmware im
 of the following:
 .Bd -ragged -offset indent
 .Cd "device iwn1000fw"
+.Cd "device iwn100fw"
 .Cd "device iwn105fw"
 .Cd "device iwn135fw"
 .Cd "device iwn2000fw"
@@ -61,6 +62,7 @@ module at boot time, place the following
 .Xr loader.conf 5 :
 .Bd -literal -offset indent
 iwn1000fw_load="YES"
+iwn100fw_load="YES"
 iwn105fw_load="YES"
 iwn135fw_load="YES"
 iwn2000fw_load="YES"
@@ -75,7 +77,7 @@ iwn6050fw_load="YES"
 .Ed
 .Sh DESCRIPTION
 This module provides access to firmware sets for the
-Intel Wireless WiFi Link 105, 135, 1000, 2000, 2030, 4965, 5000 and 6000 series of
+Intel Wireless WiFi Link 100, 105, 135, 1000, 2000, 2030, 4965, 5000 and 6000 series of
 IEEE 802.11n adapters.
 It may be
 statically linked into the kernel, or loaded as a module.

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Sat Aug 30 13:28:10 2014	(r270841)
+++ head/sys/conf/files	Sat Aug 30 13:47:05 2014	(r270842)
@@ -1602,6 +1602,20 @@ iwn1000.fw			optional iwn1000fw | iwnfw	
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwn1000.fw"
+iwn100fw.c			optional iwn100fw | iwnfw		\
+	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn100.fw:iwn100fw -miwn100fw -c${.TARGET}" \
+	no-implicit-rule before-depend local				\
+	clean		"iwn100fw.c"
+iwn100fw.fwo			optional iwn100fw | iwnfw		\
+	dependency	"iwn100.fw"					\
+	compile-with	"${NORMAL_FWO}"					\
+	no-implicit-rule						\
+	clean		"iwn100fw.fwo"
+iwn100.fw			optional iwn100fw | iwnfw		\
+	dependency	"$S/contrib/dev/iwn/iwlwifi-100-39.31.5.1.fw.uu" \
+	compile-with	"${NORMAL_FW}"					\
+	no-obj no-implicit-rule						\
+	clean		"iwn100.fw"
 iwn105fw.c			optional iwn105fw | iwnfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn105.fw:iwn105fw -miwn105fw -c${.TARGET}" \
 	no-implicit-rule before-depend local				\

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 14:24:20 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id EA9A18BC;
 Sat, 30 Aug 2014 14:24:20 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D601E1FB5;
 Sat, 30 Aug 2014 14:24:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7UEOK8i061028;
 Sat, 30 Aug 2014 14:24:20 GMT (envelope-from kevlo@FreeBSD.org)
Received: (from kevlo@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7UEOKB8061027;
 Sat, 30 Aug 2014 14:24:20 GMT (envelope-from kevlo@FreeBSD.org)
Message-Id: <201408301424.s7UEOKB8061027@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: kevlo set sender to
 kevlo@FreeBSD.org using -f
From: Kevin Lo 
Date: Sat, 30 Aug 2014 14:24:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270843 - stable/10/sys/dev/usb/wlan
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 14:24:21 -0000

Author: kevlo
Date: Sat Aug 30 14:24:20 2014
New Revision: 270843
URL: http://svnweb.freebsd.org/changeset/base/270843

Log:
  MFC r270643:
  Fix typo: s/mac_rev/mac_ver/
  
  Submitted by:	Stefan Sperling 

Modified:
  stable/10/sys/dev/usb/wlan/if_run.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/usb/wlan/if_run.c
==============================================================================
--- stable/10/sys/dev/usb/wlan/if_run.c	Sat Aug 30 13:47:05 2014	(r270842)
+++ stable/10/sys/dev/usb/wlan/if_run.c	Sat Aug 30 14:24:20 2014	(r270843)
@@ -5488,7 +5488,7 @@ run_rt3070_rf_init(struct run_softc *sc)
 		run_rt3070_rf_write(sc, 17, rf);
 	}
 
-	if (sc->mac_rev == 0x3071) {
+	if (sc->mac_ver == 0x3071) {
 		run_rt3070_rf_read(sc, 1, &rf);
 		rf &= ~(RT3070_RX0_PD | RT3070_TX0_PD);
 		rf |= RT3070_RF_BLOCK | RT3070_RX1_PD | RT3070_TX1_PD;

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 15:41:08 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 49B39160;
 Sat, 30 Aug 2014 15:41:08 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2B97118B0;
 Sat, 30 Aug 2014 15:41:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7UFf8dL099610;
 Sat, 30 Aug 2014 15:41:08 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7UFf7YD099607;
 Sat, 30 Aug 2014 15:41:07 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201408301541.s7UFf7YD099607@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: pfg set sender to pfg@FreeBSD.org
 using -f
From: "Pedro F. Giffuni" 
Date: Sat, 30 Aug 2014 15:41:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270844 - in head/sys: amd64/amd64 i386/i386
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 15:41:08 -0000

Author: pfg
Date: Sat Aug 30 15:41:07 2014
New Revision: 270844
URL: http://svnweb.freebsd.org/changeset/base/270844

Log:
  Minor space/tab cleanups.
  
  Most of them were ripped from the GSoC 2104
  SMAP + kpatch project.
  This is only a cosmetic change.
  
  Taken from:	Oliver Pinter (op@)
  MFC after:	5 days

Modified:
  head/sys/amd64/amd64/support.S
  head/sys/i386/i386/db_disasm.c
  head/sys/i386/i386/support.s

Modified: head/sys/amd64/amd64/support.S
==============================================================================
--- head/sys/amd64/amd64/support.S	Sat Aug 30 14:24:20 2014	(r270843)
+++ head/sys/amd64/amd64/support.S	Sat Aug 30 15:41:07 2014	(r270844)
@@ -59,7 +59,7 @@ ENTRY(bzero)
 	stosb
 	ret
 END(bzero)
-	
+
 /* Address: %rdi */
 ENTRY(pagezero)
 	movq	$-PAGE_SIZE,%rdx
@@ -137,7 +137,7 @@ ENTRY(bcopy)
 	cld
 	ret
 END(bcopy)
-	
+
 /*
  * Note: memcpy does not support overlapping copies
  */
@@ -181,10 +181,10 @@ ENTRY(pagecopy)
 	ret
 END(pagecopy)
 
-/* fillw(pat, base, cnt) */  
+/* fillw(pat, base, cnt) */
 /*       %rdi,%rsi, %rdx */
 ENTRY(fillw)
-	movq	%rdi,%rax   
+	movq	%rdi,%rax
 	movq	%rsi,%rdi
 	movq	%rdx,%rcx
 	cld
@@ -388,7 +388,7 @@ ENTRY(fuword)
 	movq	(%rdi),%rax
 	movq	$0,PCB_ONFAULT(%rcx)
 	ret
-END(fuword64)	
+END(fuword64)
 END(fuword)
 
 ENTRY(fuword32)

Modified: head/sys/i386/i386/db_disasm.c
==============================================================================
--- head/sys/i386/i386/db_disasm.c	Sat Aug 30 14:24:20 2014	(r270843)
+++ head/sys/i386/i386/db_disasm.c	Sat Aug 30 15:41:07 2014	(r270844)
@@ -782,7 +782,7 @@ static const struct inst db_inst_table[2
 /*c7*/	{ "mov",   TRUE,  LONG,  op2(I, E),   0 },
 
 /*c8*/	{ "enter", FALSE, NONE,  op2(Iw, Ib), 0 },
-/*c9*/	{ "leave", FALSE, NONE,  0,           0 },
+/*c9*/	{ "leave", FALSE, NONE,  0,	      0 },
 /*ca*/	{ "lret",  FALSE, NONE,  op1(Iw),     0 },
 /*cb*/	{ "lret",  FALSE, NONE,  0,	      0 },
 /*cc*/	{ "int",   FALSE, NONE,  op1(o3),     0 },
@@ -1266,7 +1266,7 @@ db_disasm(loc, altfmt)
 		case 0xc8:
 			i_name = "monitor";
 			i_size = NONE;
-			i_mode = 0;			
+			i_mode = 0;
 			break;
 		case 0xc9:
 			i_name = "mwait";

Modified: head/sys/i386/i386/support.s
==============================================================================
--- head/sys/i386/i386/support.s	Sat Aug 30 14:24:20 2014	(r270843)
+++ head/sys/i386/i386/support.s	Sat Aug 30 15:41:07 2014	(r270844)
@@ -62,8 +62,8 @@ ENTRY(bzero)
 	stosb
 	popl	%edi
 	ret
-END(bzero)	
-	
+END(bzero)
+
 ENTRY(sse2_pagezero)
 	pushl	%ebx
 	movl	8(%esp),%ecx
@@ -694,7 +694,7 @@ ENTRY(lgdt)
 	movl	4(%esp),%eax
 	lgdt	(%eax)
 #endif
-	
+
 	/* flush the prefetch q */
 	jmp	1f
 	nop
@@ -740,13 +740,13 @@ END(ssdtosd)
 
 /* void reset_dbregs() */
 ENTRY(reset_dbregs)
-	movl    $0,%eax
-	movl    %eax,%dr7     /* disable all breapoints first */
-	movl    %eax,%dr0
-	movl    %eax,%dr1
-	movl    %eax,%dr2
-	movl    %eax,%dr3
-	movl    %eax,%dr6
+	movl	$0,%eax
+	movl	%eax,%dr7	/* disable all breakpoints first */
+	movl	%eax,%dr0
+	movl	%eax,%dr1
+	movl	%eax,%dr2
+	movl	%eax,%dr3
+	movl	%eax,%dr6
 	ret
 END(reset_dbregs)
 

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 17:14:47 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id C904E8E5;
 Sat, 30 Aug 2014 17:14:47 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B4F33105C;
 Sat, 30 Aug 2014 17:14:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7UHEllr043672;
 Sat, 30 Aug 2014 17:14:47 GMT (envelope-from kargl@FreeBSD.org)
Received: (from kargl@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7UHEl0R043670;
 Sat, 30 Aug 2014 17:14:47 GMT (envelope-from kargl@FreeBSD.org)
Message-Id: <201408301714.s7UHEl0R043670@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: kargl set sender to
 kargl@FreeBSD.org using -f
From: Steve Kargl 
Date: Sat, 30 Aug 2014 17:14:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270845 - head/lib/msun/src
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 17:14:47 -0000

Author: kargl
Date: Sat Aug 30 17:14:47 2014
New Revision: 270845
URL: http://svnweb.freebsd.org/changeset/base/270845

Log:
  Make tiny volatile to prevent the compiler(s) from
  constant folding expressions of the form "1 - tiny",
  which are used to raise FE_INEXACT.

Modified:
  head/lib/msun/src/s_tanh.c
  head/lib/msun/src/s_tanhf.c

Modified: head/lib/msun/src/s_tanh.c
==============================================================================
--- head/lib/msun/src/s_tanh.c	Sat Aug 30 15:41:07 2014	(r270844)
+++ head/lib/msun/src/s_tanh.c	Sat Aug 30 17:14:47 2014	(r270845)
@@ -42,7 +42,8 @@ __FBSDID("$FreeBSD$");
 #include "math.h"
 #include "math_private.h"
 
-static const double one = 1.0, two = 2.0, tiny = 1.0e-300, huge = 1.0e300;
+static volatile const double tiny = 1.0e-300;
+static const double one = 1.0, two = 2.0, huge = 1.0e300;
 
 double
 tanh(double x)

Modified: head/lib/msun/src/s_tanhf.c
==============================================================================
--- head/lib/msun/src/s_tanhf.c	Sat Aug 30 15:41:07 2014	(r270844)
+++ head/lib/msun/src/s_tanhf.c	Sat Aug 30 17:14:47 2014	(r270845)
@@ -19,7 +19,9 @@ __FBSDID("$FreeBSD$");
 #include "math.h"
 #include "math_private.h"
 
-static const float one=1.0, two=2.0, tiny = 1.0e-30, huge = 1.0e30;
+static volatile const float tiny = 1.0e-30;
+static const float one=1.0, two=2.0, huge = 1.0e30;
+
 float
 tanhf(float x)
 {

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 17:31:54 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 600AB3E9;
 Sat, 30 Aug 2014 17:31:54 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4B7DC12DA;
 Sat, 30 Aug 2014 17:31:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7UHVseY053198;
 Sat, 30 Aug 2014 17:31:54 GMT (envelope-from kargl@FreeBSD.org)
Received: (from kargl@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7UHVrsZ053194;
 Sat, 30 Aug 2014 17:31:53 GMT (envelope-from kargl@FreeBSD.org)
Message-Id: <201408301731.s7UHVrsZ053194@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: kargl set sender to
 kargl@FreeBSD.org using -f
From: Steve Kargl 
Date: Sat, 30 Aug 2014 17:31:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270847 - head/lib/msun/src
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 17:31:54 -0000

Author: kargl
Date: Sat Aug 30 17:31:53 2014
New Revision: 270847
URL: http://svnweb.freebsd.org/changeset/base/270847

Log:
  Fix the order of "const volatile" to be consistent with
  the rest of msun.

Modified:
  head/lib/msun/src/s_tanh.c
  head/lib/msun/src/s_tanhf.c

Modified: head/lib/msun/src/s_tanh.c
==============================================================================
--- head/lib/msun/src/s_tanh.c	Sat Aug 30 17:18:11 2014	(r270846)
+++ head/lib/msun/src/s_tanh.c	Sat Aug 30 17:31:53 2014	(r270847)
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
 #include "math.h"
 #include "math_private.h"
 
-static volatile const double tiny = 1.0e-300;
+static const volatile double tiny = 1.0e-300;
 static const double one = 1.0, two = 2.0, huge = 1.0e300;
 
 double

Modified: head/lib/msun/src/s_tanhf.c
==============================================================================
--- head/lib/msun/src/s_tanhf.c	Sat Aug 30 17:18:11 2014	(r270846)
+++ head/lib/msun/src/s_tanhf.c	Sat Aug 30 17:31:53 2014	(r270847)
@@ -19,7 +19,7 @@ __FBSDID("$FreeBSD$");
 #include "math.h"
 #include "math_private.h"
 
-static volatile const float tiny = 1.0e-30;
+static const volatile float tiny = 1.0e-30;
 static const float one=1.0, two=2.0, huge = 1.0e30;
 
 float

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 17:32:31 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 3569A525;
 Sat, 30 Aug 2014 17:32:31 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1B15D12E0;
 Sat, 30 Aug 2014 17:32:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7UHWULs053613;
 Sat, 30 Aug 2014 17:32:30 GMT (envelope-from ume@FreeBSD.org)
Received: (from ume@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7UHWU6b053612;
 Sat, 30 Aug 2014 17:32:30 GMT (envelope-from ume@FreeBSD.org)
Message-Id: <201408301732.s7UHWU6b053612@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ume set sender to ume@FreeBSD.org
 using -f
From: Hajimu UMEMOTO 
Date: Sat, 30 Aug 2014 17:32:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r270848 - in stable/9/lib/libc: . md
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 17:32:31 -0000

Author: ume
Date: Sat Aug 30 17:32:30 2014
New Revision: 270848
URL: http://svnweb.freebsd.org/changeset/base/270848

Log:
  MFC r269865:
  Bring the md5 functions into libc for internal use only.
  It is required to support ID randomization for our stub
  resolver.

Added:
  stable/9/lib/libc/md/
     - copied from r270837, stable/10/lib/libc/md/
Modified:
  stable/9/lib/libc/Makefile
Directory Properties:
  stable/9/lib/libc/   (props changed)

Modified: stable/9/lib/libc/Makefile
==============================================================================
--- stable/9/lib/libc/Makefile	Sat Aug 30 17:31:53 2014	(r270847)
+++ stable/9/lib/libc/Makefile	Sat Aug 30 17:32:30 2014	(r270848)
@@ -63,6 +63,7 @@ NOASM=
 .include "${.CURDIR}/inet/Makefile.inc"
 .include "${.CURDIR}/isc/Makefile.inc"
 .include "${.CURDIR}/locale/Makefile.inc"
+.include "${.CURDIR}/md/Makefile.inc"
 .include "${.CURDIR}/nameser/Makefile.inc"
 .include "${.CURDIR}/net/Makefile.inc"
 .include "${.CURDIR}/nls/Makefile.inc"

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 17:37:53 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 31F0B68B;
 Sat, 30 Aug 2014 17:37:53 +0000 (UTC)
Received: from smtp2.wemm.org (smtp2.wemm.org [IPv6:2001:470:67:39d::78])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "smtp2.wemm.org",
 Issuer "StartCom Class 1 Primary Intermediate Server CA" (not verified))
 by mx1.freebsd.org (Postfix) with ESMTPS id EFFDA12FF;
 Sat, 30 Aug 2014 17:37:52 +0000 (UTC)
Received: from overcee.wemm.org (canning.wemm.org [192.203.228.65])
 by smtp2.wemm.org (Postfix) with ESMTP id 8F89A37A;
 Sat, 30 Aug 2014 10:37:51 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wemm.org;
 s=m20140428; t=1409420271;
 bh=o5VqUEzC+dl6Yc4ojfYrdmShl7JDJw3HSUa+fiuMdBY=;
 h=From:To:Cc:Subject:Date:In-Reply-To:References;
 b=i8hXhka5rjv8cwBR0hADQIcwkbjfEAAApWcJTsVVVEIFhr9xqUnbCWub/jYZK19uF
 iHLDK4WLGHBAV3FSZ07YbkTW2IJDNERl38QR4ZB9mH3XkyLr6ZQZ/8Ox5q9g+d0AX6
 taEioxDn4JZT4wjc2h5KFc0Xm8ZJVhw1a5jxbo3I=
From: Peter Wemm 
To: Steven Hartland 
Subject: Re: svn commit: r270759 - in head/sys: cddl/compat/opensolaris/kern
 cddl/compat/opensolaris/sys cddl/contrib/opensolaris/uts/common/fs/zfs vm
Date: Sat, 30 Aug 2014 10:37:43 -0700
Message-ID: <39211177.i8nn9sHiCx@overcee.wemm.org>
User-Agent: KMail/4.12.5 (FreeBSD/11.0-CURRENT; KDE/4.12.5; amd64; ; )
In-Reply-To: 
References: <201408281950.s7SJo90I047213@svn.freebsd.org>
 <2714752.cWQfguSlQD@overcee.wemm.org>
 
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="nextPart23165865.b7KFKC409C";
 micalg="pgp-sha1"; protocol="application/pgp-signature"
Cc: src-committers@freebsd.org, Alan Cox ,
 svn-src-all@freebsd.org, Dmitry Morozovsky ,
 "Matthew D. Fuller" , svn-src-head@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 17:37:53 -0000


--nextPart23165865.b7KFKC409C
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset="us-ascii"

On Saturday 30 August 2014 02:03:42 Steven Hartland wrote:
> ----- Original Message -----
> From: "Peter Wemm" 
>=20
> > On Friday 29 August 2014 21:42:15 Steven Hartland wrote:

>=20
> > If this function returns non-zerp, ARC is given back:
> >=20
> > static int
> > arc_reclaim_needed(void)
> > {
> >=20
> >         if (kmem_free_count() < zfs_arc_free_target) {
> >        =20
> >                 return (1);
> >        =20
> >         }
> >        =20
> >          /*
> >          * Cooperate with pagedaemon when it's time for it to scan
> >          * and reclaim some pages.
> >          */
> >        =20
> >         if (vm_paging_needed()) {
> >        =20
> >                 return (1);
> >        =20
> >         }
> >=20
> > ie: if v_free (ignoring v_cache free pages) gets below the threshol=
d,
> > stop
> > evertyhing and discard ARC pages.
> >=20
> > The vm_paging_needed() code is a NO-OP at this point. It can never
> > return
> >=20
> > true.  Consider:
> >         vm_cnt.v_free_target =3D 4 * vm_cnt.v_free_min +
> >=20
> > vm_cnt.v_free_reserved;
> > vs
> >=20
> >         vm_pageout_wakeup_thresh =3D (vm_cnt.v_free_min / 10) * 11;=

> >=20
> > zfs_arc_free_target defaults to vm_cnt.v_free_target, which is 400%=
 of
> > v_free_min, and compares it against the smaller v_free pool.
> >=20
> > vm_paging_needed() compares the total free pool (v_free + v_cache)
> > against the
> > smaller wakeup threshold - 110% of v_free_min.
> >=20
> > Comparing a larger value against a smaller target than the previous=

> > test will
> > never succeed unless you manually change the arc_free_target sysctl=
.
>=20
> I'm aware of the values involved, and as I said what you're proposing=

> was more akin to where I started, but I was informed that it had alre=
ady
> been tested and didn't work well.

And Karl also said that his tests are on machines that have no v_cache,=
 so=20
he's not testing the scenario.

The code, as written, is wrong.  It's as simple as that.

The logic is wrong.

You've introduced dead code.

Your code changes introduce a scenario that CAUSES one of the very prob=
lems=20
you're using as a justtification for the changes.

Your own testers have admitted that they don't test the scenario that t=
he=20
problem exists with.

> > Also, what about the magic numbers here:
> > u_int zfs_arc_free_target =3D (1 << 19); /* default before pagedaem=
on
> > init only */
>=20
> That is just a total fall back case and should never be triggered unl=
ess
> as the comment states the pagedaemon isn't initialised.
>=20
> > That's half a million pages, or 2GB of physical ram on a 4K page si=
ze
> > system
> > How is this going to work on early boot in the machines in the clus=
ter
> > with
> > less than 2GB of ram?
>=20
> Its there to ensure that ARC doesn't run wild ARC for the few
> milliseconds
> / seconds before pagedaemon is initalised.
>=20
> We can change the value no problem, what would you suggest 1<<16 aka
> 256MB?

Please stop picking magic numbers out of thin air.  You are working wit=
h file=20
system and VM - critical parts of the system.  This is NOT the place to=
 be=20
screwing around with things you don't understand.  alc@ was trying to b=
e=20
polite.

> Thanks for all the feedback, its great to have my understanding of
> how things work in this area confirmed by those who know.
>
> Hopefully we'll be able to get to the bottom of this with everyones
> help and get a solid fix for these issues that have plaged 10 into
> 10.1 :)

I'm very disappointed in the attention to detail and errors in the comm=
it. =20
I'm almost at the point where I want to ask for the whole thing to be b=
acked=20
out.

=2D-=20
Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com; KI=
6FJV
UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246
--nextPart23165865.b7KFKC409C
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part.
Content-Transfer-Encoding: 7Bit

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQEcBAABAgAGBQJUAgvvAAoJEDXWlwnsgJ4EBDEH/Rv4pgRYMVSMZWd5b4aKqcnS
O2/6Pwi/UWpEbxjWCRArymuomKizJmum0Caik/xPhH03MFEYI72tZEcuNoC2p5jT
z1MWPtyyODHkfrR8f2gDRnhcTH/NNsMbd0LDOhK8lQFzZi/me6iBq8yovpTIfNn7
nZquAPwvd8nJV1uO6QqZi+T6EsV1y7AV6UyJZFyeJV32dIlSlXXDnGVjoZzHS05C
uAFroAeDl7jqtTEY06SBe9q1Y9i4f9UsiTX7cckdEtK4dlLiYaJOVoofZi5YN9Ol
iuIDwpYlGrG+IEgfMeqbbF9gyxcO191y30S/64N2pwUqpRN3oclEyKWSRu8EPq8=
=7zlO
-----END PGP SIGNATURE-----

--nextPart23165865.b7KFKC409C--


From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 17:39:29 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 5F572802;
 Sat, 30 Aug 2014 17:39:29 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4A4931314;
 Sat, 30 Aug 2014 17:39:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7UHdT9f054594;
 Sat, 30 Aug 2014 17:39:29 GMT (envelope-from ume@FreeBSD.org)
Received: (from ume@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7UHdTHM054593;
 Sat, 30 Aug 2014 17:39:29 GMT (envelope-from ume@FreeBSD.org)
Message-Id: <201408301739.s7UHdTHM054593@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ume set sender to ume@FreeBSD.org
 using -f
From: Hajimu UMEMOTO 
Date: Sat, 30 Aug 2014 17:39:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r270849 - stable/9/lib/libc
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 17:39:29 -0000

Author: ume
Date: Sat Aug 30 17:39:28 2014
New Revision: 270849
URL: http://svnweb.freebsd.org/changeset/base/270849

Log:
  MFC r264070 (partially), r264082:
  Add 11.x symbol version namespace for stub resolver update.

Modified:
  stable/9/lib/libc/Versions.def
Directory Properties:
  stable/9/lib/libc/   (props changed)

Modified: stable/9/lib/libc/Versions.def
==============================================================================
--- stable/9/lib/libc/Versions.def	Sat Aug 30 17:32:30 2014	(r270848)
+++ stable/9/lib/libc/Versions.def	Sat Aug 30 17:39:28 2014	(r270849)
@@ -23,6 +23,10 @@ FBSD_1.2 {
 FBSD_1.3 {
 } FBSD_1.2;
 
+# This version was first added to 11.0-current.
+FBSD_1.4 {
+} FBSD_1.3;
+
 # This is our private namespace.  Any global interfaces that are
 # strictly for use only by other FreeBSD applications and libraries
 # are listed here.  We use a separate namespace so we can write
@@ -30,4 +34,4 @@ FBSD_1.3 {
 #
 # Please do NOT increment the version of this namespace.
 FBSDprivate_1.0 {
-} FBSD_1.3;
+} FBSD_1.4;

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 17:48:40 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 3F4C8B6F;
 Sat, 30 Aug 2014 17:48:40 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1ED5813D0;
 Sat, 30 Aug 2014 17:48:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7UHmdSi059710;
 Sat, 30 Aug 2014 17:48:39 GMT (envelope-from jhb@FreeBSD.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7UHmc6H059701;
 Sat, 30 Aug 2014 17:48:38 GMT (envelope-from jhb@FreeBSD.org)
Message-Id: <201408301748.s7UHmc6H059701@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jhb set sender to jhb@FreeBSD.org
 using -f
From: John Baldwin 
Date: Sat, 30 Aug 2014 17:48:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270850 - in head/sys: i386/i386 i386/include i386/isa
 x86/acpica
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 17:48:40 -0000

Author: jhb
Date: Sat Aug 30 17:48:38 2014
New Revision: 270850
URL: http://svnweb.freebsd.org/changeset/base/270850

Log:
  Save and restore FPU state across suspend and resume.  In earlier revisions
  of this patch, resumectx() called npxresume() directly, but that doesn't
  work because resumectx() runs with a non-standard %cs selector.  Instead,
  all of the FPU suspend/resume handling is done in C.
  
  MFC after:	1 week

Modified:
  head/sys/i386/i386/mp_machdep.c
  head/sys/i386/i386/swtch.s
  head/sys/i386/include/npx.h
  head/sys/i386/include/pcb.h
  head/sys/i386/isa/npx.c
  head/sys/x86/acpica/acpi_wakeup.c

Modified: head/sys/i386/i386/mp_machdep.c
==============================================================================
--- head/sys/i386/i386/mp_machdep.c	Sat Aug 30 17:39:28 2014	(r270849)
+++ head/sys/i386/i386/mp_machdep.c	Sat Aug 30 17:48:38 2014	(r270850)
@@ -1522,9 +1522,15 @@ cpususpend_handler(void)
 
 	cpu = PCPU_GET(cpuid);
 	if (savectx(susppcbs[cpu])) {
+#ifdef DEV_NPX
+		npxsuspend(&suspcbs[cpu]->pcb_fpususpend);
+#endif
 		wbinvd();
 		CPU_SET_ATOMIC(cpu, &suspended_cpus);
 	} else {
+#ifdef DEV_NPX
+		npxresume(&suspcbs[cpu]->pcb_fpususpend);
+#endif
 		pmap_init_pat();
 		PCPU_SET(switchtime, 0);
 		PCPU_SET(switchticks, ticks);

Modified: head/sys/i386/i386/swtch.s
==============================================================================
--- head/sys/i386/i386/swtch.s	Sat Aug 30 17:39:28 2014	(r270849)
+++ head/sys/i386/i386/swtch.s	Sat Aug 30 17:48:38 2014	(r270850)
@@ -416,45 +416,6 @@ ENTRY(savectx)
 	sldt	PCB_LDT(%ecx)
 	str	PCB_TR(%ecx)
 
-#ifdef DEV_NPX
-	/*
-	 * If fpcurthread == NULL, then the npx h/w state is irrelevant and the
-	 * state had better already be in the pcb.  This is true for forks
-	 * but not for dumps (the old book-keeping with FP flags in the pcb
-	 * always lost for dumps because the dump pcb has 0 flags).
-	 *
-	 * If fpcurthread != NULL, then we have to save the npx h/w state to
-	 * fpcurthread's pcb and copy it to the requested pcb, or save to the
-	 * requested pcb and reload.  Copying is easier because we would
-	 * have to handle h/w bugs for reloading.  We used to lose the
-	 * parent's npx state for forks by forgetting to reload.
-	 */
-	pushfl
-	CLI
-	movl	PCPU(FPCURTHREAD),%eax
-	testl	%eax,%eax
-	je	1f
-
-	pushl	%ecx
-	movl	TD_PCB(%eax),%eax
-	movl	PCB_SAVEFPU(%eax),%eax
-	pushl	%eax
-	pushl	%eax
-	call	npxsave
-	addl	$4,%esp
-	popl	%eax
-	popl	%ecx
-
-	pushl	$PCB_SAVEFPU_SIZE
-	leal	PCB_USERFPU(%ecx),%ecx
-	pushl	%ecx
-	pushl	%eax
-	call	bcopy
-	addl	$12,%esp
-1:
-	popfl
-#endif	/* DEV_NPX */
-
 	movl	$1,%eax
 	ret
 END(savectx)
@@ -519,10 +480,6 @@ ENTRY(resumectx)
 	movl	PCB_DR7(%ecx),%eax
 	movl	%eax,%dr7
 
-#ifdef DEV_NPX
-	/* XXX FIX ME */
-#endif
-
 	/* Restore other registers */
 	movl	PCB_EDI(%ecx),%edi
 	movl	PCB_ESI(%ecx),%esi

Modified: head/sys/i386/include/npx.h
==============================================================================
--- head/sys/i386/include/npx.h	Sat Aug 30 17:39:28 2014	(r270849)
+++ head/sys/i386/include/npx.h	Sat Aug 30 17:48:38 2014	(r270850)
@@ -53,8 +53,10 @@ void	npxexit(struct thread *td);
 int	npxformat(void);
 int	npxgetregs(struct thread *td);
 void	npxinit(void);
+void	npxresume(union savefpu *addr);
 void	npxsave(union savefpu *addr);
 void	npxsetregs(struct thread *td, union savefpu *addr);
+void	npxsuspend(union savefpu *addr);
 int	npxtrap_x87(void);
 int	npxtrap_sse(void);
 void	npxuserinited(struct thread *);

Modified: head/sys/i386/include/pcb.h
==============================================================================
--- head/sys/i386/include/pcb.h	Sat Aug 30 17:39:28 2014	(r270849)
+++ head/sys/i386/include/pcb.h	Sat Aug 30 17:48:38 2014	(r270850)
@@ -90,6 +90,8 @@ struct pcb {
 	struct region_descriptor pcb_idt;
 	uint16_t	pcb_ldt;
 	uint16_t	pcb_tr;
+
+	union	savefpu pcb_fpususpend;
 };
 
 #ifdef _KERNEL

Modified: head/sys/i386/isa/npx.c
==============================================================================
--- head/sys/i386/isa/npx.c	Sat Aug 30 17:39:28 2014	(r270849)
+++ head/sys/i386/isa/npx.c	Sat Aug 30 17:48:38 2014	(r270850)
@@ -761,6 +761,43 @@ npxsave(addr)
 	PCPU_SET(fpcurthread, NULL);
 }
 
+/*
+ * Unconditionally save the current co-processor state across suspend and
+ * resume.
+ */
+void
+npxsuspend(union savefpu *addr)
+{
+	register_t cr0;
+
+	if (!hw_float)
+		return;
+	if (PCPU_GET(fpcurthread) == NULL) {
+		*addr = npx_initialstate;
+		return;
+	}
+	cr0 = rcr0();
+	clts();
+	fpusave(addr);
+	load_cr0(cr0);
+}
+
+void
+npxresume(union savefpu *addr)
+{
+	register_t cr0;
+
+	if (!hw_float)
+		return;
+
+	cr0 = rcr0();
+	clts();
+	npxinit();
+	stop_emulating();
+	fpurstor(addr);
+	load_cr0(cr0);
+}
+
 void
 npxdrop()
 {

Modified: head/sys/x86/acpica/acpi_wakeup.c
==============================================================================
--- head/sys/x86/acpica/acpi_wakeup.c	Sat Aug 30 17:39:28 2014	(r270849)
+++ head/sys/x86/acpica/acpi_wakeup.c	Sat Aug 30 17:48:38 2014	(r270850)
@@ -30,6 +30,10 @@
 #include 
 __FBSDID("$FreeBSD$");
 
+#ifdef __i386__
+#include "opt_npx.h"
+#endif
+
 #include 
 #include 
 #include 
@@ -203,6 +207,8 @@ acpi_sleep_machdep(struct acpi_softc *sc
 	if (savectx(susppcbs[0])) {
 #ifdef __amd64__
 		fpususpend(susppcbs[0]->pcb_fpususpend);
+#elif defined(DEV_NPX)
+		npxsuspend(&susppcbs[0]->pcb_fpususpend);
 #endif
 #ifdef SMP
 		if (!CPU_EMPTY(&suspcpus) && suspend_cpus(suspcpus) == 0) {
@@ -237,6 +243,10 @@ acpi_sleep_machdep(struct acpi_softc *sc
 
 		for (;;)
 			ia32_pause();
+	} else {
+#ifdef DEV_NPX
+		npxresume(&susppcbs[0]->pcb_fpususpend);
+#endif
 	}
 
 	return (1);	/* wakeup successfully */

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 17:57:03 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 4640EF4D;
 Sat, 30 Aug 2014 17:57:03 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2E4021511;
 Sat, 30 Aug 2014 17:57:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7UHv3BE064316;
 Sat, 30 Aug 2014 17:57:03 GMT (envelope-from ume@FreeBSD.org)
Received: (from ume@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7UHuwsu064258;
 Sat, 30 Aug 2014 17:56:58 GMT (envelope-from ume@FreeBSD.org)
Message-Id: <201408301756.s7UHuwsu064258@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ume set sender to ume@FreeBSD.org
 using -f
From: Hajimu UMEMOTO 
Date: Sat, 30 Aug 2014 17:56:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r270851 - in stable/9: include include/arpa
 lib/libc/include lib/libc/include/isc lib/libc/inet lib/libc/isc
 lib/libc/nameser lib/libc/resolv
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 17:57:03 -0000

Author: ume
Date: Sat Aug 30 17:56:58 2014
New Revision: 270851
URL: http://svnweb.freebsd.org/changeset/base/270851

Log:
  MFC r269867:
  Update our stub resolver to final version of libbind
  (libbind-6.0).
  
  Obtained from:	ISC

Modified:
  stable/9/include/arpa/inet.h
  stable/9/include/arpa/nameser.h
  stable/9/include/arpa/nameser_compat.h
  stable/9/include/res_update.h
  stable/9/include/resolv.h
  stable/9/lib/libc/include/isc/eventlib.h
  stable/9/lib/libc/include/isc/list.h
  stable/9/lib/libc/include/port_before.h
  stable/9/lib/libc/inet/inet_addr.c
  stable/9/lib/libc/inet/inet_cidr_ntop.c
  stable/9/lib/libc/inet/inet_cidr_pton.c
  stable/9/lib/libc/inet/inet_net_ntop.c
  stable/9/lib/libc/inet/inet_net_pton.c
  stable/9/lib/libc/inet/inet_neta.c
  stable/9/lib/libc/inet/inet_ntoa.c
  stable/9/lib/libc/inet/inet_ntop.c
  stable/9/lib/libc/inet/inet_pton.c
  stable/9/lib/libc/inet/nsap_addr.c
  stable/9/lib/libc/isc/ev_streams.c
  stable/9/lib/libc/isc/ev_timers.c
  stable/9/lib/libc/isc/eventlib_p.h
  stable/9/lib/libc/nameser/Symbol.map
  stable/9/lib/libc/nameser/ns_name.c
  stable/9/lib/libc/nameser/ns_netint.c
  stable/9/lib/libc/nameser/ns_parse.c
  stable/9/lib/libc/nameser/ns_print.c
  stable/9/lib/libc/nameser/ns_samedomain.c
  stable/9/lib/libc/nameser/ns_ttl.c
  stable/9/lib/libc/resolv/Makefile.inc
  stable/9/lib/libc/resolv/Symbol.map
  stable/9/lib/libc/resolv/herror.c
  stable/9/lib/libc/resolv/res_comp.c
  stable/9/lib/libc/resolv/res_data.c
  stable/9/lib/libc/resolv/res_debug.c
  stable/9/lib/libc/resolv/res_findzonecut.c
  stable/9/lib/libc/resolv/res_init.c
  stable/9/lib/libc/resolv/res_mkquery.c
  stable/9/lib/libc/resolv/res_mkupdate.c
  stable/9/lib/libc/resolv/res_query.c
  stable/9/lib/libc/resolv/res_send.c
  stable/9/lib/libc/resolv/res_update.c
Directory Properties:
  stable/9/include/   (props changed)
  stable/9/include/arpa/   (props changed)
  stable/9/lib/libc/   (props changed)

Modified: stable/9/include/arpa/inet.h
==============================================================================
--- stable/9/include/arpa/inet.h	Sat Aug 30 17:48:38 2014	(r270850)
+++ stable/9/include/arpa/inet.h	Sat Aug 30 17:56:58 2014	(r270851)
@@ -51,7 +51,7 @@
 
 /*%
  *	@(#)inet.h	8.1 (Berkeley) 6/2/93
- *	$Id: inet.h,v 1.2.18.1 2005/04/27 05:00:50 sra Exp $
+ *	$Id: inet.h,v 1.3 2005/04/27 04:56:16 sra Exp $
  * $FreeBSD$
  */
 

Modified: stable/9/include/arpa/nameser.h
==============================================================================
--- stable/9/include/arpa/nameser.h	Sat Aug 30 17:48:38 2014	(r270850)
+++ stable/9/include/arpa/nameser.h	Sat Aug 30 17:56:58 2014	(r270851)
@@ -1,7 +1,24 @@
 /*
+ * Portions Copyright (C) 2004, 2005, 2008, 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 1996-2003  Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/*
  * Copyright (c) 1983, 1989, 1993
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +30,7 @@
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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
@@ -28,24 +45,7 @@
  */
 
 /*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996-1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- *	$Id: nameser.h,v 1.7.18.2 2008/04/03 23:15:15 marka Exp $
+ *	$Id: nameser.h,v 1.16 2009/03/03 01:52:48 each Exp $
  * $FreeBSD$
  */
 
@@ -68,15 +68,18 @@
  * contains a new enough lib/nameser/ to support the feature you need.
  */
 
-#define __NAMESER	19991006	/*%< New interface version stamp. */
+#define __NAMESER	20090302	/*%< New interface version stamp. */
 /*
  * Define constants based on RFC0883, RFC1034, RFC 1035
  */
 #define NS_PACKETSZ	512	/*%< default UDP packet size */
-#define NS_MAXDNAME	1025	/*%< maximum domain name */
+#define NS_MAXDNAME	1025	/*%< maximum domain name (presentation format)*/
 #define NS_MAXMSG	65535	/*%< maximum message size */
 #define NS_MAXCDNAME	255	/*%< maximum compressed domain name */
 #define NS_MAXLABEL	63	/*%< maximum length of domain label */
+#define NS_MAXLABELS	128	/*%< theoretical max #/labels per domain name */
+#define NS_MAXNNAME	256	/*%< maximum uncompressed (binary) domain name*/
+#define	NS_MAXPADDR	(sizeof "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")
 #define NS_HFIXEDSZ	12	/*%< #/bytes of fixed data in header */
 #define NS_QFIXEDSZ	4	/*%< #/bytes of fixed data in query */
 #define NS_RRFIXEDSZ	10	/*%< #/bytes of fixed data in r record */
@@ -103,6 +106,18 @@ typedef enum __ns_sect {
 } ns_sect;
 
 /*%
+ * Network name (compressed or not) type.  Equivilent to a pointer when used
+ * in a function prototype.  Can be const'd.
+ */
+typedef u_char ns_nname[NS_MAXNNAME];
+typedef const u_char *ns_nname_ct;
+typedef u_char *ns_nname_t;
+
+struct ns_namemap { ns_nname_ct base; int len; };
+typedef struct ns_namemap *ns_namemap_t;
+typedef const struct ns_namemap *ns_namemap_ct;
+
+/*%
  * This is a message handle.  It is caller allocated and has no dynamic data.
  * This structure is intended to be opaque to all but ns_parse.c, thus the
  * leading _'s on the member names.  Use the accessor functions, not the _'s.
@@ -116,6 +131,17 @@ typedef struct __ns_msg {
 	const u_char	*_msg_ptr;
 } ns_msg;
 
+/*
+ * This is a newmsg handle, used when constructing new messages with
+ * ns_newmsg_init, et al.
+ */
+struct ns_newmsg {
+	ns_msg		msg;
+	const u_char	*dnptrs[25];
+	const u_char	**lastdnptr;
+};
+typedef struct ns_newmsg ns_newmsg;
+
 /* Private data structure - do not use from outside library. */
 struct _ns_flagdata {  int mask, shift;  };
 extern struct _ns_flagdata _ns_flagdata[];
@@ -140,8 +166,23 @@ typedef	struct __ns_rr {
 	const u_char *	rdata;
 } ns_rr;
 
+/*
+ * Same thing, but using uncompressed network binary names, and real C types.
+ */
+typedef	struct __ns_rr2 {
+	ns_nname	nname;
+	size_t		nnamel;
+	int		type;
+	int		rr_class;
+	u_int		ttl;
+	int		rdlength;
+	const u_char *	rdata;
+} ns_rr2;
+
 /* Accessor macros - this is part of the public interface. */
 #define ns_rr_name(rr)	(((rr).name[0] != '\0') ? (rr).name : ".")
+#define ns_rr_nname(rr)	((const ns_nname_t)(rr).nname)
+#define ns_rr_nnamel(rr) ((rr).nnamel + 0)
 #define ns_rr_type(rr)	((ns_type)((rr).type + 0))
 #define ns_rr_class(rr)	((ns_class)((rr).rr_class + 0))
 #define ns_rr_ttl(rr)	((rr).ttl + 0)
@@ -216,9 +257,9 @@ typedef enum __ns_update_operation {
  * This structure is used for TSIG authenticated messages
  */
 struct ns_tsig_key {
-        char name[NS_MAXDNAME], alg[NS_MAXDNAME];
-        unsigned char *data;
-        int len;
+	char name[NS_MAXDNAME], alg[NS_MAXDNAME];
+	unsigned char *data;
+	int len;
 };
 typedef struct ns_tsig_key ns_tsig_key;
 
@@ -274,7 +315,7 @@ typedef enum __ns_type {
 	ns_t_key = 25,		/*%< Security key. */
 	ns_t_px = 26,		/*%< X.400 mail mapping. */
 	ns_t_gpos = 27,		/*%< Geographical position (withdrawn). */
-	ns_t_aaaa = 28,		/*%< Ip6 Address. */
+	ns_t_aaaa = 28,		/*%< IPv6 Address. */
 	ns_t_loc = 29,		/*%< Location Information. */
 	ns_t_nxt = 30,		/*%< Next domain (security). */
 	ns_t_eid = 31,		/*%< Endpoint identifier. */
@@ -284,11 +325,22 @@ typedef enum __ns_type {
 	ns_t_naptr = 35,	/*%< Naming Authority PoinTeR */
 	ns_t_kx = 36,		/*%< Key Exchange */
 	ns_t_cert = 37,		/*%< Certification record */
-	ns_t_a6 = 38,		/*%< IPv6 address (deprecates AAAA) */
-	ns_t_dname = 39,	/*%< Non-terminal DNAME (for IPv6) */
+	ns_t_a6 = 38,		/*%< IPv6 address (experimental) */
+	ns_t_dname = 39,	/*%< Non-terminal DNAME */
 	ns_t_sink = 40,		/*%< Kitchen sink (experimentatl) */
 	ns_t_opt = 41,		/*%< EDNS0 option (meta-RR) */
 	ns_t_apl = 42,		/*%< Address prefix list (RFC3123) */
+	ns_t_ds = 43,		/*%< Delegation Signer */
+	ns_t_sshfp = 44,	/*%< SSH Fingerprint */
+	ns_t_ipseckey = 45,	/*%< IPSEC Key */
+	ns_t_rrsig = 46,	/*%< RRset Signature */
+	ns_t_nsec = 47,		/*%< Negative security */
+	ns_t_dnskey = 48,	/*%< DNS Key */
+	ns_t_dhcid = 49,	/*%< Dynamic host configuratin identifier */
+	ns_t_nsec3 = 50,	/*%< Negative security type 3 */
+	ns_t_nsec3param = 51,	/*%< Negative security type 3 parameters */
+	ns_t_hip = 55,		/*%< Host Identity Protocol */
+	ns_t_spf = 99,		/*%< Sender Policy Framework */
 	ns_t_tkey = 249,	/*%< Transaction key */
 	ns_t_tsig = 250,	/*%< Transaction signature. */
 	ns_t_ixfr = 251,	/*%< Incremental zone transfer. */
@@ -297,6 +349,7 @@ typedef enum __ns_type {
 	ns_t_maila = 254,	/*%< Transfer mail agent records. */
 	ns_t_any = 255,		/*%< Wildcard match. */
 	ns_t_zxfr = 256,	/*%< BIND-specific, nonstandard. */
+	ns_t_dlv = 32769,	/*%< DNSSEC look-aside validatation. */
 	ns_t_max = 65536
 } ns_type;
 
@@ -475,6 +528,7 @@ typedef enum __ns_cert_types {
 #define ns_initparse		__ns_initparse
 #define ns_skiprr		__ns_skiprr
 #define ns_parserr		__ns_parserr
+#define ns_parserr2		__ns_parserr2
 #define	ns_sprintrr		__ns_sprintrr
 #define	ns_sprintrrf		__ns_sprintrrf
 #define	ns_format_ttl		__ns_format_ttl
@@ -485,12 +539,19 @@ typedef enum __ns_cert_types {
 #define	ns_name_ntol		__ns_name_ntol
 #define	ns_name_ntop		__ns_name_ntop
 #define	ns_name_pton		__ns_name_pton
+#define	ns_name_pton2		__ns_name_pton2
 #define	ns_name_unpack		__ns_name_unpack
+#define	ns_name_unpack2		__ns_name_unpack2
 #define	ns_name_pack		__ns_name_pack
 #define	ns_name_compress	__ns_name_compress
 #define	ns_name_uncompress	__ns_name_uncompress
 #define	ns_name_skip		__ns_name_skip
 #define	ns_name_rollback	__ns_name_rollback
+#define	ns_name_length		__ns_name_length
+#define	ns_name_eq		__ns_name_eq
+#define	ns_name_owned		__ns_name_owned
+#define	ns_name_map		__ns_name_map
+#define	ns_name_labels		__ns_name_labels
 #if 0
 #define	ns_sign			__ns_sign
 #define	ns_sign2		__ns_sign2
@@ -508,6 +569,16 @@ typedef enum __ns_cert_types {
 #endif
 #define	ns_makecanon		__ns_makecanon
 #define	ns_samename		__ns_samename
+#define	ns_newmsg_init		__ns_newmsg_init
+#define	ns_newmsg_copy		__ns_newmsg_copy
+#define	ns_newmsg_id		__ns_newmsg_id
+#define	ns_newmsg_flag		__ns_newmsg_flag
+#define	ns_newmsg_q		__ns_newmsg_q
+#define	ns_newmsg_rr		__ns_newmsg_rr
+#define	ns_newmsg_done		__ns_newmsg_done
+#define	ns_rdata_unpack		__ns_rdata_unpack
+#define	ns_rdata_equal		__ns_rdata_equal
+#define	ns_rdata_refers		__ns_rdata_refers
 
 __BEGIN_DECLS
 int		ns_msg_getflag(ns_msg, int);
@@ -518,6 +589,7 @@ void		ns_put32(u_long, u_char *);
 int		ns_initparse(const u_char *, int, ns_msg *);
 int		ns_skiprr(const u_char *, const u_char *, ns_sect, int);
 int		ns_parserr(ns_msg *, ns_sect, int, ns_rr *);
+int		ns_parserr2(ns_msg *, ns_sect, int, ns_rr2 *);
 int		ns_sprintrr(const ns_msg *, const ns_rr *,
 			    const char *, const char *, char *, size_t);
 int		ns_sprintrrf(const u_char *, size_t, const char *,
@@ -532,8 +604,12 @@ u_int32_t	ns_datetosecs(const char *cp, 
 int		ns_name_ntol(const u_char *, u_char *, size_t);
 int		ns_name_ntop(const u_char *, char *, size_t);
 int		ns_name_pton(const char *, u_char *, size_t);
+int		ns_name_pton2(const char *, u_char *, size_t, size_t *);
 int		ns_name_unpack(const u_char *, const u_char *,
 			       const u_char *, u_char *, size_t);
+int		ns_name_unpack2(const u_char *, const u_char *,
+				const u_char *, u_char *, size_t,
+				size_t *);
 int		ns_name_pack(const u_char *, u_char *, int,
 			     const u_char **, const u_char **);
 int		ns_name_uncompress(const u_char *, const u_char *,
@@ -543,6 +619,11 @@ int		ns_name_compress(const char *, u_ch
 int		ns_name_skip(const u_char **, const u_char *);
 void		ns_name_rollback(const u_char *, const u_char **,
 				 const u_char **);
+ssize_t		ns_name_length(ns_nname_ct, size_t);
+int		ns_name_eq(ns_nname_ct, size_t, ns_nname_ct, size_t);
+int		ns_name_owned(ns_namemap_ct, int, ns_namemap_ct, int);
+int		ns_name_map(ns_nname_ct, size_t, ns_namemap_t, int);
+int		ns_name_labels(ns_nname_ct, size_t);
 #if 0
 int		ns_sign(u_char *, int *, int, int, void *,
 			const u_char *, int, u_char *, int *, time_t);
@@ -570,6 +651,25 @@ int		ns_subdomain(const char *, const ch
 #endif
 int		ns_makecanon(const char *, char *, size_t);
 int		ns_samename(const char *, const char *);
+int		ns_newmsg_init(u_char *buffer, size_t bufsiz, ns_newmsg *);
+int		ns_newmsg_copy(ns_newmsg *, ns_msg *);
+void		ns_newmsg_id(ns_newmsg *handle, u_int16_t id);
+void		ns_newmsg_flag(ns_newmsg *handle, ns_flag flag, u_int value);
+int		ns_newmsg_q(ns_newmsg *handle, ns_nname_ct qname,
+			    ns_type qtype, ns_class qclass);
+int		ns_newmsg_rr(ns_newmsg *handle, ns_sect sect,
+			     ns_nname_ct name, ns_type type,
+			     ns_class rr_class, u_int32_t ttl,
+			     u_int16_t rdlen, const u_char *rdata);
+size_t		ns_newmsg_done(ns_newmsg *handle);
+ssize_t		ns_rdata_unpack(const u_char *, const u_char *, ns_type,
+				const u_char *, size_t, u_char *, size_t);
+int		ns_rdata_equal(ns_type,
+			       const u_char *, size_t,
+			       const u_char *, size_t);
+int		ns_rdata_refers(ns_type,
+				const u_char *, size_t,
+				const u_char *);
 __END_DECLS
 
 #ifdef BIND_4_COMPAT

Modified: stable/9/include/arpa/nameser_compat.h
==============================================================================
--- stable/9/include/arpa/nameser_compat.h	Sat Aug 30 17:48:38 2014	(r270850)
+++ stable/9/include/arpa/nameser_compat.h	Sat Aug 30 17:56:58 2014	(r270851)
@@ -28,7 +28,7 @@
 
 /*%
  *      from nameser.h	8.1 (Berkeley) 6/2/93
- *	$Id: nameser_compat.h,v 1.5.18.3 2006/05/19 02:36:00 marka Exp $
+ *	$Id: nameser_compat.h,v 1.8 2006/05/19 02:33:40 marka Exp $
  * $FreeBSD$
  */
 

Modified: stable/9/include/res_update.h
==============================================================================
--- stable/9/include/res_update.h	Sat Aug 30 17:48:38 2014	(r270850)
+++ stable/9/include/res_update.h	Sat Aug 30 17:56:58 2014	(r270851)
@@ -16,7 +16,7 @@
  */
 
 /*
- *	$Id: res_update.h,v 1.2.18.1 2005/04/27 05:00:49 sra Exp $
+ *	$Id: res_update.h,v 1.3 2005/04/27 04:56:15 sra Exp $
  * $FreeBSD$
  */
 

Modified: stable/9/include/resolv.h
==============================================================================
--- stable/9/include/resolv.h	Sat Aug 30 17:48:38 2014	(r270850)
+++ stable/9/include/resolv.h	Sat Aug 30 17:56:58 2014	(r270851)
@@ -1,7 +1,24 @@
 /*
+ * Portions Copyright (C) 2004, 2005, 2008, 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 1995-2003  Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/*
  * Copyright (c) 1983, 1987, 1989
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +30,7 @@
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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
@@ -27,26 +44,9 @@
  * SUCH DAMAGE.
  */
 
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (c) 1996-1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
 /*%
  *	@(#)resolv.h	8.1 (Berkeley) 6/2/93
- *	$Id: resolv.h,v 1.19.18.4 2008/04/03 23:15:15 marka Exp $
+ *	$Id: resolv.h,v 1.30 2009/03/03 01:52:48 each Exp $
  * $FreeBSD$
  */
 
@@ -68,7 +68,7 @@
  * is new enough to contain a certain feature.
  */
 
-#define	__RES	20030124
+#define	__RES	20090302
 
 /*%
  * This used to be defined in res_query.c, now it's in herror.c.
@@ -179,7 +179,7 @@ struct __res_state {
 	u_int	_pad;			/*%< make _u 64 bit aligned */
 	union {
 		/* On an 32-bit arch this means 512b total. */
-		char	pad[72 - 4*sizeof (int) - 2*sizeof (void *)];
+		char	pad[72 - 4*sizeof (int) - 3*sizeof (void *)];
 		struct {
 			u_int16_t		nscount;
 			u_int16_t		nstimes[MAXNS];	/*%< ms. */
@@ -187,6 +187,7 @@ struct __res_state {
 			struct __res_state_ext *ext;	/*%< extention for IPv6 */
 		} _ext;
 	} _u;
+	u_char	*_rnd;			/*%< PRIVATE: random state */
 };
 
 typedef struct __res_state *res_state;
@@ -320,7 +321,7 @@ __END_DECLS
 #if !defined(SHARED_LIBBIND) || defined(LIB)
 /*
  * If libbind is a shared object (well, DLL anyway)
- * these externs break the linker when resolv.h is 
+ * these externs break the linker when resolv.h is
  * included by a lib client (like named)
  * Make them go away if a client is including this
  *
@@ -378,7 +379,9 @@ extern const struct res_sym __p_rcode_sy
 #define res_nisourserver	__res_nisourserver
 #define res_ownok		__res_ownok
 #define res_queriesmatch	__res_queriesmatch
+#define res_rndinit		__res_rndinit
 #define res_randomid		__res_randomid
+#define res_nrandomid		__res_nrandomid
 #define sym_ntop		__sym_ntop
 #define sym_ntos		__sym_ntos
 #define sym_ston		__sym_ston
@@ -441,7 +444,9 @@ int		dn_count_labels(const char *);
 int		dn_comp(const char *, u_char *, int, u_char **, u_char **);
 int		dn_expand(const u_char *, const u_char *, const u_char *,
 			  char *, int);
+void		res_rndinit(res_state);
 u_int		res_randomid(void);
+u_int		res_nrandomid(res_state);
 int		res_nameinquery(const char *, int, int, const u_char *,
 				const u_char *);
 int		res_queriesmatch(const u_char *, const u_char *,

Modified: stable/9/lib/libc/include/isc/eventlib.h
==============================================================================
--- stable/9/lib/libc/include/isc/eventlib.h	Sat Aug 30 17:48:38 2014	(r270850)
+++ stable/9/lib/libc/include/isc/eventlib.h	Sat Aug 30 17:56:58 2014	(r270851)
@@ -1,24 +1,24 @@
 /*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1995-1999 by Internet Software Consortium
+ * Copyright (C) 2004, 2005, 2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1995-1999, 2001, 2003  Internet Software Consortium.
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
  */
 
 /* eventlib.h - exported interfaces for eventlib
  * vix 09sep95 [initial]
  *
- * $Id: eventlib.h,v 1.3.18.3 2008/01/23 02:12:01 marka Exp $
+ * $Id: eventlib.h,v 1.7 2008/11/14 02:36:51 marka Exp $
  */
 
 #ifndef _EVENTLIB_H

Modified: stable/9/lib/libc/include/isc/list.h
==============================================================================
--- stable/9/lib/libc/include/isc/list.h	Sat Aug 30 17:48:38 2014	(r270850)
+++ stable/9/lib/libc/include/isc/list.h	Sat Aug 30 17:56:58 2014	(r270851)
@@ -38,7 +38,8 @@
 	} while (0)
 #define INIT_LINK(elt, link) \
 	INIT_LINK_TYPE(elt, link, void)
-#define LINKED(elt, link) ((void *)((elt)->link.prev) != (void *)(-1))
+#define LINKED(elt, link) ((void *)((elt)->link.prev) != (void *)(-1) && \
+			   (void *)((elt)->link.next) != (void *)(-1))
 
 #define HEAD(list) ((list).head)
 #define TAIL(list) ((list).tail)

Modified: stable/9/lib/libc/include/port_before.h
==============================================================================
--- stable/9/lib/libc/include/port_before.h	Sat Aug 30 17:48:38 2014	(r270850)
+++ stable/9/lib/libc/include/port_before.h	Sat Aug 30 17:56:58 2014	(r270851)
@@ -6,6 +6,7 @@
 #define _LIBC		1
 #define DO_PTHREADS	1
 #define USE_KQUEUE	1
+#define HAVE_MD5	1
 
 #define ISC_SOCKLEN_T	socklen_t
 #define ISC_FORMAT_PRINTF(fmt, args) \

Modified: stable/9/lib/libc/inet/inet_addr.c
==============================================================================
--- stable/9/lib/libc/inet/inet_addr.c	Sat Aug 30 17:48:38 2014	(r270850)
+++ stable/9/lib/libc/inet/inet_addr.c	Sat Aug 30 17:56:58 2014	(r270851)
@@ -66,7 +66,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)inet_addr.c	8.1 (Berkeley) 6/17/93";
-static const char rcsid[] = "$Id: inet_addr.c,v 1.4.18.1 2005/04/27 05:00:52 sra Exp $";
+static const char rcsid[] = "$Id: inet_addr.c,v 1.5 2005/04/27 04:56:19 sra Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include 
 __FBSDID("$FreeBSD$");

Modified: stable/9/lib/libc/inet/inet_cidr_ntop.c
==============================================================================
--- stable/9/lib/libc/inet/inet_cidr_ntop.c	Sat Aug 30 17:48:38 2014	(r270850)
+++ stable/9/lib/libc/inet/inet_cidr_ntop.c	Sat Aug 30 17:56:58 2014	(r270851)
@@ -16,8 +16,10 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_cidr_ntop.c,v 1.4.18.3 2006/10/11 02:32:47 marka Exp $";
+static const char rcsid[] = "$Id: inet_cidr_ntop.c,v 1.7 2006/10/11 02:18:18 marka Exp $";
 #endif
+#include 
+__FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 

Modified: stable/9/lib/libc/inet/inet_cidr_pton.c
==============================================================================
--- stable/9/lib/libc/inet/inet_cidr_pton.c	Sat Aug 30 17:48:38 2014	(r270850)
+++ stable/9/lib/libc/inet/inet_cidr_pton.c	Sat Aug 30 17:56:58 2014	(r270851)
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_cidr_pton.c,v 1.5.18.1 2005/04/27 05:00:53 sra Exp $";
+static const char rcsid[] = "$Id: inet_cidr_pton.c,v 1.6 2005/04/27 04:56:19 sra Exp $";
 #endif
 #include 
 __FBSDID("$FreeBSD$");

Modified: stable/9/lib/libc/inet/inet_net_ntop.c
==============================================================================
--- stable/9/lib/libc/inet/inet_net_ntop.c	Sat Aug 30 17:48:38 2014	(r270850)
+++ stable/9/lib/libc/inet/inet_net_ntop.c	Sat Aug 30 17:56:58 2014	(r270851)
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_net_ntop.c,v 1.3.18.2 2006/06/20 02:51:32 marka Exp $";
+static const char rcsid[] = "$Id: inet_net_ntop.c,v 1.5 2006/06/20 02:50:14 marka Exp $";
 #endif
 #include 
 __FBSDID("$FreeBSD$");

Modified: stable/9/lib/libc/inet/inet_net_pton.c
==============================================================================
--- stable/9/lib/libc/inet/inet_net_pton.c	Sat Aug 30 17:48:38 2014	(r270850)
+++ stable/9/lib/libc/inet/inet_net_pton.c	Sat Aug 30 17:56:58 2014	(r270851)
@@ -1,22 +1,22 @@
 /*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996,1999 by Internet Software Consortium.
+ * Copyright (C) 2004, 2005, 2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1996, 1998, 1999, 2001, 2003  Internet Software Consortium.
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_net_pton.c,v 1.7.18.2 2008/08/26 04:42:43 marka Exp $";
+static const char rcsid[] = "$Id: inet_net_pton.c,v 1.10 2008/11/14 02:36:51 marka Exp $";
 #endif
 #include 
 __FBSDID("$FreeBSD$");

Modified: stable/9/lib/libc/inet/inet_neta.c
==============================================================================
--- stable/9/lib/libc/inet/inet_neta.c	Sat Aug 30 17:48:38 2014	(r270850)
+++ stable/9/lib/libc/inet/inet_neta.c	Sat Aug 30 17:56:58 2014	(r270851)
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_neta.c,v 1.2.18.1 2005/04/27 05:00:53 sra Exp $";
+static const char rcsid[] = "$Id: inet_neta.c,v 1.3 2005/04/27 04:56:20 sra Exp $";
 #endif
 #include 
 __FBSDID("$FreeBSD$");

Modified: stable/9/lib/libc/inet/inet_ntoa.c
==============================================================================
--- stable/9/lib/libc/inet/inet_ntoa.c	Sat Aug 30 17:48:38 2014	(r270850)
+++ stable/9/lib/libc/inet/inet_ntoa.c	Sat Aug 30 17:56:58 2014	(r270851)
@@ -29,7 +29,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)inet_ntoa.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: inet_ntoa.c,v 1.1.352.1 2005/04/27 05:00:54 sra Exp $";
+static const char rcsid[] = "$Id: inet_ntoa.c,v 1.2 2005/04/27 04:56:21 sra Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include 
 __FBSDID("$FreeBSD$");

Modified: stable/9/lib/libc/inet/inet_ntop.c
==============================================================================
--- stable/9/lib/libc/inet/inet_ntop.c	Sat Aug 30 17:48:38 2014	(r270850)
+++ stable/9/lib/libc/inet/inet_ntop.c	Sat Aug 30 17:56:58 2014	(r270851)
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_ntop.c,v 1.3.18.2 2005/11/03 23:02:22 marka Exp $";
+static const char rcsid[] = "$Id: inet_ntop.c,v 1.5 2005/11/03 22:59:52 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include 
 __FBSDID("$FreeBSD$");

Modified: stable/9/lib/libc/inet/inet_pton.c
==============================================================================
--- stable/9/lib/libc/inet/inet_pton.c	Sat Aug 30 17:48:38 2014	(r270850)
+++ stable/9/lib/libc/inet/inet_pton.c	Sat Aug 30 17:56:58 2014	(r270851)
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_pton.c,v 1.3.18.2 2005/07/28 07:38:07 marka Exp $";
+static const char rcsid[] = "$Id: inet_pton.c,v 1.5 2005/07/28 06:51:47 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include 
 __FBSDID("$FreeBSD$");

Modified: stable/9/lib/libc/inet/nsap_addr.c
==============================================================================
--- stable/9/lib/libc/inet/nsap_addr.c	Sat Aug 30 17:48:38 2014	(r270850)
+++ stable/9/lib/libc/inet/nsap_addr.c	Sat Aug 30 17:56:58 2014	(r270851)
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: nsap_addr.c,v 1.3.18.2 2005/07/28 07:38:08 marka Exp $";
+static const char rcsid[] = "$Id: nsap_addr.c,v 1.5 2005/07/28 06:51:48 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include 
 __FBSDID("$FreeBSD$");

Modified: stable/9/lib/libc/isc/ev_streams.c
==============================================================================
--- stable/9/lib/libc/isc/ev_streams.c	Sat Aug 30 17:48:38 2014	(r270850)
+++ stable/9/lib/libc/isc/ev_streams.c	Sat Aug 30 17:56:58 2014	(r270851)
@@ -20,7 +20,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: ev_streams.c,v 1.4.18.1 2005/04/27 05:01:06 sra Exp $";
+static const char rcsid[] = "$Id: ev_streams.c,v 1.5 2005/04/27 04:56:36 sra Exp $";
 #endif
 #include 
 __FBSDID("$FreeBSD$");

Modified: stable/9/lib/libc/isc/ev_timers.c
==============================================================================
--- stable/9/lib/libc/isc/ev_timers.c	Sat Aug 30 17:48:38 2014	(r270850)
+++ stable/9/lib/libc/isc/ev_timers.c	Sat Aug 30 17:56:58 2014	(r270851)
@@ -20,7 +20,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: ev_timers.c,v 1.5.18.1 2005/04/27 05:01:06 sra Exp $";
+static const char rcsid[] = "$Id: ev_timers.c,v 1.6 2005/04/27 04:56:36 sra Exp $";
 #endif
 #include 
 __FBSDID("$FreeBSD$");

Modified: stable/9/lib/libc/isc/eventlib_p.h
==============================================================================
--- stable/9/lib/libc/isc/eventlib_p.h	Sat Aug 30 17:48:38 2014	(r270850)
+++ stable/9/lib/libc/isc/eventlib_p.h	Sat Aug 30 17:56:58 2014	(r270851)
@@ -19,7 +19,7 @@
  * \brief private interfaces for eventlib
  * \author vix 09sep95 [initial]
  *
- * $Id: eventlib_p.h,v 1.5.18.4 2006/03/10 00:20:08 marka Exp $
+ * $Id: eventlib_p.h,v 1.9 2006/03/09 23:57:56 marka Exp $
  * $FreeBSD$
  */
 

Modified: stable/9/lib/libc/nameser/Symbol.map
==============================================================================
--- stable/9/lib/libc/nameser/Symbol.map	Sat Aug 30 17:48:38 2014	(r270850)
+++ stable/9/lib/libc/nameser/Symbol.map	Sat Aug 30 17:56:58 2014	(r270851)
@@ -29,3 +29,24 @@ FBSD_1.0 {
 	__ns_format_ttl;
 	__ns_parse_ttl;
 };
+
+FBSD_1.4 {
+	__ns_parserr2;
+	__ns_name_pton2;
+	__ns_name_unpack2;
+	__ns_name_length;
+	__ns_name_eq;
+	__ns_name_owned;
+	__ns_name_map;
+	__ns_name_labels;
+	__ns_newmsg_init;
+	__ns_newmsg_copy;
+	__ns_newmsg_id;
+	__ns_newmsg_flag;
+	__ns_newmsg_q;
+	__ns_newmsg_rr;
+	__ns_newmsg_done;
+	__ns_rdata_unpack;
+	__ns_rdata_equal;
+	__ns_rdata_refers;
+};

Modified: stable/9/lib/libc/nameser/ns_name.c
==============================================================================
--- stable/9/lib/libc/nameser/ns_name.c	Sat Aug 30 17:48:38 2014	(r270850)
+++ stable/9/lib/libc/nameser/ns_name.c	Sat Aug 30 17:56:58 2014	(r270851)
@@ -16,8 +16,10 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: ns_name.c,v 1.8.18.2 2005/04/27 05:01:08 sra Exp $";
+static const char rcsid[] = "$Id: ns_name.c,v 1.11 2009/01/23 19:59:16 each Exp $";
 #endif
+#include 
+__FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 
@@ -121,7 +123,7 @@ ns_name_ntop(const u_char *src, char *ds
 		}
 		if ((l = labellen(cp - 1)) < 0) {
 			errno = EMSGSIZE; /*%< XXX */
-			return(-1);
+			return (-1);
 		}
 		if (dn + l >= eom) {
 			errno = EMSGSIZE;
@@ -133,12 +135,12 @@ ns_name_ntop(const u_char *src, char *ds
 			if (n != DNS_LABELTYPE_BITSTRING) {
 				/* XXX: labellen should reject this case */
 				errno = EINVAL;
-				return(-1);
+				return (-1);
 			}
 			if ((m = decode_bitstring(&cp, dn, eom)) < 0)
 			{
 				errno = EMSGSIZE;
-				return(-1);
+				return (-1);
 			}
 			dn += m; 
 			continue;
@@ -197,10 +199,25 @@ ns_name_ntop(const u_char *src, char *ds
  * notes:
  *\li	Enforces label and domain length limits.
  */
+int
+ns_name_pton(const char *src, u_char *dst, size_t dstsiz) {
+	return (ns_name_pton2(src, dst, dstsiz, NULL));
+}
 
+/*
+ * ns_name_pton2(src, dst, dstsiz, *dstlen)
+ *	Convert a ascii string into an encoded domain name as per RFC1035.
+ * return:
+ *	-1 if it fails
+ *	1 if string was fully qualified
+ *	0 is string was not fully qualified
+ * side effects:
+ *	fills in *dstlen (if non-NULL)
+ * notes:
+ *	Enforces label and domain length limits.
+ */
 int
-ns_name_pton(const char *src, u_char *dst, size_t dstsiz)
-{
+ns_name_pton2(const char *src, u_char *dst, size_t dstsiz, size_t *dstlen) {
 	u_char *label, *bp, *eom;
 	int c, n, escaped, e = 0;
 	char *cp;
@@ -215,13 +232,13 @@ ns_name_pton(const char *src, u_char *ds
 			if (c == '[') { /*%< start a bit string label */
 				if ((cp = strchr(src, ']')) == NULL) {
 					errno = EINVAL; /*%< ??? */
-					return(-1);
+					return (-1);
 				}
 				if ((e = encode_bitsring(&src, cp + 2,
 							 &label, &bp, eom))
 				    != 0) {
 					errno = e;
-					return(-1);
+					return (-1);
 				}
 				escaped = 0;
 				label = bp++;
@@ -229,7 +246,7 @@ ns_name_pton(const char *src, u_char *ds
 					goto done;
 				else if (c != '.') {
 					errno = EINVAL;
-					return(-1);
+					return	(-1);
 				}
 				continue;
 			}
@@ -281,6 +298,8 @@ ns_name_pton(const char *src, u_char *ds
 					errno = EMSGSIZE;
 					return (-1);
 				}
+				if (dstlen != NULL)
+					*dstlen = (bp - dst);
 				return (1);
 			}
 			if (c == 0 || *src == '.') {
@@ -318,6 +337,8 @@ ns_name_pton(const char *src, u_char *ds
 		errno = EMSGSIZE;
 		return (-1);
 	}
+	if (dstlen != NULL)
+		*dstlen = (bp - dst);
 	return (0);
 }
 
@@ -365,7 +386,7 @@ ns_name_ntol(const u_char *src, u_char *
 		}
 		for ((void)NULL; l > 0; l--) {
 			c = *cp++;
-			if (isupper(c))
+			if (isascii(c) && isupper(c))
 				*dn++ = tolower(c);
 			else
 				*dn++ = c;
@@ -385,6 +406,21 @@ int
 ns_name_unpack(const u_char *msg, const u_char *eom, const u_char *src,
 	       u_char *dst, size_t dstsiz)
 {
+	return (ns_name_unpack2(msg, eom, src, dst, dstsiz, NULL));
+}
+
+/*
+ * ns_name_unpack2(msg, eom, src, dst, dstsiz, *dstlen)
+ *	Unpack a domain name from a message, source may be compressed.
+ * return:
+ *	-1 if it fails, or consumed octets if it succeeds.
+ * side effect:
+ *	fills in *dstlen (if non-NULL).
+ */
+int
+ns_name_unpack2(const u_char *msg, const u_char *eom, const u_char *src,
+		u_char *dst, size_t dstsiz, size_t *dstlen)
+{
 	const u_char *srcp, *dstlim;
 	u_char *dstp;
 	int n, len, checked, l;
@@ -407,7 +443,7 @@ ns_name_unpack(const u_char *msg, const 
 			/* Limit checks. */
 			if ((l = labellen(srcp - 1)) < 0) {
 				errno = EMSGSIZE;
-				return(-1);
+				return (-1);
 			}
 			if (dstp + l + 1 >= dstlim || srcp + l >= eom) {
 				errno = EMSGSIZE;
@@ -449,7 +485,9 @@ ns_name_unpack(const u_char *msg, const 
 			return (-1);			/*%< flag error */
 		}
 	}
-	*dstp = '\0';
+	*dstp++ = 0;
+	if (dstlen != NULL)
+		*dstlen = dstp - dst;
 	if (len < 0)
 		len = srcp - src;
 	return (len);
@@ -508,7 +546,7 @@ ns_name_pack(const u_char *src, u_char *
 		}
 		if ((l0 = labellen(srcp)) < 0) {
 			errno = EINVAL;
-			return(-1);
+			return (-1);
 		}
 		l += l0 + 1;
 		if (l > MAXCDNAME) {
@@ -655,7 +693,7 @@ ns_name_skip(const u_char **ptrptr, cons
 		case NS_TYPE_ELT: /*%< EDNS0 extended label */
 			if ((l = labellen(cp - 1)) < 0) {
 				errno = EMSGSIZE; /*%< XXX */
-				return(-1);
+				return (-1);
 			}
 			cp += l;
 			continue;
@@ -676,6 +714,150 @@ ns_name_skip(const u_char **ptrptr, cons
 	return (0);
 }
 
+/* Find the number of octets an nname takes up, including the root label.
+ * (This is basically ns_name_skip() without compression-pointer support.)
+ * ((NOTE: can only return zero if passed-in namesiz argument is zero.))
+ */
+ssize_t
+ns_name_length(ns_nname_ct nname, size_t namesiz) {
+	ns_nname_ct orig = nname;
+	u_int n;
+
+	while (namesiz-- > 0 && (n = *nname++) != 0) {
+		if ((n & NS_CMPRSFLGS) != 0) {
+			errno = EISDIR;
+			return (-1);
+		}
+		if (n > namesiz) {
+			errno = EMSGSIZE;
+			return (-1);
+		}
+		nname += n;
+		namesiz -= n;
+	}
+	return (nname - orig);
+}
+
+/* Compare two nname's for equality.  Return -1 on error (setting errno).
+ */
+int
+ns_name_eq(ns_nname_ct a, size_t as, ns_nname_ct b, size_t bs) {
+	ns_nname_ct ae = a + as, be = b + bs;
+	int ac, bc;
+
+	while (ac = *a, bc = *b, ac != 0 && bc != 0) {
+		if ((ac & NS_CMPRSFLGS) != 0 || (bc & NS_CMPRSFLGS) != 0) {
+			errno = EISDIR;
+			return (-1);
+		}
+		if (a + ac >= ae || b + bc >= be) {
+			errno = EMSGSIZE;
+			return (-1);
+		}
+		if (ac != bc || strncasecmp((const char *) ++a,
+					    (const char *) ++b, ac) != 0)
+			return (0);
+		a += ac, b += bc;
+	}
+	return (ac == 0 && bc == 0);
+}
+
+/* Is domain "A" owned by (at or below) domain "B"?
+ */
+int
+ns_name_owned(ns_namemap_ct a, int an, ns_namemap_ct b, int bn) {
+	/* If A is shorter, it cannot be owned by B. */
+	if (an < bn)
+		return (0);
+
+	/* If they are unequal before the length of the shorter, A cannot... */
+	while (bn > 0) {
+		if (a->len != b->len ||
+		    strncasecmp((const char *) a->base,
+				(const char *) b->base, a->len) != 0)
+			return (0);
+		a++, an--;
+		b++, bn--;
+	}
+
+	/* A might be longer or not, but either way, B owns it. */
+	return (1);
+}
+
+/* Build an array of  tuples from an nname, top-down order.
+ * Return the number of tuples (labels) thus discovered.
+ */
+int
+ns_name_map(ns_nname_ct nname, size_t namelen, ns_namemap_t map, int mapsize) {
+	u_int n;
+	int l;
+
+	n = *nname++;
+	namelen--;
+
+	/* Root zone? */
+	if (n == 0) {
+		/* Extra data follows name? */
+		if (namelen > 0) {
+			errno = EMSGSIZE;
+			return (-1);
+		}
+		return (0);
+	}
+
+	/* Compression pointer? */
+	if ((n & NS_CMPRSFLGS) != 0) {
+		errno = EISDIR;
+		return (-1);
+	}
+
+	/* Label too long? */
+	if (n > namelen) {
+		errno = EMSGSIZE;
+		return (-1);
+	}
+

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 17:58:37 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 0965D122;
 Sat, 30 Aug 2014 17:58:37 +0000 (UTC)
Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1])
 (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D49F7151C;
 Sat, 30 Aug 2014 17:58:36 +0000 (UTC)
Received: from ralph.baldwin.cx (pool-173-70-85-31.nwrknj.fios.verizon.net
 [173.70.85.31])
 by bigwig.baldwin.cx (Postfix) with ESMTPSA id 7E3DAB94F;
 Sat, 30 Aug 2014 13:58:35 -0400 (EDT)
From: John Baldwin 
To: Andreas Tobler 
Subject: Re: svn commit: r270829 - head/sys/kern
Date: Fri, 29 Aug 2014 18:03:33 -0400
Message-ID: <2276459.JCmJL37UO2@ralph.baldwin.cx>
User-Agent: KMail/4.10.5 (FreeBSD/10.0-STABLE; KDE/4.10.5; amd64; ; )
In-Reply-To: <201408292150.s7TLoWWD098346@svn.freebsd.org>
References: <201408292150.s7TLoWWD098346@svn.freebsd.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7
 (bigwig.baldwin.cx); Sat, 30 Aug 2014 13:58:35 -0400 (EDT)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 17:58:37 -0000

On Friday, August 29, 2014 09:50:32 PM Andreas Tobler wrote:
> Author: andreast
> Date: Fri Aug 29 21:50:32 2014
> New Revision: 270829
> URL: http://svnweb.freebsd.org/changeset/base/270829
> 
> Log:
>   Rename shm_dict_init to shm_init to fix a compiler warning.
> 
>   Reviewed by:	jhb

Thanks!

-- 
John Baldwin

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 17:58:36 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id EB338121;
 Sat, 30 Aug 2014 17:58:36 +0000 (UTC)
Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1])
 (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C141C151A;
 Sat, 30 Aug 2014 17:58:36 +0000 (UTC)
Received: from ralph.baldwin.cx (pool-173-70-85-31.nwrknj.fios.verizon.net
 [173.70.85.31])
 by bigwig.baldwin.cx (Postfix) with ESMTPSA id DA540B95D;
 Sat, 30 Aug 2014 13:58:34 -0400 (EDT)
From: John Baldwin 
To: src-committers@freebsd.org
Subject: Re: svn commit: r270850 - in head/sys: i386/i386 i386/include
 i386/isa x86/acpica
Date: Sat, 30 Aug 2014 13:58:20 -0400
Message-ID: <58768837.sIF65g1iXL@ralph.baldwin.cx>
User-Agent: KMail/4.10.5 (FreeBSD/10.0-STABLE; KDE/4.10.5; amd64; ; )
In-Reply-To: <201408301748.s7UHmc6H059701@svn.freebsd.org>
References: <201408301748.s7UHmc6H059701@svn.freebsd.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7
 (bigwig.baldwin.cx); Sat, 30 Aug 2014 13:58:34 -0400 (EDT)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 17:58:37 -0000

On Saturday, August 30, 2014 05:48:38 PM John Baldwin wrote:
> Author: jhb
> Date: Sat Aug 30 17:48:38 2014
> New Revision: 270850
> URL: http://svnweb.freebsd.org/changeset/base/270850
> 
> Log:
>   Save and restore FPU state across suspend and resume.  In earlier
> revisions of this patch, resumectx() called npxresume() directly, but that
> doesn't work because resumectx() runs with a non-standard %cs selector. 
> Instead, all of the FPU suspend/resume handling is done in C.

This mostly fixes suspend and resume in X on a little 32-bit only netbook I 
have.  I needed an additional patch to the i915 code to prevent it from 
tearing down its interrupt handler in suspend and re-establishing it during 
resume (this sort of thing is not needed in drivers and isn't safe because 
suspend runs pinned to CPU 0 and unregistering an interrupt needs to bind to 
the CPU the IDT vector is assigned to).

--- //depot/vendor/freebsd/src/sys/dev/drm2/i915/i915_drv.c
+++ //depot/user/jhb/acpipci/dev/drm2/i915/i915_drv.c
@@ -253,7 +253,9 @@
 			    "GEM idle failed, resume might fail\n");
 			return (error);
 		}
+#if 0
 		drm_irq_uninstall(dev);
+#endif
 	}
 
 	i915_save_state(dev);
@@ -315,7 +317,9 @@
 		sx_xlock(&dev->mode_config.mutex);
 		drm_mode_config_reset(dev);
 		sx_xunlock(&dev->mode_config.mutex);
+#if 0
 		drm_irq_install(dev);
+#endif
 
 		sx_xlock(&dev->mode_config.mutex);
 		/* Resume the modeset for every activated CRTC */

Even with that my one attempt at resuming in X so far seemed to hang in X 
(though the machine was fine and worked fine aside from X hanging).

Curiously, this netbook is able to suspend/resume just fine on the console 
with syscons(4), but the LCD is not turned back on if I suspend/resume with 
vt(4) using the VGA driver.  I think vt(4) should do some of the VESA stuff 
for suspend/resume syscons does when using vt_vga (but not when using one of 
the KMS backends).

-- 
John Baldwin

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 18:00:14 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 7122A3B1;
 Sat, 30 Aug 2014 18:00:14 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5A8BF1535;
 Sat, 30 Aug 2014 18:00:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7UI0E6f065540;
 Sat, 30 Aug 2014 18:00:14 GMT (envelope-from ume@FreeBSD.org)
Received: (from ume@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7UI0EK1065539;
 Sat, 30 Aug 2014 18:00:14 GMT (envelope-from ume@FreeBSD.org)
Message-Id: <201408301800.s7UI0EK1065539@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ume set sender to ume@FreeBSD.org
 using -f
From: Hajimu UMEMOTO 
Date: Sat, 30 Aug 2014 18:00:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r270852 - stable/9/lib/libc/nameser
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 18:00:14 -0000

Author: ume
Date: Sat Aug 30 18:00:13 2014
New Revision: 270852
URL: http://svnweb.freebsd.org/changeset/base/270852

Log:
  MFC r269873:
  Fix broken pointer overflow check ns_name_unpack()
  
  Many compilers may optimize away the overflow check `msg + l < msg',
  where `msg' is a pointer and `l' is an integer, because pointer
  overflow is undefined behavior in C.
  
  Use a safe precondition test `l >= eom - msg' instead.
  
  Reference:
  https://android-review.googlesource.com/#/c/50570/
  
  Requested by:	pfg
  Obtained from:	NetBSD (CVS rev. 1.10)

Modified:
  stable/9/lib/libc/nameser/ns_name.c
Directory Properties:
  stable/9/lib/libc/   (props changed)

Modified: stable/9/lib/libc/nameser/ns_name.c
==============================================================================
--- stable/9/lib/libc/nameser/ns_name.c	Sat Aug 30 17:56:58 2014	(r270851)
+++ stable/9/lib/libc/nameser/ns_name.c	Sat Aug 30 18:00:13 2014	(r270852)
@@ -463,11 +463,12 @@ ns_name_unpack2(const u_char *msg, const
 			}
 			if (len < 0)
 				len = srcp - src + 1;
-			srcp = msg + (((n & 0x3f) << 8) | (*srcp & 0xff));
-			if (srcp < msg || srcp >= eom) {  /*%< Out of range. */
+			l = ((n & 0x3f) << 8) | (*srcp & 0xff);
+			if (l >= eom - msg) {  /*%< Out of range. */
 				errno = EMSGSIZE;
 				return (-1);
 			}
+			srcp = msg + l;
 			checked += 2;
 			/*
 			 * Check for loops in the compressed name;

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 18:01:37 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 6B9715F0;
 Sat, 30 Aug 2014 18:01:37 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 56F011725;
 Sat, 30 Aug 2014 18:01:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7UI1baR068627;
 Sat, 30 Aug 2014 18:01:37 GMT (envelope-from ume@FreeBSD.org)
Received: (from ume@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7UI1bbt068626;
 Sat, 30 Aug 2014 18:01:37 GMT (envelope-from ume@FreeBSD.org)
Message-Id: <201408301801.s7UI1bbt068626@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ume set sender to ume@FreeBSD.org
 using -f
From: Hajimu UMEMOTO 
Date: Sat, 30 Aug 2014 18:01:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r270853 - stable/9/lib/libc/nameser
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 18:01:37 -0000

Author: ume
Date: Sat Aug 30 18:01:36 2014
New Revision: 270853
URL: http://svnweb.freebsd.org/changeset/base/270853

Log:
  MFC r270215: Add missing break.

Modified:
  stable/9/lib/libc/nameser/ns_print.c
Directory Properties:
  stable/9/lib/libc/   (props changed)

Modified: stable/9/lib/libc/nameser/ns_print.c
==============================================================================
--- stable/9/lib/libc/nameser/ns_print.c	Sat Aug 30 18:00:13 2014	(r270852)
+++ stable/9/lib/libc/nameser/ns_print.c	Sat Aug 30 18:01:36 2014	(r270853)
@@ -911,6 +911,7 @@ ns_sprintrrf(const u_char *msg, size_t m
 			if (len > 15)
 				T(addstr(" )", 2, &buf, &buflen));
 		}
+		break;
 	}
 
 	case ns_t_ipseckey: {

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 18:01:46 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 7CA7971C;
 Sat, 30 Aug 2014 18:01:46 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 59AD01729;
 Sat, 30 Aug 2014 18:01:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7UI1ksC068688;
 Sat, 30 Aug 2014 18:01:46 GMT (envelope-from gavin@FreeBSD.org)
Received: (from gavin@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7UI1kks068687;
 Sat, 30 Aug 2014 18:01:46 GMT (envelope-from gavin@FreeBSD.org)
Message-Id: <201408301801.s7UI1kks068687@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gavin set sender to
 gavin@FreeBSD.org using -f
From: Gavin Atkinson 
Date: Sat, 30 Aug 2014 18:01:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270854 - head/sys/dev/bktr
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 18:01:46 -0000

Author: gavin
Date: Sat Aug 30 18:01:45 2014
New Revision: 270854
URL: http://svnweb.freebsd.org/changeset/base/270854

Log:
  Replace cvsweb link wihg svnweb URL in bktr(4) release notes.

Modified:
  head/sys/dev/bktr/CHANGELOG.TXT

Modified: head/sys/dev/bktr/CHANGELOG.TXT
==============================================================================
--- head/sys/dev/bktr/CHANGELOG.TXT	Sat Aug 30 18:01:36 2014	(r270853)
+++ head/sys/dev/bktr/CHANGELOG.TXT	Sat Aug 30 18:01:45 2014	(r270854)
@@ -515,5 +515,5 @@
                   support for audio on Hauppauge cards without the audio mux.
                   The MSP is used for audio selection. (the 44xxx models)
 
-[see http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/dev/bktr/
+[see https://svnweb.freebsd.org/base/head/sys/dev/bktr/
 for newer change logs ]

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 18:05:08 2014
Return-Path: 
Delivered-To: svn-src-all@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 1033)
 id 908FAA28; Sat, 30 Aug 2014 18:05:08 +0000 (UTC)
Date: Sat, 30 Aug 2014 18:05:08 +0000
From: Alexey Dokuchaev 
To: John Baldwin 
Subject: Re: svn commit: r270850 - in head/sys: i386/i386 i386/include
 i386/isa x86/acpica
Message-ID: <20140830180508.GA49052@FreeBSD.org>
References: <201408301748.s7UHmc6H059701@svn.freebsd.org>
 <58768837.sIF65g1iXL@ralph.baldwin.cx>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <58768837.sIF65g1iXL@ralph.baldwin.cx>
User-Agent: Mutt/1.5.23 (2014-03-12)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 18:05:08 -0000

On Sat, Aug 30, 2014 at 01:58:20PM -0400, John Baldwin wrote:
> On Saturday, August 30, 2014 05:48:38 PM John Baldwin wrote:
> > New Revision: 270850
> > URL: http://svnweb.freebsd.org/changeset/base/270850
> > 
> > Log:
> >   Save and restore FPU state across suspend and resume.  In earlier
> > revisions of this patch, resumectx() called npxresume() directly, but that
> > doesn't work because resumectx() runs with a non-standard %cs selector.
> > Instead, all of the FPU suspend/resume handling is done in C.
> 
> This mostly fixes suspend and resume in X on a little 32-bit only netbook I
> have.  I needed an additional patch to the i915 code to prevent it from
> tearing down its interrupt handler in suspend and re-establishing it during
> resume (this sort of thing is not needed in drivers and isn't safe because
> suspend runs pinned to CPU 0 and unregistering an interrupt needs to bind to
> the CPU the IDT vector is assigned to).

John, thanks for a lot for making more and more laptops sleep-ready, as this
will certainly help FreeBSD to be considered as a suitable platform for them.

./danfe

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 18:18:33 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 82828DE1;
 Sat, 30 Aug 2014 18:18:33 +0000 (UTC)
Received: from mail-qa0-x22b.google.com (mail-qa0-x22b.google.com
 [IPv6:2607:f8b0:400d:c00::22b])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 0F9DA186E;
 Sat, 30 Aug 2014 18:18:32 +0000 (UTC)
Received: by mail-qa0-f43.google.com with SMTP id cm18so3399073qab.2
 for ; Sat, 30 Aug 2014 11:18:32 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:date:message-id:subject
 :from:to:cc:content-type;
 bh=OwSGfFnJsQTApo/BDsyE4mSZvHTsfrHbHNp1u5Ts1c0=;
 b=B5oFDNHNpwwnms1wk/NSZsV5WQSobDI5D+yEaPDfyLfBHc5D5PEv3N0jMDmVZaFX+o
 7cYuW3P6oGpFp8Rme/OB38+wtcPPU4iNI1mNBMLsjZB/fHuwcvmn2qKs+ZegNBmPRTEG
 NE9RLS1SYnV8O12vnDh8T0hr0oawsKuyy1H+t1w6qng5uqWSm4K2RHTpe4WyIJB5xy4D
 57eXS4/UHXXuvc47sHcq1A79OJbrM9PEuhjImyeRBNNsbkX9fGHiVxcdMgxLAZLH50Ea
 2I5R5qcj8V+SNOaBtX98piGyLssR8fYLeGRqGH9LZx+ZfTZJreOSO1Ko8CzsI/fM8ixo
 FxpA==
MIME-Version: 1.0
X-Received: by 10.140.19.201 with SMTP id 67mr28157462qgh.28.1409422712267;
 Sat, 30 Aug 2014 11:18:32 -0700 (PDT)
Sender: adrian.chadd@gmail.com
Received: by 10.224.39.139 with HTTP; Sat, 30 Aug 2014 11:18:32 -0700 (PDT)
In-Reply-To: <20140830031146.GB21347@dft-labs.eu>
References: <201408280841.s7S8fC6X012986@svn.freebsd.org>
 
 <20140830005028.GA1881@borg.lerctr.org>
 <20140830031146.GB21347@dft-labs.eu>
Date: Sat, 30 Aug 2014 11:18:32 -0700
X-Google-Sender-Auth: z9G8yRoLv1z-jadwkijJxZwjDxk
Message-ID: 
Subject: Re: svn commit: r270745 - in head: bin/ps sys/compat/freebsd32
 sys/kern sys/sys
From: Adrian Chadd 
To: Mateusz Guzik 
Content-Type: text/plain; charset=UTF-8
Cc: John Baldwin ,
 "svn-src-all@freebsd.org" ,
 svn-committers-src@freebsd.org, Mateusz Guzik ,
 Larry Rosenman 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 18:18:33 -0000

On 29 August 2014 20:11, Mateusz Guzik  wrote:
> On Fri, Aug 29, 2014 at 07:50:28PM -0500, Larry Rosenman wrote:
>> On Fri, Aug 29, 2014 at 05:07:51PM -0700, Adrian Chadd wrote:
>> > Hi!
>> >
>> > So I'm now getting panics in the process coredump path on -HEAD. The
>> > proctree lock isn't held.
>> >
>> > Assertion : proctree not locked @ kern_proc.c:795
>> >
>> > path:
>> >
>> > sigexit() -> elf64_coredump() -> elf64_note_procstat_proc() ->
>> > kern_proc_out() -> fill_kinfo_proc() -> panic.
>> >
>> > What did you peeps do this time? :P
>> >
>> >
>> >
>> > -a
>> Here's my similar one...
>>
> [snip]
>
> Sorry guys, fixed in r270834.

Thanks!



-a

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 18:35:16 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id DBE9746C;
 Sat, 30 Aug 2014 18:35:16 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AD5B31A10;
 Sat, 30 Aug 2014 18:35:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7UIZGjq084705;
 Sat, 30 Aug 2014 18:35:16 GMT (envelope-from neel@FreeBSD.org)
Received: (from neel@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7UIZGti084704;
 Sat, 30 Aug 2014 18:35:16 GMT (envelope-from neel@FreeBSD.org)
Message-Id: <201408301835.s7UIZGti084704@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: neel set sender to neel@FreeBSD.org
 using -f
From: Neel Natu 
Date: Sat, 30 Aug 2014 18:35:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270855 - head/usr.sbin/bhyve
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 18:35:17 -0000

Author: neel
Date: Sat Aug 30 18:35:16 2014
New Revision: 270855
URL: http://svnweb.freebsd.org/changeset/base/270855

Log:
  Set the 'inst_length' to '0' early on before any error conditions are detected
  in the emulation of the task switch. If any exceptions are triggered then the
  guest %rip should point to instruction that caused the task switch as opposed
  to the one after it.

Modified:
  head/usr.sbin/bhyve/task_switch.c

Modified: head/usr.sbin/bhyve/task_switch.c
==============================================================================
--- head/usr.sbin/bhyve/task_switch.c	Sat Aug 30 18:01:45 2014	(r270854)
+++ head/usr.sbin/bhyve/task_switch.c	Sat Aug 30 18:35:16 2014	(r270855)
@@ -725,6 +725,21 @@ vmexit_task_switch(struct vmctx *ctx, st
 	assert(paging->cpu_mode == CPU_MODE_PROTECTED);
 
 	/*
+	 * Calculate the %eip to store in the old TSS before modifying the
+	 * 'inst_length'.
+	 */
+	eip = vmexit->rip + vmexit->inst_length;
+
+	/*
+	 * Set the 'inst_length' to '0'.
+	 *
+	 * If an exception is triggered during emulation of the task switch
+	 * then the exception handler should return to the instruction that
+	 * caused the task switch as opposed to the subsequent instruction.
+	 */
+	vmexit->inst_length = 0;
+
+	/*
 	 * Section 4.6, "Access Rights" in Intel SDM Vol 3.
 	 * The following page table accesses are implicitly supervisor mode:
 	 * - accesses to GDT or LDT to load segment descriptors
@@ -839,7 +854,6 @@ vmexit_task_switch(struct vmctx *ctx, st
 	}
 
 	/* Save processor state in old TSS */
-	eip = vmexit->rip + vmexit->inst_length;
 	tss32_save(ctx, vcpu, task_switch, eip, &oldtss, ot_iov);
 
 	/*
@@ -870,7 +884,7 @@ vmexit_task_switch(struct vmctx *ctx, st
 	 * the saved instruction pointer will belong to the new task.
 	 */
 	vmexit->rip = newtss.tss_eip;
-	vmexit->inst_length = 0;
+	assert(vmexit->inst_length == 0);
 
 	/* Load processor state from new TSS */
 	error = tss32_restore(ctx, vcpu, task_switch, ot_sel, &newtss, nt_iov);

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 19:22:21 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id D4D93821;
 Sat, 30 Aug 2014 19:22:21 +0000 (UTC)
Received: from mail-qg0-x233.google.com (mail-qg0-x233.google.com
 [IPv6:2607:f8b0:400d:c04::233])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 62D981ED9;
 Sat, 30 Aug 2014 19:22:21 +0000 (UTC)
Received: by mail-qg0-f51.google.com with SMTP id i50so3722423qgf.10
 for ; Sat, 30 Aug 2014 12:22:20 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:date:message-id:subject
 :from:to:cc:content-type;
 bh=YNstv4RmJe8RoBC2QcB21tAMgMwPgUPEV+7SIgQFl7Y=;
 b=oXx6rZ3RiCr1RR0/fe9yvBLWzgSVgkUAraZFa3JOwk3s6BoYdr7SZwNv0B1LAXQG3S
 0cZLCzoUpRhtzp45Au6pKv+EMHbF/LgNLA5R7nbILW2DRYoXajkEjZojj+T5ciL9gMes
 ZfyFJIe9syOxAjMLsHLfTwfAidmPY+niGbDc3xjLkWPkWz7EI2zL+GoA4RS5BS5JAHOR
 q+SS0cRa2pskyAznhhr/y8Kg9F0f1XNHWL8gnc9jj1iF4qlRL/JG1FZKWgLdX9bRV+0s
 yJzL/rWja8X7WWtEjfhjb3RaWFLsI1Y6QK4KfjrawelKpDQBDuJ5nPJ9jvlC/qJ39A5q
 Xdyg==
MIME-Version: 1.0
X-Received: by 10.224.75.73 with SMTP id x9mr30432729qaj.63.1409426540456;
 Sat, 30 Aug 2014 12:22:20 -0700 (PDT)
Sender: adrian.chadd@gmail.com
Received: by 10.224.39.139 with HTTP; Sat, 30 Aug 2014 12:22:20 -0700 (PDT)
In-Reply-To: <58768837.sIF65g1iXL@ralph.baldwin.cx>
References: <201408301748.s7UHmc6H059701@svn.freebsd.org>
 <58768837.sIF65g1iXL@ralph.baldwin.cx>
Date: Sat, 30 Aug 2014 12:22:20 -0700
X-Google-Sender-Auth: sT1KcNz4UvCuaiwoUDKrthwRyyw
Message-ID: 
Subject: Re: svn commit: r270850 - in head/sys: i386/i386 i386/include
 i386/isa x86/acpica
From: Adrian Chadd 
To: John Baldwin 
Content-Type: text/plain; charset=UTF-8
Cc: "svn-src-head@freebsd.org" ,
 "svn-src-all@freebsd.org" ,
 "src-committers@freebsd.org" 
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 19:22:22 -0000

On 30 August 2014 10:58, John Baldwin  wrote:
> On Saturday, August 30, 2014 05:48:38 PM John Baldwin wrote:
>> Author: jhb
>> Date: Sat Aug 30 17:48:38 2014
>> New Revision: 270850
>> URL: http://svnweb.freebsd.org/changeset/base/270850
>>
>> Log:
>>   Save and restore FPU state across suspend and resume.  In earlier
>> revisions of this patch, resumectx() called npxresume() directly, but that
>> doesn't work because resumectx() runs with a non-standard %cs selector.
>> Instead, all of the FPU suspend/resume handling is done in C.
>
> This mostly fixes suspend and resume in X on a little 32-bit only netbook I
> have.  I needed an additional patch to the i915 code to prevent it from
> tearing down its interrupt handler in suspend and re-establishing it during
> resume (this sort of thing is not needed in drivers and isn't safe because
> suspend runs pinned to CPU 0 and unregistering an interrupt needs to bind to
> the CPU the IDT vector is assigned to).
>
> --- //depot/vendor/freebsd/src/sys/dev/drm2/i915/i915_drv.c
> +++ //depot/user/jhb/acpipci/dev/drm2/i915/i915_drv.c
> @@ -253,7 +253,9 @@
>                             "GEM idle failed, resume might fail\n");
>                         return (error);
>                 }
> +#if 0
>                 drm_irq_uninstall(dev);
> +#endif
>         }
>
>         i915_save_state(dev);
> @@ -315,7 +317,9 @@
>                 sx_xlock(&dev->mode_config.mutex);
>                 drm_mode_config_reset(dev);
>                 sx_xunlock(&dev->mode_config.mutex);
> +#if 0
>                 drm_irq_install(dev);
> +#endif
>
>                 sx_xlock(&dev->mode_config.mutex);
>                 /* Resume the modeset for every activated CRTC */
>
> Even with that my one attempt at resuming in X so far seemed to hang in X
> (though the machine was fine and worked fine aside from X hanging).
>
> Curiously, this netbook is able to suspend/resume just fine on the console
> with syscons(4), but the LCD is not turned back on if I suspend/resume with
> vt(4) using the VGA driver.  I think vt(4) should do some of the VESA stuff
> for suspend/resume syscons does when using vt_vga (but not when using one of
> the KMS backends).

Hm, can you file the DRM patch to get reviewed and put into the tree?
That's a good catch.

As for vt(4) + VESA - yeah, I think we may have to write VESA
extensions for vt_vga, or write vt_vga_vesa. It's sorely lacking. :(


-a

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 19:37:05 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id A0A20B39;
 Sat, 30 Aug 2014 19:37:05 +0000 (UTC)
Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D35391FBE;
 Sat, 30 Aug 2014 19:37:04 +0000 (UTC)
Received: from tom.home (kib@localhost [127.0.0.1])
 by kib.kiev.ua (8.14.9/8.14.9) with ESMTP id s7UJavEs041696
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
 Sat, 30 Aug 2014 22:36:57 +0300 (EEST)
 (envelope-from kostikbel@gmail.com)
DKIM-Filter: OpenDKIM Filter v2.9.2 kib.kiev.ua s7UJavEs041696
Received: (from kostik@localhost)
 by tom.home (8.14.9/8.14.9/Submit) id s7UJav0j041695;
 Sat, 30 Aug 2014 22:36:57 +0300 (EEST)
 (envelope-from kostikbel@gmail.com)
X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com
 using -f
Date: Sat, 30 Aug 2014 22:36:57 +0300
From: Konstantin Belousov 
To: Bryan Drewery 
Subject: Re: svn commit: r270803 - head/libexec/rtld-elf
Message-ID: <20140830193657.GR2737@kib.kiev.ua>
References: <201408291044.s7TAiwmI077897@svn.freebsd.org>
 <540094DB.5050307@FreeBSD.org> <20140829172311.GP2737@kib.kiev.ua>
 <5400D873.70707@FreeBSD.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature"; boundary="JpBuuFAFSbNvDzdI"
Content-Disposition: inline
In-Reply-To: <5400D873.70707@FreeBSD.org>
User-Agent: Mutt/1.5.23 (2014-03-12)
X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00,
 DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no
 autolearn_force=no version=3.4.0
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on tom.home
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 19:37:05 -0000


--JpBuuFAFSbNvDzdI
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Fri, Aug 29, 2014 at 02:45:55PM -0500, Bryan Drewery wrote:
> My only uses so far have been observing which file is loaded for a
> library with dlopen(3) and where symbols are resolved from. Seeing where
> symbols are resolved from is useful for both dlopen(3)/dlsym(3) usage
> and LD_PRELOAD.
Ok.

Note that there are no traces of why the symbols where resolved from
the specified object, and, why that symbol was selected (one object
may contain several symbols with the same name, for several reasons).

>=20
> I've written an application that "optionally" allows using some
> libraries such as libtcl to be used without requiring the library at
> build time or startup. At build time the library's headers are used to
> generate wrapper functions for every symbol needed. The library is not
> linked in. When the binary is ran it starts up fine if libtcl is
> missing. At runtime if TCL is enabled then it will attempt to
> dlopen(libtcl.so.VER) using the VER its symbols was compiled against. If
> it cannot find it then the feature is disabled. It uses dlsym(3) to load
> all symbols into a table and the wrapper functions use that table via
> hash table lookups.
Note that ELF PLT symbols (i.e. function call sites) resolution is lazy
by default, i.e. the only tricky part to do for this with the standard
tools is to avoid writing the DT_NEEDED tag into the binary you construct.

Newer GNU ld has interesting options like --unresolved-symbols=3Dignore-all,
or --warn-unresolved-symbols, which seemingly allow to link the binary
even with unresolved symbols.

If you use then dlopen(libname, RTLD_LAZY | RTLD_GLOBAL) before calling
the functions from the library, you should get what you want without
needing to laborously provide stubs and use dlsym().

And, this cannot work for non-PLT relocations, e.g. references to global
variables.

>=20
> This all pretty convoluted and only done to avoid requiring a library at
> startup. The application is distributed pre-compiled for specific OS
> releases and not intended to be compiled manually.
>=20
> Anyway some examples from GNU's rtld:
>=20
> > # env LD_DEBUG=3Dhelp ./app
> > Valid options for the LD_DEBUG environment variable are:
> >=20
> >   libs        display library search paths
> >   reloc       display relocation processing
> >   files       display progress for input file
> >   symbols     display symbol table processing
> >   bindings    display information about symbol binding
> >   versions    display version dependencies
> >   all         all previous options combined
> >   statistics  display relocation statistics
> >   unused      determined unused DSOs
> >   help        display this help message and exit
> >=20
> > To direct the debugging output into a file instead of standard output
> > a filename can be specified using the LD_DEBUG_OUTPUT environment varia=
ble.
>=20
> With libs:
>=20
> > # env LD_DEBUG=3Dlibs ./app
> > ...
> >       9328:     find library=3Dlibtcl.so [0]; searching
> >       9328:      search cache=3D/etc/ld.so.cache
> >       9328:      search path=3D/lib64/tls/x86_64:/lib64/tls:/lib64/x86_=
64:/lib64:/usr/lib64/tls/x86_64:/usr/lib64/tls:/usr/lib64/x86_64:/usr/lib64=
                (system search path)
> >       9328:       trying file=3D/lib64/tls/x86_64/libtcl.so
> >       9328:       trying file=3D/lib64/tls/libtcl.so
> >       9328:       trying file=3D/lib64/x86_64/libtcl.so
> >       9328:       trying file=3D/lib64/libtcl.so
> >       9328:       trying file=3D/usr/lib64/tls/x86_64/libtcl.so
> >       9328:       trying file=3D/usr/lib64/tls/libtcl.so
> >       9328:       trying file=3D/usr/lib64/x86_64/libtcl.so
> >       9328:       trying file=3D/usr/lib64/libtcl.so
> >       9328:
> >       9328:     find library=3Dlibpthread.so.0 [0]; searching
> >       9328:      search path=3D/usr/lib64         (system search path)
> >       9328:       trying file=3D/usr/lib64/libpthread.so.0
> >       9328:      search cache=3D/etc/ld.so.cache
> >       9328:       trying file=3D/lib64/libpthread.so.0
> >       9328:
> >       9328:
> >       9328:     calling init: /lib64/libpthread.so.0
> >       9328:
> >       9328:
> >       9328:     calling init: /usr/lib64/libtcl.so
> >       9328:
> >       9328:     find library=3Dlibnss_compat.so.2 [0]; searching
> >       9328:      search cache=3D/etc/ld.so.cache
> >       9328:       trying file=3D/lib64/libnss_compat.so.2
> >       9328:
> >       9328:     find library=3Dlibnsl.so.1 [0]; searching
> >       9328:      search cache=3D/etc/ld.so.cache
> >       9328:       trying file=3D/lib64/libnsl.so.1
> >       9328:
> >       9328:
> >       9328:     calling init: /lib64/libnsl.so.1
> >       9328:
> >       9328:
> >       9328:     calling init: /lib64/libnss_compat.so.2
> >       9328:
> >       9328:     find library=3Dlibnss_nis.so.2 [0]; searching
> >       9328:      search cache=3D/etc/ld.so.cache
> >       9328:       trying file=3D/lib64/libnss_nis.so.2
> >       9328:
> >       9328:     find library=3Dlibnss_files.so.2 [0]; searching
> >       9328:      search cache=3D/etc/ld.so.cache
> >       9328:       trying file=3D/lib64/libnss_files.so.2
> >       9328:
> >       9328:
> >       9328:     calling init: /lib64/libnss_files.so.2
> >       9328:
> >       9328:
> >       9328:     calling init: /lib64/libnss_nis.so.2
> > ^C
> >       9328:     calling fini: /usr/lib64/libtcl.so [0]
> >       9328:
> >       9328:
> >       9328:     calling fini: /lib64/libm.so.6 [0]
> >       9328:
> >       9328:
> >       9328:     calling fini: /lib64/libdl.so.2 [0]
> >       9328:
> >       9328:
> >       9328:     calling fini: /lib64/libpthread.so.0 [0]
> >       9328:
> >       9328:
> >       9328:     calling fini: /lib64/libnss_compat.so.2 [0]
> >       9328:
> >       9328:
> >       9328:     calling fini: /lib64/libnss_nis.so.2 [0]
> >       9328:
> >       9328:
> >       9328:     calling fini: /lib64/libnsl.so.1 [0]
> >       9328:
> >       9328:
> >       9328:     calling fini: /lib64/libnss_files.so.2 [0]
> >       9328:
> >       9328:
> >       9328:     calling fini: /lib64/libc.so.6 [0]
>=20
> With symbols:
>=20
> > # LD_DEBUG=3Dsymbols ./app
> > ...
> >       9355:     symbol=3DTcl_SetObjResult;  lookup in file=3D/lib64/lib=
dl.so.2 [0]
> >       9355:     symbol=3DTcl_SetObjResult;  lookup in file=3D/usr/lib/g=
cc/x86_64-pc-linux-gnu/4.8.2/libstdc++.so.6 [0]
> >       9355:     symbol=3DTcl_SetObjResult;  lookup in file=3D/lib64/lib=
m.so.6 [0]
> >       9355:     symbol=3DTcl_SetObjResult;  lookup in file=3D/usr/lib/g=
cc/x86_64-pc-linux-gnu/4.8.2/libgcc_s.so.1 [0]
> >       9355:     symbol=3DTcl_SetObjResult;  lookup in file=3D/lib64/lib=
c.so.6 [0]
> >       9355:     symbol=3DTcl_SetObjResult;  lookup in file=3D/lib64/ld-=
linux-x86-64.so.2 [0]
> >       9355:     symbol=3DTcl_SetObjResult;  lookup in file=3D/usr/lib64=
/libcrypto.so.1.0.0 [0]
> >       9355:     symbol=3DTcl_SetObjResult;  lookup in file=3D/lib64/lib=
z.so.1 [0]
> >       9355:     symbol=3DTcl_SetObjResult;  lookup in file=3D/usr/lib64=
/libtcl.so [0]
> >       9355:     symbol=3DTcl_GetObjResult;  lookup in file=3D./netplay =
[0]
> >       9355:     symbol=3DTcl_GetObjResult;  lookup in file=3D/lib64/lib=
dl.so.2 [0]
> >       9355:     symbol=3DTcl_GetObjResult;  lookup in file=3D/usr/lib/g=
cc/x86_64-pc-linux-gnu/4.8.2/libstdc++.so.6 [0]
> >       9355:     symbol=3DTcl_GetObjResult;  lookup in file=3D/lib64/lib=
m.so.6 [0]
> >       9355:     symbol=3DTcl_GetObjResult;  lookup in file=3D/usr/lib/g=
cc/x86_64-pc-linux-gnu/4.8.2/libgcc_s.so.1 [0]
> >       9355:     symbol=3DTcl_GetObjResult;  lookup in file=3D/lib64/lib=
c.so.6 [0]
> >       9355:     symbol=3DTcl_GetObjResult;  lookup in file=3D/lib64/ld-=
linux-x86-64.so.2 [0]
> >       9355:     symbol=3DTcl_GetObjResult;  lookup in file=3D/usr/lib64=
/libcrypto.so.1.0.0 [0]
> >       9355:     symbol=3DTcl_GetObjResult;  lookup in file=3D/lib64/lib=
z.so.1 [0]
> >       9355:     symbol=3DTcl_GetObjResult;  lookup in file=3D/usr/lib64=
/libtcl.so [0]
>=20
>=20
> I would love to work on adding such a feature to ours, especially if it
> can assist with debugging rtld itself. I would think with some
> predict_false() checks we could avoid much of the performance penalties.
As I said, for debugging rtld, currently existing or, probably, any
predefined set of debugging statements is mostly useless.  A startup
problems usually results in coredumps, which is compfortably debugged
by loading core with debugging symbols (-g) in gdb.

If you can determine useful set of the debugging output for application
programmers to introspect the rtld activity, I am all for adding it
and enabling LD_DEBUG unconditionally.

>=20
> As a side note I think I may have found an rtld issue (on 8.4) with -32
> handling. Being a production machine I don't want to attempt installing
> a DEBUG rtld to figure out the problem. Having LD_DEBUG would have been
> useful on this as well.
>=20
> The issue I ran into with -32 was from converting a i386 system to
> amd64. I have hundreds of out-of-ports binaries that need to be manually
> recompiled. To allow delaying this task for a bit I copied all of the
> libraries from /usr/local/lib from the old i386 system to
> /usr/local/lib32/compat/system and added all of the paths in there to
> ldconfig:
>=20
> > [~] # ldconfig -32 -r|head -n3
> > /var/run/ld-elf32.so.hints:
> >         search directories: /usr/lib32:/usr/local/lib32/compat/system:/=
usr/local/lib32/compat/system/mysql:/usr/local/lib32/compat/system/gnutls3:=
/usr/local/lib32/compat/system/pth:/usr/local/lib32/compat/system/qt4:/usr/=
local/lib32/compat/system/tdom0.8.3:/usr/local/lib32/compat/system/gcc46:/u=
sr/local/lib32/compat/system/gcc47:/usr/local/lib32/compat/system/gcc48:/us=
r/local/lib32/compat/system/gcc49:/usr/local/lib32/compat/system/event2:/us=
r/local/lib32/compat/pkg:/usr/local/lib32/compat
>=20
> It worked for 90% of the system but then I ran into some libraries that
> refused to find their own dependencies. The issue seemingly is that
> dependencies for libraries that are also in the -32 path are not looked u=
p.
>=20
> For example:
>=20
> > [~] # ldd -a /usr/local/lib32/compat/system/libssl.so
> > /usr/local/lib32/compat/system/libssl.so:
> >         libcrypto.so.8 =3D> not found (0x0)
> >         libthr.so.3 =3D> /usr/lib32/libthr.so.3 (0x310fb000)
> >         libc.so.7 =3D> /usr/lib32/libc.so.7 (0x29165000)
> > /usr/lib32/libthr.so.3:
> >         libc.so.7 =3D> /usr/lib32/libc.so.7 (0x29165000)
> > [~] # ldconfig -32 -r|grep libcrypto.so.8
> >         105:-lcrypto.8 =3D> /usr/local/lib32/compat/system/libcrypto.so=
=2E8
> > [~] # readelf -a /usr/local/lib32/compat/system/libssl.so|egrep "(path|=
NEEDED)"
> >  0x00000001 (NEEDED)                     Shared library: [libcrypto.so.=
8]
> >  0x00000001 (NEEDED)                     Shared library: [libthr.so.3]
> >  0x00000001 (NEEDED)                     Shared library: [libc.so.7]
> >  0x0000000f (RPATH)                      Library rpath: [/usr/local/lib]
>=20
> My guess is it is the RPATH. I am not sure without a simple debug ability.
>=20
> --=20
> Regards,
> Bryan Drewery
>=20



--JpBuuFAFSbNvDzdI
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBAgAGBQJUAifZAAoJEJDCuSvBvK1BnEIP/jK7QVFtc8K3qj3q016N3ZNd
ZWYGWbEOFi9MUKzvySqUwkAQaSOBsqjc9ezUGR+RyQJn1oO5pXBQ2LQDObZq2R5+
1iyNFx3WzqaTf25OGh8bUQzhunWjwkcaKYtOR+ZzAVAH97298qNhDlxK9buA7FnI
AxjQFKkVYd8wZUt5XP4GUzruXQSPU6C077L9MrppJpXi5HRoVPjHoM5Wqt8jdeEc
KpVhyFp5uNp2naAJNsBULU7tRGa7Sso+wQHnMIAPZkdCMI9XNNb9Y7E2k3EkNIdI
I2XMbDD+ZLC/DFmhZBIvygIX9jgpi1tnvulLjLqlL/Tzy5QChxsZ+vsiTFgCQwGU
bwmeWuf6PcW27FN/ncT74GZ8mc197UI9vSXrqNfbLbanU0pvgWKIL2tyePWofItb
bHSwj2Wv75IASeogIbfECqwi5MtzomhtebHVtaBH5Kdsrl1S8DivS8U7l7sJsd+1
vLG0gg95aLS3IvTY5F8zVpcWlZvRnjrCGUhjsR9VR67Sb8L2O4AS2AvBBDj8KqYH
x/c+9v2LtSS5WTRuMMV54a86KWw9OhbWJwcWaJV67u0PlUvsMiBBBAW6cPIwKfTr
dQrKnGsHryKZfcHMrPsxR8/Jl1++6JxvJz5TlHYqox3naF5hs7iOWkGZq628nEyl
EkxVzbgfWn55NiBzRqba
=Emte
-----END PGP SIGNATURE-----

--JpBuuFAFSbNvDzdI--

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 19:53:34 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id AF17CEC7;
 Sat, 30 Aug 2014 19:53:34 +0000 (UTC)
Received: from smtp1.multiplay.co.uk (smtp1.multiplay.co.uk [85.236.96.35])
 by mx1.freebsd.org (Postfix) with ESMTP id 46D791213;
 Sat, 30 Aug 2014 19:53:33 +0000 (UTC)
Received: by smtp1.multiplay.co.uk (Postfix, from userid 65534)
 id 1F3D320E7088B; Sat, 30 Aug 2014 19:53:26 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
 smtp1.multiplay.co.uk
X-Spam-Level: 
X-Spam-Status: No, score=0.9 required=8.0 tests=AWL,BAYES_00,DOS_OE_TO_MX,
 FSL_HELO_NON_FQDN_1,RDNS_DYNAMIC,STOX_REPLY_TYPE autolearn=no version=3.3.1
Received: from r2d2 (82-69-141-170.dsl.in-addr.zen.co.uk [82.69.141.170])
 by smtp1.multiplay.co.uk (Postfix) with ESMTP id 3CC9220E70885;
 Sat, 30 Aug 2014 19:53:23 +0000 (UTC)
Message-ID: 
From: "Steven Hartland" 
To: "Peter Wemm" 
References: <201408281950.s7SJo90I047213@svn.freebsd.org>
 <2714752.cWQfguSlQD@overcee.wemm.org>
 
 <39211177.i8nn9sHiCx@overcee.wemm.org>
Subject: Re: svn commit: r270759 - in head/sys: cddl/compat/opensolaris/kern
 cddl/compat/opensolaris/sys cddl/contrib/opensolaris/uts/common/fs/zfs vm
Date: Sat, 30 Aug 2014 20:53:21 +0100
MIME-Version: 1.0
Content-Type: text/plain; format=flowed; charset="iso-8859-1";
 reply-type=original
Content-Transfer-Encoding: 7bit
X-Priority: 3
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook Express 6.00.2900.5931
X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.6157
Cc: src-committers@freebsd.org, Alan Cox ,
 svn-src-all@freebsd.org, Dmitry Morozovsky ,
 "Matthew D. Fuller" , svn-src-head@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 19:53:34 -0000

----- Original Message ----- 
From: "Peter Wemm" 
snip...
> > I'm aware of the values involved, and as I said what you're 
> > proposing
> > was more akin to where I started, but I was informed that it had 
> > already
> > been tested and didn't work well.
>
> And Karl also said that his tests are on machines that have no 
> v_cache, so
> he's not testing the scenario.
>
> The code, as written, is wrong.  It's as simple as that.
>
> The logic is wrong.
>
> You've introduced dead code.
>
> Your code changes introduce a scenario that CAUSES one of the very 
> problems
> you're using as a justtification for the changes.
>
> Your own testers have admitted that they don't test the scenario that 
> the
> problem exists with.

Wooo hold on there, I'm trying to react to feedback and come to a proper
solution. I've already said that my initial version was very much like 
what
I believe your requesting its changed to, but I reacted to feedback on 
that.

Now if that feedback was inaccurate or miss-guided I'm sorry, and I'm
thankfull for your input as the domain expert.

The PR was created quite some time ago, and it wasn't till I encountered 
a
related issue in a live system the other weekend that it got some 
attention.

Its clearly an important issue that needs resolving so lets work 
together
to come up with a fix everyones happy with.

> > > Also, what about the magic numbers here:
> > > u_int zfs_arc_free_target = (1 << 19); /* default before 
> > > pagedaemon
> > > init only */
> >
> > That is just a total fall back case and should never be triggered 
> > unless
> > as the comment states the pagedaemon isn't initialised.
> >
> > > That's half a million pages, or 2GB of physical ram on a 4K page 
> > > size
> > > system
> > > How is this going to work on early boot in the machines in the 
> > > cluster
> > > with
> > > less than 2GB of ram?
> >
> > Its there to ensure that ARC doesn't run wild ARC for the few
> > milliseconds
> > / seconds before pagedaemon is initalised.
> >
> > We can change the value no problem, what would you suggest 1<<16 aka
> > 256MB?
>
> Please stop picking magic numbers out of thin air.  You are working 
> with file
> system and VM - critical parts of the system.  This is NOT the place 
> to be
> screwing around with things you don't understand.  alc@ was trying to 
> be
> polite.

Please help me out here, I'm trying to do the right thing so I'm looking
to you guys for advice.

> > Thanks for all the feedback, its great to have my understanding of
> > how things work in this area confirmed by those who know.
> >
> > Hopefully we'll be able to get to the bottom of this with everyones
> > help and get a solid fix for these issues that have plaged 10 into
> > 10.1 :)
>
> I'm very disappointed in the attention to detail and errors in the 
> commit.
> I'm almost at the point where I want to ask for the whole thing to be 
> backed
> out.

I'm not disagreeing with anyone, I'm simply trying to accure the 
information
on how to update this that will result in the best for users, so 
sweeping
statements like this just make me feel bad for trying to help :(

I'm more than happy to address any concerns people have.

I've kicked this off with a webrev https://reviews.freebsd.org/D700

    Regards
    Steve 


From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 19:56:04 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 39326B0;
 Sat, 30 Aug 2014 19:56:04 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 205CE121C;
 Sat, 30 Aug 2014 19:56:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7UJu4cr023569;
 Sat, 30 Aug 2014 19:56:04 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7UJtsds023500;
 Sat, 30 Aug 2014 19:55:54 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201408301955.s7UJtsds023500@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: glebius set sender to
 glebius@FreeBSD.org using -f
From: Gleb Smirnoff 
Date: Sat, 30 Aug 2014 19:55:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270856 - in head/sys: dev/ae dev/age dev/alc dev/ale
 dev/altera/atse dev/bfe dev/cas dev/dc dev/e1000 dev/ffec dev/firewire
 dev/gem dev/gxemul/ether dev/hme dev/hyperv/netvsc dev/ixgb ...
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 19:56:04 -0000

Author: glebius
Date: Sat Aug 30 19:55:54 2014
New Revision: 270856
URL: http://svnweb.freebsd.org/changeset/base/270856

Log:
  Use define from if_var.h to access a field inside struct if_data,
  that resides in struct ifnet.
  
  Sponsored by:	Nginx, Inc.

Modified:
  head/sys/dev/ae/if_ae.c
  head/sys/dev/age/if_age.c
  head/sys/dev/alc/if_alc.c
  head/sys/dev/ale/if_ale.c
  head/sys/dev/altera/atse/if_atse.c
  head/sys/dev/bfe/if_bfe.c
  head/sys/dev/cas/if_cas.c
  head/sys/dev/dc/if_dc.c
  head/sys/dev/e1000/if_igb.c
  head/sys/dev/ffec/if_ffec.c
  head/sys/dev/firewire/if_fwe.c
  head/sys/dev/gem/if_gem.c
  head/sys/dev/gxemul/ether/if_gx.c
  head/sys/dev/hme/if_hme.c
  head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
  head/sys/dev/ixgb/if_ixgb.c
  head/sys/dev/ixgbe/ixgbe.c
  head/sys/dev/ixgbe/ixv.c
  head/sys/dev/ixl/if_ixl.c
  head/sys/dev/ixl/if_ixlv.c
  head/sys/dev/jme/if_jme.c
  head/sys/dev/le/lance.c
  head/sys/dev/msk/if_msk.c
  head/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c
  head/sys/dev/nge/if_nge.c
  head/sys/dev/qlxgb/qla_os.c
  head/sys/dev/qlxgbe/ql_os.c
  head/sys/dev/qlxge/qls_os.c
  head/sys/dev/re/if_re.c
  head/sys/dev/rt/if_rt.c
  head/sys/dev/sf/if_sf.c
  head/sys/dev/sge/if_sge.c
  head/sys/dev/sis/if_sis.c
  head/sys/dev/sk/if_sk.c
  head/sys/dev/ste/if_ste.c
  head/sys/dev/stge/if_stge.c
  head/sys/dev/txp/if_txp.c
  head/sys/dev/vge/if_vge.c
  head/sys/dev/virtio/network/if_vtnet.c
  head/sys/dev/vr/if_vr.c
  head/sys/dev/vxge/vxge.c
  head/sys/mips/cavium/if_octm.c
  head/sys/mips/cavium/octe/octe.c

Modified: head/sys/dev/ae/if_ae.c
==============================================================================
--- head/sys/dev/ae/if_ae.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/ae/if_ae.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -363,7 +363,7 @@ ae_attach(device_t dev)
 
 	ether_ifattach(ifp, sc->eaddr);
 	/* Tell the upper layer(s) we support long frames. */
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 
 	/*
 	 * Create and run all helper tasks.

Modified: head/sys/dev/age/if_age.c
==============================================================================
--- head/sys/dev/age/if_age.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/age/if_age.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -635,7 +635,7 @@ age_attach(device_t dev)
 	ifp->if_capenable = ifp->if_capabilities;
 
 	/* Tell the upper layer(s) we support long frames. */
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 
 	/* Create local taskq. */
 	sc->age_tq = taskqueue_create_fast("age_taskq", M_WAITOK,

Modified: head/sys/dev/alc/if_alc.c
==============================================================================
--- head/sys/dev/alc/if_alc.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/alc/if_alc.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -1012,7 +1012,7 @@ alc_attach(device_t dev)
 	ifp->if_hwassist &= ~ALC_CSUM_FEATURES;
 
 	/* Tell the upper layer(s) we support long frames. */
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 
 	/* Create local taskq. */
 	sc->alc_tq = taskqueue_create_fast("alc_taskq", M_WAITOK,

Modified: head/sys/dev/ale/if_ale.c
==============================================================================
--- head/sys/dev/ale/if_ale.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/ale/if_ale.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -658,7 +658,7 @@ ale_attach(device_t dev)
 	ifp->if_capenable &= ~IFCAP_RXCSUM;
 
 	/* Tell the upper layer(s) we support long frames. */
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 
 	/* Create local taskq. */
 	sc->ale_tq = taskqueue_create_fast("ale_taskq", M_WAITOK,

Modified: head/sys/dev/altera/atse/if_atse.c
==============================================================================
--- head/sys/dev/altera/atse/if_atse.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/altera/atse/if_atse.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -1708,7 +1708,7 @@ atse_attach(device_t dev)
 	ether_ifattach(ifp, sc->atse_eth_addr);
 
 	/* Tell the upper layer(s) about vlan mtu support. */
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 	ifp->if_capabilities |= IFCAP_VLAN_MTU;
 	ifp->if_capenable = ifp->if_capabilities;
 #ifdef DEVICE_POLLING

Modified: head/sys/dev/bfe/if_bfe.c
==============================================================================
--- head/sys/dev/bfe/if_bfe.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/bfe/if_bfe.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -514,7 +514,7 @@ bfe_attach(device_t dev)
 	/*
 	 * Tell the upper layer(s) we support long frames.
 	 */
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 	ifp->if_capabilities |= IFCAP_VLAN_MTU;
 	ifp->if_capenable |= IFCAP_VLAN_MTU;
 

Modified: head/sys/dev/cas/if_cas.c
==============================================================================
--- head/sys/dev/cas/if_cas.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/cas/if_cas.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -423,7 +423,7 @@ cas_attach(struct cas_softc *sc)
 	/*
 	 * Tell the upper layer(s) we support long frames/checksum offloads.
 	 */
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 	ifp->if_capabilities = IFCAP_VLAN_MTU;
 	if ((sc->sc_flags & CAS_NO_CSUM) == 0) {
 		ifp->if_capabilities |= IFCAP_HWCSUM;

Modified: head/sys/dev/dc/if_dc.c
==============================================================================
--- head/sys/dev/dc/if_dc.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/dc/if_dc.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -2484,7 +2484,7 @@ dc_attach(device_t dev)
 	/*
 	 * Tell the upper layer(s) we support long frames.
 	 */
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 	ifp->if_capabilities |= IFCAP_VLAN_MTU;
 	ifp->if_capenable = ifp->if_capabilities;
 #ifdef DEVICE_POLLING

Modified: head/sys/dev/e1000/if_igb.c
==============================================================================
--- head/sys/dev/e1000/if_igb.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/e1000/if_igb.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -3241,7 +3241,7 @@ igb_setup_interface(device_t dev, struct
 	 * Tell the upper layer(s) we
 	 * support full VLAN capability.
 	 */
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 	ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING
 			     |  IFCAP_VLAN_HWTSO
 			     |  IFCAP_VLAN_MTU;

Modified: head/sys/dev/ffec/if_ffec.c
==============================================================================
--- head/sys/dev/ffec/if_ffec.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/ffec/if_ffec.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -1676,7 +1676,7 @@ ffec_attach(device_t dev)
 	IFQ_SET_MAXLEN(&ifp->if_snd, TX_DESC_COUNT - 1);
 	ifp->if_snd.ifq_drv_maxlen = TX_DESC_COUNT - 1;
 	IFQ_SET_READY(&ifp->if_snd);
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 
 #if 0 /* XXX The hardware keeps stats we could use for these. */
 	ifp->if_linkmib = &sc->mibdata;

Modified: head/sys/dev/firewire/if_fwe.c
==============================================================================
--- head/sys/dev/firewire/if_fwe.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/firewire/if_fwe.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -223,7 +223,7 @@ fwe_attach(device_t dev)
 	splx(s);
 
         /* Tell the upper layer(s) we support long frames. */
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 #if defined(__FreeBSD__) && __FreeBSD_version >= 500000
 	ifp->if_capabilities |= IFCAP_VLAN_MTU | IFCAP_POLLING;
 	ifp->if_capenable |= IFCAP_VLAN_MTU;

Modified: head/sys/dev/gem/if_gem.c
==============================================================================
--- head/sys/dev/gem/if_gem.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/gem/if_gem.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -382,7 +382,7 @@ gem_attach(struct gem_softc *sc)
 	/*
 	 * Tell the upper layer(s) we support long frames/checksum offloads.
 	 */
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 	ifp->if_capabilities |= IFCAP_VLAN_MTU | IFCAP_HWCSUM;
 	ifp->if_hwassist |= sc->sc_csum_features;
 	ifp->if_capenable |= IFCAP_VLAN_MTU | IFCAP_HWCSUM;

Modified: head/sys/dev/gxemul/ether/if_gx.c
==============================================================================
--- head/sys/dev/gxemul/ether/if_gx.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/gxemul/ether/if_gx.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -324,7 +324,7 @@ gx_ioctl(struct ifnet *ifp, u_long cmd, 
 		return (0);
 
 	case SIOCSIFMTU:
-		if (ifr->ifr_mtu + ifp->if_data.ifi_hdrlen > GXEMUL_ETHER_DEV_MTU)
+		if (ifr->ifr_mtu + ifp->if_hdrlen > GXEMUL_ETHER_DEV_MTU)
 			return (ENOTSUP);
 		return (0);
 

Modified: head/sys/dev/hme/if_hme.c
==============================================================================
--- head/sys/dev/hme/if_hme.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/hme/if_hme.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -367,7 +367,7 @@ hme_config(struct hme_softc *sc)
 	/*
 	 * Tell the upper layer(s) we support long frames/checksum offloads.
 	 */
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 	ifp->if_capabilities |= IFCAP_VLAN_MTU | IFCAP_HWCSUM;
 	ifp->if_hwassist |= sc->sc_csum_features;
 	ifp->if_capenable |= IFCAP_VLAN_MTU | IFCAP_HWCSUM;

Modified: head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
==============================================================================
--- head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -275,7 +275,7 @@ netvsc_attach(device_t dev)
 	/*
 	 * Tell upper layers that we support full VLAN capability.
 	 */
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 	ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_MTU;
 	ifp->if_capenable |= IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_MTU;
 

Modified: head/sys/dev/ixgb/if_ixgb.c
==============================================================================
--- head/sys/dev/ixgb/if_ixgb.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/ixgb/if_ixgb.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -1368,7 +1368,7 @@ ixgb_setup_interface(device_t dev, struc
 	/*
 	 * Tell the upper layer(s) we support long frames.
 	 */
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 
 #if __FreeBSD_version >= 500000
 	ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_MTU;

Modified: head/sys/dev/ixgbe/ixgbe.c
==============================================================================
--- head/sys/dev/ixgbe/ixgbe.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/ixgbe/ixgbe.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -2739,7 +2739,7 @@ ixgbe_setup_interface(device_t dev, stru
 	/*
 	 * Tell the upper layer(s) we support long frames.
 	 */
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 
 	ifp->if_capabilities |= IFCAP_HWCSUM | IFCAP_TSO | IFCAP_VLAN_HWCSUM;
 	ifp->if_capabilities |= IFCAP_JUMBO_MTU;

Modified: head/sys/dev/ixgbe/ixv.c
==============================================================================
--- head/sys/dev/ixgbe/ixv.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/ixgbe/ixv.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -1851,7 +1851,7 @@ ixv_setup_interface(device_t dev, struct
 	/*
 	 * Tell the upper layer(s) we support long frames.
 	 */
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 
 	ifp->if_capabilities |= IFCAP_HWCSUM | IFCAP_TSO4 | IFCAP_VLAN_HWCSUM;
 	ifp->if_capabilities |= IFCAP_JUMBO_MTU;

Modified: head/sys/dev/ixl/if_ixl.c
==============================================================================
--- head/sys/dev/ixl/if_ixl.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/ixl/if_ixl.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -2288,7 +2288,7 @@ ixl_setup_interface(device_t dev, struct
 	/*
 	 * Tell the upper layer(s) we support long frames.
 	 */
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 
 	ifp->if_capabilities |= IFCAP_HWCSUM;
 	ifp->if_capabilities |= IFCAP_HWCSUM_IPV6;

Modified: head/sys/dev/ixl/if_ixlv.c
==============================================================================
--- head/sys/dev/ixl/if_ixlv.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/ixl/if_ixlv.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -1367,7 +1367,7 @@ ixlv_setup_interface(device_t dev, struc
 	/*
 	 * Tell the upper layer(s) we support long frames.
 	 */
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 
 	ifp->if_capabilities |= IFCAP_HWCSUM;
 	ifp->if_capabilities |= IFCAP_HWCSUM_IPV6;

Modified: head/sys/dev/jme/if_jme.c
==============================================================================
--- head/sys/dev/jme/if_jme.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/jme/if_jme.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -878,7 +878,7 @@ jme_attach(device_t dev)
 	ifp->if_capenable = ifp->if_capabilities;
 
 	/* Tell the upper layer(s) we support long frames. */
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 
 	/* Create local taskq. */
 	sc->jme_tq = taskqueue_create_fast("jme_taskq", M_WAITOK,

Modified: head/sys/dev/le/lance.c
==============================================================================
--- head/sys/dev/le/lance.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/le/lance.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -196,7 +196,7 @@ lance_attach(struct lance_softc *sc)
 	ether_ifattach(ifp, sc->sc_enaddr);
 
 	/* Claim 802.1q capability. */
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 	ifp->if_capabilities |= IFCAP_VLAN_MTU;
 	ifp->if_capenable |= IFCAP_VLAN_MTU;
 }

Modified: head/sys/dev/msk/if_msk.c
==============================================================================
--- head/sys/dev/msk/if_msk.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/msk/if_msk.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -1710,7 +1710,7 @@ msk_attach(device_t dev)
 	 * Must appear after the call to ether_ifattach() because
 	 * ether_ifattach() sets ifi_hdrlen to the default value.
 	 */
-        ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+        ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 
 	/*
 	 * Do miibus setup.

Modified: head/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c
==============================================================================
--- head/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -819,7 +819,7 @@ nf10bmac_attach(device_t dev)
 	ether_ifattach(ifp, sc->nf10bmac_eth_addr);
 
 	/* Tell the upper layer(s) about vlan mtu support. */
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 	ifp->if_capabilities |= IFCAP_VLAN_MTU;
 	ifp->if_capenable = ifp->if_capabilities;
 #ifdef DEVICE_POLLING

Modified: head/sys/dev/nge/if_nge.c
==============================================================================
--- head/sys/dev/nge/if_nge.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/nge/if_nge.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -964,7 +964,7 @@ nge_attach(device_t dev)
 	 * Must appear after the call to ether_ifattach() because
 	 * ether_ifattach() sets ifi_hdrlen to the default value.
 	 */
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 
 	/*
 	 * Hookup IRQ last.

Modified: head/sys/dev/qlxgb/qla_os.c
==============================================================================
--- head/sys/dev/qlxgb/qla_os.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/qlxgb/qla_os.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -699,7 +699,7 @@ qla_init_ifnet(device_t dev, qla_host_t 
 
 	ifp->if_capenable = ifp->if_capabilities;
 
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 
 	ifmedia_init(&ha->media, IFM_IMASK, qla_media_change, qla_media_status);
 

Modified: head/sys/dev/qlxgbe/ql_os.c
==============================================================================
--- head/sys/dev/qlxgbe/ql_os.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/qlxgbe/ql_os.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -775,7 +775,7 @@ qla_init_ifnet(device_t dev, qla_host_t 
 
 	ifp->if_capenable = ifp->if_capabilities;
 
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 
 	ifmedia_init(&ha->media, IFM_IMASK, qla_media_change, qla_media_status);
 

Modified: head/sys/dev/qlxge/qls_os.c
==============================================================================
--- head/sys/dev/qlxge/qls_os.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/qlxge/qls_os.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -770,7 +770,7 @@ qls_init_ifnet(device_t dev, qla_host_t 
 
 	ifp->if_capenable = ifp->if_capabilities;
 
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 
 	ifmedia_init(&ha->media, IFM_IMASK, qls_media_change, qls_media_status);
 

Modified: head/sys/dev/re/if_re.c
==============================================================================
--- head/sys/dev/re/if_re.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/re/if_re.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -1681,7 +1681,7 @@ re_attach(device_t dev)
 	 * Must appear after the call to ether_ifattach() because
 	 * ether_ifattach() sets ifi_hdrlen to the default value.
 	 */
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 
 #ifdef DEV_NETMAP
 	re_netmap_attach(sc);

Modified: head/sys/dev/rt/if_rt.c
==============================================================================
--- head/sys/dev/rt/if_rt.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/rt/if_rt.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -411,7 +411,7 @@ rt_attach(device_t dev)
 	/*
 	 * Tell the upper layer(s) we support long frames.
 	 */
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 	ifp->if_capabilities |= IFCAP_VLAN_MTU;
 	ifp->if_capenable |= IFCAP_VLAN_MTU;
 	ifp->if_capabilities |= IFCAP_RXCSUM|IFCAP_TXCSUM;

Modified: head/sys/dev/sf/if_sf.c
==============================================================================
--- head/sys/dev/sf/if_sf.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/sf/if_sf.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -902,7 +902,7 @@ sf_attach(device_t dev)
 	 * Must appear after the call to ether_ifattach() because
 	 * ether_ifattach() sets ifi_hdrlen to the default value.
 	 */
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 
 	/* Hook interrupt last to avoid having to lock softc */
 	error = bus_setup_intr(dev, sc->sf_irq, INTR_TYPE_NET | INTR_MPSAFE,

Modified: head/sys/dev/sge/if_sge.c
==============================================================================
--- head/sys/dev/sge/if_sge.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/sge/if_sge.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -641,7 +641,7 @@ sge_attach(device_t dev)
 	    IFCAP_VLAN_HWTSO | IFCAP_VLAN_MTU;
 	ifp->if_capenable = ifp->if_capabilities;
 	/* Tell the upper layer(s) we support long frames. */
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 
 	/* Hook interrupt last to avoid having to lock softc */
 	error = bus_setup_intr(dev, sc->sge_irq, INTR_TYPE_NET | INTR_MPSAFE,

Modified: head/sys/dev/sis/if_sis.c
==============================================================================
--- head/sys/dev/sis/if_sis.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/sis/if_sis.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -1089,7 +1089,7 @@ sis_attach(device_t dev)
 	/*
 	 * Tell the upper layer(s) we support long frames.
 	 */
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 	ifp->if_capabilities |= IFCAP_VLAN_MTU;
 	ifp->if_capenable = ifp->if_capabilities;
 #ifdef DEVICE_POLLING

Modified: head/sys/dev/sk/if_sk.c
==============================================================================
--- head/sys/dev/sk/if_sk.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/sk/if_sk.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -1496,7 +1496,7 @@ sk_attach(dev)
 	 * Must appear after the call to ether_ifattach() because
 	 * ether_ifattach() sets ifi_hdrlen to the default value.
 	 */
-        ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+        ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 
 	/*
 	 * Do miibus setup.

Modified: head/sys/dev/ste/if_ste.c
==============================================================================
--- head/sys/dev/ste/if_ste.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/ste/if_ste.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -1024,7 +1024,7 @@ ste_attach(device_t dev)
 	/*
 	 * Tell the upper layer(s) we support long frames.
 	 */
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 	ifp->if_capabilities |= IFCAP_VLAN_MTU;
 	if (pci_find_cap(dev, PCIY_PMG, &pmc) == 0)
 		ifp->if_capabilities |= IFCAP_WOL_MAGIC;

Modified: head/sys/dev/stge/if_stge.c
==============================================================================
--- head/sys/dev/stge/if_stge.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/stge/if_stge.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -621,7 +621,7 @@ stge_attach(device_t dev)
 	 * Must appear after the call to ether_ifattach() because
 	 * ether_ifattach() sets ifi_hdrlen to the default value.
 	 */
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 
 	/*
 	 * The manual recommends disabling early transmit, so we

Modified: head/sys/dev/txp/if_txp.c
==============================================================================
--- head/sys/dev/txp/if_txp.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/txp/if_txp.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -436,7 +436,7 @@ txp_attach(device_t dev)
 	ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_HWCSUM;
 	ifp->if_capenable = ifp->if_capabilities;
 	/* Tell the upper layer(s) we support long frames. */
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 
 	WRITE_REG(sc, TXP_IER, TXP_INTR_NONE);
 	WRITE_REG(sc, TXP_IMR, TXP_INTR_ALL);

Modified: head/sys/dev/vge/if_vge.c
==============================================================================
--- head/sys/dev/vge/if_vge.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/vge/if_vge.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -1130,7 +1130,7 @@ vge_attach(device_t dev)
 	ether_ifattach(ifp, eaddr);
 
 	/* Tell the upper layer(s) we support long frames. */
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 
 	/* Hook interrupt last to avoid having to lock softc */
 	error = bus_setup_intr(dev, sc->vge_irq, INTR_TYPE_NET|INTR_MPSAFE,

Modified: head/sys/dev/virtio/network/if_vtnet.c
==============================================================================
--- head/sys/dev/virtio/network/if_vtnet.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/virtio/network/if_vtnet.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -947,7 +947,7 @@ vtnet_setup_interface(struct vtnet_softc
 		ifp->if_capabilities |= IFCAP_LINKSTATE;
 
 	/* Tell the upper layer(s) we support long frames. */
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 	ifp->if_capabilities |= IFCAP_JUMBO_MTU | IFCAP_VLAN_MTU;
 
 	if (virtio_with_feature(dev, VIRTIO_NET_F_CSUM)) {

Modified: head/sys/dev/vr/if_vr.c
==============================================================================
--- head/sys/dev/vr/if_vr.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/vr/if_vr.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -784,7 +784,7 @@ vr_attach(device_t dev)
 	 * Must appear after the call to ether_ifattach() because
 	 * ether_ifattach() sets ifi_hdrlen to the default value.
 	 */
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 
 	/* Hook interrupt last to avoid having to lock softc. */
 	error = bus_setup_intr(dev, sc->vr_irq, INTR_TYPE_NET | INTR_MPSAFE,

Modified: head/sys/dev/vxge/vxge.c
==============================================================================
--- head/sys/dev/vxge/vxge.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/dev/vxge/vxge.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -1395,7 +1395,7 @@ vxge_ifp_setup(device_t ndev)
 	IFQ_SET_MAXLEN(&ifp->if_snd, ifp->if_snd.ifq_drv_maxlen);
 	/* IFQ_SET_READY(&ifp->if_snd); */
 
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 
 	ifp->if_capabilities |= IFCAP_HWCSUM | IFCAP_VLAN_HWCSUM;
 	ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_MTU;

Modified: head/sys/mips/cavium/if_octm.c
==============================================================================
--- head/sys/mips/cavium/if_octm.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/mips/cavium/if_octm.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -238,7 +238,7 @@ octm_attach(device_t dev)
 
 	ifp->if_transmit = octm_transmit;
 
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 	ifp->if_capabilities = IFCAP_VLAN_MTU;
 	ifp->if_capenable = ifp->if_capabilities;
 
@@ -473,7 +473,7 @@ octm_ioctl(struct ifnet *ifp, u_long cmd
 		return (0);
 
 	case SIOCSIFMTU:
-		cvmx_mgmt_port_set_max_packet_size(sc->sc_port, ifr->ifr_mtu + ifp->if_data.ifi_hdrlen);
+		cvmx_mgmt_port_set_max_packet_size(sc->sc_port, ifr->ifr_mtu + ifp->if_hdrlen);
 		return (0);
 
 	case SIOCSIFMEDIA:

Modified: head/sys/mips/cavium/octe/octe.c
==============================================================================
--- head/sys/mips/cavium/octe/octe.c	Sat Aug 30 18:35:16 2014	(r270855)
+++ head/sys/mips/cavium/octe/octe.c	Sat Aug 30 19:55:54 2014	(r270856)
@@ -189,7 +189,7 @@ octe_attach(device_t dev)
 
 	ifp->if_transmit = octe_transmit;
 
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 	ifp->if_capabilities = IFCAP_VLAN_MTU | IFCAP_HWCSUM;
 	ifp->if_capenable = ifp->if_capabilities;
 	ifp->if_hwassist = CSUM_TCP | CSUM_UDP;

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 19:58:16 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 246CA2A7;
 Sat, 30 Aug 2014 19:58:16 +0000 (UTC)
Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9DDED1239;
 Sat, 30 Aug 2014 19:58:15 +0000 (UTC)
Received: from tom.home (kib@localhost [127.0.0.1])
 by kib.kiev.ua (8.14.9/8.14.9) with ESMTP id s7UJw9mi046233
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
 Sat, 30 Aug 2014 22:58:09 +0300 (EEST)
 (envelope-from kostikbel@gmail.com)
DKIM-Filter: OpenDKIM Filter v2.9.2 kib.kiev.ua s7UJw9mi046233
Received: (from kostik@localhost)
 by tom.home (8.14.9/8.14.9/Submit) id s7UJw9gZ046232;
 Sat, 30 Aug 2014 22:58:09 +0300 (EEST)
 (envelope-from kostikbel@gmail.com)
X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com
 using -f
Date: Sat, 30 Aug 2014 22:58:09 +0300
From: Konstantin Belousov 
To: John Baldwin 
Subject: Re: svn commit: r270850 - in head/sys: i386/i386 i386/include
 i386/isa x86/acpica
Message-ID: <20140830195809.GS2737@kib.kiev.ua>
References: <201408301748.s7UHmc6H059701@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature"; boundary="zTZp/B23emyWiNs8"
Content-Disposition: inline
In-Reply-To: <201408301748.s7UHmc6H059701@svn.freebsd.org>
User-Agent: Mutt/1.5.23 (2014-03-12)
X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00,
 DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no
 autolearn_force=no version=3.4.0
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on tom.home
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 19:58:16 -0000


--zTZp/B23emyWiNs8
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Sat, Aug 30, 2014 at 05:48:38PM +0000, John Baldwin wrote:
> Author: jhb
> Date: Sat Aug 30 17:48:38 2014
> New Revision: 270850
> URL: http://svnweb.freebsd.org/changeset/base/270850
>=20
> Log:
>   Save and restore FPU state across suspend and resume.  In earlier revis=
ions
>   of this patch, resumectx() called npxresume() directly, but that doesn't
>   work because resumectx() runs with a non-standard %cs selector.  Instea=
d,
>   all of the FPU suspend/resume handling is done in C.
>  =20
>   MFC after:	1 week
>=20
> Modified:
>   head/sys/i386/i386/mp_machdep.c
>   head/sys/i386/i386/swtch.s
>   head/sys/i386/include/npx.h
>   head/sys/i386/include/pcb.h
>   head/sys/i386/isa/npx.c
>   head/sys/x86/acpica/acpi_wakeup.c
>=20
> Modified: head/sys/i386/i386/mp_machdep.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/sys/i386/i386/mp_machdep.c	Sat Aug 30 17:39:28 2014	(r270849)
> +++ head/sys/i386/i386/mp_machdep.c	Sat Aug 30 17:48:38 2014	(r270850)
> @@ -1522,9 +1522,15 @@ cpususpend_handler(void)
> =20
>  	cpu =3D PCPU_GET(cpuid);
>  	if (savectx(susppcbs[cpu])) {
> +#ifdef DEV_NPX
> +		npxsuspend(&suspcbs[cpu]->pcb_fpususpend);
> +#endif
>  		wbinvd();
>  		CPU_SET_ATOMIC(cpu, &suspended_cpus);
>  	} else {
> +#ifdef DEV_NPX
> +		npxresume(&suspcbs[cpu]->pcb_fpususpend);
> +#endif
>  		pmap_init_pat();
>  		PCPU_SET(switchtime, 0);
>  		PCPU_SET(switchticks, ticks);
>=20
> Modified: head/sys/i386/i386/swtch.s
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/sys/i386/i386/swtch.s	Sat Aug 30 17:39:28 2014	(r270849)
> +++ head/sys/i386/i386/swtch.s	Sat Aug 30 17:48:38 2014	(r270850)
> @@ -416,45 +416,6 @@ ENTRY(savectx)
>  	sldt	PCB_LDT(%ecx)
>  	str	PCB_TR(%ecx)
> =20
> -#ifdef DEV_NPX
> -	/*
> -	 * If fpcurthread =3D=3D NULL, then the npx h/w state is irrelevant and=
 the
> -	 * state had better already be in the pcb.  This is true for forks
> -	 * but not for dumps (the old book-keeping with FP flags in the pcb
> -	 * always lost for dumps because the dump pcb has 0 flags).
> -	 *
> -	 * If fpcurthread !=3D NULL, then we have to save the npx h/w state to
> -	 * fpcurthread's pcb and copy it to the requested pcb, or save to the
> -	 * requested pcb and reload.  Copying is easier because we would
> -	 * have to handle h/w bugs for reloading.  We used to lose the
> -	 * parent's npx state for forks by forgetting to reload.
> -	 */
> -	pushfl
> -	CLI
> -	movl	PCPU(FPCURTHREAD),%eax
> -	testl	%eax,%eax
> -	je	1f
> -
> -	pushl	%ecx
> -	movl	TD_PCB(%eax),%eax
> -	movl	PCB_SAVEFPU(%eax),%eax
> -	pushl	%eax
> -	pushl	%eax
> -	call	npxsave
> -	addl	$4,%esp
> -	popl	%eax
> -	popl	%ecx
> -
> -	pushl	$PCB_SAVEFPU_SIZE
> -	leal	PCB_USERFPU(%ecx),%ecx
> -	pushl	%ecx
> -	pushl	%eax
> -	call	bcopy
> -	addl	$12,%esp
> -1:
> -	popfl
> -#endif	/* DEV_NPX */
> -
>  	movl	$1,%eax
>  	ret
>  END(savectx)
> @@ -519,10 +480,6 @@ ENTRY(resumectx)
>  	movl	PCB_DR7(%ecx),%eax
>  	movl	%eax,%dr7
> =20
> -#ifdef DEV_NPX
> -	/* XXX FIX ME */
> -#endif
> -
>  	/* Restore other registers */
>  	movl	PCB_EDI(%ecx),%edi
>  	movl	PCB_ESI(%ecx),%esi
>=20
> Modified: head/sys/i386/include/npx.h
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/sys/i386/include/npx.h	Sat Aug 30 17:39:28 2014	(r270849)
> +++ head/sys/i386/include/npx.h	Sat Aug 30 17:48:38 2014	(r270850)
> @@ -53,8 +53,10 @@ void	npxexit(struct thread *td);
>  int	npxformat(void);
>  int	npxgetregs(struct thread *td);
>  void	npxinit(void);
> +void	npxresume(union savefpu *addr);
>  void	npxsave(union savefpu *addr);
>  void	npxsetregs(struct thread *td, union savefpu *addr);
> +void	npxsuspend(union savefpu *addr);
>  int	npxtrap_x87(void);
>  int	npxtrap_sse(void);
>  void	npxuserinited(struct thread *);
>=20
> Modified: head/sys/i386/include/pcb.h
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/sys/i386/include/pcb.h	Sat Aug 30 17:39:28 2014	(r270849)
> +++ head/sys/i386/include/pcb.h	Sat Aug 30 17:48:38 2014	(r270850)
> @@ -90,6 +90,8 @@ struct pcb {
>  	struct region_descriptor pcb_idt;
>  	uint16_t	pcb_ldt;
>  	uint16_t	pcb_tr;
> +
> +	union	savefpu pcb_fpususpend;
>  };
Now pcb consumes 512 bytes from each thread' kernel stack, which mostly
stay unused.

Amd64 only stores the pointer to the fpususpend context in pcb, and
acpu_wakeup() allocates the memory as needed. Even this is a waste of 8
bytes which are not needed for normal kernel operations.

Suspend FPU context, as well as amd64 MSRs should go out of pcb into
some per-cpu suspend data block.

--zTZp/B23emyWiNs8
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBAgAGBQJUAizQAAoJEJDCuSvBvK1Bj7oP/RtHm39XHxHaKoV7noWYzOD2
5S9dm6P3TQsWdjDZQ2TtYLroCiur3bRzTpR12FbSRLp7oL1jAhiWRFvvF/1gz9BU
tn86/4Z2KrXys+oGr0B2Ozi7kotVNM07CWpoQuELa3V3P9rNsb1Ko+AwwYgozeMZ
UZGL4yjZtBb9NnRhzDelAhwYpnOv56j0trKkwKAR5n/vZ3NYEVgjjVHu4rDIONUd
DMTHNUI/A2c0RtjqWI07wK1va44nZdEi7MKXv8u2VXWfrDjT6Yj7qku7Z3JfMacM
Vr5bakRVTaVtoKSqKaN0bL8y7MFMut8vJ4lf7obBxv21UAy9zjIboDkgZOKRpnsT
pWuD8Ns6CKrFXBdV9yoG0VAzuPPHpZrbZQlwX3OeVMbZkA3z1yFH+o/3ASwV3H+J
HfJMwNRUi25zXHhAC5sQkjPl7mL4gy3fBxLYIoBVrCu5NeGrz5OYemqXYm1u/6QO
eTFi8oKmXbM9dz5aainairqiGDWNlf1934XgI28RbSTqjs73HiwnqXQdIzxtjqS2
5ynLKGVKj+9PjuNj2kDRuLgHAB13dqX0H1Nr6OKK1S/4aa0S+aWH7p716QTL0O8p
L9dVasea6ZcZGSVtX6d6G5CrT2AJ9UbhBiwVWzN7H5IR6YJybouC3AO0lgnsUglZ
RrscyL8rfFfo+J3/2enb
=AjuO
-----END PGP SIGNATURE-----

--zTZp/B23emyWiNs8--

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 19:59:43 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 37E363EE;
 Sat, 30 Aug 2014 19:59:43 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 171B61246;
 Sat, 30 Aug 2014 19:59:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7UJxgsR024098;
 Sat, 30 Aug 2014 19:59:42 GMT (envelope-from neel@FreeBSD.org)
Received: (from neel@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7UJxgdN024097;
 Sat, 30 Aug 2014 19:59:42 GMT (envelope-from neel@FreeBSD.org)
Message-Id: <201408301959.s7UJxgdN024097@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: neel set sender to neel@FreeBSD.org
 using -f
From: Neel Natu 
Date: Sat, 30 Aug 2014 19:59:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270857 - head/sys/amd64/vmm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 19:59:43 -0000

Author: neel
Date: Sat Aug 30 19:59:42 2014
New Revision: 270857
URL: http://svnweb.freebsd.org/changeset/base/270857

Log:
  The "SUB" instruction used in getcc() actually does 'x -= y' so use the
  proper constraint for 'x'. The "+r" constraint indicates that 'x' is an
  input and output register operand.
  
  While here generate code for different variants of getcc() using a macro
  GETCC(sz) where 'sz' indicates the operand size.
  
  Update the status bits in %rflags when emulating AND and OR opcodes.
  
  Reviewed by:	grehan

Modified:
  head/sys/amd64/vmm/vmm_instruction_emul.c

Modified: head/sys/amd64/vmm/vmm_instruction_emul.c
==============================================================================
--- head/sys/amd64/vmm/vmm_instruction_emul.c	Sat Aug 30 19:55:54 2014	(r270856)
+++ head/sys/amd64/vmm/vmm_instruction_emul.c	Sat Aug 30 19:59:42 2014	(r270857)
@@ -316,46 +316,36 @@ vie_update_register(void *vm, int vcpuid
 	return (error);
 }
 
+#define	RFLAGS_STATUS_BITS    (PSL_C | PSL_PF | PSL_AF | PSL_Z | PSL_N | PSL_V)
+
 /*
  * Return the status flags that would result from doing (x - y).
  */
-static u_long
-getcc16(uint16_t x, uint16_t y)
-{
-	u_long rflags;
-
-	__asm __volatile("sub %1,%2; pushfq; popq %0" :
-	    "=r" (rflags) : "m" (y), "r" (x));
-	return (rflags);
-}
-
-static u_long
-getcc32(uint32_t x, uint32_t y)
-{
-	u_long rflags;
-
-	__asm __volatile("sub %1,%2; pushfq; popq %0" :
-	    "=r" (rflags) : "m" (y), "r" (x));
-	return (rflags);
-}
-
-static u_long
-getcc64(uint64_t x, uint64_t y)
-{
-	u_long rflags;
-
-	__asm __volatile("sub %1,%2; pushfq; popq %0" :
-	    "=r" (rflags) : "m" (y), "r" (x));
-	return (rflags);
-}
+#define	GETCC(sz)							\
+static u_long								\
+getcc##sz(uint##sz##_t x, uint##sz##_t y)				\
+{									\
+	u_long rflags;							\
+									\
+	__asm __volatile("sub %2,%1; pushfq; popq %0" :			\
+	    "=r" (rflags), "+r" (x) : "m" (y));				\
+	return (rflags);						\
+} struct __hack
+
+GETCC(8);
+GETCC(16);
+GETCC(32);
+GETCC(64);
 
 static u_long
 getcc(int opsize, uint64_t x, uint64_t y)
 {
-	KASSERT(opsize == 2 || opsize == 4 || opsize == 8,
+	KASSERT(opsize == 1 || opsize == 2 || opsize == 4 || opsize == 8,
 	    ("getcc: invalid operand size %d", opsize));
 
-	if (opsize == 2)
+	if (opsize == 1)
+		return (getcc8(x, y));
+	else if (opsize == 2)
 		return (getcc16(x, y));
 	else if (opsize == 4)
 		return (getcc32(x, y));
@@ -569,7 +559,7 @@ emulate_and(void *vm, int vcpuid, uint64
 {
 	int error, size;
 	enum vm_reg_name reg;
-	uint64_t val1, val2;
+	uint64_t result, rflags, rflags2, val1, val2;
 
 	size = vie->opsize;
 	error = EINVAL;
@@ -597,8 +587,8 @@ emulate_and(void *vm, int vcpuid, uint64
 			break;
 
 		/* perform the operation and write the result */
-		val1 &= val2;
-		error = vie_update_register(vm, vcpuid, reg, val1, size);
+		result = val1 & val2;
+		error = vie_update_register(vm, vcpuid, reg, result, size);
 		break;
 	case 0x81:
 		/*
@@ -625,11 +615,11 @@ emulate_and(void *vm, int vcpuid, uint64
 		switch (vie->reg & 7) {
 		case 0x4:
 			/* modrm:reg == b100, AND */
-			val1 &= vie->immediate;
+			result = val1 & vie->immediate;
 			break;
 		case 0x1:
 			/* modrm:reg == b001, OR */
-			val1 |= vie->immediate;
+			result = val1 | vie->immediate;
 			break;
 		default:
 			error = EINVAL;
@@ -638,11 +628,29 @@ emulate_and(void *vm, int vcpuid, uint64
 		if (error)
 			break;
 
-		error = memwrite(vm, vcpuid, gpa, val1, size, arg);
+		error = memwrite(vm, vcpuid, gpa, result, size, arg);
 		break;
 	default:
 		break;
 	}
+	if (error)
+		return (error);
+
+	error = vie_read_register(vm, vcpuid, VM_REG_GUEST_RFLAGS, &rflags);
+	if (error)
+		return (error);
+
+	/*
+	 * OF and CF are cleared; the SF, ZF and PF flags are set according
+	 * to the result; AF is undefined.
+	 *
+	 * The updated status flags are obtained by subtracting 0 from 'result'.
+	 */
+	rflags2 = getcc(size, result, 0);
+	rflags &= ~RFLAGS_STATUS_BITS;
+	rflags |= rflags2 & (PSL_PF | PSL_Z | PSL_N);
+
+	error = vie_update_register(vm, vcpuid, VM_REG_GUEST_RFLAGS, rflags, 8);
 	return (error);
 }
 
@@ -651,7 +659,7 @@ emulate_or(void *vm, int vcpuid, uint64_
 	    mem_region_read_t memread, mem_region_write_t memwrite, void *arg)
 {
 	int error, size;
-	uint64_t val1;
+	uint64_t val1, result, rflags, rflags2;
 
 	size = vie->opsize;
 	error = EINVAL;
@@ -681,17 +689,33 @@ emulate_or(void *vm, int vcpuid, uint64_
 		 * perform the operation with the pre-fetched immediate
 		 * operand and write the result
 		 */
-                val1 |= vie->immediate;
-                error = memwrite(vm, vcpuid, gpa, val1, size, arg);
+                result = val1 | vie->immediate;
+                error = memwrite(vm, vcpuid, gpa, result, size, arg);
 		break;
 	default:
 		break;
 	}
+	if (error)
+		return (error);
+
+	error = vie_read_register(vm, vcpuid, VM_REG_GUEST_RFLAGS, &rflags);
+	if (error)
+		return (error);
+
+	/*
+	 * OF and CF are cleared; the SF, ZF and PF flags are set according
+	 * to the result; AF is undefined.
+	 *
+	 * The updated status flags are obtained by subtracting 0 from 'result'.
+	 */
+	rflags2 = getcc(size, result, 0);
+	rflags &= ~RFLAGS_STATUS_BITS;
+	rflags |= rflags2 & (PSL_PF | PSL_Z | PSL_N);
+
+	error = vie_update_register(vm, vcpuid, VM_REG_GUEST_RFLAGS, rflags, 8);
 	return (error);
 }
 
-#define	RFLAGS_STATUS_BITS    (PSL_C | PSL_PF | PSL_AF | PSL_Z | PSL_N | PSL_V)
-
 static int
 emulate_cmp(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
 	    mem_region_read_t memread, mem_region_write_t memwrite, void *arg)

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 20:00:18 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id CA315531;
 Sat, 30 Aug 2014 20:00:18 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B45C412D1;
 Sat, 30 Aug 2014 20:00:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7UK0IbL024463;
 Sat, 30 Aug 2014 20:00:18 GMT (envelope-from tuexen@FreeBSD.org)
Received: (from tuexen@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7UK0IhC024462;
 Sat, 30 Aug 2014 20:00:18 GMT (envelope-from tuexen@FreeBSD.org)
Message-Id: <201408302000.s7UK0IhC024462@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: tuexen set sender to
 tuexen@FreeBSD.org using -f
From: Michael Tuexen 
Date: Sat, 30 Aug 2014 20:00:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270858 - head/sys/arm/conf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 20:00:18 -0000

Author: tuexen
Date: Sat Aug 30 20:00:18 2014
New Revision: 270858
URL: http://svnweb.freebsd.org/changeset/base/270858

Log:
  Remove FDT option, since it is in every file, which includes this one.

Modified:
  head/sys/arm/conf/IMX6

Modified: head/sys/arm/conf/IMX6
==============================================================================
--- head/sys/arm/conf/IMX6	Sat Aug 30 19:59:42 2014	(r270857)
+++ head/sys/arm/conf/IMX6	Sat Aug 30 20:00:18 2014	(r270858)
@@ -147,7 +147,6 @@ device  	u3g			# USB modems
 options  	ROOTDEVNAME=\"ufs:mmcsd0s2a\"
 
 # ARM and SoC-specific options
-options  	FDT			# Configure using FDT/DTB data.
 options  	SMP			# Enable multiple cores
 options  	VFP			# Enable floating point hardware support
 options  	FREEBSD_BOOT_LOADER	# Process metadata passed from loader(8)

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 20:18:48 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 15C76BCB;
 Sat, 30 Aug 2014 20:18:48 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 00D261448;
 Sat, 30 Aug 2014 20:18:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7UKIlfr035577;
 Sat, 30 Aug 2014 20:18:47 GMT (envelope-from tuexen@FreeBSD.org)
Received: (from tuexen@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7UKIlwk035576;
 Sat, 30 Aug 2014 20:18:47 GMT (envelope-from tuexen@FreeBSD.org)
Message-Id: <201408302018.s7UKIlwk035576@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: tuexen set sender to
 tuexen@FreeBSD.org using -f
From: Michael Tuexen 
Date: Sat, 30 Aug 2014 20:18:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270859 - head/sys/arm/conf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 20:18:48 -0000

Author: tuexen
Date: Sat Aug 30 20:18:47 2014
New Revision: 270859
URL: http://svnweb.freebsd.org/changeset/base/270859

Log:
  Enable SCTP support. It runs perfectly fine on a Wandboard quad.
  
  MFC after: 3 days

Modified:
  head/sys/arm/conf/IMX6

Modified: head/sys/arm/conf/IMX6
==============================================================================
--- head/sys/arm/conf/IMX6	Sat Aug 30 20:00:18 2014	(r270858)
+++ head/sys/arm/conf/IMX6	Sat Aug 30 20:18:47 2014	(r270859)
@@ -25,7 +25,7 @@ options  	SCHED_ULE		# ULE scheduler
 options  	PREEMPTION		# Enable kernel thread preemption
 options  	INET			# InterNETworking
 options  	INET6			# IPv6 communications protocols
-#options  	SCTP			# Stream Control Transmission Protocol
+options  	SCTP			# Stream Control Transmission Protocol
 options  	FFS			# Berkeley Fast Filesystem
 options  	SOFTUPDATES		# Enable FFS soft updates support
 options  	UFS_ACL			# Support for access control lists

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 20:26:31 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 55AD2E41;
 Sat, 30 Aug 2014 20:26:31 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3FEE9153C;
 Sat, 30 Aug 2014 20:26:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7UKQVnU040229;
 Sat, 30 Aug 2014 20:26:31 GMT (envelope-from rmacklem@FreeBSD.org)
Received: (from rmacklem@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7UKQVTE040228;
 Sat, 30 Aug 2014 20:26:31 GMT (envelope-from rmacklem@FreeBSD.org)
Message-Id: <201408302026.s7UKQVTE040228@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: rmacklem set sender to
 rmacklem@FreeBSD.org using -f
From: Rick Macklem 
Date: Sat, 30 Aug 2014 20:26:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r270860 - stable/9/usr.sbin/nfsd
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 20:26:31 -0000

Author: rmacklem
Date: Sat Aug 30 20:26:30 2014
New Revision: 270860
URL: http://svnweb.freebsd.org/changeset/base/270860

Log:
  MFC: r269788
  Document the use of the vfs.nfsd sysctls that control the size of
  the NFS server's DRC for TCP.
  This is a content change.

Modified:
  stable/9/usr.sbin/nfsd/nfsd.8
Directory Properties:
  stable/9/usr.sbin/nfsd/   (props changed)

Modified: stable/9/usr.sbin/nfsd/nfsd.8
==============================================================================
--- stable/9/usr.sbin/nfsd/nfsd.8	Sat Aug 30 20:18:47 2014	(r270859)
+++ stable/9/usr.sbin/nfsd/nfsd.8	Sat Aug 30 20:26:30 2014	(r270860)
@@ -28,7 +28,7 @@
 .\"	@(#)nfsd.8	8.4 (Berkeley) 3/29/95
 .\" $FreeBSD$
 .\"
-.Dd April 23, 2011
+.Dd August 10, 2014
 .Dt NFSD 8
 .Os
 .Sh NAME
@@ -164,6 +164,24 @@ utility
 would then be used to block nfs-related packets that come in on the outside
 interface.
 .Pp
+If the server has stopped servicing clients and has generated a console message
+like
+.Dq Li "nfsd server cache flooded..." ,
+the value for vfs.nfsd.tcphighwater needs to be increased.
+This should allow the server to again handle requests without a reboot.
+Also, you may want to consider decreasing the value for
+vfs.nfsd.tcpcachetimeo to several minutes (in seconds) instead of 12 hours
+when this occurs.
+.Pp
+Unfortunately making vfs.nfsd.tcphighwater too large can result in the mbuf
+limit being reached, as indicated by a console message
+like
+.Dq Li "kern.ipc.nmbufs limit reached" .
+If you cannot find values of the above
+.Nm sysctl
+values that work, you can disable the DRC cache for TCP by setting
+vfs.nfsd.cachetcp to 0.
+.Pp
 The
 .Nm
 utility has to be terminated with

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 21:44:33 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 895E44C7;
 Sat, 30 Aug 2014 21:44:33 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5A3541D77;
 Sat, 30 Aug 2014 21:44:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7ULiXX5028878;
 Sat, 30 Aug 2014 21:44:33 GMT (envelope-from smh@FreeBSD.org)
Received: (from smh@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7ULiWsX028875;
 Sat, 30 Aug 2014 21:44:32 GMT (envelope-from smh@FreeBSD.org)
Message-Id: <201408302144.s7ULiWsX028875@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: smh set sender to smh@FreeBSD.org
 using -f
From: Steven Hartland 
Date: Sat, 30 Aug 2014 21:44:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270861 - in head/sys/cddl: compat/opensolaris/kern
 compat/opensolaris/sys contrib/opensolaris/uts/common/fs/zfs
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 21:44:33 -0000

Author: smh
Date: Sat Aug 30 21:44:32 2014
New Revision: 270861
URL: http://svnweb.freebsd.org/changeset/base/270861

Log:
  Ensure that ZFS ARC free memory checks include cached pages
  
  Also restore kmem_used() check for i386 as it has KVA limits that the raw
  page counts above don't consider
  
  PR:		187594
  Reviewed by:	peter
  X-MFC-With: r270759
  Review:	D700
  Sponsored by:	Multiplay

Modified:
  head/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c
  head/sys/cddl/compat/opensolaris/sys/kmem.h
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c

Modified: head/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c
==============================================================================
--- head/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c	Sat Aug 30 20:26:30 2014	(r270860)
+++ head/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c	Sat Aug 30 21:44:32 2014	(r270861)
@@ -152,7 +152,7 @@ u_int
 kmem_free_count(void)
 {
 
-	return (vm_cnt.v_free_count);
+	return (vm_cnt.v_free_count + vm_cnt.v_cache_count);
 }
 
 u_int
@@ -169,6 +169,13 @@ kmem_size(void)
 	return (kmem_size_val);
 }
 
+uint64_t
+kmem_used(void)
+{
+
+	return (vmem_size(kmem_arena, VMEM_ALLOC));
+}
+
 static int
 kmem_std_constructor(void *mem, int size __unused, void *private, int flags)
 {

Modified: head/sys/cddl/compat/opensolaris/sys/kmem.h
==============================================================================
--- head/sys/cddl/compat/opensolaris/sys/kmem.h	Sat Aug 30 20:26:30 2014	(r270860)
+++ head/sys/cddl/compat/opensolaris/sys/kmem.h	Sat Aug 30 21:44:32 2014	(r270861)
@@ -66,6 +66,7 @@ typedef struct kmem_cache {
 void *zfs_kmem_alloc(size_t size, int kmflags);
 void zfs_kmem_free(void *buf, size_t size);
 uint64_t kmem_size(void);
+uint64_t kmem_used(void);
 u_int kmem_page_count(void);
 
 /*

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Sat Aug 30 20:26:30 2014	(r270860)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Sat Aug 30 21:44:32 2014	(r270861)
@@ -2563,6 +2563,14 @@ arc_reclaim_needed(void)
 #endif	/* sun */
 
 #else
+#ifdef __i386__
+	/* i386 has KVA limits that the raw page counts above don't consider */
+	if (kmem_used() > (kmem_size() * 3) / 4) {
+		DTRACE_PROBE2(arc__reclaim_used, uint64_t,
+		    kmem_used(), uint64_t, (kmem_size() * 3) / 4);
+		return (1);
+	}
+#endif
 	if (spa_get_random(100) == 0)
 		return (1);
 #endif

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 22:21:57 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id E8B25D28;
 Sat, 30 Aug 2014 22:21:57 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D54261119;
 Sat, 30 Aug 2014 22:21:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7UMLv40003792;
 Sat, 30 Aug 2014 22:21:57 GMT (envelope-from ian@FreeBSD.org)
Received: (from ian@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7UMLvMS003791;
 Sat, 30 Aug 2014 22:21:57 GMT (envelope-from ian@FreeBSD.org)
Message-Id: <201408302221.s7UMLvMS003791@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org
 using -f
From: Ian Lepore 
Date: Sat, 30 Aug 2014 22:21:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270862 - head/sys/arm/arm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 22:21:58 -0000

Author: ian
Date: Sat Aug 30 22:21:57 2014
New Revision: 270862
URL: http://svnweb.freebsd.org/changeset/base/270862

Log:
  Fix the handling of MMU type in the AP entry code.  The ARM_MMU_V6/V7
  symbols are always #defined to 0 or 1, so use #if SYM not #if defined(SYM).
  Also, it helps if you include the header file that defines the symbols.

Modified:
  head/sys/arm/arm/locore.S

Modified: head/sys/arm/arm/locore.S
==============================================================================
--- head/sys/arm/arm/locore.S	Sat Aug 30 21:44:32 2014	(r270861)
+++ head/sys/arm/arm/locore.S	Sat Aug 30 22:21:57 2014	(r270862)
@@ -37,6 +37,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 __FBSDID("$FreeBSD$");
@@ -389,9 +390,9 @@ ASENTRY_NP(mpentry)
 	nop
 	CPWAIT(r0)
 
-#if defined(ARM_MMU_V6)
+#if ARM_MMU_V6
 	bl	armv6_idcache_inv_all	/* Modifies r0 only */
-#elif defined(ARM_MMU_V7)
+#elif ARM_MMU_V7
 	bl	armv7_idcache_inv_all	/* Modifies r0-r3, ip */
 #endif
 

From owner-svn-src-all@FreeBSD.ORG  Sat Aug 30 22:39:16 2014
Return-Path: 
Delivered-To: svn-src-all@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 ESMTPS id 4902D2BA;
 Sat, 30 Aug 2014 22:39:16 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 35EE2127B;
 Sat, 30 Aug 2014 22:39:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7UMdGxr044269;
 Sat, 30 Aug 2014 22:39:16 GMT (envelope-from ian@FreeBSD.org)
Received: (from ian@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7UMdGP2044268;
 Sat, 30 Aug 2014 22:39:16 GMT (envelope-from ian@FreeBSD.org)
Message-Id: <201408302239.s7UMdGP2044268@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org
 using -f
From: Ian Lepore 
Date: Sat, 30 Aug 2014 22:39:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270863 - head/sys/tools/fdt
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
 user" and " projects" \)" 
List-Unsubscribe: ,
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
 
X-List-Received-Date: Sat, 30 Aug 2014 22:39:16 -0000

Author: ian
Date: Sat Aug 30 22:39:15 2014
New Revision: 270863
URL: http://svnweb.freebsd.org/changeset/base/270863

Log:
  Allow the make_dtb script to work outside of a "make buildkernel" context
  by setting MACHINE from uname -m if it's not set already.
  
  Reviewed by:	imp, tuexen

Modified:
  head/sys/tools/fdt/make_dtb.sh

Modified: head/sys/tools/fdt/make_dtb.sh
==============================================================================
--- head/sys/tools/fdt/make_dtb.sh	Sat Aug 30 22:21:57 2014	(r270862)
+++ head/sys/tools/fdt/make_dtb.sh	Sat Aug 30 22:39:15 2014	(r270863)
@@ -12,6 +12,10 @@ if [ -z "$dts" ]; then
     exit 1
 fi
 
+if [ -z "${MACHINE}" ]; then
+    MACHINE=$(uname -m)
+fi
+
 for d in ${dts}; do
     dtb=${dtb_path}/`basename $d .dts`.dtb
     echo "converting $d -> $dtb"