From owner-svn-src-releng@freebsd.org Sun Sep 17 16:45:13 2017 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4177EE1D4A3; Sun, 17 Sep 2017 16:45:13 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 10DA564A05; Sun, 17 Sep 2017 16:45:12 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8HGjCwI046686; Sun, 17 Sep 2017 16:45:12 GMT (envelope-from marius@FreeBSD.org) Received: (from marius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8HGjCuk046685; Sun, 17 Sep 2017 16:45:12 GMT (envelope-from marius@FreeBSD.org) Message-Id: <201709171645.v8HGjCuk046685@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marius set sender to marius@FreeBSD.org using -f From: Marius Strobl Date: Sun, 17 Sep 2017 16:45:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r323680 - releng/10.4/lib/libfetch X-SVN-Group: releng X-SVN-Commit-Author: marius X-SVN-Commit-Paths: releng/10.4/lib/libfetch X-SVN-Commit-Revision: 323680 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Sep 2017 16:45:13 -0000 Author: marius Date: Sun Sep 17 16:45:12 2017 New Revision: 323680 URL: https://svnweb.freebsd.org/changeset/base/323680 Log: MF10: r323660, MFC: r322669 In fetch_resolve() if the port number or service name is included in the host argument (e. g. "www.freebsd.org:443"), correctly set the service pointer accordingly. Previously, the service pointer was set to the separator instead, causing getaddrinfo(3) to fail. Approved by: re (kib) Modified: releng/10.4/lib/libfetch/common.c Directory Properties: releng/10.4/ (props changed) Modified: releng/10.4/lib/libfetch/common.c ============================================================================== --- releng/10.4/lib/libfetch/common.c Sun Sep 17 15:58:16 2017 (r323679) +++ releng/10.4/lib/libfetch/common.c Sun Sep 17 16:45:12 2017 (r323680) @@ -291,7 +291,7 @@ fetch_resolve(const char *addr, int port, int af) goto syserr; service = sbuf; } else if (*sep != '\0') { - service = sep; + service = sep + 1; } else { service = NULL; } From owner-svn-src-releng@freebsd.org Mon Sep 18 17:26:48 2017 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CB70EE20614; Mon, 18 Sep 2017 17:26:48 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 98B507288E; Mon, 18 Sep 2017 17:26:48 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8IHQlX8056065; Mon, 18 Sep 2017 17:26:47 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8IHQldH056064; Mon, 18 Sep 2017 17:26:47 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201709181726.v8IHQldH056064@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 18 Sep 2017 17:26:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r323711 - releng/10.4/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: releng/10.4/release/doc/en_US.ISO8859-1/relnotes X-SVN-Commit-Revision: 323711 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Sep 2017 17:26:48 -0000 Author: gjb Date: Mon Sep 18 17:26:47 2017 New Revision: 323711 URL: https://svnweb.freebsd.org/changeset/base/323711 Log: Document r313433, bsdinstall(8) 4096k alignment on new partitions. Document r318430, ifconfig(8) reports persistent NIC MAC addresses. Submitted by: rpokala Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.4/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: releng/10.4/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- releng/10.4/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Sep 18 17:14:13 2017 (r323710) +++ releng/10.4/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Sep 18 17:26:47 2017 (r323711) @@ -198,6 +198,14 @@ added, providing command-line access to features and debugging facilities of &man.cxgbe.4; devices. + The &man.ifconfig.8; utility has been + updated to persistently store the hardware + MAC addres of an interface. This provides + a mechanism through which the original MAC + address can be retrieved if, for example, an interface is + added to a &man.lagg.4; and the MAC is + overridden in &man.rc.conf.5;. + The &man.rcp.1;, &man.rlogin.1;, &man.rsh.1;, &man.rlogind.8;, and &man.rshd.8; utilities have been marked as deprecated, and planned for removal in @@ -274,6 +282,10 @@ Installation and Configuration Tools + + The &man.bsdinstall.8; utility has been + updated to ensure newly-created partitions are properly + aligned at 4096k boundaries. The default EFI partition created by From owner-svn-src-releng@freebsd.org Mon Sep 18 19:56:06 2017 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D467DE02BC5; Mon, 18 Sep 2017 19:56:06 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A0E987D501; Mon, 18 Sep 2017 19:56:06 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8IJu56d025731; Mon, 18 Sep 2017 19:56:05 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8IJu5Co025730; Mon, 18 Sep 2017 19:56:05 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201709181956.v8IJu5Co025730@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 18 Sep 2017 19:56:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r323716 - releng/10.4/release/doc/en_US.ISO8859-1 X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: releng/10.4/release/doc/en_US.ISO8859-1 X-SVN-Commit-Revision: 323716 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Sep 2017 19:56:06 -0000 Author: gjb Date: Mon Sep 18 19:56:05 2017 New Revision: 323716 URL: https://svnweb.freebsd.org/changeset/base/323716 Log: Reconnect errata.html back to the build, accidentally removed as part of r323618. This directory needs to be included, as it is used by the 'reldoc' target of release/Makefile. Approved by: re (implicit, relnotes-related) Sponsored by: The FreeBSD Foundation Modified: releng/10.4/release/doc/en_US.ISO8859-1/Makefile Modified: releng/10.4/release/doc/en_US.ISO8859-1/Makefile ============================================================================== --- releng/10.4/release/doc/en_US.ISO8859-1/Makefile Mon Sep 18 19:16:41 2017 (r323715) +++ releng/10.4/release/doc/en_US.ISO8859-1/Makefile Mon Sep 18 19:56:05 2017 (r323716) @@ -3,6 +3,7 @@ RELN_ROOT?= ${.CURDIR}/.. SUBDIR = relnotes +SUBDIR+= errata SUBDIR+= hardware SUBDIR+= installation SUBDIR+= readme From owner-svn-src-releng@freebsd.org Tue Sep 19 15:39:48 2017 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 46169E19457; Tue, 19 Sep 2017 15:39:48 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 14B8584963; Tue, 19 Sep 2017 15:39:48 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8JFdlX0014525; Tue, 19 Sep 2017 15:39:47 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8JFdleo014524; Tue, 19 Sep 2017 15:39:47 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201709191539.v8JFdleo014524@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 19 Sep 2017 15:39:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r323765 - releng/10.4/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: releng/10.4/release/doc/en_US.ISO8859-1/relnotes X-SVN-Commit-Revision: 323765 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Sep 2017 15:39:48 -0000 Author: gjb Date: Tue Sep 19 15:39:47 2017 New Revision: 323765 URL: https://svnweb.freebsd.org/changeset/base/323765 Log: Wordsmith entries for r318430 and r313433 for clarification. Submitted by: rpokala Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.4/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: releng/10.4/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- releng/10.4/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Sep 19 15:08:31 2017 (r323764) +++ releng/10.4/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Sep 19 15:39:47 2017 (r323765) @@ -199,8 +199,8 @@ facilities of &man.cxgbe.4; devices. The &man.ifconfig.8; utility has been - updated to persistently store the hardware - MAC addres of an interface. This provides + updated to show MAC addresses + persistently stored by network drivers. This provides a mechanism through which the original MAC address can be retrieved if, for example, an interface is added to a &man.lagg.4; and the MAC is @@ -285,7 +285,7 @@ The &man.bsdinstall.8; utility has been updated to ensure newly-created partitions are properly - aligned at 4096k boundaries. + aligned at 4096 byte boundaries. The default EFI partition created by From owner-svn-src-releng@freebsd.org Wed Sep 20 17:23:46 2017 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CF2D2E19087; Wed, 20 Sep 2017 17:23:46 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9601A741A4; Wed, 20 Sep 2017 17:23:46 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8KHNjXF058455; Wed, 20 Sep 2017 17:23:45 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8KHNj2w058453; Wed, 20 Sep 2017 17:23:45 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201709201723.v8KHNj2w058453@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 20 Sep 2017 17:23:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r323817 - releng/10.4/release/tools X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: releng/10.4/release/tools X-SVN-Commit-Revision: 323817 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Sep 2017 17:23:46 -0000 Author: gjb Date: Wed Sep 20 17:23:45 2017 New Revision: 323817 URL: https://svnweb.freebsd.org/changeset/base/323817 Log: MFS10 r323815: MFC r323812: Bootstrap etcupdate(8) and mergemaster(8) databases when creating virtual machine images and embedded images, similar to what is done when extracting base.txz to the target root filesystem in a new installation. Approved by: re (marius) Sponsored by: The FreeBSD Foundation Modified: releng/10.4/release/tools/arm.subr releng/10.4/release/tools/vmimage.subr Directory Properties: releng/10.4/ (props changed) Modified: releng/10.4/release/tools/arm.subr ============================================================================== --- releng/10.4/release/tools/arm.subr Wed Sep 20 17:15:58 2017 (r323816) +++ releng/10.4/release/tools/arm.subr Wed Sep 20 17:23:45 2017 (r323817) @@ -99,6 +99,16 @@ arm_install_base() { TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \ DESTDIR=${DESTDIR} KERNCONF=${KERNEL} \ installworld installkernel distribution + + # Bootstrap etcupdate(8) and mergemaster(8) databases. + mkdir -p ${DESTDIR}/var/db/etcupdate + etcupdate extract -B \ + -M "TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH}" \ + -s ${WORLDDIR} -d ${DESTDIR}/var/db/etcupdate + sh ${WORLDDIR}/release/scripts/mm-mtree.sh -m ${WORLDDIR} \ + -F "TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH}" \ + -D ${DESTDIR} + chroot ${CHROOTDIR} mkdir -p ${DESTDIR}/boot/msdos arm_create_user Modified: releng/10.4/release/tools/vmimage.subr ============================================================================== --- releng/10.4/release/tools/vmimage.subr Wed Sep 20 17:15:58 2017 (r323816) +++ releng/10.4/release/tools/vmimage.subr Wed Sep 20 17:23:45 2017 (r323817) @@ -116,6 +116,15 @@ vm_install_base() { installworld installkernel distribution || \ err "\n\nCannot install the base system to ${DESTDIR}." + # Bootstrap etcupdate(8) and mergemaster(8) databases. + mkdir -p ${DESTDIR}/var/db/etcupdate + etcupdate extract -B \ + -M "TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}" \ + -s ${WORLDDIR} -d ${DESTDIR}/var/db/etcupdate + sh ${WORLDDIR}/release/scripts/mm-mtree.sh -m ${WORLDDIR} \ + -F "TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}" \ + -D ${DESTDIR} + echo '# Custom /etc/fstab for FreeBSD VM images' \ > ${DESTDIR}/etc/fstab echo '/dev/gpt/rootfs / ufs rw 1 1' \ From owner-svn-src-releng@freebsd.org Wed Sep 20 17:30:02 2017 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B649BE1956C; Wed, 20 Sep 2017 17:30:02 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 907B7744DB; Wed, 20 Sep 2017 17:30:02 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8KHU12p058736; Wed, 20 Sep 2017 17:30:01 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8KHU1LT058735; Wed, 20 Sep 2017 17:30:01 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201709201730.v8KHU1LT058735@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 20 Sep 2017 17:30:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r323818 - releng/10.4/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: releng/10.4/release/doc/en_US.ISO8859-1/relnotes X-SVN-Commit-Revision: 323818 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Sep 2017 17:30:02 -0000 Author: gjb Date: Wed Sep 20 17:30:01 2017 New Revision: 323818 URL: https://svnweb.freebsd.org/changeset/base/323818 Log: Prune the majority of empty sections from the 10.4-RELEASE relnotes page. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.4/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: releng/10.4/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- releng/10.4/release/doc/en_US.ISO8859-1/relnotes/article.xml Wed Sep 20 17:23:45 2017 (r323817) +++ releng/10.4/release/doc/en_US.ISO8859-1/relnotes/article.xml Wed Sep 20 17:30:01 2017 (r323818) @@ -293,20 +293,6 @@ 200MB. - - <filename class="directory">/etc/rc.d</filename> - Scripts - -   - - - - <filename class="directory">/etc/periodic</filename> - Scripts - -   - - Runtime Libraries and API @@ -378,12 +364,6 @@ flush_queue handling. - - Kernel Configuration - -   - - System Tuning and Controls @@ -470,12 +450,6 @@ as hardware changes and updates that do not otherwise fit in other sections of this document. - - Hardware Support - -   - - Virtualization Support @@ -490,12 +464,6 @@ devices to be marked for passthrough or host use at runtime. - - - ARM Support - -   - @@ -504,12 +472,6 @@ This section covers changes and additions to file systems and other storage subsystems, both local and networked. - - General Storage - -   - - Networked Storage @@ -526,18 +488,6 @@ commit through the DS. - - - ZFS - - - - - - &man.geom.4; - -   - @@ -545,18 +495,6 @@ This section covers the boot loader, boot menu, and other boot-related changes. - - - Boot Loader Changes - -   - - - - Boot Menu Changes - -   - @@ -603,12 +541,6 @@ This section covers changes to the &os; Ports Collection, package infrastructure, and package maintenance and installation tools. - - - Infrastructure Changes - -   - Packaging Changes From owner-svn-src-releng@freebsd.org Wed Sep 20 18:04:29 2017 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BA815E1B139; Wed, 20 Sep 2017 18:04:29 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 878FB75944; Wed, 20 Sep 2017 18:04:29 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8KI4SjK074793; Wed, 20 Sep 2017 18:04:28 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8KI4SpE074792; Wed, 20 Sep 2017 18:04:28 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201709201804.v8KI4SpE074792@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 20 Sep 2017 18:04:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r323821 - releng/10.4/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: releng/10.4/release/doc/en_US.ISO8859-1/relnotes X-SVN-Commit-Revision: 323821 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Sep 2017 18:04:29 -0000 Author: gjb Date: Wed Sep 20 18:04:28 2017 New Revision: 323821 URL: https://svnweb.freebsd.org/changeset/base/323821 Log: Document r323333, pw(8) allow empty secondary group list. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.4/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: releng/10.4/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- releng/10.4/release/doc/en_US.ISO8859-1/relnotes/article.xml Wed Sep 20 17:53:25 2017 (r323820) +++ releng/10.4/release/doc/en_US.ISO8859-1/relnotes/article.xml Wed Sep 20 18:04:28 2017 (r323821) @@ -241,6 +241,11 @@ compliant with RFC5424. For more details, see the description for the T flag in &man.newsyslog.conf.5;. + + The &man.pw.8; utility has been updated + to support empty secondary groups being passed with the + -G flag, ensuring the target user does not + have any secondary group memberships. From owner-svn-src-releng@freebsd.org Wed Sep 20 22:14:52 2017 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9525BE26535; Wed, 20 Sep 2017 22:14:52 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 70CFC826BB; Wed, 20 Sep 2017 22:14:52 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8KMEp22078503; Wed, 20 Sep 2017 22:14:51 GMT (envelope-from marius@FreeBSD.org) Received: (from marius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8KMEpno078499; Wed, 20 Sep 2017 22:14:51 GMT (envelope-from marius@FreeBSD.org) Message-Id: <201709202214.v8KMEpno078499@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marius set sender to marius@FreeBSD.org using -f From: Marius Strobl Date: Wed, 20 Sep 2017 22:14:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r323838 - releng/10.4/sys/dev/ixgbe X-SVN-Group: releng X-SVN-Commit-Author: marius X-SVN-Commit-Paths: releng/10.4/sys/dev/ixgbe X-SVN-Commit-Revision: 323838 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Sep 2017 22:14:52 -0000 Author: marius Date: Wed Sep 20 22:14:50 2017 New Revision: 323838 URL: https://svnweb.freebsd.org/changeset/base/323838 Log: MF10: r323830 Unbreak netmap(4) support in ixgbe(4) after r315333: - Both ixgbe_netmap.c and ixv_netmap.c assumed a netmap(4) driver newer than what's actually in stable/10. - Additionally, at the bottom line ixv_netmap.c did exactly the same as ixgbe_netmap.c, i. e. used IXGBE_TDH() as appropriate for PFs only instead of IXGBE_VFTDH() and tried to configure CRC stripping although the corresponding registers aren't available to VFs in the first place. With these changes, the netmap(4) support in ixgbe(4) is in line again with the code in sys/dev/netmap/ixgbe_netmap.h as of r295008. Breakage reported by: Slawa Olhovchenkov Just like r315333 that never existed in head, this is a direct commit to stable/10. However, ixgbe(4) in head has a related bug in that it assumes a netmap(4) driver API older than what's in head and also does the wrong things for VFs as it uses the PF-only ixgbe_netmap.c for both PFs and VFs in the first place. MF10: r323835, MFC: r320916 Reset unsupported SFP tuneable back to original entry name. Approved by: re (gjb) Modified: releng/10.4/sys/dev/ixgbe/if_ix.c releng/10.4/sys/dev/ixgbe/ixgbe_netmap.c releng/10.4/sys/dev/ixgbe/ixv_netmap.c releng/10.4/sys/dev/ixgbe/ixv_netmap.h Directory Properties: releng/10.4/ (props changed) Modified: releng/10.4/sys/dev/ixgbe/if_ix.c ============================================================================== --- releng/10.4/sys/dev/ixgbe/if_ix.c Wed Sep 20 22:11:01 2017 (r323837) +++ releng/10.4/sys/dev/ixgbe/if_ix.c Wed Sep 20 22:14:50 2017 (r323838) @@ -338,7 +338,7 @@ SYSCTL_INT(_hw_ix, OID_AUTO, rxd, CTLFLAG_RDTUN, &ixgb */ static int allow_unsupported_sfp = FALSE; TUNABLE_INT("hw.ix.unsupported_sfp", &allow_unsupported_sfp); -SYSCTL_INT(_hw_ix, OID_AUTO, allow_unsupported_sfp, CTLFLAG_RDTUN, +SYSCTL_INT(_hw_ix, OID_AUTO, unsupported_sfp, CTLFLAG_RDTUN, &allow_unsupported_sfp, 0, "Allow unsupported SFP modules...use at your own risk"); Modified: releng/10.4/sys/dev/ixgbe/ixgbe_netmap.c ============================================================================== --- releng/10.4/sys/dev/ixgbe/ixgbe_netmap.c Wed Sep 20 22:11:01 2017 (r323837) +++ releng/10.4/sys/dev/ixgbe/ixgbe_netmap.c Wed Sep 20 22:14:50 2017 (r323838) @@ -316,6 +316,8 @@ ixgbe_netmap_txsync(struct netmap_kring *kring, int fl } } + nm_txsync_finalize(kring); + return 0; } @@ -343,7 +345,7 @@ ixgbe_netmap_rxsync(struct netmap_kring *kring, int fl u_int nic_i; /* index into the NIC ring */ u_int n; u_int const lim = kring->nkr_num_slots - 1; - u_int const head = kring->rhead; + u_int const head = nm_rxsync_prologue(kring); int force_update = (flags & NAF_FORCE_READ) || kring->nr_kflags & NKR_PENDINTR; /* device-specific */ @@ -449,6 +451,9 @@ ixgbe_netmap_rxsync(struct netmap_kring *kring, int fl nic_i = nm_prev(nic_i, lim); IXGBE_WRITE_REG(&adapter->hw, rxr->tail, nic_i); } + + /* tell userspace that there might be new packets */ + nm_rxsync_finalize(kring); return 0; Modified: releng/10.4/sys/dev/ixgbe/ixv_netmap.c ============================================================================== --- releng/10.4/sys/dev/ixgbe/ixv_netmap.c Wed Sep 20 22:11:01 2017 (r323837) +++ releng/10.4/sys/dev/ixgbe/ixv_netmap.c Wed Sep 20 22:14:50 2017 (r323838) @@ -60,7 +60,7 @@ /* * $FreeBSD$ * - * netmap support for: ixgbe + * netmap support for: ixv * * This file is meant to be a reference on how to implement * netmap support for a network driver. @@ -83,63 +83,17 @@ /* * device-specific sysctl variables: * - * ixv_crcstrip: 0: keep CRC in rx frames (default), 1: strip it. - * During regular operations the CRC is stripped, but on some - * hardware reception of frames not multiple of 64 is slower, - * so using crcstrip=0 helps in benchmarks. - * * ixv_rx_miss, ixv_rx_miss_bufs: * count packets that might be missed due to lost interrupts. */ SYSCTL_DECL(_dev_netmap); static int ixv_rx_miss, ixv_rx_miss_bufs; -int ixv_crcstrip; -SYSCTL_INT(_dev_netmap, OID_AUTO, ixv_crcstrip, - CTLFLAG_RW, &ixv_crcstrip, 0, "strip CRC on rx frames"); SYSCTL_INT(_dev_netmap, OID_AUTO, ixv_rx_miss, CTLFLAG_RW, &ixv_rx_miss, 0, "potentially missed rx intr"); SYSCTL_INT(_dev_netmap, OID_AUTO, ixv_rx_miss_bufs, CTLFLAG_RW, &ixv_rx_miss_bufs, 0, "potentially missed rx intr bufs"); -static void -set_crcstrip(struct ixgbe_hw *hw, int onoff) -{ - /* crc stripping is set in two places: - * IXGBE_HLREG0 (modified on init_locked and hw reset) - * IXGBE_RDRXCTL (set by the original driver in - * ixgbe_setup_hw_rsc() called in init_locked. - * We disable the setting when netmap is compiled in). - * We update the values here, but also in ixgbe.c because - * init_locked sometimes is called outside our control. - */ - uint32_t hl, rxc; - - hl = IXGBE_READ_REG(hw, IXGBE_HLREG0); - rxc = IXGBE_READ_REG(hw, IXGBE_RDRXCTL); - if (netmap_verbose) - D("%s read HLREG 0x%x rxc 0x%x", - onoff ? "enter" : "exit", hl, rxc); - /* hw requirements ... */ - rxc &= ~IXGBE_RDRXCTL_RSCFRSTSIZE; - rxc |= IXGBE_RDRXCTL_RSCACKC; - if (onoff && !ixv_crcstrip) { - /* keep the crc. Fast rx */ - hl &= ~IXGBE_HLREG0_RXCRCSTRP; - rxc &= ~IXGBE_RDRXCTL_CRCSTRIP; - } else { - /* reset default mode */ - hl |= IXGBE_HLREG0_RXCRCSTRP; - rxc |= IXGBE_RDRXCTL_CRCSTRIP; - } - if (netmap_verbose) - D("%s write HLREG 0x%x rxc 0x%x", - onoff ? "enter" : "exit", hl, rxc); - IXGBE_WRITE_REG(hw, IXGBE_HLREG0, hl); - IXGBE_WRITE_REG(hw, IXGBE_RDRXCTL, rxc); -} - - /* * Register/unregister. We are already under netmap lock. * Only called on the first register or the last unregister. @@ -153,7 +107,6 @@ ixv_netmap_reg(struct netmap_adapter *na, int onoff) IXGBE_CORE_LOCK(adapter); adapter->stop_locked(adapter); - set_crcstrip(&adapter->hw, onoff); /* enable or disable flags and callbacks in na and ifp */ if (onoff) { nm_set_native_flags(na); @@ -161,7 +114,6 @@ ixv_netmap_reg(struct netmap_adapter *na, int onoff) nm_clear_native_flags(na); } adapter->init_locked(adapter); /* also enables intr */ - set_crcstrip(&adapter->hw, onoff); // XXX why twice ? IXGBE_CORE_UNLOCK(adapter); return (ifp->if_drv_flags & IFF_DRV_RUNNING ? 0 : 1); } @@ -338,7 +290,7 @@ ixv_netmap_txsync(struct netmap_kring *kring, int flag * REPORT_STATUS in a few slots so TDH is the only * good way. */ - nic_i = IXGBE_READ_REG(&adapter->hw, IXGBE_TDH(kring->ring_id)); + nic_i = IXGBE_READ_REG(&adapter->hw, IXGBE_VFTDH(kring->ring_id)); if (nic_i >= kring->nkr_num_slots) { /* XXX can it happen ? */ D("TDH wrap %d", nic_i); nic_i -= kring->nkr_num_slots; @@ -350,6 +302,8 @@ ixv_netmap_txsync(struct netmap_kring *kring, int flag } } + nm_txsync_finalize(kring); + return 0; } @@ -377,7 +331,7 @@ ixv_netmap_rxsync(struct netmap_kring *kring, int flag u_int nic_i; /* index into the NIC ring */ u_int n; u_int const lim = kring->nkr_num_slots - 1; - u_int const head = kring->rhead; + u_int const head = nm_rxsync_prologue(kring); int force_update = (flags & NAF_FORCE_READ) || kring->nr_kflags & NKR_PENDINTR; /* device-specific */ @@ -407,7 +361,7 @@ ixv_netmap_rxsync(struct netmap_kring *kring, int flag * rxr->next_to_check is set to 0 on a ring reinit */ if (netmap_no_pendintr || force_update) { - int crclen = (ixv_crcstrip) ? 0 : 4; + int crclen = 0; uint16_t slot_flags = kring->nkr_slot_flags; nic_i = rxr->next_to_check; // or also k2n(kring->nr_hwtail) @@ -483,6 +437,9 @@ ixv_netmap_rxsync(struct netmap_kring *kring, int flag nic_i = nm_prev(nic_i, lim); IXGBE_WRITE_REG(&adapter->hw, rxr->tail, nic_i); } + + /* tell userspace that there might be new packets */ + nm_rxsync_finalize(kring); return 0; Modified: releng/10.4/sys/dev/ixgbe/ixv_netmap.h ============================================================================== --- releng/10.4/sys/dev/ixgbe/ixv_netmap.h Wed Sep 20 22:11:01 2017 (r323837) +++ releng/10.4/sys/dev/ixgbe/ixv_netmap.h Wed Sep 20 22:14:50 2017 (r323838) @@ -42,12 +42,10 @@ #include #include -extern int ixv_crcstrip; - /* - * ixgbe_netmap.c contains functions for netmap + * ixv_netmap.c contains functions for netmap * support that extend the standard driver. See additional - * comments in ixgbe_netmap.c. + * comments in ixv_netmap.c. */ void ixv_netmap_attach(struct adapter *adapter); From owner-svn-src-releng@freebsd.org Thu Sep 21 20:13:05 2017 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EDD0BE1F233; Thu, 21 Sep 2017 20:13:05 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C951A68617; Thu, 21 Sep 2017 20:13:05 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8LKD5dP024258; Thu, 21 Sep 2017 20:13:05 GMT (envelope-from marius@FreeBSD.org) Received: (from marius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8LKD3Of024243; Thu, 21 Sep 2017 20:13:03 GMT (envelope-from marius@FreeBSD.org) Message-Id: <201709212013.v8LKD3Of024243@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marius set sender to marius@FreeBSD.org using -f From: Marius Strobl Date: Thu, 21 Sep 2017 20:13:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r323872 - in releng/10.4: share/man/man9 sys/kern sys/sys X-SVN-Group: releng X-SVN-Commit-Author: marius X-SVN-Commit-Paths: in releng/10.4: share/man/man9 sys/kern sys/sys X-SVN-Commit-Revision: 323872 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Sep 2017 20:13:06 -0000 Author: marius Date: Thu Sep 21 20:13:03 2017 New Revision: 323872 URL: https://svnweb.freebsd.org/changeset/base/323872 Log: MF10: r323870, MFC: r275751 Add _NEW flag to mtx(9), sx(9), rmlock(9) and rwlock(9). A _NEW flag passed to _init_flags() to avoid check for double-init. Approved by: re (gjb) Modified: releng/10.4/share/man/man9/mutex.9 releng/10.4/share/man/man9/rmlock.9 releng/10.4/share/man/man9/rwlock.9 releng/10.4/share/man/man9/sx.9 releng/10.4/sys/kern/kern_mutex.c releng/10.4/sys/kern/kern_rmlock.c releng/10.4/sys/kern/kern_rwlock.c releng/10.4/sys/kern/kern_sx.c releng/10.4/sys/kern/subr_lock.c releng/10.4/sys/sys/lock.h releng/10.4/sys/sys/mutex.h releng/10.4/sys/sys/rmlock.h releng/10.4/sys/sys/rwlock.h releng/10.4/sys/sys/sx.h Directory Properties: releng/10.4/ (props changed) Modified: releng/10.4/share/man/man9/mutex.9 ============================================================================== --- releng/10.4/share/man/man9/mutex.9 Thu Sep 21 19:30:32 2017 (r323871) +++ releng/10.4/share/man/man9/mutex.9 Thu Sep 21 20:13:03 2017 (r323872) @@ -183,13 +183,17 @@ It may contain either or .Dv MTX_SPIN but not both. -See below for additional initialization options. -It is not permissible to pass the same -.Fa mutex -to +If the kernel has been compiled with +.Cd "option INVARIANTS" , .Fn mtx_init -multiple times without intervening calls to -.Fn mtx_destroy . +will assert that the +.Fa mutex +has not been initialized multiple times without intervening calls to +.Fn mtx_destroy +unless the +.Dv MTX_NEW +option is specified. +See below for additional initialization options. .Pp The .Fn mtx_lock @@ -473,6 +477,8 @@ to ignore this lock. Witness should not log messages about duplicate locks being acquired. .It Dv MTX_NOPROFILE Do not profile this lock. +.It Dv MTX_NEW +Do not check for double-init. .El .Ss Lock and Unlock Flags The flags passed to the Modified: releng/10.4/share/man/man9/rmlock.9 ============================================================================== --- releng/10.4/share/man/man9/rmlock.9 Thu Sep 21 19:30:32 2017 (r323871) +++ releng/10.4/share/man/man9/rmlock.9 Thu Sep 21 20:13:03 2017 (r323872) @@ -26,7 +26,7 @@ .\" $FreeBSD$ .\" .\" Based on rwlock.9 man page -.Dd June 25, 2013 +.Dd December 13, 2014 .Dt RMLOCK 9 .Os .Sh NAME @@ -156,6 +156,15 @@ Allow threads to recursively acquire shared locks for .Fa rm . .It Dv RM_SLEEPABLE Create a sleepable read-mostly lock. +.It Dv RM_NEW +If the kernel has been compiled with +.Cd "option INVARIANTS" , +.Fn rm_init_flags +will assert that the +.Fa rm +has not been initialized multiple times without intervening calls to +.Fn rm_destroy +unless this option is specified. .El .It Fn rm_rlock "struct rmlock *rm" "struct rm_priotracker* tracker" Lock Modified: releng/10.4/share/man/man9/rwlock.9 ============================================================================== --- releng/10.4/share/man/man9/rwlock.9 Thu Sep 21 19:30:32 2017 (r323871) +++ releng/10.4/share/man/man9/rwlock.9 Thu Sep 21 20:13:03 2017 (r323872) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 20, 2013 +.Dd December 13, 2014 .Dt RWLOCK 9 .Os .Sh NAME @@ -154,6 +154,15 @@ Do not log any operations for this lock via .It Dv RW_RECURSE Allow threads to recursively acquire exclusive locks for .Fa rw . +.It Dv RW_NEW +If the kernel has been compiled with +.Cd "option INVARIANTS" , +.Fn rw_init_flags +will assert that the +.Fa rw +has not been initialized multiple times without intervening calls to +.Fn rw_destroy +unless this option is specified. .El .It Fn rw_rlock "struct rwlock *rw" Lock Modified: releng/10.4/share/man/man9/sx.9 ============================================================================== --- releng/10.4/share/man/man9/sx.9 Thu Sep 21 19:30:32 2017 (r323871) +++ releng/10.4/share/man/man9/sx.9 Thu Sep 21 20:13:03 2017 (r323872) @@ -142,6 +142,15 @@ Allow threads to recursively acquire exclusive locks f .It Dv SX_QUIET Do not log any operations for this lock via .Xr ktr 4 . +.It Dv SX_NEW +If the kernel has been compiled with +.Cd "options INVARIANTS" , +.Fn sx_init +will assert that the +.Fa sx +has not been initialized multiple times without intervening calls to +.Fn sx_destroy +unless this option is specified. .El .Pp Shared/exclusive locks are destroyed with Modified: releng/10.4/sys/kern/kern_mutex.c ============================================================================== --- releng/10.4/sys/kern/kern_mutex.c Thu Sep 21 19:30:32 2017 (r323871) +++ releng/10.4/sys/kern/kern_mutex.c Thu Sep 21 20:13:03 2017 (r323872) @@ -979,7 +979,7 @@ _mtx_init(volatile uintptr_t *c, const char *name, con m = mtxlock2mtx(c); MPASS((opts & ~(MTX_SPIN | MTX_QUIET | MTX_RECURSE | - MTX_NOWITNESS | MTX_DUPOK | MTX_NOPROFILE)) == 0); + MTX_NOWITNESS | MTX_DUPOK | MTX_NOPROFILE | MTX_NEW)) == 0); ASSERT_ATOMIC_LOAD_PTR(m->mtx_lock, ("%s: mtx_lock not aligned for %s: %p", __func__, name, &m->mtx_lock)); @@ -1005,6 +1005,8 @@ _mtx_init(volatile uintptr_t *c, const char *name, con flags |= LO_DUPOK; if (opts & MTX_NOPROFILE) flags |= LO_NOPROFILE; + if (opts & MTX_NEW) + flags |= LO_NEW; /* Initialize mutex. */ lock_init(&m->lock_object, class, name, type, flags); Modified: releng/10.4/sys/kern/kern_rmlock.c ============================================================================== --- releng/10.4/sys/kern/kern_rmlock.c Thu Sep 21 19:30:32 2017 (r323871) +++ releng/10.4/sys/kern/kern_rmlock.c Thu Sep 21 20:13:03 2017 (r323872) @@ -278,22 +278,28 @@ void rm_init_flags(struct rmlock *rm, const char *name, int opts) { struct lock_class *lc; - int liflags; + int liflags, xflags; liflags = 0; if (!(opts & RM_NOWITNESS)) liflags |= LO_WITNESS; if (opts & RM_RECURSE) liflags |= LO_RECURSABLE; + if (opts & RM_NEW) + liflags |= LO_NEW; rm->rm_writecpus = all_cpus; LIST_INIT(&rm->rm_activeReaders); if (opts & RM_SLEEPABLE) { liflags |= LO_SLEEPABLE; lc = &lock_class_rm_sleepable; - sx_init_flags(&rm->rm_lock_sx, "rmlock_sx", SX_NOWITNESS); + xflags = (opts & RM_NEW ? SX_NEW : 0); + sx_init_flags(&rm->rm_lock_sx, "rmlock_sx", + xflags | SX_NOWITNESS); } else { lc = &lock_class_rm; - mtx_init(&rm->rm_lock_mtx, name, "rmlock_mtx", MTX_NOWITNESS); + xflags = (opts & RM_NEW ? MTX_NEW : 0); + mtx_init(&rm->rm_lock_mtx, name, "rmlock_mtx", + xflags | MTX_NOWITNESS); } lock_init(&rm->lock_object, lc, name, NULL, liflags); } Modified: releng/10.4/sys/kern/kern_rwlock.c ============================================================================== --- releng/10.4/sys/kern/kern_rwlock.c Thu Sep 21 19:30:32 2017 (r323871) +++ releng/10.4/sys/kern/kern_rwlock.c Thu Sep 21 20:13:03 2017 (r323872) @@ -216,7 +216,7 @@ _rw_init_flags(volatile uintptr_t *c, const char *name rw = rwlock2rw(c); MPASS((opts & ~(RW_DUPOK | RW_NOPROFILE | RW_NOWITNESS | RW_QUIET | - RW_RECURSE)) == 0); + RW_RECURSE | RW_NEW)) == 0); ASSERT_ATOMIC_LOAD_PTR(rw->rw_lock, ("%s: rw_lock not aligned for %s: %p", __func__, name, &rw->rw_lock)); @@ -232,6 +232,8 @@ _rw_init_flags(volatile uintptr_t *c, const char *name flags |= LO_RECURSABLE; if (opts & RW_QUIET) flags |= LO_QUIET; + if (opts & RW_NEW) + flags |= LO_NEW; lock_init(&rw->lock_object, &lock_class_rw, name, NULL, flags); rw->rw_lock = RW_UNLOCKED; Modified: releng/10.4/sys/kern/kern_sx.c ============================================================================== --- releng/10.4/sys/kern/kern_sx.c Thu Sep 21 19:30:32 2017 (r323871) +++ releng/10.4/sys/kern/kern_sx.c Thu Sep 21 20:13:03 2017 (r323872) @@ -240,7 +240,7 @@ sx_init_flags(struct sx *sx, const char *description, int flags; MPASS((opts & ~(SX_QUIET | SX_RECURSE | SX_NOWITNESS | SX_DUPOK | - SX_NOPROFILE | SX_NOADAPTIVE)) == 0); + SX_NOPROFILE | SX_NOADAPTIVE | SX_NEW)) == 0); ASSERT_ATOMIC_LOAD_PTR(sx->sx_lock, ("%s: sx_lock not aligned for %s: %p", __func__, description, &sx->sx_lock)); @@ -256,6 +256,8 @@ sx_init_flags(struct sx *sx, const char *description, flags |= LO_RECURSABLE; if (opts & SX_QUIET) flags |= LO_QUIET; + if (opts & SX_NEW) + flags |= LO_NEW; flags |= opts & SX_NOADAPTIVE; lock_init(&sx->lock_object, &lock_class_sx, description, NULL, flags); Modified: releng/10.4/sys/kern/subr_lock.c ============================================================================== --- releng/10.4/sys/kern/subr_lock.c Thu Sep 21 19:30:32 2017 (r323871) +++ releng/10.4/sys/kern/subr_lock.c Thu Sep 21 20:13:03 2017 (r323872) @@ -76,8 +76,8 @@ lock_init(struct lock_object *lock, struct lock_class int i; /* Check for double-init and zero object. */ - KASSERT(!lock_initalized(lock), ("lock \"%s\" %p already initialized", - name, lock)); + KASSERT(flags & LO_NEW || !lock_initalized(lock), + ("lock \"%s\" %p already initialized", name, lock)); /* Look up lock class to find its index. */ for (i = 0; i < LOCK_CLASS_MAX; i++) Modified: releng/10.4/sys/sys/lock.h ============================================================================== --- releng/10.4/sys/sys/lock.h Thu Sep 21 19:30:32 2017 (r323871) +++ releng/10.4/sys/sys/lock.h Thu Sep 21 20:13:03 2017 (r323872) @@ -83,6 +83,7 @@ struct lock_class { #define LO_IS_VNODE 0x00800000 /* Tell WITNESS about a VNODE lock */ #define LO_CLASSMASK 0x0f000000 /* Class index bitmask. */ #define LO_NOPROFILE 0x10000000 /* Don't profile this lock */ +#define LO_NEW 0x20000000 /* Don't check for double-init */ /* * Lock classes are statically assigned an index into the gobal lock_classes Modified: releng/10.4/sys/sys/mutex.h ============================================================================== --- releng/10.4/sys/sys/mutex.h Thu Sep 21 19:30:32 2017 (r323871) +++ releng/10.4/sys/sys/mutex.h Thu Sep 21 20:13:03 2017 (r323872) @@ -52,6 +52,7 @@ #define MTX_RECURSE 0x00000004 /* Option: lock allowed to recurse */ #define MTX_NOWITNESS 0x00000008 /* Don't do any witness checking. */ #define MTX_NOPROFILE 0x00000020 /* Don't profile this lock */ +#define MTX_NEW 0x00000040 /* Don't check for double-init */ /* * Option flags passed to certain lock/unlock routines, through the use Modified: releng/10.4/sys/sys/rmlock.h ============================================================================== --- releng/10.4/sys/sys/rmlock.h Thu Sep 21 19:30:32 2017 (r323871) +++ releng/10.4/sys/sys/rmlock.h Thu Sep 21 20:13:03 2017 (r323872) @@ -45,6 +45,7 @@ #define RM_NOWITNESS 0x00000001 #define RM_RECURSE 0x00000002 #define RM_SLEEPABLE 0x00000004 +#define RM_NEW 0x00000008 void rm_init(struct rmlock *rm, const char *name); void rm_init_flags(struct rmlock *rm, const char *name, int opts); Modified: releng/10.4/sys/sys/rwlock.h ============================================================================== --- releng/10.4/sys/sys/rwlock.h Thu Sep 21 19:30:32 2017 (r323871) +++ releng/10.4/sys/sys/rwlock.h Thu Sep 21 20:13:03 2017 (r323872) @@ -254,6 +254,7 @@ struct rw_args_flags { #define RW_NOWITNESS 0x04 #define RW_QUIET 0x08 #define RW_RECURSE 0x10 +#define RW_NEW 0x20 /* * The INVARIANTS-enabled rw_assert() functionality. Modified: releng/10.4/sys/sys/sx.h ============================================================================== --- releng/10.4/sys/sys/sx.h Thu Sep 21 19:30:32 2017 (r323871) +++ releng/10.4/sys/sys/sx.h Thu Sep 21 20:13:03 2017 (r323872) @@ -289,6 +289,7 @@ __sx_sunlock(struct sx *sx, const char *file, int line #define SX_QUIET 0x08 #define SX_NOADAPTIVE 0x10 #define SX_RECURSE 0x20 +#define SX_NEW 0x40 /* * Options passed to sx_*lock_hard(). From owner-svn-src-releng@freebsd.org Thu Sep 21 20:29:15 2017 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 88891E20404; Thu, 21 Sep 2017 20:29:15 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 63B5C69747; Thu, 21 Sep 2017 20:29:15 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8LKTEAn028983; Thu, 21 Sep 2017 20:29:14 GMT (envelope-from marius@FreeBSD.org) Received: (from marius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8LKTE8F028981; Thu, 21 Sep 2017 20:29:14 GMT (envelope-from marius@FreeBSD.org) Message-Id: <201709212029.v8LKTE8F028981@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marius set sender to marius@FreeBSD.org using -f From: Marius Strobl Date: Thu, 21 Sep 2017 20:29:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r323875 - releng/10.4/sys/crypto/aesni X-SVN-Group: releng X-SVN-Commit-Author: marius X-SVN-Commit-Paths: releng/10.4/sys/crypto/aesni X-SVN-Commit-Revision: 323875 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Sep 2017 20:29:15 -0000 Author: marius Date: Thu Sep 21 20:29:14 2017 New Revision: 323875 URL: https://svnweb.freebsd.org/changeset/base/323875 Log: MF10: r323871 MFC: r285215 remove _NORMAL flag which isn't suppose to be used w/ _alloc_ctx... MFC: r285289 address an issue where consumers, like IPsec, can reuse the same session in multiple threads w/o locking.. There was a single fpu context shared per session, if multiple threads were using the session, and both migrated away, they could corrupt each other's fpu context... MFC: r285297 upon further examination, it turns out that _unregister_all already provides the guarantee that no threads will be in the _newsession code.. MFC: r298332 aesni(4): Initialize error before use [1] Reported by: Coverity [1] CID: 1331554 [1] Approved by: re (gjb, kib) Modified: releng/10.4/sys/crypto/aesni/aesni.c releng/10.4/sys/crypto/aesni/aesni.h Directory Properties: releng/10.4/ (props changed) Modified: releng/10.4/sys/crypto/aesni/aesni.c ============================================================================== --- releng/10.4/sys/crypto/aesni/aesni.c Thu Sep 21 20:27:43 2017 (r323874) +++ releng/10.4/sys/crypto/aesni/aesni.c Thu Sep 21 20:29:14 2017 (r323875) @@ -39,16 +39,34 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include +static struct mtx_padalign *ctx_mtx; +static struct fpu_kern_ctx **ctx_fpu; + struct aesni_softc { + int dieing; int32_t cid; uint32_t sid; TAILQ_HEAD(aesni_sessions_head, aesni_session) sessions; struct rwlock lock; }; +#define AQUIRE_CTX(i, ctx) \ + do { \ + (i) = PCPU_GET(cpuid); \ + mtx_lock(&ctx_mtx[(i)]); \ + (ctx) = ctx_fpu[(i)]; \ + } while (0) +#define RELEASE_CTX(i, ctx) \ + do { \ + mtx_unlock(&ctx_mtx[(i)]); \ + (i) = -1; \ + (ctx) = NULL; \ + } while (0) + static int aesni_newsession(device_t, uint32_t *sidp, struct cryptoini *cri); static int aesni_freesession(device_t, uint64_t tid); static void aesni_freesession_locked(struct aesni_softc *sc, @@ -88,14 +106,36 @@ aesni_probe(device_t dev) return (0); } +static void +aensi_cleanctx(void) +{ + int i; + + /* XXX - no way to return driverid */ + CPU_FOREACH(i) { + if (ctx_fpu[i] != NULL) { + mtx_destroy(&ctx_mtx[i]); + fpu_kern_free_ctx(ctx_fpu[i]); + } + ctx_fpu[i] = NULL; + } + free(ctx_mtx, M_AESNI); + ctx_mtx = NULL; + free(ctx_fpu, M_AESNI); + ctx_fpu = NULL; +} + static int aesni_attach(device_t dev) { struct aesni_softc *sc; + int i; sc = device_get_softc(dev); + sc->dieing = 0; TAILQ_INIT(&sc->sessions); sc->sid = 1; + sc->cid = crypto_get_driverid(dev, CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SYNC); if (sc->cid < 0) { @@ -103,6 +143,16 @@ aesni_attach(device_t dev) return (ENOMEM); } + ctx_mtx = malloc(sizeof *ctx_mtx * (mp_maxid + 1), M_AESNI, + M_WAITOK|M_ZERO); + ctx_fpu = malloc(sizeof *ctx_fpu * (mp_maxid + 1), M_AESNI, + M_WAITOK|M_ZERO); + + CPU_FOREACH(i) { + ctx_fpu[i] = fpu_kern_alloc_ctx(0); + mtx_init(&ctx_mtx[i], "anifpumtx", NULL, MTX_DEF|MTX_NEW); + } + rw_init(&sc->lock, "aesni_lock"); crypto_register(sc->cid, CRYPTO_AES_CBC, 0, 0); crypto_register(sc->cid, CRYPTO_AES_XTS, 0, 0); @@ -116,6 +166,7 @@ aesni_detach(device_t dev) struct aesni_session *ses; sc = device_get_softc(dev); + rw_wlock(&sc->lock); TAILQ_FOREACH(ses, &sc->sessions, next) { if (ses->used) { @@ -125,14 +176,18 @@ aesni_detach(device_t dev) return (EBUSY); } } + sc->dieing = 1; while ((ses = TAILQ_FIRST(&sc->sessions)) != NULL) { TAILQ_REMOVE(&sc->sessions, ses, next); - fpu_kern_free_ctx(ses->fpu_ctx); free(ses, M_AESNI); } rw_wunlock(&sc->lock); - rw_destroy(&sc->lock); crypto_unregister_all(sc->cid); + + rw_destroy(&sc->lock); + + aensi_cleanctx(); + return (0); } @@ -148,6 +203,9 @@ aesni_newsession(device_t dev, uint32_t *sidp, struct return (EINVAL); sc = device_get_softc(dev); + if (sc->dieing) + return (EINVAL); + ses = NULL; encini = NULL; for (; cri != NULL; cri = cri->cri_next) { @@ -166,6 +224,10 @@ aesni_newsession(device_t dev, uint32_t *sidp, struct return (EINVAL); rw_wlock(&sc->lock); + if (sc->dieing) { + rw_wunlock(&sc->lock); + return (EINVAL); + } /* * Free sessions goes first, so if first session is used, we need to * allocate one. @@ -177,13 +239,6 @@ aesni_newsession(device_t dev, uint32_t *sidp, struct rw_wunlock(&sc->lock); return (ENOMEM); } - ses->fpu_ctx = fpu_kern_alloc_ctx(FPU_KERN_NORMAL | - FPU_KERN_NOWAIT); - if (ses->fpu_ctx == NULL) { - free(ses, M_AESNI); - rw_wunlock(&sc->lock); - return (ENOMEM); - } ses->id = sc->sid++; } else { TAILQ_REMOVE(&sc->sessions, ses, next); @@ -208,15 +263,14 @@ aesni_newsession(device_t dev, uint32_t *sidp, struct static void aesni_freesession_locked(struct aesni_softc *sc, struct aesni_session *ses) { - struct fpu_kern_ctx *ctx; uint32_t sid; + rw_assert(&sc->lock, RA_WLOCKED); + sid = ses->id; TAILQ_REMOVE(&sc->sessions, ses, next); - ctx = ses->fpu_ctx; bzero(ses, sizeof(*ses)); ses->id = sid; - ses->fpu_ctx = ctx; TAILQ_INSERT_HEAD(&sc->sessions, ses, next); } @@ -362,17 +416,27 @@ MODULE_DEPEND(aesni, crypto, 1, 1, 1); static int aesni_cipher_setup(struct aesni_session *ses, struct cryptoini *encini) { - struct thread *td; + struct fpu_kern_ctx *ctx; int error; + int kt, ctxidx; - td = curthread; - error = fpu_kern_enter(td, ses->fpu_ctx, FPU_KERN_NORMAL | - FPU_KERN_KTHR); - if (error != 0) - return (error); + kt = is_fpu_kern_thread(0); + if (!kt) { + AQUIRE_CTX(ctxidx, ctx); + error = fpu_kern_enter(curthread, ctx, + FPU_KERN_NORMAL | FPU_KERN_KTHR); + if (error != 0) + goto out; + } + error = aesni_cipher_setup_common(ses, encini->cri_key, encini->cri_klen); - fpu_kern_leave(td, ses->fpu_ctx); + + if (!kt) { + fpu_kern_leave(curthread, ctx); +out: + RELEASE_CTX(ctxidx, ctx); + } return (error); } @@ -380,19 +444,24 @@ static int aesni_cipher_process(struct aesni_session *ses, struct cryptodesc *enccrd, struct cryptop *crp) { - struct thread *td; + struct fpu_kern_ctx *ctx; uint8_t *buf; int error, allocated; + int kt, ctxidx; buf = aesni_cipher_alloc(enccrd, crp, &allocated); if (buf == NULL) return (ENOMEM); - td = curthread; - error = fpu_kern_enter(td, ses->fpu_ctx, FPU_KERN_NORMAL | - FPU_KERN_KTHR); - if (error != 0) - goto out1; + error = 0; + kt = is_fpu_kern_thread(0); + if (!kt) { + AQUIRE_CTX(ctxidx, ctx); + error = fpu_kern_enter(curthread, ctx, + FPU_KERN_NORMAL|FPU_KERN_KTHR); + if (error != 0) + goto out2; + } if ((enccrd->crd_flags & CRD_F_KEY_EXPLICIT) != 0) { error = aesni_cipher_setup_common(ses, enccrd->crd_key, @@ -438,8 +507,12 @@ aesni_cipher_process(struct aesni_session *ses, struct enccrd->crd_skip + enccrd->crd_len - AES_BLOCK_LEN, AES_BLOCK_LEN, ses->iv); out: - fpu_kern_leave(td, ses->fpu_ctx); -out1: + if (!kt) { + fpu_kern_leave(curthread, ctx); +out2: + RELEASE_CTX(ctxidx, ctx); + } + if (allocated) { bzero(buf, enccrd->crd_len); free(buf, M_AESNI); Modified: releng/10.4/sys/crypto/aesni/aesni.h ============================================================================== --- releng/10.4/sys/crypto/aesni/aesni.h Thu Sep 21 20:27:43 2017 (r323874) +++ releng/10.4/sys/crypto/aesni/aesni.h Thu Sep 21 20:29:14 2017 (r323875) @@ -65,7 +65,6 @@ struct aesni_session { int used; uint32_t id; TAILQ_ENTRY(aesni_session) next; - struct fpu_kern_ctx *fpu_ctx; }; /* From owner-svn-src-releng@freebsd.org Fri Sep 22 00:16:47 2017 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8A088E02E98; Fri, 22 Sep 2017 00:16:47 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 566C8719D6; Fri, 22 Sep 2017 00:16:47 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8M0GkgO024552; Fri, 22 Sep 2017 00:16:46 GMT (envelope-from marius@FreeBSD.org) Received: (from marius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8M0GkRh024551; Fri, 22 Sep 2017 00:16:46 GMT (envelope-from marius@FreeBSD.org) Message-Id: <201709220016.v8M0GkRh024551@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marius set sender to marius@FreeBSD.org using -f From: Marius Strobl Date: Fri, 22 Sep 2017 00:16:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r323890 - releng/10.4/sys/conf X-SVN-Group: releng X-SVN-Commit-Author: marius X-SVN-Commit-Paths: releng/10.4/sys/conf X-SVN-Commit-Revision: 323890 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Sep 2017 00:16:47 -0000 Author: marius Date: Fri Sep 22 00:16:46 2017 New Revision: 323890 URL: https://svnweb.freebsd.org/changeset/base/323890 Log: Update releng/10.4 to RC2 in preparation for 10.4-RC2 builds. Approved by: re (implicit) Modified: releng/10.4/sys/conf/newvers.sh Modified: releng/10.4/sys/conf/newvers.sh ============================================================================== --- releng/10.4/sys/conf/newvers.sh Fri Sep 22 00:15:54 2017 (r323889) +++ releng/10.4/sys/conf/newvers.sh Fri Sep 22 00:16:46 2017 (r323890) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="10.4" -BRANCH="RC1" +BRANCH="RC2" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi From owner-svn-src-releng@freebsd.org Fri Sep 22 05:14:12 2017 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6DEDEE163A9; Fri, 22 Sep 2017 05:14:12 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3D15E7E295; Fri, 22 Sep 2017 05:14:12 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8M5EBBL047833; Fri, 22 Sep 2017 05:14:11 GMT (envelope-from marius@FreeBSD.org) Received: (from marius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8M5EBWi047832; Fri, 22 Sep 2017 05:14:11 GMT (envelope-from marius@FreeBSD.org) Message-Id: <201709220514.v8M5EBWi047832@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marius set sender to marius@FreeBSD.org using -f From: Marius Strobl Date: Fri, 22 Sep 2017 05:14:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r323901 - releng/10.4/release X-SVN-Group: releng X-SVN-Commit-Author: marius X-SVN-Commit-Paths: releng/10.4/release X-SVN-Commit-Revision: 323901 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Sep 2017 05:14:12 -0000 Author: marius Date: Fri Sep 22 05:14:11 2017 New Revision: 323901 URL: https://svnweb.freebsd.org/changeset/base/323901 Log: MF10: r323900 - Akin r302691 in head, synchronize the build stripping for the disc1 image with that of the bootonly image (but similarly modulo games and groff(1)) as the amd64 disc1 image is overflowing. This also removes the defunct WITHOUT_ATF. - Remove the misspelled WITHOUT_INSTALLIB (also in place with correct spelling, i. e. WITHOUT_INSTALLLIB) from the bootonly image build stripping. This is a direct commit to stable/10 as the corresponding knobs have different names in head and counterparts to e. g. MK_DEBUG_FILES and MK_TESTS default to off in stable/10 in the first place. Approved by: re (implicit) Modified: releng/10.4/release/Makefile Directory Properties: releng/10.4/ (props changed) Modified: releng/10.4/release/Makefile ============================================================================== --- releng/10.4/release/Makefile Fri Sep 22 04:57:42 2017 (r323900) +++ releng/10.4/release/Makefile Fri Sep 22 05:14:11 2017 (r323901) @@ -192,8 +192,11 @@ disc1: packagesystem # Install system mkdir -p ${.TARGET} cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \ - DESTDIR=${.OBJDIR}/${.TARGET} WITHOUT_RESCUE=1 WITHOUT_KERNEL_SYMBOLS=1 \ - WITHOUT_PROFILE=1 WITHOUT_SENDMAIL=1 WITHOUT_ATF=1 WITHOUT_LIB32=1 + DESTDIR=${.OBJDIR}/${.TARGET} WITHOUT_AMD=1 WITHOUT_AT=1 \ + WITHOUT_INSTALLLIB=1 WITHOUT_LIB32=1 WITHOUT_MAIL=1 \ + WITHOUT_NCP=1 WITHOUT_TOOLCHAIN=1 WITHOUT_PROFILE=1 \ + WITHOUT_RESCUE=1 WITHOUT_DICT=1 \ + WITHOUT_KERNEL_SYMBOLS=1 # Copy distfiles mkdir -p ${.TARGET}/usr/freebsd-dist cp *.txz MANIFEST ${.TARGET}/usr/freebsd-dist @@ -217,7 +220,7 @@ bootonly: packagesystem WITHOUT_GAMES=1 WITHOUT_GROFF=1 \ WITHOUT_INSTALLLIB=1 WITHOUT_LIB32=1 WITHOUT_MAIL=1 \ WITHOUT_NCP=1 WITHOUT_TOOLCHAIN=1 WITHOUT_PROFILE=1 \ - WITHOUT_INSTALLIB=1 WITHOUT_RESCUE=1 WITHOUT_DICT=1 \ + WITHOUT_RESCUE=1 WITHOUT_DICT=1 \ WITHOUT_KERNEL_SYMBOLS=1 # Copy manifest only (no distfiles) to get checksums mkdir -p ${.TARGET}/usr/freebsd-dist From owner-svn-src-releng@freebsd.org Fri Sep 22 14:56:44 2017 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B9AD7E00AF1; Fri, 22 Sep 2017 14:56:44 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 88EC76F2EF; Fri, 22 Sep 2017 14:56:44 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8MEuhrO097852; Fri, 22 Sep 2017 14:56:43 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8MEuhJT097851; Fri, 22 Sep 2017 14:56:43 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201709221456.v8MEuhJT097851@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 22 Sep 2017 14:56:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r323926 - releng/10.4/release/tools X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: releng/10.4/release/tools X-SVN-Commit-Revision: 323926 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Sep 2017 14:56:44 -0000 Author: gjb Date: Fri Sep 22 14:56:43 2017 New Revision: 323926 URL: https://svnweb.freebsd.org/changeset/base/323926 Log: MFS10 r323925: MFC r323924: Revert r323812 from release/tools/arm.subr, which has broken the build on arm/armv6 images. Pointyhat: gjb (myself) Approved by: re (marius) Sponsored by: The FreeBSD Foundation Modified: releng/10.4/release/tools/arm.subr Directory Properties: releng/10.4/ (props changed) Modified: releng/10.4/release/tools/arm.subr ============================================================================== --- releng/10.4/release/tools/arm.subr Fri Sep 22 14:40:04 2017 (r323925) +++ releng/10.4/release/tools/arm.subr Fri Sep 22 14:56:43 2017 (r323926) @@ -99,16 +99,6 @@ arm_install_base() { TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \ DESTDIR=${DESTDIR} KERNCONF=${KERNEL} \ installworld installkernel distribution - - # Bootstrap etcupdate(8) and mergemaster(8) databases. - mkdir -p ${DESTDIR}/var/db/etcupdate - etcupdate extract -B \ - -M "TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH}" \ - -s ${WORLDDIR} -d ${DESTDIR}/var/db/etcupdate - sh ${WORLDDIR}/release/scripts/mm-mtree.sh -m ${WORLDDIR} \ - -F "TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH}" \ - -D ${DESTDIR} - chroot ${CHROOTDIR} mkdir -p ${DESTDIR}/boot/msdos arm_create_user From owner-svn-src-releng@freebsd.org Fri Sep 22 15:27:03 2017 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AA767E01C8D; Fri, 22 Sep 2017 15:27:03 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7730E70586; Fri, 22 Sep 2017 15:27:03 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8MFR25S010861; Fri, 22 Sep 2017 15:27:02 GMT (envelope-from marius@FreeBSD.org) Received: (from marius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8MFR2fW010860; Fri, 22 Sep 2017 15:27:02 GMT (envelope-from marius@FreeBSD.org) Message-Id: <201709221527.v8MFR2fW010860@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marius set sender to marius@FreeBSD.org using -f From: Marius Strobl Date: Fri, 22 Sep 2017 15:27:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r323927 - releng/10.4/sys/conf X-SVN-Group: releng X-SVN-Commit-Author: marius X-SVN-Commit-Paths: releng/10.4/sys/conf X-SVN-Commit-Revision: 323927 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Sep 2017 15:27:03 -0000 Author: marius Date: Fri Sep 22 15:27:02 2017 New Revision: 323927 URL: https://svnweb.freebsd.org/changeset/base/323927 Log: Revert releng/10.4 to RC1 again. Approved by: re (implicit) Modified: releng/10.4/sys/conf/newvers.sh Modified: releng/10.4/sys/conf/newvers.sh ============================================================================== --- releng/10.4/sys/conf/newvers.sh Fri Sep 22 14:56:43 2017 (r323926) +++ releng/10.4/sys/conf/newvers.sh Fri Sep 22 15:27:02 2017 (r323927) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="10.4" -BRANCH="RC2" +BRANCH="RC1" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi From owner-svn-src-releng@freebsd.org Fri Sep 22 15:27:51 2017 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C4F66E01D41; Fri, 22 Sep 2017 15:27:51 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 91D60706C8; Fri, 22 Sep 2017 15:27:51 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8MFRooB010926; Fri, 22 Sep 2017 15:27:50 GMT (envelope-from marius@FreeBSD.org) Received: (from marius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8MFRo5I010925; Fri, 22 Sep 2017 15:27:50 GMT (envelope-from marius@FreeBSD.org) Message-Id: <201709221527.v8MFRo5I010925@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marius set sender to marius@FreeBSD.org using -f From: Marius Strobl Date: Fri, 22 Sep 2017 15:27:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r323928 - releng/10.4/sys/conf X-SVN-Group: releng X-SVN-Commit-Author: marius X-SVN-Commit-Paths: releng/10.4/sys/conf X-SVN-Commit-Revision: 323928 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Sep 2017 15:27:51 -0000 Author: marius Date: Fri Sep 22 15:27:50 2017 New Revision: 323928 URL: https://svnweb.freebsd.org/changeset/base/323928 Log: Update releng/10.4 to RC2 again so the revision of sys/conf/newvers.sh will reflect the (hopefully) final 10.4-RC2 builds. Approved by: re (implicit) Modified: releng/10.4/sys/conf/newvers.sh Modified: releng/10.4/sys/conf/newvers.sh ============================================================================== --- releng/10.4/sys/conf/newvers.sh Fri Sep 22 15:27:02 2017 (r323927) +++ releng/10.4/sys/conf/newvers.sh Fri Sep 22 15:27:50 2017 (r323928) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="10.4" -BRANCH="RC1" +BRANCH="RC2" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi