From owner-svn-src-stable-10@FreeBSD.ORG Tue Dec 3 18:18:36 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0C3F4666; Tue, 3 Dec 2013 18:18: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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E99CC173A; Tue, 3 Dec 2013 18:18:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB3IIZ1Z030710; Tue, 3 Dec 2013 18:18:35 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB3IIZnT030709; Tue, 3 Dec 2013 18:18:35 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201312031818.rB3IIZnT030709@svn.freebsd.org> From: Edward Tomasz Napierala Date: Tue, 3 Dec 2013 18:18: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: r258875 - stable/10/lib/libc/posix1e X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Dec 2013 18:18:36 -0000 Author: trasz Date: Tue Dec 3 18:18:35 2013 New Revision: 258875 URL: http://svnweb.freebsd.org/changeset/base/258875 Log: MFC r258041: Mention acl_get_brand_np(3). Approved by: re (gjb) Sponsored by: The FreeBSD Foundation Modified: stable/10/lib/libc/posix1e/acl.3 Directory Properties: stable/10/lib/libc/ (props changed) Modified: stable/10/lib/libc/posix1e/acl.3 ============================================================================== --- stable/10/lib/libc/posix1e/acl.3 Tue Dec 3 18:15:27 2013 (r258874) +++ stable/10/lib/libc/posix1e/acl.3 Tue Dec 3 18:18:35 2013 (r258875) @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 25, 2009 +.Dd November 12, 2013 .Dt ACL 3 .Os .Sh NAME @@ -131,6 +131,10 @@ This function is described in .Xr acl_from_text 3 , and may be used to convert a text-form ACL into working ACL state, if the ACL has POSIX.1e or NFSv4 semantics. +.It Fn acl_get_brand_np +This function is described in +.Xr acl_get_brand_np 3 +and may be used to determine whether the ACL has POSIX.1e or NFSv4 semantics. .It Fn acl_get_entry This function is described in .Xr acl_get_entry 3 , @@ -248,6 +252,7 @@ library. .Xr acl_free 3 , .Xr acl_from_text 3 , .Xr acl_get 3 , +.Xr acl_get_brand_np 3 , .Xr acl_get_entry_type_np 3 , .Xr acl_get_flagset_np 3 , .Xr acl_get_permset 3 , From owner-svn-src-stable-10@FreeBSD.ORG Tue Dec 3 18:28:19 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5B5FA9EE; Tue, 3 Dec 2013 18:28: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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4224B17B4; Tue, 3 Dec 2013 18:28:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB3ISJoX034135; Tue, 3 Dec 2013 18:28:19 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB3ISJms034134; Tue, 3 Dec 2013 18:28:19 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201312031828.rB3ISJms034134@svn.freebsd.org> From: Edward Tomasz Napierala Date: Tue, 3 Dec 2013 18:28: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: r258877 - stable/10/lib/libc/posix1e X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Dec 2013 18:28:19 -0000 Author: trasz Date: Tue Dec 3 18:28:18 2013 New Revision: 258877 URL: http://svnweb.freebsd.org/changeset/base/258877 Log: MFC r258042: Fix description to actually make sense. Approved by: re (gjb) Sponsored by: The FreeBSD Foundation Modified: stable/10/lib/libc/posix1e/acl_is_trivial_np.3 Directory Properties: stable/10/lib/libc/ (props changed) Modified: stable/10/lib/libc/posix1e/acl_is_trivial_np.3 ============================================================================== --- stable/10/lib/libc/posix1e/acl_is_trivial_np.3 Tue Dec 3 18:27:10 2013 (r258876) +++ stable/10/lib/libc/posix1e/acl_is_trivial_np.3 Tue Dec 3 18:28:18 2013 (r258877) @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 13, 2010 +.Dd November 12, 2013 .Dt ACL_STRIP_NP 3 .Os .Sh NAME @@ -56,9 +56,8 @@ ACL is trivial if it can be fully expres any access rules. For POSIX.1e ACLs, ACL is trivial if it has the three required entries, one for owner, one for owning group, and one for other. -For NFSv4 ACLs, ACL is trivial if is identical to the ACL generated by -.Fn acl_strip_np 3 -from the file mode. +For NFSv4 ACLs, ACL is trivial if it is identical to the ACL generated by +.Fn acl_strip_np 3 . Files that have non-trivial ACL have a plus sign appended after mode bits in "ls -l" output. .Sh RETURN VALUES From owner-svn-src-stable-10@FreeBSD.ORG Tue Dec 3 18:35:18 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 28A95DC0; Tue, 3 Dec 2013 18:35: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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 15A16184B; Tue, 3 Dec 2013 18:35:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB3IZHZ3037310; Tue, 3 Dec 2013 18:35:17 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB3IZH1Z037309; Tue, 3 Dec 2013 18:35:17 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201312031835.rB3IZH1Z037309@svn.freebsd.org> From: Edward Tomasz Napierala Date: Tue, 3 Dec 2013 18:35: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: r258880 - stable/10/lib/libc/posix1e X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Dec 2013 18:35:18 -0000 Author: trasz Date: Tue Dec 3 18:35:17 2013 New Revision: 258880 URL: http://svnweb.freebsd.org/changeset/base/258880 Log: MFC r258043: Fix typo. Approved by: re (gjb) Sponsored by: The FreeBSD Foundation Modified: stable/10/lib/libc/posix1e/acl.3 Directory Properties: stable/10/lib/libc/ (props changed) Modified: stable/10/lib/libc/posix1e/acl.3 ============================================================================== --- stable/10/lib/libc/posix1e/acl.3 Tue Dec 3 18:34:52 2013 (r258879) +++ stable/10/lib/libc/posix1e/acl.3 Tue Dec 3 18:35:17 2013 (r258880) @@ -206,7 +206,7 @@ This function is described in .Xr acl_set_tag_type 3 , and may be used to set the tag type of an ACL. .It Fn acl_strip_np -This function is describe din +This function is described in .Xr acl-strip_np 3 , and may be used to remove extended entries from an ACL. .It Xo From owner-svn-src-stable-10@FreeBSD.ORG Tue Dec 3 19:40:34 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 111E61B6; Tue, 3 Dec 2013 19:40: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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F06451D32; Tue, 3 Dec 2013 19:40:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB3JeXwW061410; Tue, 3 Dec 2013 19:40:33 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB3JeXAL061406; Tue, 3 Dec 2013 19:40:33 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201312031940.rB3JeXAL061406@svn.freebsd.org> From: Konstantin Belousov Date: Tue, 3 Dec 2013 19:40: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: r258885 - in stable/10/sys: compat/freebsd32 kern 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-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Dec 2013 19:40:34 -0000 Author: kib Date: Tue Dec 3 19:40:32 2013 New Revision: 258885 URL: http://svnweb.freebsd.org/changeset/base/258885 Log: MFC r258661: Add sysctl KERN_PROC_SIGTRAMP to retrieve signal trampoline location for the given process. Approved by: re (gjb) Modified: stable/10/sys/compat/freebsd32/freebsd32.h stable/10/sys/kern/kern_proc.c stable/10/sys/sys/sysctl.h stable/10/sys/sys/user.h Directory Properties: stable/10/sys/ (props changed) Modified: stable/10/sys/compat/freebsd32/freebsd32.h ============================================================================== --- stable/10/sys/compat/freebsd32/freebsd32.h Tue Dec 3 19:23:54 2013 (r258884) +++ stable/10/sys/compat/freebsd32/freebsd32.h Tue Dec 3 19:40:32 2013 (r258885) @@ -362,6 +362,12 @@ struct kinfo_proc32 { int ki_tdflags; }; +struct kinfo_sigtramp32 { + uint32_t ksigtramp_start; + uint32_t ksigtramp_end; + uint32_t ksigtramp_spare[4]; +}; + struct kld32_file_stat_1 { int version; /* set to sizeof(struct kld_file_stat_1) */ char name[MAXPATHLEN]; Modified: stable/10/sys/kern/kern_proc.c ============================================================================== --- stable/10/sys/kern/kern_proc.c Tue Dec 3 19:23:54 2013 (r258884) +++ stable/10/sys/kern/kern_proc.c Tue Dec 3 19:40:32 2013 (r258885) @@ -2632,6 +2632,60 @@ errout: return (error); } +static int +sysctl_kern_proc_sigtramp(SYSCTL_HANDLER_ARGS) +{ + int *name = (int *)arg1; + u_int namelen = arg2; + struct proc *p; + struct kinfo_sigtramp kst; + const struct sysentvec *sv; + int error; +#ifdef COMPAT_FREEBSD32 + struct kinfo_sigtramp32 kst32; +#endif + + if (namelen != 1) + return (EINVAL); + + error = pget((pid_t)name[0], PGET_CANDEBUG, &p); + if (error != 0) + return (error); + sv = p->p_sysent; +#ifdef COMPAT_FREEBSD32 + if ((req->flags & SCTL_MASK32) != 0) { + bzero(&kst32, sizeof(kst32)); + if (SV_PROC_FLAG(p, SV_ILP32)) { + if (sv->sv_sigcode_base != 0) { + kst32.ksigtramp_start = sv->sv_sigcode_base; + kst32.ksigtramp_end = sv->sv_sigcode_base + + *sv->sv_szsigcode; + } else { + kst32.ksigtramp_start = sv->sv_psstrings - + *sv->sv_szsigcode; + kst32.ksigtramp_end = sv->sv_psstrings; + } + } + PROC_UNLOCK(p); + error = SYSCTL_OUT(req, &kst32, sizeof(kst32)); + return (error); + } +#endif + bzero(&kst, sizeof(kst)); + if (sv->sv_sigcode_base != 0) { + kst.ksigtramp_start = (char *)sv->sv_sigcode_base; + kst.ksigtramp_end = (char *)sv->sv_sigcode_base + + *sv->sv_szsigcode; + } else { + kst.ksigtramp_start = (char *)sv->sv_psstrings - + *sv->sv_szsigcode; + kst.ksigtramp_end = (char *)sv->sv_psstrings; + } + PROC_UNLOCK(p); + error = SYSCTL_OUT(req, &kst, sizeof(kst)); + return (error); +} + SYSCTL_NODE(_kern, KERN_PROC, proc, CTLFLAG_RD, 0, "Process table"); SYSCTL_PROC(_kern_proc, KERN_PROC_ALL, all, CTLFLAG_RD|CTLTYPE_STRUCT| @@ -2740,3 +2794,7 @@ static SYSCTL_NODE(_kern_proc, KERN_PROC static SYSCTL_NODE(_kern_proc, KERN_PROC_OSREL, osrel, CTLFLAG_RW | CTLFLAG_ANYBODY | CTLFLAG_MPSAFE, sysctl_kern_proc_osrel, "Process binary osreldate"); + +static SYSCTL_NODE(_kern_proc, KERN_PROC_SIGTRAMP, sigtramp, CTLFLAG_RD | + CTLFLAG_MPSAFE, sysctl_kern_proc_sigtramp, + "Process signal trampoline location"); Modified: stable/10/sys/sys/sysctl.h ============================================================================== --- stable/10/sys/sys/sysctl.h Tue Dec 3 19:23:54 2013 (r258884) +++ stable/10/sys/sys/sysctl.h Tue Dec 3 19:40:32 2013 (r258885) @@ -530,6 +530,7 @@ SYSCTL_ALLOWED_TYPES(UINT64, uint64_t *a #define KERN_PROC_PS_STRINGS 38 /* get ps_strings location */ #define KERN_PROC_UMASK 39 /* process umask */ #define KERN_PROC_OSREL 40 /* osreldate for process binary */ +#define KERN_PROC_SIGTRAMP 41 /* signal trampoline location */ /* * KERN_IPC identifiers Modified: stable/10/sys/sys/user.h ============================================================================== --- stable/10/sys/sys/user.h Tue Dec 3 19:23:54 2013 (r258884) +++ stable/10/sys/sys/user.h Tue Dec 3 19:40:32 2013 (r258885) @@ -498,6 +498,12 @@ struct kinfo_kstack { int _kkst_ispare[16]; /* Space for more stuff. */ }; +struct kinfo_sigtramp { + void *ksigtramp_start; + void *ksigtramp_end; + void *ksigtramp_spare[4]; +}; + #ifdef _KERNEL /* Flags for kern_proc_out function. */ #define KERN_PROC_NOTHREADS 0x1 From owner-svn-src-stable-10@FreeBSD.ORG Tue Dec 3 19:41:49 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5D62F2EB; Tue, 3 Dec 2013 19:41: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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 48D331D60; Tue, 3 Dec 2013 19:41:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB3JfnIa063243; Tue, 3 Dec 2013 19:41:49 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB3JfmvR063238; Tue, 3 Dec 2013 19:41:48 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201312031941.rB3JfmvR063238@svn.freebsd.org> From: Konstantin Belousov Date: Tue, 3 Dec 2013 19:41: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: r258886 - 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-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Dec 2013 19:41:49 -0000 Author: kib Date: Tue Dec 3 19:41:48 2013 New Revision: 258886 URL: http://svnweb.freebsd.org/changeset/base/258886 Log: MFC r258660: Fix sys/sysctl.h use for cc -m32 on amd64. Approved by: re (gjb) Modified: stable/10/sys/amd64/include/pcb.h stable/10/sys/amd64/include/segments.h Directory Properties: stable/10/sys/ (props changed) Modified: stable/10/sys/amd64/include/pcb.h ============================================================================== --- stable/10/sys/amd64/include/pcb.h Tue Dec 3 19:40:32 2013 (r258885) +++ stable/10/sys/amd64/include/pcb.h Tue Dec 3 19:41:48 2013 (r258886) @@ -43,6 +43,7 @@ #include #include +#ifdef __amd64__ struct pcb { register_t pcb_r15; register_t pcb_r14; @@ -105,6 +106,7 @@ struct pcb { uint64_t pcb_pad[3]; }; +#endif #ifdef _KERNEL struct trapframe; Modified: stable/10/sys/amd64/include/segments.h ============================================================================== --- stable/10/sys/amd64/include/segments.h Tue Dec 3 19:40:32 2013 (r258885) +++ stable/10/sys/amd64/include/segments.h Tue Dec 3 19:41:48 2013 (r258886) @@ -82,8 +82,8 @@ struct soft_segment_descriptor { * region descriptors, used to load gdt/idt tables before segments yet exist. */ struct region_descriptor { - unsigned long rd_limit:16; /* segment extent */ - unsigned long rd_base:64 __packed; /* base address */ + uint64_t rd_limit:16; /* segment extent */ + uint64_t rd_base:64 __packed; /* base address */ } __packed; #ifdef _KERNEL From owner-svn-src-stable-10@FreeBSD.ORG Tue Dec 3 19:42:47 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8EDA6424; Tue, 3 Dec 2013 19:42: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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 60D151D6D; Tue, 3 Dec 2013 19:42:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB3JglFJ063391; Tue, 3 Dec 2013 19:42:47 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB3JglBf063390; Tue, 3 Dec 2013 19:42:47 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201312031942.rB3JglBf063390@svn.freebsd.org> From: Konstantin Belousov Date: Tue, 3 Dec 2013 19:42: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: r258887 - stable/10/contrib/gdb/gdb X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Dec 2013 19:42:47 -0000 Author: kib Date: Tue Dec 3 19:42:46 2013 New Revision: 258887 URL: http://svnweb.freebsd.org/changeset/base/258887 Log: MFC r258663: Use sysctl KERN_PROC_SIGTRAMP to retrieve the signal trampoline location for the native amd64 ABI. This fixes unwinding over the signal frame after trampoline was moved to the shared page. Approved by: re (gjb) Modified: stable/10/contrib/gdb/gdb/amd64fbsd-nat.c Directory Properties: stable/10/contrib/gdb/ (props changed) Modified: stable/10/contrib/gdb/gdb/amd64fbsd-nat.c ============================================================================== --- stable/10/contrib/gdb/gdb/amd64fbsd-nat.c Tue Dec 3 19:41:48 2013 (r258886) +++ stable/10/contrib/gdb/gdb/amd64fbsd-nat.c Tue Dec 3 19:42:46 2013 (r258887) @@ -29,6 +29,7 @@ #include #include #include +#include #include #ifdef HAVE_SYS_PROCFS_H @@ -212,24 +213,23 @@ Please report this to . SC_RBP_OFFSET = offset; - /* FreeBSD provides a kern.ps_strings sysctl that we can use to + /* FreeBSD provides a kern.proc.sigtramp sysctl that we can use to locate the sigtramp. That way we can still recognize a sigtramp - if its location is changed in a new kernel. Of course this is - still based on the assumption that the sigtramp is placed - directly under the location where the program arguments and - environment can be found. */ + if its location is changed in a new kernel. */ { - int mib[2]; - long ps_strings; + int mib[4]; + struct kinfo_sigtramp kst; size_t len; mib[0] = CTL_KERN; - mib[1] = KERN_PS_STRINGS; - len = sizeof (ps_strings); - if (sysctl (mib, 2, &ps_strings, &len, NULL, 0) == 0) + mib[1] = KERN_PROC; + mib[2] = KERN_PROC_SIGTRAMP; + mib[3] = getpid(); + len = sizeof (kst); + if (sysctl (mib, sizeof(mib) / sizeof(mib[0]), &kst, &len, NULL, 0) == 0) { - amd64fbsd_sigtramp_start_addr = ps_strings - 32; - amd64fbsd_sigtramp_end_addr = ps_strings; + amd64fbsd_sigtramp_start_addr = kst.ksigtramp_start; + amd64fbsd_sigtramp_end_addr = kst.ksigtramp_end; } } } From owner-svn-src-stable-10@FreeBSD.ORG Tue Dec 3 20:55:38 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 770C87E3; Tue, 3 Dec 2013 20:55: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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 47ADE11A3; Tue, 3 Dec 2013 20:55:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB3Ktc0V087676; Tue, 3 Dec 2013 20:55:38 GMT (envelope-from tuexen@svn.freebsd.org) Received: (from tuexen@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB3KtbKT087672; Tue, 3 Dec 2013 20:55:37 GMT (envelope-from tuexen@svn.freebsd.org) Message-Id: <201312032055.rB3KtbKT087672@svn.freebsd.org> From: Michael Tuexen Date: Tue, 3 Dec 2013 20:55: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: r258890 - stable/10/sys/netinet X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Dec 2013 20:55:38 -0000 Author: tuexen Date: Tue Dec 3 20:55:37 2013 New Revision: 258890 URL: http://svnweb.freebsd.org/changeset/base/258890 Log: MFC r258574: Only initialize some mutexes for the default VNET. In r208160, sctp_it_ctl was made a global variable, across all VNETs. However, sctp_init() is called for every VNET that is created. This results in the same global mutexes which are part of sctp_it_ctl being initialized. This can result in crashes if many jails are created. To reproduce the problem: (1) Take a GENERIC kernel config, and add options for: VIMAGE, WITNESS, INVARIANTS. (2) Run this command in a loop: jail -l -u root -c path=/ name=foo persist vnet && jexec foo ifconfig lo0 127.0.0.1/8 && jail -r foo (see http://lists.freebsd.org/pipermail/freebsd-current/2010-November/021280.html ) Witness will warn about the same mutex being initialized. Fix the problem by only initializing these mutexes in the default VNET. MFC r258765: In http://svnweb.freebsd.org/changeset/base/258221 I introduced a bug which initialized global locks whenever the SCTP stack initialized. This was fixed in http://svnweb.freebsd.org/changeset/base/258574 by rodrigc@. He just initialized the locks for the default vnet. This fix reverts to the old behaviour before r258221, which explicitly makes sure it is only called once, because this works also on other platforms. Approved by: re@ (gjb) Modified: stable/10/sys/netinet/sctp_bsd_addr.c stable/10/sys/netinet/sctp_pcb.c Directory Properties: stable/10/sys/ (props changed) Modified: stable/10/sys/netinet/sctp_bsd_addr.c ============================================================================== --- stable/10/sys/netinet/sctp_bsd_addr.c Tue Dec 3 20:06:58 2013 (r258889) +++ stable/10/sys/netinet/sctp_bsd_addr.c Tue Dec 3 20:55:37 2013 (r258890) @@ -100,6 +100,9 @@ sctp_startup_iterator(void) /* You only get one */ return; } + /* Initialize global locks here, thus only once. */ + SCTP_ITERATOR_LOCK_INIT(); + SCTP_IPI_ITERATOR_WQ_INIT(); TAILQ_INIT(&sctp_it_ctl.iteratorhead); kproc_create(sctp_iterator_thread, (void *)NULL, Modified: stable/10/sys/netinet/sctp_pcb.c ============================================================================== --- stable/10/sys/netinet/sctp_pcb.c Tue Dec 3 20:06:58 2013 (r258889) +++ stable/10/sys/netinet/sctp_pcb.c Tue Dec 3 20:55:37 2013 (r258890) @@ -5864,8 +5864,6 @@ sctp_pcb_init() for (i = 0; i < SCTP_STACK_VTAG_HASH_SIZE; i++) { LIST_INIT(&SCTP_BASE_INFO(vtag_timewait)[i]); } - SCTP_ITERATOR_LOCK_INIT(); - SCTP_IPI_ITERATOR_WQ_INIT(); sctp_startup_iterator(); #if defined(__FreeBSD__) && defined(SCTP_MCORE_INPUT) && defined(SMP) From owner-svn-src-stable-10@FreeBSD.ORG Wed Dec 4 07:45:09 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1E8C471A; Wed, 4 Dec 2013 07:45: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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0AA2E19BE; Wed, 4 Dec 2013 07:45:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB47j8EK012231; Wed, 4 Dec 2013 07:45:08 GMT (envelope-from rodrigc@svn.freebsd.org) Received: (from rodrigc@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB47j8Ji012230; Wed, 4 Dec 2013 07:45:08 GMT (envelope-from rodrigc@svn.freebsd.org) Message-Id: <201312040745.rB47j8Ji012230@svn.freebsd.org> From: Craig Rodrigues Date: Wed, 4 Dec 2013 07:45: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: r258910 - 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-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Dec 2013 07:45:09 -0000 Author: rodrigc Date: Wed Dec 4 07:45:08 2013 New Revision: 258910 URL: http://svnweb.freebsd.org/changeset/base/258910 Log: MFC r258738 Also mention that drill(1) can be used, now that nslookup and dig are no longer in the base system. Suggested by: peter Approved by: re (gjb) Modified: stable/10/UPDATING (contents, props changed) Directory Properties: stable/10/ (props changed) Modified: stable/10/UPDATING ============================================================================== --- stable/10/UPDATING Wed Dec 4 07:38:23 2013 (r258909) +++ stable/10/UPDATING Wed Dec 4 07:45:08 2013 (r258910) @@ -58,7 +58,7 @@ older version of current is a bit fragil available in the ports tree. The dns/bind99 port is one example. With this change, nslookup(1) and dig(1) are no longer in the base - system. Users should instead use host(1) which is still + system. Users should instead use host(1) and drill(1) which are in the base system. Alternatively, nslookup and dig can be obtained by installing the dns/bind-tools port. From owner-svn-src-stable-10@FreeBSD.ORG Wed Dec 4 07:46:53 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C5D2B869; Wed, 4 Dec 2013 07:46: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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B1A4719D4; Wed, 4 Dec 2013 07:46:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB47krQK012455; Wed, 4 Dec 2013 07:46:53 GMT (envelope-from rodrigc@svn.freebsd.org) Received: (from rodrigc@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB47kr1h012453; Wed, 4 Dec 2013 07:46:53 GMT (envelope-from rodrigc@svn.freebsd.org) Message-Id: <201312040746.rB47kr1h012453@svn.freebsd.org> From: Craig Rodrigues Date: Wed, 4 Dec 2013 07:46: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: r258911 - 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-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Dec 2013 07:46:53 -0000 Author: rodrigc Date: Wed Dec 4 07:46:53 2013 New Revision: 258911 URL: http://svnweb.freebsd.org/changeset/base/258911 Log: MFC r258737 In keg_dtor(), print out the keg name in the "Freed UMA keg was not empty" message printed to the console. This makes it easier to track down the source of certain memory leaks. Suggested by: adrian Approved by: re (gjb) Modified: stable/10/sys/vm/uma_core.c Directory Properties: stable/10/sys/ (props changed) Modified: stable/10/sys/vm/uma_core.c ============================================================================== --- stable/10/sys/vm/uma_core.c Wed Dec 4 07:45:08 2013 (r258910) +++ stable/10/sys/vm/uma_core.c Wed Dec 4 07:46:53 2013 (r258911) @@ -1571,8 +1571,9 @@ keg_dtor(void *arg, int size, void *udat keg = (uma_keg_t)arg; KEG_LOCK(keg); if (keg->uk_free != 0) { - printf("Freed UMA keg was not empty (%d items). " + printf("Freed UMA keg (%s) was not empty (%d items). " " Lost %d pages of memory.\n", + keg->uk_name ? keg->uk_name : "", keg->uk_free, keg->uk_pages); } KEG_UNLOCK(keg); From owner-svn-src-stable-10@FreeBSD.ORG Wed Dec 4 07:50:18 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BAFF99F1; Wed, 4 Dec 2013 07:50: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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8E8E319F1; Wed, 4 Dec 2013 07:50:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB47oIFI013444; Wed, 4 Dec 2013 07:50:18 GMT (envelope-from rodrigc@svn.freebsd.org) Received: (from rodrigc@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB47oICn013416; Wed, 4 Dec 2013 07:50:18 GMT (envelope-from rodrigc@svn.freebsd.org) Message-Id: <201312040750.rB47oICn013416@svn.freebsd.org> From: Craig Rodrigues Date: Wed, 4 Dec 2013 07:50: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: r258912 - stable/10/sys/netpfil/ipfw X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Dec 2013 07:50:18 -0000 Author: rodrigc Date: Wed Dec 4 07:50:18 2013 New Revision: 258912 URL: http://svnweb.freebsd.org/changeset/base/258912 Log: MFC r258588 In sys/netpfil/ipfw/ip_fw_nat.c:vnet_ipfw_nat_uninit() we call "IPFW_WLOCK(chain);". This lock gets deleted in sys/netpfil/ipfw/ip_fw2.c:vnet_ipfw_uninit(). Therefore, vnet_ipfw_nat_uninit() *must* be called before vnet_ipfw_uninit(), but this doesn't always happen, because the VNET_SYSINIT order is the same for both functions. In sys/net/netpfil/ipfw/ip_fw2.c and sys/net/netpfil/ipfw/ip_fw_nat.c, IPFW_SI_SUB_FIREWALL == IPFW_NAT_SI_SUB_FIREWALL == SI_SUB_PROTO_IFATTACHDOMAIN and IPFW_MODULE_ORDER == IPFW_NAT_MODULE_ORDER Consequently, if VIMAGE is enabled, and jails are created and destroyed, the system sometimes crashes, because we are trying to use a deleted lock. To reproduce the problem: (1) Take a GENERIC kernel config, and add options for: VIMAGE, WITNESS, INVARIANTS. (2) Run this command in a loop: jail -l -u root -c path=/ name=foo persist vnet && jexec foo ifconfig lo0 127.0.0.1/8 && jail -r foo (see http://lists.freebsd.org/pipermail/freebsd-current/2010-November/021280.html ) Fix the problem by increasing the value of IPFW_NAT_SI_SUB_FIREWALL, so that vnet_ipfw_nat_uninit() runs after vnet_ipfw_uninit(). Approved by: re (gjb) Modified: stable/10/sys/netpfil/ipfw/ip_fw_nat.c Directory Properties: stable/10/sys/ (props changed) Modified: stable/10/sys/netpfil/ipfw/ip_fw_nat.c ============================================================================== --- stable/10/sys/netpfil/ipfw/ip_fw_nat.c Wed Dec 4 07:46:53 2013 (r258911) +++ stable/10/sys/netpfil/ipfw/ip_fw_nat.c Wed Dec 4 07:50:18 2013 (r258912) @@ -674,7 +674,7 @@ static moduledata_t ipfw_nat_mod = { }; /* Define startup order. */ -#define IPFW_NAT_SI_SUB_FIREWALL SI_SUB_PROTO_IFATTACHDOMAIN +#define IPFW_NAT_SI_SUB_FIREWALL (SI_SUB_PROTO_IFATTACHDOMAIN + 1) #define IPFW_NAT_MODEVENT_ORDER (SI_ORDER_ANY - 255) #define IPFW_NAT_MODULE_ORDER (IPFW_NAT_MODEVENT_ORDER + 1) #define IPFW_NAT_VNET_ORDER (IPFW_NAT_MODEVENT_ORDER + 2) From owner-svn-src-stable-10@FreeBSD.ORG Wed Dec 4 07:55:50 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7E431E77; Wed, 4 Dec 2013 07:55: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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6A7B91A5C; Wed, 4 Dec 2013 07:55:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB47to8e015688; Wed, 4 Dec 2013 07:55:50 GMT (envelope-from rodrigc@svn.freebsd.org) Received: (from rodrigc@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB47toWF015687; Wed, 4 Dec 2013 07:55:50 GMT (envelope-from rodrigc@svn.freebsd.org) Message-Id: <201312040755.rB47toWF015687@svn.freebsd.org> From: Craig Rodrigues Date: Wed, 4 Dec 2013 07:55: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: r258913 - stable/10/sys/net X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Dec 2013 07:55:50 -0000 Author: rodrigc Date: Wed Dec 4 07:55:49 2013 New Revision: 258913 URL: http://svnweb.freebsd.org/changeset/base/258913 Log: MFC 258591 In vnet_route_uninit(), free some memory that is allocated in vnet_route_init(). To reproduce the problem: (1) Take a GENERIC kernel config, and add options for: VIMAGE, WITNESS, INVARIANTS. (2) Run this command in a loop: jail -l -u root -c path=/ name=foo persist vnet && jexec foo ifconfig lo0 127.0.0.1/8 && jail -r foo see: http://lists.freebsd.org/pipermail/freebsd-current/2010-November/021280.html http://lists.freebsd.org/pipermail/freebsd-current/2010-November/021291.html This doesn't eliminate all the "Freed UMA keg was not empty" warning messages on the console, but it helps. Approved by: re (gjb) Modified: stable/10/sys/net/route.c Directory Properties: stable/10/sys/ (props changed) Modified: stable/10/sys/net/route.c ============================================================================== --- stable/10/sys/net/route.c Wed Dec 4 07:50:18 2013 (r258912) +++ stable/10/sys/net/route.c Wed Dec 4 07:55:49 2013 (r258913) @@ -262,6 +262,9 @@ vnet_route_uninit(const void *unused __u dom->dom_rtdetach((void **)rnh, dom->dom_rtoffset); } } + + free(V_rt_tables, M_RTABLE); + uma_zdestroy(V_rtzone); } VNET_SYSUNINIT(vnet_route_uninit, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, vnet_route_uninit, 0); From owner-svn-src-stable-10@FreeBSD.ORG Wed Dec 4 09:46:27 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CEE53A2B; Wed, 4 Dec 2013 09:46: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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BA8D811FE; Wed, 4 Dec 2013 09:46:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB49kRYU053193; Wed, 4 Dec 2013 09:46:27 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB49kRlJ053192; Wed, 4 Dec 2013 09:46:27 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201312040946.rB49kRlJ053192@svn.freebsd.org> From: Edward Tomasz Napierala Date: Wed, 4 Dec 2013 09:46: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: r258915 - stable/10/sys/dev/iscsi X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Dec 2013 09:46:27 -0000 Author: trasz Date: Wed Dec 4 09:46:27 2013 New Revision: 258915 URL: http://svnweb.freebsd.org/changeset/base/258915 Log: MFC r258790: Fix hang on reboot with active iSCSI connections. Approved by: re (glebius) Sponsored by: The FreeBSD Foundation Modified: stable/10/sys/dev/iscsi/iscsi.c Directory Properties: stable/10/sys/ (props changed) Modified: stable/10/sys/dev/iscsi/iscsi.c ============================================================================== --- stable/10/sys/dev/iscsi/iscsi.c Wed Dec 4 08:20:04 2013 (r258914) +++ stable/10/sys/dev/iscsi/iscsi.c Wed Dec 4 09:46:27 2013 (r258915) @@ -2110,10 +2110,12 @@ iscsi_load(void) sc->sc_cdev->si_drv1 = sc; /* - * XXX: For some reason this doesn't do its job; active sessions still hang out there - * after final sync, making the reboot effectively hang. + * Note that this needs to get run before dashutdown(). Otherwise, + * when rebooting with iSCSI session with outstanding requests, + * but disconnected, dashutdown() will hang on cam_periph_runccb(). */ - sc->sc_shutdown_eh = EVENTHANDLER_REGISTER(shutdown_post_sync, iscsi_shutdown, sc, SHUTDOWN_PRI_DEFAULT); + sc->sc_shutdown_eh = EVENTHANDLER_REGISTER(shutdown_post_sync, + iscsi_shutdown, sc, SHUTDOWN_PRI_FIRST); return (0); } From owner-svn-src-stable-10@FreeBSD.ORG Wed Dec 4 10:54:24 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 74107382; Wed, 4 Dec 2013 10:54: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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4639F169F; Wed, 4 Dec 2013 10:54:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB4AsOhE077306; Wed, 4 Dec 2013 10:54:24 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB4AsOUJ077305; Wed, 4 Dec 2013 10:54:24 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201312041054.rB4AsOUJ077305@svn.freebsd.org> From: Alexander Motin Date: Wed, 4 Dec 2013 10:54: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: r258918 - 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-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Dec 2013 10:54:24 -0000 Author: mav Date: Wed Dec 4 10:54:23 2013 New Revision: 258918 URL: http://svnweb.freebsd.org/changeset/base/258918 Log: MFC r258495: Update description of logical CPU handling in the latest releases and remove obsolete sysctl variable machdep.hlt_logical_cpus. Approved by: re (hrs) Modified: stable/10/release/doc/en_US.ISO8859-1/hardware/article.xml Directory Properties: stable/10/release/doc/ (props changed) Modified: stable/10/release/doc/en_US.ISO8859-1/hardware/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/hardware/article.xml Wed Dec 4 09:58:50 2013 (r258917) +++ stable/10/release/doc/en_US.ISO8859-1/hardware/article.xml Wed Dec 4 10:54:23 2013 (r258918) @@ -177,16 +177,13 @@ bugs may generate some problems. Perusal of the archives of the &a.smp; may yield some clues. - &os; will take advantage of HyperThreading (HTT) support - on &intel; CPUs that support this feature. The - default &os; scheduler treats the logical processors the same - as additional physical processors; in other words, no attempt - is made to optimize scheduling decisions given the shared - resources between logical processors within the same CPU. - Because this naive scheduling can result in suboptimal - performance, under certain circumstances it may be useful to - disable the logical processors with the - machdep.hyperthreading_allowed tunable. + &os; will take advantage of SMT (Symmetric MultiThreading, + also known as HyperThreading on &intel; CPUs) on the supported + CPUs. The GENERIC kernel which is + installed by default will automatically detect the additional + logical processors. The default &os; scheduler recognizes + processor topology on the system and selects logical and + physical processors to obtain optimal performance. The &man.smp.4; manual page has more details. &os; will take advantage of Physical Address Extensions From owner-svn-src-stable-10@FreeBSD.ORG Wed Dec 4 18:25:05 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AD57CF17; Wed, 4 Dec 2013 18: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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 992D61580; Wed, 4 Dec 2013 18:25:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB4IP5Rh029970; Wed, 4 Dec 2013 18:25:05 GMT (envelope-from peter@svn.freebsd.org) Received: (from peter@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB4IP57Z029968; Wed, 4 Dec 2013 18:25:05 GMT (envelope-from peter@svn.freebsd.org) Message-Id: <201312041825.rB4IP57Z029968@svn.freebsd.org> From: Peter Wemm Date: Wed, 4 Dec 2013 18:25: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: r258929 - in stable/10/sys: compat/freebsd32 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-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Dec 2013 18:25:05 -0000 Author: peter Date: Wed Dec 4 18:25:04 2013 New Revision: 258929 URL: http://svnweb.freebsd.org/changeset/base/258929 Log: MFC: r258718: fix emulated jail_v0 byte order Approved by: re (gjb) Modified: stable/10/sys/compat/freebsd32/freebsd32_misc.c stable/10/sys/kern/kern_jail.c Modified: stable/10/sys/compat/freebsd32/freebsd32_misc.c ============================================================================== --- stable/10/sys/compat/freebsd32/freebsd32_misc.c Wed Dec 4 16:38:40 2013 (r258928) +++ stable/10/sys/compat/freebsd32/freebsd32_misc.c Wed Dec 4 18:25:04 2013 (r258929) @@ -1925,7 +1925,7 @@ freebsd32_jail(struct thread *td, struct CP(j32_v0, j, version); PTRIN_CP(j32_v0, j, path); PTRIN_CP(j32_v0, j, hostname); - j.ip4s = j32_v0.ip_number; + j.ip4s = htonl(j32_v0.ip_number); /* jail_v0 is host order */ break; } Modified: stable/10/sys/kern/kern_jail.c ============================================================================== --- stable/10/sys/kern/kern_jail.c Wed Dec 4 16:38:40 2013 (r258928) +++ stable/10/sys/kern/kern_jail.c Wed Dec 4 18:25:04 2013 (r258929) @@ -313,7 +313,7 @@ sys_jail(struct thread *td, struct jail_ j.version = j0.version; j.path = j0.path; j.hostname = j0.hostname; - j.ip4s = j0.ip_number; + j.ip4s = htonl(j0.ip_number); /* jail_v0 is host order */ break; } From owner-svn-src-stable-10@FreeBSD.ORG Wed Dec 4 20:18:36 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8B4DFC65 for ; Wed, 4 Dec 2013 20:18:36 +0000 (UTC) Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1lp0153.outbound.protection.outlook.com [207.46.163.153]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 240E11E66 for ; Wed, 4 Dec 2013 20:18:35 +0000 (UTC) Received: from BL2PR03MB210.namprd03.prod.outlook.com (10.255.230.144) by BL2PR03MB210.namprd03.prod.outlook.com (10.255.230.144) with Microsoft SMTP Server (TLS) id 15.0.837.10; Wed, 4 Dec 2013 20:18:27 +0000 Received: from BL2PR03MB210.namprd03.prod.outlook.com ([169.254.1.158]) by BL2PR03MB210.namprd03.prod.outlook.com ([169.254.1.158]) with mapi id 15.00.0837.004; Wed, 4 Dec 2013 20:18:27 +0000 From: "Abhishek Gupta (LIS)" To: "svn-src-stable-10@freebsd.org" Subject: Hyper-V Drivers Not Included in i386 ISO Thread-Topic: Hyper-V Drivers Not Included in i386 ISO Thread-Index: AQHO73pU4qFQham3Nk6nuDQj6C//0ppBX/wAgAAAJTCAAAKigIAAAB4ggABF94CAARaIa4AADSgAgAAD/ICAAauDsA== Date: Wed, 4 Dec 2013 20:18:26 +0000 Message-ID: References: <0fb7339604164487a4b200c364724e20@BL2PR03MB210.namprd03.prod.outlook.com> <529CF178.1000500@freebsd.org> <529CF3CD.2030509@freebsd.org> <606ef6c4b4f24fe4bd39506efc5f54be@BL2PR03MB210.namprd03.prod.outlook.com>, <529D2E97.7000604@freebsd.org> <529E2346.8040209@freebsd.org> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-originating-ip: [2001:4898:80e0:ed43::2] x-forefront-prvs: 0050CEFE70 x-forefront-antispam-report: SFV:NSPM; SFS:(189002)(199002)(164054003)(83322001)(81686001)(56776001)(54316002)(90146001)(47446002)(56816005)(74502001)(81816001)(74706001)(53806001)(4396001)(2656002)(76576001)(49866001)(54356001)(77982001)(33646001)(77096001)(76796001)(59766001)(76786001)(83072001)(87936001)(74662001)(85306002)(85852002)(31966008)(69226001)(80022001)(65816001)(81542001)(85806002)(76482001)(79102001)(50986001)(81342001)(47976001)(47736001)(74366001)(80976001)(51856001)(63696002)(87266001)(74316001)(46102001)(74876001)(3826001)(24736002); DIR:OUT; SFP:; SCL:1; SRVR:BL2PR03MB210; H:BL2PR03MB210.namprd03.prod.outlook.com; CLIP:2001:4898:80e0:ed43::2; FPR:; RD:InfoNoRecords; MX:1; A:1; LANG:en; Content-Type: multipart/mixed; boundary="_002_e28f7bedd3964a4b9379d87114435a05BL2PR03MB210namprd03pro_" MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Dec 2013 20:18:36 -0000 --_002_e28f7bedd3964a4b9379d87114435a05BL2PR03MB210namprd03pro_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi folks, It appears that Hyper-V drivers are not part of the FreeBSD 10 i386 ISO by = default. Please could someone help us include the attached patch in FreeBSD= 10? This will save a lot of time and headache for FreeBSD 10 i386 users. W= e have built a private ISO and have tested the patch locally and it seems t= o work. Unfortunately we do not have a committed maintainer at our end so a= re looking for some help. Please let us know if someone could lend a hand. Thanks, Abhishek --_002_e28f7bedd3964a4b9379d87114435a05BL2PR03MB210namprd03pro_ Content-Type: application/octet-stream; name="i386_patch.patch" Content-Description: i386_patch.patch Content-Disposition: attachment; filename="i386_patch.patch"; size=1927; creation-date="Wed, 04 Dec 2013 20:17:46 GMT"; modification-date="Wed, 04 Dec 2013 20:17:46 GMT" Content-Transfer-Encoding: base64 SW5kZXg6IHN5cy9jb25mL2ZpbGVzLmkzODYKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gc3lzL2NvbmYvZmlsZXMu aTM4NgkocmV2aXNpb24gMjU4OTEyKQorKysgc3lzL2NvbmYvZmlsZXMuaTM4Ngkod29ya2luZyBj b3B5KQpAQCAtMjIxLDYgKzIyMSwxOCBAQAogZGV2L2h3cG1jL2h3cG1jX3Bwcm8uYwkJb3B0aW9u YWwgaHdwbWMKIGRldi9od3BtYy9od3BtY190c2MuYwkJb3B0aW9uYWwgaHdwbWMKIGRldi9od3Bt Yy9od3BtY194ODYuYwkJb3B0aW9uYWwgaHdwbWMKK2Rldi9oeXBlcnYvbmV0dnNjL2h2X25ldF92 c2MuYyAgICAgICAgICAgICAgICAgICAgICAgICAgb3B0aW9uYWwgICAgICAgIGh5cGVydgorZGV2 L2h5cGVydi9uZXR2c2MvaHZfbmV0dnNjX2Rydl9mcmVlYnNkLmMgICAgICAgICAgICAgICBvcHRp b25hbCAgICAgICAgaHlwZXJ2CitkZXYvaHlwZXJ2L25ldHZzYy9odl9ybmRpc19maWx0ZXIuYyAg ICAgICAgICAgICAgICAgICAgIG9wdGlvbmFsICAgICAgICBoeXBlcnYKK2Rldi9oeXBlcnYvc3Rv cmRpc2VuZ2FnZS9odl9hdGFfcGNpX2Rpc2VuZ2FnZS5jICAgICAgICAgb3B0aW9uYWwgICAgICAg IGh5cGVydgorZGV2L2h5cGVydi9zdG9ydnNjL2h2X3N0b3J2c2NfZHJ2X2ZyZWVic2QuYyAgICAg ICAgICAgICBvcHRpb25hbCAgICAgICAgaHlwZXJ2CitkZXYvaHlwZXJ2L3V0aWxpdGllcy9odl91 dGlsLmMgICAgICAgICAgICAgICAgICAgICAgICAgIG9wdGlvbmFsICAgICAgICBoeXBlcnYKK2Rl di9oeXBlcnYvdm1idXMvaHZfY2hhbm5lbC5jICAgICAgICAgICAgICAgICAgICAgICAgICAgb3B0 aW9uYWwgICAgICAgIGh5cGVydgorZGV2L2h5cGVydi92bWJ1cy9odl9jaGFubmVsX21nbXQuYyAg ICAgICAgICAgICAgICAgICAgICBvcHRpb25hbCAgICAgICAgaHlwZXJ2CitkZXYvaHlwZXJ2L3Zt YnVzL2h2X2Nvbm5lY3Rpb24uYyAgICAgICAgICAgICAgICAgICAgICAgIG9wdGlvbmFsICAgICAg ICBoeXBlcnYKK2Rldi9oeXBlcnYvdm1idXMvaHZfaHYuYyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgb3B0aW9uYWwgICAgICAgIGh5cGVydgorZGV2L2h5cGVydi92bWJ1cy9odl9yaW5n X2J1ZmZlci5jICAgICAgICAgICAgICAgICAgICAgICBvcHRpb25hbCAgICAgICAgaHlwZXJ2Citk ZXYvaHlwZXJ2L3ZtYnVzL2h2X3ZtYnVzX2Rydl9mcmVlYnNkLmMgICAgICAgICAgICAgICAgIG9w dGlvbmFsICAgICAgICBoeXBlcnYKIGRldi9pY2h3ZC9pY2h3ZC5jCQlvcHRpb25hbCBpY2h3ZAog ZGV2L2lmX25kaXMvaWZfbmRpcy5jCQlvcHRpb25hbCBuZGlzCiBkZXYvaWZfbmRpcy9pZl9uZGlz X3BjY2FyZC5jCW9wdGlvbmFsIG5kaXMgcGNjYXJkCkluZGV4OiBzeXMvaTM4Ni9jb25mL0dFTkVS SUMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gc3lzL2kzODYvY29uZi9HRU5FUklDCShyZXZpc2lvbiAyNTg5MTIp CisrKyBzeXMvaTM4Ni9jb25mL0dFTkVSSUMJKHdvcmtpbmcgY29weSkKQEAgLTM0Niw2ICszNDYs OSBAQAogZGV2aWNlCQl2aXJ0aW9fc2NzaQkjIFZpcnRJTyBTQ1NJIGRldmljZQogZGV2aWNlCQl2 aXJ0aW9fYmFsbG9vbgkjIFZpcnRJTyBNZW1vcnkgQmFsbG9vbiBkZXZpY2UKIAorIyBIeXBlclYg ZHJpdmVycworZGV2aWNlICAgICAgICAgIGh5cGVydiAgICAgICAgICAjIEh5cGVyViBkcml2ZXJz CisKICMgWGVuIEhWTSBHdWVzdCBPcHRpbWl6YXRpb25zCiAjIE5PVEU6IFhFTkhWTSBkZXBlbmRz IG9uIHhlbnBjaS4gIFRoZXkgbXVzdCBiZSBhZGRlZCBvciByZW1vdmVkIHRvZ2V0aGVyLgogb3B0 aW9ucyAJWEVOSFZNCQkjIFhlbiBIVk0ga2VybmVsIGluZnJhc3RydWN0dXJlCg== --_002_e28f7bedd3964a4b9379d87114435a05BL2PR03MB210namprd03pro_-- From owner-svn-src-stable-10@FreeBSD.ORG Wed Dec 4 20:56:14 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3AF0DA5E for ; Wed, 4 Dec 2013 20:56:14 +0000 (UTC) Received: from mail-ea0-x22e.google.com (mail-ea0-x22e.google.com [IPv6:2a00:1450:4013:c01::22e]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C2BD110B5 for ; Wed, 4 Dec 2013 20:56:13 +0000 (UTC) Received: by mail-ea0-f174.google.com with SMTP id b10so10839499eae.33 for ; Wed, 04 Dec 2013 12:56:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject:openpgp :content-type; bh=1wzvd8r2jvabL08GIFvse6AaWjfGAMJnr+w+k/G2j9Q=; b=dWsU6LS6antH1XqhxyfnPz9TFW4qOmCf+/iI4a8EDsTowQXsQaQGbj+xXyBLXUJVKb 4A+lZoMVpty+0v06wS4SlwnnlN7U52NopppMaKP/rQvwID8D7puvdPec9UTckP/BA/rw gPJvcG90lNGrsoKZYnswjK9NyWBGNLHTlpnp9aKRtsBtWEPKu29kQ36GjMU2UBEpnwFh XJnRJYQYPJ8/F4P0seYbTR9osFjnc+djUnuTTY/PFNvInwkFH7McHAPOS6lKu6OzGHY0 c6O3QPHqxRZsR4UO/loxAW/FLQgcV2Ljg5xZdHyWyADYaCXHtySTk5xeEmMGuXM6KqxN 6DsA== X-Received: by 10.14.99.3 with SMTP id w3mr5830359eef.96.1386190572301; Wed, 04 Dec 2013 12:56:12 -0800 (PST) Received: from [192.168.1.102] ([193.106.246.106]) by mx.google.com with ESMTPSA id g47sm98565236eeo.19.2013.12.04.12.56.10 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 04 Dec 2013 12:56:11 -0800 (PST) Message-ID: <529F96E9.5080808@gmail.com> Date: Wed, 04 Dec 2013 21:56:09 +0100 From: Piotr Kubaj User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.1.0 MIME-Version: 1.0 To: svn-src-stable-10@freebsd.org Subject: Re: Hyper-V Drivers Not Included in i386 ISO X-Enigmail-Version: 1.6 OpenPGP: id=11B1F63E Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="sP6xsdxwcaJSP3LS1r1ETvVoK4uDD2ct1" X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Dec 2013 20:56:14 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --sP6xsdxwcaJSP3LS1r1ETvVoK4uDD2ct1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 12/04/2013 21:18, Abhishek Gupta (LIS) wrote: > Hi folks, > > It appears that Hyper-V drivers are not part of the FreeBSD 10 i386 ISO by default. Please could someone help us include the attached patch in FreeBSD 10? This will save a lot of time and headache for FreeBSD 10 i386 users. We have built a private ISO and have tested the patch locally and it seems to work. Unfortunately we do not have a committed maintainer at our end so are looking for some help. Please let us know if someone could lend a hand. > > Thanks, > Abhishek > > > > > _______________________________________________ > svn-src-stable-10@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10 > To unsubscribe, send any mail to "svn-src-stable-10-unsubscribe@freebsd.org" > You can build your own custom ISO by specifying KERNCONF when doing make release, e.g. make memstick KERNCONF=3DHVKERNEL. --sP6xsdxwcaJSP3LS1r1ETvVoK4uDD2ct1 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (FreeBSD) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJSn5bpAAoJEC9nKukRsfY+woYP/inXyQyEmBowtuwJBsW9P4Gw FDES0oeXk8VaE6YZoAqGK1F1CLM9PnpNfDWrRREM+zqVCxRWwfQZtaJvsdoguhSL oiEBb/gBrk53YhUaAisPyuMSHVO8tiDXeoxJ20l4QXUYhvKlzuS1pw9hum0gJCX+ 0bPTRNp1mlUiDSfkIjGg++4SDnxYH4QLxTe+kw2DC/xEhmn3s3UQWhEIh/M+ajl9 UvtmtE+YZTY+xTwYJlbQDimPDYCEKl3L8fxEwz6cfqkEMZKHhDisQpTIgrbQV/aN odalEZ/m0Vd16RKI9AgJTsmpUUf40bMKz+QF7GwbcgbQOW333WRofo5ScLXUYwRP mupTRX0KYRR9HWl6TcEcrk6BXSXgoOS9B2pnuK98jrirlaUZlJM9WtJnxv/vubYO 9MC37/0iT0b3PIoHI6rTggOGURQKr/e6CyLa6yJRUq5E8hrSREe+uT65wyFv3IPD 9GDRA9m+nRtkfeTKNyMP3FEGPg0c/dkW22ErguRQiETHmpbJBQzm9WgmQkO0iJ7J DaJzujTYpmrsofhFVdt8L7dG4oEThsPaijhbcLjZgw2EbxC61uG5nbZ1y6JAchF4 EE8DqLeFhS+54FEkSWArQondAMxzFWFjRinkMKqRDkLyTO0w/UhwNIwWymY/9LRa vs5n2HnZzbko2xoGx6fA =SJH+ -----END PGP SIGNATURE----- --sP6xsdxwcaJSP3LS1r1ETvVoK4uDD2ct1-- From owner-svn-src-stable-10@FreeBSD.ORG Thu Dec 5 00:59:30 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E111A3C6; Thu, 5 Dec 2013 00:59: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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C13641FC0; Thu, 5 Dec 2013 00:59:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB50xU1Z071699; Thu, 5 Dec 2013 00:59:30 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB50xTF8071694; Thu, 5 Dec 2013 00:59:29 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201312050059.rB50xTF8071694@svn.freebsd.org> From: Glen Barber Date: Thu, 5 Dec 2013 00:59: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: r258952 - in stable/10: release release/scripts share/man/man7 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Dec 2013 00:59:31 -0000 Author: gjb Date: Thu Dec 5 00:59:29 2013 New Revision: 258952 URL: http://svnweb.freebsd.org/changeset/base/258952 Log: MFC r258786, r258796, r258797, r258847, r258853, r258949: r258786: Move OPTIONS_UNSET outside of the PBUILD_FLAGS variable, otherwise the textproc/docproj port build fails. r258796 (hrs): - Prevent TARGET and TARGET_ARCH from being defined as empty when TARGET="" and/or TARGET_ARCH="" is specified. - Remove extra (). r258797 (hrs): Use standard CLEANFILES/CLEANDIRS and clean target in bsd.obj.mk. r258847: Provide reproducibility between builds by building pkg(8) from ports, instead of using pkg-bootstrap. This should resolve a problem that was discovered during 10.0-BETA4 freebsd-update(8) builds, r258853: Turn off the dvdrom target by default. dvd1.iso is now built by specifying 'WITH_DVD=1' during 'make release'. This caused some problems during the freebsd-update builds for 10.0-BETA4. r258949: Ensure WITH_DVD is not empty to prevent 'WITH_DVD= ' from evaluating to true. Approved by: re (hrs) Sponsored by: The FreeBSD Foundation Modified: stable/10/release/Makefile stable/10/release/release.sh stable/10/release/scripts/pkg-stage.sh stable/10/share/man/man7/release.7 Directory Properties: stable/10/release/ (props changed) stable/10/share/man/man7/ (props changed) Modified: stable/10/release/Makefile ============================================================================== --- stable/10/release/Makefile Thu Dec 5 00:57:53 2013 (r258951) +++ stable/10/release/Makefile Thu Dec 5 00:59:29 2013 (r258952) @@ -18,7 +18,7 @@ # NOPORTS: if set, do not distribute ports tree # NOSRC: if set, do not distribute source tree # NODOC: if set, do not generate release documentation -# NODVD: if set, do not generate dvd1.iso +# WITH_DVD: if set, generate dvd1.iso # TARGET/TARGET_ARCH: architecture of built release # @@ -27,11 +27,15 @@ PORTSDIR?= /usr/ports DOCDIR?= /usr/doc RELNOTES_LANG?= en_US.ISO8859-1 -TARGET?= ${MACHINE} +.if !defined(TARGET) || empty(TARGET) +TARGET= ${MACHINE} +.endif +.if !defined(TARGET_ARCH) || empty(TARGET_ARCH) .if ${TARGET} == ${MACHINE} -TARGET_ARCH?= ${MACHINE_ARCH} +TARGET_ARCH= ${MACHINE_ARCH} .else -TARGET_ARCH?= ${TARGET} +TARGET_ARCH= ${TARGET} +.endif .endif IMAKE= ${MAKE} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET} DISTDIR= dist @@ -73,7 +77,7 @@ IMAGES= .if exists(${.CURDIR}/${TARGET}/mkisoimages.sh) RELEASE_TARGETS+= cdrom IMAGES+= disc1.iso bootonly.iso -. if(!defined(NODVD)) +. if defined(WITH_DVD) && !empty(WITH_DVD) RELEASE_TARGETS+= dvdrom IMAGES+= dvd1.iso . endif @@ -83,7 +87,12 @@ RELEASE_TARGETS+= memstick.img IMAGES+= memstick.img .endif +CLEANFILES= packagesystem *.txz MANIFEST system ${IMAGES} +CLEANDIRS= dist ftp release bootonly dvd +beforeclean: + chflags -R noschg . .include +clean: beforeclean base.txz: mkdir -p ${DISTDIR} @@ -220,15 +229,6 @@ release: ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} obj ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${RELEASE_TARGETS} -clean: - chflags -R noschg . - rm -rf dist ftp - rm -f packagesystem - rm -f *.txz MANIFEST - rm -f system - rm -rf release bootonly dvd - rm -f ${IMAGES} - install: .if defined(DESTDIR) && !empty(DESTDIR) mkdir -p ${DESTDIR} Modified: stable/10/release/release.sh ============================================================================== --- stable/10/release/release.sh Thu Dec 5 00:57:53 2013 (r258951) +++ stable/10/release/release.sh Thu Dec 5 00:59:29 2013 (r258952) @@ -176,9 +176,9 @@ build_doc_ports() { _OSVERSION=$(sysctl -n kern.osreldate) if [ -d ${CHROOTDIR}/usr/doc ] && [ "x${NODOC}" = "x" ]; then PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes" - PBUILD_FLAGS="${PBUILD_FLAGS} OPTIONS_UNSET='FOP IGOR'" + PBUILD_FLAGS="${PBUILD_FLAGS}" chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \ - ${PBUILD_FLAGS} install clean distclean + ${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" install clean distclean fi } Modified: stable/10/release/scripts/pkg-stage.sh ============================================================================== --- stable/10/release/scripts/pkg-stage.sh Thu Dec 5 00:57:53 2013 (r258951) +++ stable/10/release/scripts/pkg-stage.sh Thu Dec 5 00:59:29 2013 (r258952) @@ -25,7 +25,7 @@ REVISION="${2}" . "${1}" || exit 1 if [ ! -x /usr/local/sbin/pkg ]; then - /usr/sbin/pkg bootstrap + /usr/bin/make -C /usr/ports/ports-mgmt/pkg install clean fi /bin/mkdir -p ${PKG_CACHEDIR} Modified: stable/10/share/man/man7/release.7 ============================================================================== --- stable/10/share/man/man7/release.7 Thu Dec 5 00:57:53 2013 (r258951) +++ stable/10/share/man/man7/release.7 Thu Dec 5 00:59:29 2013 (r258952) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 18, 2013 +.Dd December 2, 2013 .Dt RELEASE 7 .Os .Sh NAME @@ -230,10 +230,6 @@ When set, will prevent the .Fa doc.txz distribution package from being created. -.It Va NODVD -Set to a non-empty value to skip the -.Cm dvdrom -target. .It Va NOPORTS Set to a non-empty value to skip the .Li ports/ @@ -245,6 +241,10 @@ will prevent the distribution package from being created. Setting this also sets .Va NODOC . +.It Va WITH_DVD +Set to a non-empty value to include the +.Cm dvdrom +target. .El .Sh MAKEFILE TARGETS The release makefile From owner-svn-src-stable-10@FreeBSD.ORG Thu Dec 5 01:06:05 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CACC4744; Thu, 5 Dec 2013 01:06: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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B6D561030; Thu, 5 Dec 2013 01:06:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB5165cr074953; Thu, 5 Dec 2013 01:06:05 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB5165jl074952; Thu, 5 Dec 2013 01:06:05 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201312050106.rB5165jl074952@svn.freebsd.org> From: Glen Barber Date: Thu, 5 Dec 2013 01:06: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: r258953 - stable/10/usr.sbin/bsdconfig/share X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Dec 2013 01:06:05 -0000 Author: gjb Date: Thu Dec 5 01:06:05 2013 New Revision: 258953 URL: http://svnweb.freebsd.org/changeset/base/258953 Log: MFC r258854: Fix PKG_ABI detection in bsdconfig(8) after pkg-1.2 is released, since the format of 'pkg -vv' output has changed. Approved by: re (hrs) Sponsored by: The FreeBSD Foundation Modified: stable/10/usr.sbin/bsdconfig/share/common.subr Directory Properties: stable/10/usr.sbin/bsdconfig/ (props changed) Modified: stable/10/usr.sbin/bsdconfig/share/common.subr ============================================================================== --- stable/10/usr.sbin/bsdconfig/share/common.subr Thu Dec 5 00:59:29 2013 (r258952) +++ stable/10/usr.sbin/bsdconfig/share/common.subr Thu Dec 5 01:06:05 2013 (r258953) @@ -65,7 +65,7 @@ export UNAME_R="$(uname -r)" # Release L if [ ! "${PKG_ABI+set}" ]; then export PKG_ABI="$( ASSUME_ALWAYS_YES=1 pkg -vv | - awk '$1=="ABI:"{print $2;exit}' 2> /dev/null + awk '$1=="ABI"{print $3;exit}' 2> /dev/null )" fi From owner-svn-src-stable-10@FreeBSD.ORG Thu Dec 5 01:21:46 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 28577D12; Thu, 5 Dec 2013 01: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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 085F31117; Thu, 5 Dec 2013 01:21:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB51Lj6D081385; Thu, 5 Dec 2013 01:21:45 GMT (envelope-from rodrigc@svn.freebsd.org) Received: (from rodrigc@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB51Ljb9081384; Thu, 5 Dec 2013 01:21:45 GMT (envelope-from rodrigc@svn.freebsd.org) Message-Id: <201312050121.rB51Ljb9081384@svn.freebsd.org> From: Craig Rodrigues Date: Thu, 5 Dec 2013 01:21: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: r258954 - 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-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Dec 2013 01:21:46 -0000 Author: rodrigc Date: Thu Dec 5 01:21:45 2013 New Revision: 258954 URL: http://svnweb.freebsd.org/changeset/base/258954 Log: MFC r258914 Update release notes. Submitted by: skreuzer Approved by: re (delphij) Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Directory Properties: stable/10/release/ (props changed) stable/10/release/doc/ (props changed) Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Dec 5 01:06:05 2013 (r258953) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Dec 5 01:21:45 2013 (r258954) @@ -120,6 +120,9 @@ Kernel Changes + The maximum amount of memory the &os; kernel + can address has been increased from 1TB to 4TB. + A new &man.cpuset.2; API has been added for thread to CPU binding and CPU resource grouping and assignment. The &man.cpuset.1; userland utility has been added @@ -201,7 +204,9 @@ Multimedia Support - + Support for version 2.0 of the USB Audio reference design + has been added. New devices should support higher bandwidth, + increased sampling frequency and wider dynamic range. @@ -249,26 +254,23 @@ Network Protocols - The &man.bpf.4; packet filter and capture facility now - supports a zero-copy mode of operation, in which buffers are - loaned from a user process to the kernel. This feature can - be enabled by setting - the net.bpf.zerocopy_enable sysctl - variable to 1. - - ISDN4BSD(I4B), netatm, and all - related subsystems have been removed due to lack of - multi-processor support. - - A bug in TCP options padding, where the wrong padding - bytes were used, has been fixed. - - The IEEE 802.11s element identifiers have - been updated to reflect the final version of the amendment. This - update breaks compatibility with older mesh setups but is necessary - as the previous IDs are used by another amendment leading to - unexpected results when trying to associate with an accesspoint - using the affected IDs. + &man.carp.4; has been rewritten to make addresses + more sane from the viewpoint of routing daemons such as + quagga/zebra. It also brings support for a single redundant + address on the subnet (carpdev), switching state with + ifconfig, better locking and using modern kernel + interfaces to allocate multicast memberships. + + The &man.pf.4; firewall now supports fine-grain locking + and better utilization on multi-cpu machines resulting in + significant improvements in performance. + + Support for up to 65536 routing tables has been + introduced. + + Support for setting/matching differentiated services + codepoints (DSCP) in IP header has been added to + &man.ipfw.8;. @@ -293,19 +295,34 @@ File Systems - A problem with using &man.mmap.2; on ZFS filesystems has - been fixed. + A new kernel-based iSCSI target and initiator has been + added - A new kernel-mode NFS lock manager has been added, - improving performance and behavior of NFS locking. A new - &man.clear.locks.8; command has been added to clear locks held - on behalf of an NFS client. - - The ZFS file system - has been upgraded to version 28. Changes include Data - Deduplication, Triple parity RAIDZ, and zfs diff. + UFS filesystems can now be enlarged with &man.growfs.8; while + mounted read-write. This is especially useful for virtual + machines, allowing the addition of more harddrive space without + interruption of service. + + A state of the art FUSE implementation is now part of the + base system. It allows the use of nearly all fusefs file + systems + + Support for the high performance LZ4 compression algorithm + has been added to ZFS. LZ4 is usually faster and can achieve a + higher compression ratio than LZJB, the default compression + algorithm + + Support for L2ARC compression has been added to ZFS. + + ZFS will now compare the checksums of incoming writes to + the checksum of the existing on-disk data and avoid issuing any + write I/O for data that has not changed. This will reduce I/O + as well as space usage because if the old block is referenced + by a snapshot, both copies of the block are kept even though + both contain the same data. + @@ -443,8 +460,8 @@ bzip2 has been updated from 1.0.4 to 1.0.5. - CVS has been updated from 1.11.17 - to a post-1.11.22 snapshot from 10 March 2008. + CVS has been removed from the + base system, but is still available from ports FILE has been updated from 4.23 to 5.03. From owner-svn-src-stable-10@FreeBSD.ORG Thu Dec 5 06:14:00 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 71264FC9; Thu, 5 Dec 2013 06:14: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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 518421FF4; Thu, 5 Dec 2013 06:14:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB56E04w080976; Thu, 5 Dec 2013 06:14:00 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB56Dxve080968; Thu, 5 Dec 2013 06:13:59 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201312050613.rB56Dxve080968@svn.freebsd.org> From: Pyun YongHyeon Date: Thu, 5 Dec 2013 06:13: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: r258959 - stable/10/sys/dev/bge X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Dec 2013 06:14:00 -0000 Author: yongari Date: Thu Dec 5 06:13:59 2013 New Revision: 258959 URL: http://svnweb.freebsd.org/changeset/base/258959 Log: MFC r258830: Add support for BCM57764, BCM57767, BCM57782, BCM57786 and BCM57787. PR: 184304 Approved by: re (rodrigc) Modified: stable/10/sys/dev/bge/if_bge.c stable/10/sys/dev/bge/if_bgereg.h Directory Properties: stable/10/sys/ (props changed) Modified: stable/10/sys/dev/bge/if_bge.c ============================================================================== --- stable/10/sys/dev/bge/if_bge.c Thu Dec 5 05:59:09 2013 (r258958) +++ stable/10/sys/dev/bge/if_bge.c Thu Dec 5 06:13:59 2013 (r258959) @@ -220,11 +220,16 @@ static const struct bge_type { { BCOM_VENDORID, BCOM_DEVICEID_BCM57760 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM57761 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM57762 }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM57764 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM57765 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM57766 }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM57767 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM57780 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM57781 }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM57782 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM57785 }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM57786 }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM57787 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM57788 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM57790 }, { BCOM_VENDORID, BCOM_DEVICEID_BCM57791 }, @@ -2693,6 +2698,9 @@ bge_chipid(device_t dev) case BCOM_DEVICEID_BCM5725: case BCOM_DEVICEID_BCM5727: case BCOM_DEVICEID_BCM5762: + case BCOM_DEVICEID_BCM57764: + case BCOM_DEVICEID_BCM57767: + case BCOM_DEVICEID_BCM57787: id = pci_read_config(dev, BGE_PCI_GEN2_PRODID_ASICREV, 4); break; @@ -2701,7 +2709,9 @@ bge_chipid(device_t dev) case BCOM_DEVICEID_BCM57765: case BCOM_DEVICEID_BCM57766: case BCOM_DEVICEID_BCM57781: + case BCOM_DEVICEID_BCM57782: case BCOM_DEVICEID_BCM57785: + case BCOM_DEVICEID_BCM57786: case BCOM_DEVICEID_BCM57791: case BCOM_DEVICEID_BCM57795: id = pci_read_config(dev, Modified: stable/10/sys/dev/bge/if_bgereg.h ============================================================================== --- stable/10/sys/dev/bge/if_bgereg.h Thu Dec 5 05:59:09 2013 (r258958) +++ stable/10/sys/dev/bge/if_bgereg.h Thu Dec 5 06:13:59 2013 (r258959) @@ -2503,11 +2503,16 @@ struct bge_status_block { #define BCOM_DEVICEID_BCM57760 0x1690 #define BCOM_DEVICEID_BCM57761 0x16B0 #define BCOM_DEVICEID_BCM57762 0x1682 +#define BCOM_DEVICEID_BCM57764 0x1642 #define BCOM_DEVICEID_BCM57765 0x16B4 #define BCOM_DEVICEID_BCM57766 0x1686 +#define BCOM_DEVICEID_BCM57767 0x1683 #define BCOM_DEVICEID_BCM57780 0x1692 #define BCOM_DEVICEID_BCM57781 0x16B1 +#define BCOM_DEVICEID_BCM57782 0x16B7 #define BCOM_DEVICEID_BCM57785 0x16B5 +#define BCOM_DEVICEID_BCM57786 0x16B3 +#define BCOM_DEVICEID_BCM57787 0x1641 #define BCOM_DEVICEID_BCM57788 0x1691 #define BCOM_DEVICEID_BCM57790 0x1694 #define BCOM_DEVICEID_BCM57791 0x16B2 From owner-svn-src-stable-10@FreeBSD.ORG Thu Dec 5 16:14:57 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3D219E42; Thu, 5 Dec 2013 16:14: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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 28E3417DF; Thu, 5 Dec 2013 16:14:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB5GEvsB086408; Thu, 5 Dec 2013 16:14:57 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB5GEvQv086406; Thu, 5 Dec 2013 16:14:57 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201312051614.rB5GEvQv086406@svn.freebsd.org> From: Edward Tomasz Napierala Date: Thu, 5 Dec 2013 16:14: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: r258989 - stable/10/usr.sbin/ctld X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Dec 2013 16:14:57 -0000 Author: trasz Date: Thu Dec 5 16:14:56 2013 New Revision: 258989 URL: http://svnweb.freebsd.org/changeset/base/258989 Log: MFC r258841: Fix typos. Approved by: re (gjb) Sponsored by: The FreeBSD Foundation Modified: stable/10/usr.sbin/ctld/parse.y Directory Properties: stable/10/usr.sbin/ctld/ (props changed) Modified: stable/10/usr.sbin/ctld/parse.y ============================================================================== --- stable/10/usr.sbin/ctld/parse.y Thu Dec 5 15:28:27 2013 (r258988) +++ stable/10/usr.sbin/ctld/parse.y Thu Dec 5 16:14:56 2013 (r258989) @@ -300,7 +300,7 @@ auth_group_statement: AUTH_GROUP STR log_warnx("auth-group for target \"%s\" " "specified more than once", target->t_iqn); else - log_warnx("cannot mix auth-grup with explicit " + log_warnx("cannot mix auth-group with explicit " "authorisations for target \"%s\"", target->t_iqn); return (1); @@ -321,7 +321,7 @@ chap_statement: CHAP STR STR if (target->t_auth_group != NULL) { if (target->t_auth_group->ag_name != NULL) { - log_warnx("cannot mix auth-grup with explicit " + log_warnx("cannot mix auth-group with explicit " "authorisations for target \"%s\"", target->t_iqn); free($2); @@ -351,7 +351,7 @@ chap_mutual_statement: CHAP_MUTUAL STR S if (target->t_auth_group != NULL) { if (target->t_auth_group->ag_name != NULL) { - log_warnx("cannot mix auth-grup with explicit " + log_warnx("cannot mix auth-group with explicit " "authorisations for target \"%s\"", target->t_iqn); free($2); From owner-svn-src-stable-10@FreeBSD.ORG Thu Dec 5 16:29:23 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 89D6F247; Thu, 5 Dec 2013 16:29: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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7578018C7; Thu, 5 Dec 2013 16:29:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB5GTNIx019726; Thu, 5 Dec 2013 16:29:23 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB5GTNlg019723; Thu, 5 Dec 2013 16:29:23 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201312051629.rB5GTNlg019723@svn.freebsd.org> From: Edward Tomasz Napierala Date: Thu, 5 Dec 2013 16:29: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: r258990 - stable/10/usr.sbin/ctld X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Dec 2013 16:29:23 -0000 Author: trasz Date: Thu Dec 5 16:29:22 2013 New Revision: 258990 URL: http://svnweb.freebsd.org/changeset/base/258990 Log: MFC r258842: Grammar fix. Approved by: re (gjb) Sponsored by: The FreeBSD Foundation Modified: stable/10/usr.sbin/ctld/ctl.conf.5 Directory Properties: stable/10/usr.sbin/ctld/ (props changed) Modified: stable/10/usr.sbin/ctld/ctl.conf.5 ============================================================================== --- stable/10/usr.sbin/ctld/ctl.conf.5 Thu Dec 5 16:14:56 2013 (r258989) +++ stable/10/usr.sbin/ctld/ctl.conf.5 Thu Dec 5 16:29:22 2013 (r258990) @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 10, 2013 +.Dd December 2, 2013 .Dt CTL.CONF 5 .Os .Sh NAME @@ -141,7 +141,7 @@ Note that targets must use either auth-g or chap-mutual clauses; it's a configuration error to mix them in one target. .It Ic chap-mutual Ao Ar user Ac Ao Ar secret Ac Ao Ar mutualuser Ac Aq Ar mutualsecret Specifies mutual CHAP authentication credentials. -Note that targets must use either auth-group, chap, +Note that targets must use either auth-group, chap, or chap-mutual clauses; it's a configuration error to mix them in one target. .It Ic portal-group Aq Ar name Assigns previously defined portal group to that target. From owner-svn-src-stable-10@FreeBSD.ORG Thu Dec 5 17:57:52 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4EA3FA70; Thu, 5 Dec 2013 17:57: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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3A2B91FC6; Thu, 5 Dec 2013 17:57:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB5HvqF2018544; Thu, 5 Dec 2013 17:57:52 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB5Hvqu2018543; Thu, 5 Dec 2013 17:57:52 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <201312051757.rB5Hvqu2018543@svn.freebsd.org> From: Sean Bruno Date: Thu, 5 Dec 2013 17:57: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: r258994 - stable/10/sys/x86/cpufreq X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Dec 2013 17:57:52 -0000 Author: sbruno Date: Thu Dec 5 17:57:51 2013 New Revision: 258994 URL: http://svnweb.freebsd.org/changeset/base/258994 Log: MFC r257769 to stable/10 Fix powerd/states on AMD cpus. Resolves issues with system reporting: hwpstate0: set freq failed, err 6 Tested on FX-8150 and others. PR: kern/167018 Submitted by: avg@ Approved by: re (gjb) Modified: stable/10/sys/x86/cpufreq/hwpstate.c Directory Properties: stable/10/sys/ (props changed) Modified: stable/10/sys/x86/cpufreq/hwpstate.c ============================================================================== --- stable/10/sys/x86/cpufreq/hwpstate.c Thu Dec 5 17:50:18 2013 (r258993) +++ stable/10/sys/x86/cpufreq/hwpstate.c Thu Dec 5 17:57:51 2013 (r258994) @@ -184,16 +184,21 @@ hwpstate_goto_pstate(device_t dev, int p id, PCPU_GET(cpuid)); /* Go To Px-state */ wrmsr(MSR_AMD_10H_11H_CONTROL, id); + } + CPU_FOREACH(i) { + /* Bind to each cpu. */ + thread_lock(curthread); + sched_bind(curthread, i); + thread_unlock(curthread); /* wait loop (100*100 usec is enough ?) */ for(j = 0; j < 100; j++){ + /* get the result. not assure msr=id */ msr = rdmsr(MSR_AMD_10H_11H_STATUS); if(msr == id){ break; } DELAY(100); } - /* get the result. not assure msr=id */ - msr = rdmsr(MSR_AMD_10H_11H_STATUS); HWPSTATE_DEBUG(dev, "result P%d-state on cpu%d\n", (int)msr, PCPU_GET(cpuid)); if (msr != id) { From owner-svn-src-stable-10@FreeBSD.ORG Thu Dec 5 18:06:13 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3BD9CE06; Thu, 5 Dec 2013 18:06: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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0E14B1064; Thu, 5 Dec 2013 18:06:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB5I6Cqd039087; Thu, 5 Dec 2013 18:06:12 GMT (envelope-from royger@svn.freebsd.org) Received: (from royger@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB5I6C8E039086; Thu, 5 Dec 2013 18:06:12 GMT (envelope-from royger@svn.freebsd.org) Message-Id: <201312051806.rB5I6C8E039086@svn.freebsd.org> From: Roger Pau Monné Date: Thu, 5 Dec 2013 18:06: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: r258995 - stable/10/sys/dev/xen/control X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Dec 2013 18:06:13 -0000 Author: royger Date: Thu Dec 5 18:06:12 2013 New Revision: 258995 URL: http://svnweb.freebsd.org/changeset/base/258995 Log: MFC 257876: On XenServer the "halt" message is used instead of "poweroff", which makes FreeBSD halt but not poweroff (as expected when issuing a shutdown from the VM manager). Fix this by using the same handler for both "halt" and "poweroff". NB: The "halt" signal seems to be used on XenServer only. The OSS Xen toolstack (xl) uses "poweroff" instead. Submitted by: Roger Pau Monné Sponsored by: Citrix Systems R&D Reviewed by: gibbs Approved by: gibbs (mentor) Approved by: re (gjb) Modified: stable/10/sys/dev/xen/control/control.c Directory Properties: stable/10/sys/ (props changed) Modified: stable/10/sys/dev/xen/control/control.c ============================================================================== --- stable/10/sys/dev/xen/control/control.c Thu Dec 5 17:57:51 2013 (r258994) +++ stable/10/sys/dev/xen/control/control.c Thu Dec 5 18:06:12 2013 (r258995) @@ -158,7 +158,6 @@ static xctrl_shutdown_handler_t xctrl_po static xctrl_shutdown_handler_t xctrl_reboot; static xctrl_shutdown_handler_t xctrl_suspend; static xctrl_shutdown_handler_t xctrl_crash; -static xctrl_shutdown_handler_t xctrl_halt; /*-------------------------- Private Data Structures -------------------------*/ /** Element type for lookup table of event name to handler. */ @@ -173,7 +172,7 @@ static const struct xctrl_shutdown_reaso { "reboot", xctrl_reboot }, { "suspend", xctrl_suspend }, { "crash", xctrl_crash }, - { "halt", xctrl_halt }, + { "halt", xctrl_poweroff }, }; struct xctrl_softc { @@ -441,12 +440,6 @@ xctrl_crash() panic("Xen directed crash"); } -static void -xctrl_halt() -{ - shutdown_nice(RB_HALT); -} - /*------------------------------ Event Reception -----------------------------*/ static void xctrl_on_watch_event(struct xs_watch *watch, const char **vec, unsigned int len) From owner-svn-src-stable-10@FreeBSD.ORG Thu Dec 5 18:08:06 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 69963FD6; Thu, 5 Dec 2013 18:08: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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3C6901079; Thu, 5 Dec 2013 18:08:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB5I86fE043442; Thu, 5 Dec 2013 18:08:06 GMT (envelope-from royger@svn.freebsd.org) Received: (from royger@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB5I85vv043432; Thu, 5 Dec 2013 18:08:05 GMT (envelope-from royger@svn.freebsd.org) Message-Id: <201312051808.rB5I85vv043432@svn.freebsd.org> From: Roger Pau Monné Date: Thu, 5 Dec 2013 18:08: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: r258996 - in stable/10/sys: amd64/amd64 i386/i386 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Dec 2013 18:08:06 -0000 Author: royger Date: Thu Dec 5 18:08:05 2013 New Revision: 258996 URL: http://svnweb.freebsd.org/changeset/base/258996 Log: MFC 258176: Fix accounting for hw.realmem on the i386 and amd64 platforms. sys/i386/i386/machdep.c: sys/amd64/amd64/machdep.c: The value reported by FreeBSD as "real memory" when booting doesn't match what is later reported by sysctl as hw.realmem. This is due to the fact that the value printed during the boot process is fetched from smbios data (when possible), and accounts for holes in physical memory. On the other hand, the value of hw.realmem is unconditionally set to be one larger than the highest page of the physical address space. Fix this by setting hw.realmem to the same value printed during boot, this makes hw.realmem honour it's name and account properly for physical memory present in the system. Submitted by: Roger Pau Monné Reviewed by: gibbs Approved by: gibbs (mentor) Approved by: re (gjb) Modified: stable/10/sys/amd64/amd64/machdep.c stable/10/sys/i386/i386/machdep.c Directory Properties: stable/10/sys/ (props changed) Modified: stable/10/sys/amd64/amd64/machdep.c ============================================================================== --- stable/10/sys/amd64/amd64/machdep.c Thu Dec 5 18:06:12 2013 (r258995) +++ stable/10/sys/amd64/amd64/machdep.c Thu Dec 5 18:08:05 2013 (r258996) @@ -256,7 +256,6 @@ cpu_startup(dummy) #ifdef PERFMON perfmon_init(); #endif - realmem = Maxmem; /* * Display physical memory if SMBIOS reports reasonable amount. @@ -270,6 +269,7 @@ cpu_startup(dummy) if (memsize < ptoa((uintmax_t)cnt.v_free_count)) memsize = ptoa((uintmax_t)Maxmem); printf("real memory = %ju (%ju MB)\n", memsize, memsize >> 20); + realmem = atop(memsize); /* * Display any holes after the first chunk of extended memory. Modified: stable/10/sys/i386/i386/machdep.c ============================================================================== --- stable/10/sys/i386/i386/machdep.c Thu Dec 5 18:06:12 2013 (r258995) +++ stable/10/sys/i386/i386/machdep.c Thu Dec 5 18:08:05 2013 (r258996) @@ -294,7 +294,6 @@ cpu_startup(dummy) #ifdef PERFMON perfmon_init(); #endif - realmem = Maxmem; /* * Display physical memory if SMBIOS reports reasonable amount. @@ -308,6 +307,7 @@ cpu_startup(dummy) if (memsize < ptoa((uintmax_t)cnt.v_free_count)) memsize = ptoa((uintmax_t)Maxmem); printf("real memory = %ju (%ju MB)\n", memsize, memsize >> 20); + realmem = atop(memsize); /* * Display any holes after the first chunk of extended memory. From owner-svn-src-stable-10@FreeBSD.ORG Thu Dec 5 18:09:48 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D00121BA; Thu, 5 Dec 2013 18:09: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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BB41E1086; Thu, 5 Dec 2013 18:09:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB5I9mMN047316; Thu, 5 Dec 2013 18:09:48 GMT (envelope-from royger@svn.freebsd.org) Received: (from royger@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB5I9mNU047314; Thu, 5 Dec 2013 18:09:48 GMT (envelope-from royger@svn.freebsd.org) Message-Id: <201312051809.rB5I9mNU047314@svn.freebsd.org> From: Roger Pau Monné Date: Thu, 5 Dec 2013 18:09: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: r258997 - stable/10/sys/dev/xen/balloon X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Dec 2013 18:09:49 -0000 Author: royger Date: Thu Dec 5 18:09:48 2013 New Revision: 258997 URL: http://svnweb.freebsd.org/changeset/base/258997 Log: MFC 258178: Improve robustness of the Xen balloon driver. sys/dev/xen/balloon/balloon.c: Remove unused and commented out code. Fix deadlock caused by performing a sleepable malloc while holding the balloon mutex. Perform proper accounting of the memory used by the domain. Submitted by: Roger Pau Monné Sponsored by: Citrix Systems R&D Reviewed by: gibbs Approved by: gibbs (mentor) Approved by: re (gjb) Modified: stable/10/sys/dev/xen/balloon/balloon.c Directory Properties: stable/10/sys/ (props changed) Modified: stable/10/sys/dev/xen/balloon/balloon.c ============================================================================== --- stable/10/sys/dev/xen/balloon/balloon.c Thu Dec 5 18:08:05 2013 (r258996) +++ stable/10/sys/dev/xen/balloon/balloon.c Thu Dec 5 18:09:48 2013 (r258997) @@ -52,18 +52,13 @@ __FBSDID("$FreeBSD$"); static MALLOC_DEFINE(M_BALLOON, "Balloon", "Xen Balloon Driver"); -struct mtx balloon_mutex; +/* Convert from KB (as fetched from xenstore) to number of PAGES */ +#define KB_TO_PAGE_SHIFT (PAGE_SHIFT - 10) -/* - * Protects atomic reservation decrease/increase against concurrent increases. - * Also protects non-atomic updates of current_pages and driver_pages, and - * balloon lists. - */ -struct mtx balloon_lock; +struct mtx balloon_mutex; /* We increase/decrease in batches which fit in a page */ static unsigned long frame_list[PAGE_SIZE / sizeof(unsigned long)]; -#define ARRAY_SIZE(A) (sizeof(A) / sizeof(A[0])) struct balloon_stats { /* We aim for 'current allocation' == 'target allocation'. */ @@ -116,15 +111,21 @@ static void balloon_process(void *unused printk(KERN_WARNING "xen_mem: " fmt, ##args) /* balloon_append: add the given page to the balloon. */ -static void +static int balloon_append(vm_page_t page) { struct balloon_entry *entry; - entry = malloc(sizeof(struct balloon_entry), M_BALLOON, M_WAITOK); + mtx_assert(&balloon_mutex, MA_OWNED); + + entry = malloc(sizeof(struct balloon_entry), M_BALLOON, M_NOWAIT); + if (!entry) + return (ENOMEM); entry->page = page; STAILQ_INSERT_HEAD(&ballooned_pages, entry, list); bs.balloon_low++; + + return (0); } /* balloon_retrieve: rescue a page from the balloon, if it is not empty. */ @@ -134,8 +135,10 @@ balloon_retrieve(void) vm_page_t page; struct balloon_entry *entry; + mtx_assert(&balloon_mutex, MA_OWNED); + if (STAILQ_EMPTY(&ballooned_pages)) - return NULL; + return (NULL); entry = STAILQ_FIRST(&ballooned_pages); STAILQ_REMOVE_HEAD(&ballooned_pages, list); @@ -145,7 +148,7 @@ balloon_retrieve(void) bs.balloon_low--; - return page; + return (page); } static unsigned long @@ -154,21 +157,22 @@ current_target(void) unsigned long target = min(bs.target_pages, bs.hard_limit); if (target > (bs.current_pages + bs.balloon_low + bs.balloon_high)) target = bs.current_pages + bs.balloon_low + bs.balloon_high; - return target; + return (target); } static unsigned long minimum_target(void) { #ifdef XENHVM -#define max_pfn physmem +#define max_pfn realmem #else #define max_pfn HYPERVISOR_shared_info->arch.max_pfn #endif unsigned long min_pages, curr_pages = current_target(); #define MB2PAGES(mb) ((mb) << (20 - PAGE_SHIFT)) - /* Simple continuous piecewiese linear function: + /* + * Simple continuous piecewiese linear function: * max MiB -> min MiB gradient * 0 0 * 16 16 @@ -189,12 +193,10 @@ minimum_target(void) else min_pages = MB2PAGES(296) + (max_pfn >> 5); #undef MB2PAGES +#undef max_pfn /* Don't enforce growth */ - return min(min_pages, curr_pages); -#ifndef CONFIG_XEN -#undef max_pfn -#endif + return (min(min_pages, curr_pages)); } static int @@ -210,10 +212,10 @@ increase_reservation(unsigned long nr_pa .domid = DOMID_SELF }; - if (nr_pages > ARRAY_SIZE(frame_list)) - nr_pages = ARRAY_SIZE(frame_list); + mtx_assert(&balloon_mutex, MA_OWNED); - mtx_lock(&balloon_lock); + if (nr_pages > nitems(frame_list)) + nr_pages = nitems(frame_list); for (entry = STAILQ_FIRST(&ballooned_pages), i = 0; i < nr_pages; i++, entry = STAILQ_NEXT(entry, list)) { @@ -253,33 +255,14 @@ increase_reservation(unsigned long nr_pa set_phys_to_machine(pfn, frame_list[i]); -#if 0 -#ifndef XENHVM - /* Link back into the page tables if not highmem. */ - if (pfn < max_low_pfn) { - int ret; - ret = HYPERVISOR_update_va_mapping( - (unsigned long)__va(pfn << PAGE_SHIFT), - pfn_pte_ma(frame_list[i], PAGE_KERNEL), - 0); - PASSING(ret == 0, - ("HYPERVISOR_update_va_mapping failed")); - } -#endif -#endif - - /* Relinquish the page back to the allocator. */ vm_page_unwire(page, 0); vm_page_free(page); } bs.current_pages += nr_pages; - //totalram_pages = bs.current_pages; out: - mtx_unlock(&balloon_lock); - - return 0; + return (0); } static int @@ -295,8 +278,10 @@ decrease_reservation(unsigned long nr_pa .domid = DOMID_SELF }; - if (nr_pages > ARRAY_SIZE(frame_list)) - nr_pages = ARRAY_SIZE(frame_list); + mtx_assert(&balloon_mutex, MA_OWNED); + + if (nr_pages > nitems(frame_list)) + nr_pages = nitems(frame_list); for (i = 0; i < nr_pages; i++) { if ((page = vm_page_alloc(NULL, 0, @@ -310,39 +295,15 @@ decrease_reservation(unsigned long nr_pa pfn = (VM_PAGE_TO_PHYS(page) >> PAGE_SHIFT); frame_list[i] = PFNTOMFN(pfn); -#if 0 - if (!PageHighMem(page)) { - v = phys_to_virt(pfn << PAGE_SHIFT); - scrub_pages(v, 1); -#ifdef CONFIG_XEN - ret = HYPERVISOR_update_va_mapping( - (unsigned long)v, __pte_ma(0), 0); - BUG_ON(ret); -#endif - } -#endif -#ifdef CONFIG_XEN_SCRUB_PAGES - else { - v = kmap(page); - scrub_pages(v, 1); - kunmap(page); - } -#endif - } - -#ifdef CONFIG_XEN - /* Ensure that ballooned highmem pages don't have kmaps. */ - kmap_flush_unused(); - flush_tlb_all(); -#endif - - mtx_lock(&balloon_lock); - - /* No more mappings: invalidate P2M and add to balloon. */ - for (i = 0; i < nr_pages; i++) { - pfn = MFNTOPFN(frame_list[i]); set_phys_to_machine(pfn, INVALID_P2M_ENTRY); - balloon_append(PHYS_TO_VM_PAGE(pfn << PAGE_SHIFT)); + if (balloon_append(page) != 0) { + vm_page_unwire(page, 0); + vm_page_free(page); + + nr_pages = i; + need_sleep = 1; + break; + } } set_xen_guest_handle(reservation.extent_start, frame_list); @@ -351,9 +312,6 @@ decrease_reservation(unsigned long nr_pa KASSERT(ret == nr_pages, ("HYPERVISOR_memory_op failed")); bs.current_pages -= nr_pages; - //totalram_pages = bs.current_pages; - - mtx_unlock(&balloon_lock); return (need_sleep); } @@ -425,11 +383,11 @@ watch_target(struct xs_watch *watch, return; } - /* The given memory/target value is in KiB, so it needs converting to - pages. PAGE_SHIFT converts bytes to pages, hence PAGE_SHIFT - 10. - */ - set_new_target(new_target >> (PAGE_SHIFT - 10)); - + /* + * The given memory/target value is in KiB, so it needs converting to + * pages. PAGE_SHIFT converts bytes to pages, hence PAGE_SHIFT - 10. + */ + set_new_target(new_target >> KB_TO_PAGE_SHIFT); } static void @@ -461,13 +419,12 @@ balloon_init(void *arg) if (!is_running_on_xen()) return; - mtx_init(&balloon_lock, "balloon_lock", NULL, MTX_DEF); mtx_init(&balloon_mutex, "balloon_mutex", NULL, MTX_DEF); #ifndef XENHVM bs.current_pages = min(xen_start_info->nr_pages, max_pfn); #else - bs.current_pages = physmem; + bs.current_pages = realmem; #endif bs.target_pages = bs.current_pages; bs.balloon_low = 0; @@ -497,76 +454,7 @@ void balloon_update_driver_allowance(lon void balloon_update_driver_allowance(long delta) { - mtx_lock(&balloon_lock); + mtx_lock(&balloon_mutex); bs.driver_pages += delta; - mtx_unlock(&balloon_lock); -} - -#if 0 -static int dealloc_pte_fn( - pte_t *pte, struct page *pte_page, unsigned long addr, void *data) -{ - unsigned long mfn = pte_mfn(*pte); - int ret; - struct xen_memory_reservation reservation = { - .extent_start = &mfn, - .nr_extents = 1, - .extent_order = 0, - .domid = DOMID_SELF - }; - set_pte_at(&init_mm, addr, pte, __pte_ma(0)); - set_phys_to_machine(__pa(addr) >> PAGE_SHIFT, INVALID_P2M_ENTRY); - ret = HYPERVISOR_memory_op(XENMEM_decrease_reservation, &reservation); - KASSERT(ret == 1, ("HYPERVISOR_memory_op failed")); - return 0; -} - -#endif - -#if 0 -vm_page_t -balloon_alloc_empty_page_range(unsigned long nr_pages) -{ - vm_page_t pages; - int i, rc; - unsigned long *mfn_list; - struct xen_memory_reservation reservation = { - .address_bits = 0, - .extent_order = 0, - .domid = DOMID_SELF - }; - - pages = vm_page_alloc_contig(nr_pages, 0, -1, 4, 4) - if (pages == NULL) - return NULL; - - mfn_list = malloc(nr_pages*sizeof(unsigned long), M_DEVBUF, M_WAITOK); - - for (i = 0; i < nr_pages; i++) { - mfn_list[i] = PFNTOMFN(VM_PAGE_TO_PHYS(pages[i]) >> PAGE_SHIFT); - PFNTOMFN(i) = INVALID_P2M_ENTRY; - reservation.extent_start = mfn_list; - reservation.nr_extents = nr_pages; - rc = HYPERVISOR_memory_op(XENMEM_decrease_reservation, - &reservation); - KASSERT(rc == nr_pages, ("HYPERVISOR_memory_op failed")); - } - - current_pages -= nr_pages; - - wakeup(balloon_process); - - return pages; -} - -void -balloon_dealloc_empty_page_range(vm_page_t page, unsigned long nr_pages) -{ - unsigned long i; - - for (i = 0; i < nr_pages; i++) - balloon_append(page + i); - - wakeup(balloon_process); + mtx_unlock(&balloon_mutex); } -#endif From owner-svn-src-stable-10@FreeBSD.ORG Fri Dec 6 20:48:54 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1898F920; Fri, 6 Dec 2013 20:48: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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 055121F8D; Fri, 6 Dec 2013 20:48:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB6KmrNS021603; Fri, 6 Dec 2013 20:48:53 GMT (envelope-from cperciva@svn.freebsd.org) Received: (from cperciva@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB6Kmrdo021602; Fri, 6 Dec 2013 20:48:53 GMT (envelope-from cperciva@svn.freebsd.org) Message-Id: <201312062048.rB6Kmrdo021602@svn.freebsd.org> From: Colin Percival Date: Fri, 6 Dec 2013 20:48: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: r259040 - stable/10/etc X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Dec 2013 20:48:54 -0000 Author: cperciva Date: Fri Dec 6 20:48:53 2013 New Revision: 259040 URL: http://svnweb.freebsd.org/changeset/base/259040 Log: MFC r258894: Make rc(8) re-source rc.conf upon receipt of SIGALRM. The rc system aggressively caches the contents of /etc/rc.conf in order to improve boot performance; this produces arguably astonishing (non-)results if /etc/rc.conf is modified during the boot process. This commit provides a mechanism for explicitly requesting that rc.conf be reloaded. Approved by: re (rodrigc) Modified: stable/10/etc/rc Directory Properties: stable/10/etc/ (props changed) Modified: stable/10/etc/rc ============================================================================== --- stable/10/etc/rc Fri Dec 6 18:41:16 2013 (r259039) +++ stable/10/etc/rc Fri Dec 6 20:48:53 2013 (r259040) @@ -71,6 +71,11 @@ fi . /etc/rc.subr load_rc_config 'XXX' +# If we receive a SIGALRM, re-source /etc/rc.conf; this allows rc.d +# scripts to perform "boot-time configuration" including enabling and +# disabling rc.d scripts which appear later in the boot order. +trap "_rc_conf_loaded=false; load_rc_config 'XXX'" ALRM + skip="-s nostart" if [ `/sbin/sysctl -n security.jail.jailed` -eq 1 ]; then skip="$skip -s nojail" From owner-svn-src-stable-10@FreeBSD.ORG Fri Dec 6 23:30:47 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C7248F78; Fri, 6 Dec 2013 23:30: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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B1EBE1D41; Fri, 6 Dec 2013 23:30:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB6NUlPE079153; Fri, 6 Dec 2013 23:30:47 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB6NUkKk079149; Fri, 6 Dec 2013 23:30:46 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201312062330.rB6NUkKk079149@svn.freebsd.org> From: Xin LI Date: Fri, 6 Dec 2013 23:30: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: r259050 - stable/10/sys/dev/oce X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Dec 2013 23:30:47 -0000 Author: delphij Date: Fri Dec 6 23:30:46 2013 New Revision: 259050 URL: http://svnweb.freebsd.org/changeset/base/259050 Log: MFC r258941: Apply vendor improvements to oce(4) driver: - Add support to 40Gbps devices; - Add support to control adaptive interrupt coalescing (AIC) via sysctl; - Improve support of BE3 devices; Many thanks to Emulex for their continued support of FreeBSD. Submitted by: Venkata Duvvuru Approved by: re (rodrigc) Modified: stable/10/sys/dev/oce/oce_if.c stable/10/sys/dev/oce/oce_if.h stable/10/sys/dev/oce/oce_mbox.c stable/10/sys/dev/oce/oce_sysctl.c Directory Properties: stable/10/sys/ (props changed) Modified: stable/10/sys/dev/oce/oce_if.c ============================================================================== --- stable/10/sys/dev/oce/oce_if.c Fri Dec 6 23:12:21 2013 (r259049) +++ stable/10/sys/dev/oce/oce_if.c Fri Dec 6 23:30:46 2013 (r259050) @@ -829,6 +829,10 @@ oce_media_status(struct ifnet *ifp, stru req->ifm_active |= IFM_10G_SR | IFM_FDX; sc->speed = 10000; break; + case 7: /* 40 Gbps */ + req->ifm_active |= IFM_40G_SR4 | IFM_FDX; + sc->speed = 40000; + break; } return; @@ -1953,7 +1957,6 @@ done: /* Is there atleast one eq that needs to be modified? */ if(num) oce_mbox_eqd_modify_periodic(sc, set_eqd, num); - } static void oce_detect_hw_error(POCE_SOFTC sc) @@ -2153,11 +2156,6 @@ process_link_state(POCE_SOFTC sc, struct sc->link_status = ASYNC_EVENT_LINK_DOWN; if_link_state_change(sc->ifp, LINK_STATE_DOWN); } - - /* Update speed */ - sc->link_speed = acqe->u0.s.speed; - sc->qos_link_speed = (uint32_t) acqe->u0.s.qos_link_speed * 10; - } @@ -2342,18 +2340,17 @@ oce_get_config(POCE_SOFTC sc) max_rss = OCE_MAX_RSS; if (!IS_BE(sc)) { - rc = oce_get_func_config(sc); + rc = oce_get_profile_config(sc, max_rss); if (rc) { sc->nwqs = OCE_MAX_WQ; sc->nrssqs = max_rss; sc->nrqs = sc->nrssqs + 1; } } - else { - rc = oce_get_profile_config(sc); + else { /* For BE3 don't rely on fw for determining the resources */ sc->nrssqs = max_rss; sc->nrqs = sc->nrssqs + 1; - if (rc) - sc->nwqs = OCE_MAX_WQ; + sc->nwqs = OCE_MAX_WQ; + sc->max_vlans = MAX_VLANFILTER_SIZE; } } Modified: stable/10/sys/dev/oce/oce_if.h ============================================================================== --- stable/10/sys/dev/oce/oce_if.h Fri Dec 6 23:12:21 2013 (r259049) +++ stable/10/sys/dev/oce/oce_if.h Fri Dec 6 23:30:46 2013 (r259050) @@ -882,8 +882,8 @@ typedef struct oce_softc { uint8_t hw_error; uint16_t qnq_debug_event; uint16_t qnqid; - uint16_t pvid; - uint16_t max_vlans; + uint32_t pvid; + uint32_t max_vlans; } OCE_SOFTC, *POCE_SOFTC; @@ -1055,7 +1055,7 @@ int oce_mbox_cq_create(struct oce_cq *cq int oce_mbox_read_transrecv_data(POCE_SOFTC sc, uint32_t page_num); void oce_mbox_eqd_modify_periodic(POCE_SOFTC sc, struct oce_set_eqd *set_eqd, int num); -int oce_get_profile_config(POCE_SOFTC sc); +int oce_get_profile_config(POCE_SOFTC sc, uint32_t max_rss); int oce_get_func_config(POCE_SOFTC sc); void mbx_common_req_hdr_init(struct mbx_hdr *hdr, uint8_t dom, @@ -1099,6 +1099,9 @@ extern uint32_t oce_max_rsp_handled; /* #define OCE_ONE_PORT_EXT_LOOPBACK 0x2 #define OCE_NO_LOOPBACK 0xff +#undef IFM_40G_SR4 +#define IFM_40G_SR4 28 + #define atomic_inc_32(x) atomic_add_32(x, 1) #define atomic_dec_32(x) atomic_subtract_32(x, 1) Modified: stable/10/sys/dev/oce/oce_mbox.c ============================================================================== --- stable/10/sys/dev/oce/oce_mbox.c Fri Dec 6 23:12:21 2013 (r259049) +++ stable/10/sys/dev/oce/oce_mbox.c Fri Dec 6 23:30:46 2013 (r259050) @@ -935,7 +935,7 @@ oce_get_link_status(POCE_SOFTC sc, struc bzero(&mbx, sizeof(struct oce_mbx)); - IS_XE201(sc) ? (version = OCE_MBX_VER_V1) : (version = OCE_MBX_VER_V0); + IS_BE2(sc) ? (version = OCE_MBX_VER_V0) : (version = OCE_MBX_VER_V1); fwcmd = (struct mbx_query_common_link_config *)&mbx.payload; mbx_common_req_hdr_init(&fwcmd->hdr, 0, 0, @@ -2025,7 +2025,7 @@ oce_mbox_eqd_modify_periodic(POCE_SOFTC } int -oce_get_profile_config(POCE_SOFTC sc) +oce_get_profile_config(POCE_SOFTC sc, uint32_t max_rss) { struct oce_mbx mbx; struct mbx_common_get_profile_config *fwcmd; @@ -2050,7 +2050,7 @@ oce_get_profile_config(POCE_SOFTC sc) fwcmd = OCE_DMAPTR(&dma, struct mbx_common_get_profile_config); bzero(fwcmd, sizeof(struct mbx_common_get_profile_config)); - if (IS_BE3(sc)) + if (!IS_XE201(sc)) version = OCE_MBX_VER_V1; else version = OCE_MBX_VER_V0; @@ -2102,13 +2102,20 @@ oce_get_profile_config(POCE_SOFTC sc) goto error; } else { - sc->max_vlans = nic_desc->vlan_count; - sc->nwqs = HOST_32(nic_desc->txq_count); + sc->max_vlans = HOST_16(nic_desc->vlan_count); + sc->nwqs = HOST_16(nic_desc->txq_count); if (sc->nwqs) sc->nwqs = MIN(sc->nwqs, OCE_MAX_WQ); else sc->nwqs = OCE_MAX_WQ; + sc->nrssqs = HOST_16(nic_desc->rssq_count); + if (sc->nrssqs) + sc->nrssqs = MIN(sc->nrssqs, max_rss); + else + sc->nrssqs = max_rss; + sc->nrqs = sc->nrssqs + 1; /* 1 for def RX */; + } error: oce_dma_free(sc, &dma); Modified: stable/10/sys/dev/oce/oce_sysctl.c ============================================================================== --- stable/10/sys/dev/oce/oce_sysctl.c Fri Dec 6 23:12:21 2013 (r259049) +++ stable/10/sys/dev/oce/oce_sysctl.c Fri Dec 6 23:30:46 2013 (r259050) @@ -44,6 +44,7 @@ static void copy_stats_to_sc_xe201(POCE_ static void copy_stats_to_sc_be3(POCE_SOFTC sc); static void copy_stats_to_sc_be2(POCE_SOFTC sc); static int oce_sysctl_loopback(SYSCTL_HANDLER_ARGS); +static int oce_sys_aic_enable(SYSCTL_HANDLER_ARGS); static int oce_be3_fwupgrade(POCE_SOFTC sc, const struct firmware *fw); static int oce_skyhawk_fwupgrade(POCE_SOFTC sc, const struct firmware *fw); static int oce_sys_fwupgrade(SYSCTL_HANDLER_ARGS); @@ -131,6 +132,10 @@ oce_add_sysctls(POCE_SOFTC sc) CTLTYPE_STRING | CTLFLAG_RW, (void *)sc, 0, oce_sys_fwupgrade, "A", "Firmware ufi file"); + SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "aic_enable", + CTLTYPE_INT | CTLFLAG_RW, (void *)sc, 1, + oce_sys_aic_enable, "I", "aic flags"); + /* * Dumps Transceiver data * "sysctl dev.oce.0.sfp_vpd_dump=0" @@ -170,6 +175,35 @@ oce_loopback_test(struct oce_softc *sc, } static int +oce_sys_aic_enable(SYSCTL_HANDLER_ARGS) +{ + int value = 0; + uint32_t status, vector; + POCE_SOFTC sc = (struct oce_softc *)arg1; + struct oce_aic_obj *aic; + + status = sysctl_handle_int(oidp, &value, 0, req); + if (status || !req->newptr) + return status; + + for (vector = 0; vector < sc->intr_count; vector++) { + aic = &sc->aic_obj[vector]; + + if (value == 0){ + aic->max_eqd = aic->min_eqd = aic->et_eqd = 0; + aic->enable = 0; + } + else { + aic->max_eqd = OCE_MAX_EQD; + aic->min_eqd = OCE_MIN_EQD; + aic->et_eqd = OCE_MIN_EQD; + aic->enable = TRUE; + } + } + return 0; +} + +static int oce_sysctl_loopback(SYSCTL_HANDLER_ARGS) { int value = 0; From owner-svn-src-stable-10@FreeBSD.ORG Fri Dec 6 23:40:51 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8A073723; Fri, 6 Dec 2013 23:40: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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 58EEF1E1E; Fri, 6 Dec 2013 23:40:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB6Nepwc082452; Fri, 6 Dec 2013 23:40:51 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB6NeoYa082441; Fri, 6 Dec 2013 23:40:50 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201312062340.rB6NeoYa082441@svn.freebsd.org> From: Xin LI Date: Fri, 6 Dec 2013 23: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: r259051 - in stable/10/sys: conf i386/conf modules X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Dec 2013 23:40:51 -0000 Author: delphij Date: Fri Dec 6 23:40:50 2013 New Revision: 259051 URL: http://svnweb.freebsd.org/changeset/base/259051 Log: MFC r258948: Support Hyper-V on i386: - Add 'hyperv' module into build; - Allow building Hyper-V support as part of the kernel; - Hook Hyper-V build into NOTES. Approved by: re (rodrigc) Modified: stable/10/sys/conf/files.i386 stable/10/sys/i386/conf/NOTES stable/10/sys/modules/Makefile Directory Properties: stable/10/sys/ (props changed) stable/10/sys/conf/ (props changed) Modified: stable/10/sys/conf/files.i386 ============================================================================== --- stable/10/sys/conf/files.i386 Fri Dec 6 23:30:46 2013 (r259050) +++ stable/10/sys/conf/files.i386 Fri Dec 6 23:40:50 2013 (r259051) @@ -221,6 +221,18 @@ dev/hwpmc/hwpmc_piv.c optional hwpmc dev/hwpmc/hwpmc_ppro.c optional hwpmc dev/hwpmc/hwpmc_tsc.c optional hwpmc dev/hwpmc/hwpmc_x86.c optional hwpmc +dev/hyperv/netvsc/hv_net_vsc.c optional hyperv +dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c optional hyperv +dev/hyperv/netvsc/hv_rndis_filter.c optional hyperv +dev/hyperv/stordisengage/hv_ata_pci_disengage.c optional hyperv +dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c optional hyperv +dev/hyperv/utilities/hv_util.c optional hyperv +dev/hyperv/vmbus/hv_channel.c optional hyperv +dev/hyperv/vmbus/hv_channel_mgmt.c optional hyperv +dev/hyperv/vmbus/hv_connection.c optional hyperv +dev/hyperv/vmbus/hv_hv.c optional hyperv +dev/hyperv/vmbus/hv_ring_buffer.c optional hyperv +dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c optional hyperv dev/ichwd/ichwd.c optional ichwd dev/if_ndis/if_ndis.c optional ndis dev/if_ndis/if_ndis_pccard.c optional ndis pccard Modified: stable/10/sys/i386/conf/NOTES ============================================================================== --- stable/10/sys/i386/conf/NOTES Fri Dec 6 23:30:46 2013 (r259050) +++ stable/10/sys/i386/conf/NOTES Fri Dec 6 23:40:50 2013 (r259051) @@ -800,6 +800,8 @@ device virtio_blk # VirtIO Block device device virtio_scsi # VirtIO SCSI device device virtio_balloon # VirtIO Memory Balloon device +device hyperv # HyperV drivers + ##################################################################### # Modified: stable/10/sys/modules/Makefile ============================================================================== --- stable/10/sys/modules/Makefile Fri Dec 6 23:30:46 2013 (r259050) +++ stable/10/sys/modules/Makefile Fri Dec 6 23:40:50 2013 (r259051) @@ -583,6 +583,7 @@ _hptmv= hptmv _hptnr= hptnr _hptrr= hptrr .endif +_hyperv= hyperv _ichwd= ichwd _ida= ida _iir= iir From owner-svn-src-stable-10@FreeBSD.ORG Sat Dec 7 00:33:10 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D3986EA5; Sat, 7 Dec 2013 00:33: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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BF52E1176; Sat, 7 Dec 2013 00:33:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB70XA6n001362; Sat, 7 Dec 2013 00:33:10 GMT (envelope-from dteske@svn.freebsd.org) Received: (from dteske@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB70XAvT001361; Sat, 7 Dec 2013 00:33:10 GMT (envelope-from dteske@svn.freebsd.org) Message-Id: <201312070033.rB70XAvT001361@svn.freebsd.org> From: Devin Teske Date: Sat, 7 Dec 2013 00:33: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: r259055 - 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-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Dec 2013 00:33:10 -0000 Author: dteske Date: Sat Dec 7 00:33:10 2013 New Revision: 259055 URL: http://svnweb.freebsd.org/changeset/base/259055 Log: MFC r258927: Fix a regression introduced by SVN r257842 that prevents Encryption from being enabled. Approved by: re (gjb) Modified: stable/10/usr.sbin/bsdinstall/scripts/zfsboot Directory Properties: stable/10/usr.sbin/bsdinstall/ (props changed) Modified: stable/10/usr.sbin/bsdinstall/scripts/zfsboot ============================================================================== --- stable/10/usr.sbin/bsdinstall/scripts/zfsboot Sat Dec 7 00:31:01 2013 (r259054) +++ stable/10/usr.sbin/bsdinstall/scripts/zfsboot Sat Dec 7 00:33:10 2013 (r259055) @@ -961,7 +961,7 @@ zfs_create_boot() # If encryption is enabled, we need to create the GEOMs # if [ "$ZFSBOOT_GELI_ENCRYPTION" ]; then - local bootvdev= + local bootvdev= options= local geli_pool="$BSDINSTALL_CHROOT/$ZFSBOOT_GELI_POOL_NAME" local key="$ZFSBOOT_GELI_KEY_FILE" @@ -978,11 +978,13 @@ zfs_create_boot() f_dprintf "$funcname: %s %s %s" \ "ZFSBOOT_GELI_POOL_NAME=[$ZFSBOOT_GELI_POOL_NAME]" \ "bootvdev=[$bootvdev]" "unenc_list=[$unenc_list]" + options="-o altroot=\"\$BSDINSTALL_CHROOT\"" + options="$options -m \"/\$ZFSBOOT_GELI_POOL_NAME\"" + options="$options -f" f_eval_catch $funcname zpool "$ZPOOL_CREATE_WITH_OPTIONS" \ - "-o altroot=\"\$BSDINSTALL_CHROOT\" - -m \"/\$ZFSBOOT_GELI_POOL_NAME\" -f" \ - \$ZFSBOOT_GELI_POOL_NAME \$bootvdev \ + "$options" \$ZFSBOOT_GELI_POOL_NAME \$bootvdev \ \$unenc_list || return $FAILURE + f_dprintf "$funcname: geli_pool=[%s]" "$geli_pool" f_eval_catch $funcname mkdir "$MKDIR_P" \$geli_pool/boot || return $FAILURE From owner-svn-src-stable-10@FreeBSD.ORG Sat Dec 7 11:33:07 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D9D21BEA; Sat, 7 Dec 2013 11:33: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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C683415E5; Sat, 7 Dec 2013 11:33:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB7BX7QF029935; Sat, 7 Dec 2013 11:33:07 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB7BX7wd029934; Sat, 7 Dec 2013 11:33:07 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201312071133.rB7BX7wd029934@svn.freebsd.org> From: Glen Barber Date: Sat, 7 Dec 2013 11:33: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: r259066 - stable/10/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-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Dec 2013 11:33:07 -0000 Author: gjb Date: Sat Dec 7 11:33:07 2013 New Revision: 259066 URL: http://svnweb.freebsd.org/changeset/base/259066 Log: Set stable/10 to -PRERELEASE, now that releng/10.0 has been branched. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/10/sys/conf/newvers.sh Modified: stable/10/sys/conf/newvers.sh ============================================================================== --- stable/10/sys/conf/newvers.sh Sat Dec 7 11:27:54 2013 (r259065) +++ stable/10/sys/conf/newvers.sh Sat Dec 7 11:33:07 2013 (r259066) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="10.0" -BRANCH="BETA4" +BRANCH="PRERELEASE" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi From owner-svn-src-stable-10@FreeBSD.ORG Sat Dec 7 13:06:15 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8DD4FDB0; Sat, 7 Dec 2013 13:06: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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 70B081D80; Sat, 7 Dec 2013 13:06:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB7D6FP9060662; Sat, 7 Dec 2013 13:06:15 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB7D6FxO060661; Sat, 7 Dec 2013 13:06:15 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201312071306.rB7D6FxO060661@svn.freebsd.org> From: Glen Barber Date: Sat, 7 Dec 2013 13:06: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: r259069 - 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-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Dec 2013 13:06:15 -0000 Author: gjb Date: Sat Dec 7 13:06:14 2013 New Revision: 259069 URL: http://svnweb.freebsd.org/changeset/base/259069 Log: Bump __FreeBSD_version to 1000700, to set it higher than what is in releng/10.0 now. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/10/sys/sys/param.h Modified: stable/10/sys/sys/param.h ============================================================================== --- stable/10/sys/sys/param.h Sat Dec 7 13:03:14 2013 (r259068) +++ stable/10/sys/sys/param.h Sat Dec 7 13:06:14 2013 (r259069) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1000502 /* Master, propagated to newvers */ +#define __FreeBSD_version 1000700 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From owner-svn-src-stable-10@FreeBSD.ORG Sat Dec 7 18:23:30 2013 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AF4113DC; Sat, 7 Dec 2013 18:23: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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 90E5C10C7; Sat, 7 Dec 2013 18:23:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB7INUts070600; Sat, 7 Dec 2013 18:23:30 GMT (envelope-from peter@svn.freebsd.org) Received: (from peter@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB7INUsS070594; Sat, 7 Dec 2013 18:23:30 GMT (envelope-from peter@svn.freebsd.org) Message-Id: <201312071823.rB7INUsS070594@svn.freebsd.org> From: Peter Wemm Date: Sat, 7 Dec 2013 18:23: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: r259073 - in stable/10: . contrib/ipfilter contrib/top share/man/man4 share/mk sys/amd64/include sys/contrib/dev/acpica sys/contrib/ipfilter/netinet sys/dev/fdt sys/x86/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-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Dec 2013 18:23:30 -0000 Author: peter Date: Sat Dec 7 18:23:29 2013 New Revision: 259073 URL: http://svnweb.freebsd.org/changeset/base/259073 Log: Hoist all the mergeinfo up to the root in preparation for enforcing merges to the root only. All MFC's were rerecorded to the root. Going forward, if an MFC includes mergeinfo, it will need to be made to the root and committed from the root. Merges with --ignore-ancestry or diff | patch can go anywhere. The mergeinfo in HEAD is in a bad state from years of neglect and manual tampering and this was branched into 10.x. This confuses the coalescing code and prevents it from doing its job. Approved by: re (gjb, implicit) Modified: Directory Properties: stable/10/ (props changed) stable/10/MAINTAINERS (props changed) stable/10/Makefile.inc1 (props changed) stable/10/ObsoleteFiles.inc (props changed) stable/10/UPDATING (props changed) stable/10/bin/df/ (props changed) stable/10/bin/freebsd-version/ (props changed) stable/10/cddl/ (props changed) stable/10/cddl/contrib/opensolaris/ (props changed) stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/ (props changed) stable/10/cddl/contrib/opensolaris/cmd/zfs/ (props changed) stable/10/cddl/contrib/opensolaris/lib/libzfs/ (props changed) stable/10/contrib/apr/ (props changed) stable/10/contrib/apr-util/ (props changed) stable/10/contrib/atf/ (props changed) stable/10/contrib/binutils/ (props changed) stable/10/contrib/bmake/ (props changed) stable/10/contrib/byacc/ (props changed) stable/10/contrib/bzip2/ (props changed) stable/10/contrib/com_err/ (props changed) stable/10/contrib/compiler-rt/ (props changed) stable/10/contrib/dialog/ (props changed) stable/10/contrib/dtc/ (props changed) stable/10/contrib/ee/ (props changed) stable/10/contrib/expat/ (props changed) stable/10/contrib/file/ (props changed) stable/10/contrib/gcc/ (props changed) stable/10/contrib/gdb/ (props changed) stable/10/contrib/gdtoa/ (props changed) stable/10/contrib/groff/ (props changed) stable/10/contrib/ipfilter/ (props changed) stable/10/contrib/ipfilter/ml_ipl.c (props changed) stable/10/contrib/ipfilter/mlfk_ipl.c (props changed) stable/10/contrib/ipfilter/mlh_rule.c (props changed) stable/10/contrib/ipfilter/mli_ipl.c (props changed) stable/10/contrib/ipfilter/mln_ipl.c (props changed) stable/10/contrib/ipfilter/mls_ipl.c (props changed) stable/10/contrib/ldns/ (props changed) stable/10/contrib/less/ (props changed) stable/10/contrib/libarchive/ (props changed) stable/10/contrib/libarchive/cpio/ (props changed) stable/10/contrib/libarchive/libarchive/ (props changed) stable/10/contrib/libarchive/libarchive_fe/ (props changed) stable/10/contrib/libarchive/tar/ (props changed) stable/10/contrib/libc++/ (props changed) stable/10/contrib/libc-vis/ (props changed) stable/10/contrib/libcxxrt/ (props changed) stable/10/contrib/libexecinfo/ (props changed) stable/10/contrib/libpcap/ (props changed) stable/10/contrib/libstdc++/ (props changed) stable/10/contrib/llvm/ (props changed) stable/10/contrib/llvm/tools/clang/ (props changed) stable/10/contrib/mtree/ (props changed) stable/10/contrib/ncurses/ (props changed) stable/10/contrib/netcat/ (props changed) stable/10/contrib/ntp/ (props changed) stable/10/contrib/nvi/ (props changed) stable/10/contrib/one-true-awk/ (props changed) stable/10/contrib/openbsm/ (props changed) stable/10/contrib/openpam/ (props changed) stable/10/contrib/openresolv/ (props changed) stable/10/contrib/pf/ (props changed) stable/10/contrib/sendmail/ (props changed) stable/10/contrib/serf/ (props changed) stable/10/contrib/smbfs/ (props changed) stable/10/contrib/subversion/ (props changed) stable/10/contrib/tcpdump/ (props changed) stable/10/contrib/tcsh/ (props changed) stable/10/contrib/tnftp/ (props changed) stable/10/contrib/top/ (props changed) stable/10/contrib/top/install-sh (props changed) stable/10/contrib/tzcode/stdtime/ (props changed) stable/10/contrib/tzcode/zic/ (props changed) stable/10/contrib/tzdata/ (props changed) stable/10/contrib/unbound/ (props changed) stable/10/contrib/wpa/ (props changed) stable/10/contrib/xz/ (props changed) stable/10/crypto/heimdal/ (props changed) stable/10/crypto/openssh/ (props changed) stable/10/crypto/openssl/ (props changed) stable/10/etc/ (props changed) stable/10/etc/rc.d/ (props changed) stable/10/gnu/lib/ (props changed) stable/10/gnu/usr.bin/binutils/ (props changed) stable/10/gnu/usr.bin/cc/cc_tools/ (props changed) stable/10/gnu/usr.bin/gdb/ (props changed) stable/10/include/ (props changed) stable/10/lib/ (props changed) stable/10/lib/libc/ (props changed) stable/10/lib/libc/stdtime/ (props changed) stable/10/lib/libc_nonshared/ (props changed) stable/10/lib/libfetch/ (props changed) stable/10/lib/libiconv_modules/ (props changed) stable/10/lib/libsmb/ (props changed) stable/10/lib/libthr/ (props changed) stable/10/lib/libutil/ (props changed) stable/10/lib/libvmmapi/ (props changed) stable/10/lib/libyaml/ (props changed) stable/10/lib/libz/ (props changed) stable/10/release/ (props changed) stable/10/release/doc/ (props changed) stable/10/sbin/ (props changed) stable/10/sbin/camcontrol/ (props changed) stable/10/sbin/dumpon/ (props changed) stable/10/sbin/hastd/ (props changed) stable/10/sbin/ifconfig/ (props changed) stable/10/sbin/ipfw/ (props changed) stable/10/sbin/nvmecontrol/ (props changed) stable/10/share/ (props changed) stable/10/share/examples/bhyve/ (props changed) stable/10/share/i18n/csmapper/JIS/ (props changed) stable/10/share/i18n/esdb/EUC/ (props changed) stable/10/share/man/ (props changed) stable/10/share/man/man4/ (props changed) stable/10/share/man/man4/bhyve.4 (props changed) stable/10/share/man/man5/ (props changed) stable/10/share/man/man7/ (props changed) stable/10/share/man/man8/ (props changed) stable/10/share/misc/ (props changed) stable/10/share/mk/ (props changed) stable/10/share/mk/bsd.arch.inc.mk (props changed) stable/10/share/syscons/ (props changed) stable/10/share/zoneinfo/ (props changed) stable/10/sys/ (props changed) stable/10/sys/amd64/include/vmm.h (props changed) stable/10/sys/amd64/include/vmm_dev.h (props changed) stable/10/sys/amd64/include/vmm_instruction_emul.h (props changed) stable/10/sys/amd64/include/xen/ (props changed) stable/10/sys/amd64/vmm/ (props changed) stable/10/sys/boot/ (props changed) stable/10/sys/boot/i386/efi/ (props changed) stable/10/sys/boot/ia64/efi/ (props changed) stable/10/sys/boot/ia64/ski/ (props changed) stable/10/sys/boot/powerpc/boot1.chrp/ (props changed) stable/10/sys/boot/powerpc/ofw/ (props changed) stable/10/sys/cddl/contrib/opensolaris/ (props changed) stable/10/sys/conf/ (props changed) stable/10/sys/contrib/dev/acpica/ (props changed) stable/10/sys/contrib/dev/acpica/changes.txt (props changed) stable/10/sys/contrib/dev/acpica/common/ (props changed) stable/10/sys/contrib/dev/acpica/compiler/ (props changed) stable/10/sys/contrib/dev/acpica/components/debugger/ (props changed) stable/10/sys/contrib/dev/acpica/components/disassembler/ (props changed) stable/10/sys/contrib/dev/acpica/components/dispatcher/ (props changed) stable/10/sys/contrib/dev/acpica/components/events/ (props changed) stable/10/sys/contrib/dev/acpica/components/executer/ (props changed) stable/10/sys/contrib/dev/acpica/components/hardware/ (props changed) stable/10/sys/contrib/dev/acpica/components/namespace/ (props changed) stable/10/sys/contrib/dev/acpica/components/parser/ (props changed) stable/10/sys/contrib/dev/acpica/components/resources/ (props changed) stable/10/sys/contrib/dev/acpica/components/tables/ (props changed) stable/10/sys/contrib/dev/acpica/components/utilities/ (props changed) stable/10/sys/contrib/dev/acpica/include/ (props changed) stable/10/sys/contrib/dev/acpica/os_specific/ (props changed) stable/10/sys/contrib/ipfilter/ (props changed) stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c (props changed) stable/10/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c (props changed) stable/10/sys/contrib/libfdt/ (props changed) stable/10/sys/contrib/octeon-sdk/ (props changed) stable/10/sys/contrib/x86emu/ (props changed) stable/10/sys/dev/bvm/ (props changed) stable/10/sys/dev/fdt/fdt_ic_if.m (props changed) stable/10/sys/dev/hyperv/ (props changed) stable/10/sys/modules/hyperv/ (props changed) stable/10/sys/modules/vmm/ (props changed) stable/10/sys/x86/include/acpica_machdep.h (props changed) stable/10/tools/ (props changed) stable/10/tools/build/ (props changed) stable/10/tools/build/options/ (props changed) stable/10/tools/tools/atsectl/ (props changed) stable/10/usr.bin/calendar/ (props changed) stable/10/usr.bin/csup/ (props changed) stable/10/usr.bin/iscsictl/ (props changed) stable/10/usr.bin/procstat/ (props changed) stable/10/usr.sbin/ (props changed) stable/10/usr.sbin/bhyve/ (props changed) stable/10/usr.sbin/bhyvectl/ (props changed) stable/10/usr.sbin/bhyveload/ (props changed) stable/10/usr.sbin/bsdconfig/ (props changed) stable/10/usr.sbin/bsdinstall/ (props changed) stable/10/usr.sbin/ctladm/ (props changed) stable/10/usr.sbin/ctld/ (props changed) stable/10/usr.sbin/freebsd-update/ (props changed) stable/10/usr.sbin/jail/ (props changed) stable/10/usr.sbin/mergemaster/ (props changed) stable/10/usr.sbin/mount_smbfs/ (props changed) stable/10/usr.sbin/ndiscvt/ (props changed) stable/10/usr.sbin/pkg/ (props changed) stable/10/usr.sbin/rtadvctl/ (props changed) stable/10/usr.sbin/rtadvd/ (props changed) stable/10/usr.sbin/rtsold/ (props changed) stable/10/usr.sbin/zic/ (props changed)