From owner-svn-src-all@freebsd.org Sun Oct 29 01:20:45 2017 Return-Path: Delivered-To: svn-src-all@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 40037E53B54; Sun, 29 Oct 2017 01:20:45 +0000 (UTC) (envelope-from bdrewery@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 0B0CA3EAF; Sun, 29 Oct 2017 01:20:44 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T1Kio8067730; Sun, 29 Oct 2017 01:20:44 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T1KiOn067729; Sun, 29 Oct 2017 01:20:44 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710290120.v9T1KiOn067729@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sun, 29 Oct 2017 01:20:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325068 - head X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 325068 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 01:20:45 -0000 Author: bdrewery Date: Sun Oct 29 01:20:43 2017 New Revision: 325068 URL: https://svnweb.freebsd.org/changeset/base/325068 Log: Move sendmail special check into a _sanity_check target. MFC after: 2 weeks Sponsored by: Dell EMC Isilon Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Sat Oct 28 21:26:49 2017 (r325067) +++ head/Makefile.inc1 Sun Oct 29 01:20:43 2017 (r325068) @@ -752,7 +752,7 @@ KMAKE= ${KMAKEENV} ${MAKE} ${.MAKEFLAGS} ${KERNEL_FLA # Attempt to rebuild the entire system, with reasonable chance of # success, regardless of how old your existing system is. # -_worldtmp: .PHONY +_sanity_check: .PHONY .if ${.CURDIR:C/[^,]//g} != "" # The m4 build of sendmail files doesn't like it if ',' is used # anywhere in the path of it's files. @@ -761,6 +761,8 @@ _worldtmp: .PHONY @echo false .endif + +_worldtmp: .PHONY @echo @echo "--------------------------------------------------------------" @echo ">>> Rebuilding the temporary build tree" @@ -957,7 +959,7 @@ everything: .PHONY WMAKE_TGTS= .if !defined(WORLDFAST) -WMAKE_TGTS+= _worldtmp _legacy +WMAKE_TGTS+= _sanity_check _worldtmp _legacy .if empty(SUBDIR_OVERRIDE) WMAKE_TGTS+= _bootstrap-tools .endif From owner-svn-src-all@freebsd.org Sun Oct 29 01:20:48 2017 Return-Path: Delivered-To: svn-src-all@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 592C8E53C98; Sun, 29 Oct 2017 01:20:48 +0000 (UTC) (envelope-from bdrewery@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 2334A3EBC; Sun, 29 Oct 2017 01:20:48 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T1Klcb067776; Sun, 29 Oct 2017 01:20:47 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T1KlpS067775; Sun, 29 Oct 2017 01:20:47 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710290120.v9T1KlpS067775@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sun, 29 Oct 2017 01:20:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325069 - head X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 325069 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 01:20:48 -0000 Author: bdrewery Date: Sun Oct 29 01:20:47 2017 New Revision: 325069 URL: https://svnweb.freebsd.org/changeset/base/325069 Log: Disallow using a colon ':' in source checkout paths. This leaks into the PATH handling for WORLDTMP and breaks finding cross-tools. The PATH handling could be fixed to properly quote but is not worth the effort. Also allow this sanity check to always run even with 'make -n'. MFC after: 2 weeks Sponsored by: Dell EMC Isilon Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Sun Oct 29 01:20:43 2017 (r325068) +++ head/Makefile.inc1 Sun Oct 29 01:20:47 2017 (r325069) @@ -752,14 +752,20 @@ KMAKE= ${KMAKEENV} ${MAKE} ${.MAKEFLAGS} ${KERNEL_FLA # Attempt to rebuild the entire system, with reasonable chance of # success, regardless of how old your existing system is. # -_sanity_check: .PHONY +_sanity_check: .PHONY .MAKE .if ${.CURDIR:C/[^,]//g} != "" # The m4 build of sendmail files doesn't like it if ',' is used # anywhere in the path of it's files. @echo @echo "*** Error: path to source tree contains a comma ','" @echo - false + @false +.elif ${.CURDIR:M*\:*} != "" +# Using ':' leaks into PATH and breaks finding cross-tools. + @echo + @echo "*** Error: path to source tree contains a colon ':'" + @echo + @false .endif _worldtmp: .PHONY From owner-svn-src-all@freebsd.org Sun Oct 29 01:20:51 2017 Return-Path: Delivered-To: svn-src-all@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 97BB9E53CDC; Sun, 29 Oct 2017 01:20:51 +0000 (UTC) (envelope-from bdrewery@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 5A3483EFE; Sun, 29 Oct 2017 01:20:51 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T1KoHG067823; Sun, 29 Oct 2017 01:20:50 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T1KoeI067822; Sun, 29 Oct 2017 01:20:50 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710290120.v9T1KoeI067822@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sun, 29 Oct 2017 01:20:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325070 - head X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 325070 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 01:20:51 -0000 Author: bdrewery Date: Sun Oct 29 01:20:50 2017 New Revision: 325070 URL: https://svnweb.freebsd.org/changeset/base/325070 Log: We don't need LIB32 directories extracted in early phase legacy/WORLDTMP dirs. This reverts some changes from r289662 Sponsored by: Dell EMC Isilon Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Sun Oct 29 01:20:47 2017 (r325069) +++ head/Makefile.inc1 Sun Oct 29 01:20:50 2017 (r325070) @@ -863,16 +863,6 @@ _worldtmp: .PHONY mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \ -p ${WORLDTMP}/usr/lib >/dev/null .endif -.if defined(LIBCOMPAT) - mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \ - -p ${WORLDTMP}/usr >/dev/null -.if ${MK_DEBUG_FILES} != "no" - mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \ - -p ${WORLDTMP}/legacy/usr/lib/debug/usr >/dev/null - mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \ - -p ${WORLDTMP}/usr/lib/debug/usr >/dev/null -.endif -.endif .if ${MK_TESTS} != "no" mkdir -p ${WORLDTMP}${TESTSBASE} mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \ From owner-svn-src-all@freebsd.org Sun Oct 29 01:20:54 2017 Return-Path: Delivered-To: svn-src-all@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 BC9F3E53CFB; Sun, 29 Oct 2017 01:20:54 +0000 (UTC) (envelope-from bdrewery@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 8DCD93F5F; Sun, 29 Oct 2017 01:20:54 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T1Kr9O067870; Sun, 29 Oct 2017 01:20:53 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T1KrPM067869; Sun, 29 Oct 2017 01:20:53 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710290120.v9T1KrPM067869@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sun, 29 Oct 2017 01:20:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325071 - head X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 325071 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 01:20:55 -0000 Author: bdrewery Date: Sun Oct 29 01:20:53 2017 New Revision: 325071 URL: https://svnweb.freebsd.org/changeset/base/325071 Log: Move FAST_DEPEND cleanup hack into its own target and call from _cleanobj. The _worldtmp target is for setting up WORLDTMP. Nothing between _worldtmp and _cleanobj will read these files. Move to its own target since it is so large. Sponsored by: Dell EMC Isilon Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Sun Oct 29 01:20:50 2017 (r325070) +++ head/Makefile.inc1 Sun Oct 29 01:20:53 2017 (r325071) @@ -768,41 +768,10 @@ _sanity_check: .PHONY .MAKE @false .endif -_worldtmp: .PHONY - @echo - @echo "--------------------------------------------------------------" - @echo ">>> Rebuilding the temporary build tree" - @echo "--------------------------------------------------------------" -.if !defined(NO_CLEAN) - rm -rf ${WORLDTMP} -.if defined(LIBCOMPAT) - rm -rf ${LIBCOMPATTMP} -.endif -.else -.if exists(${WORLDTMP}) - @echo ">>> Deleting stale files in build tree..." - ${_+_}cd ${.CURDIR}; ${WMAKE} -DBATCH_DELETE_OLD_FILES \ - delete-old delete-old-libs >/dev/null -.endif -.if defined(LIBCOMPAT) && exists(${LIBCOMPATTMP}) - ${_+_}cd ${.CURDIR}; ${WMAKE} -DBATCH_DELETE_OLD_FILES \ - DESTDIR=${LIBCOMPATTMP} \ - delete-old delete-old-libs >/dev/null -.endif - rm -rf ${WORLDTMP}/legacy/usr/include -.if ${USING_SYSTEM_COMPILER} == "yes" -.for cc in cc c++ - if [ -x ${WORLDTMP}/usr/bin/${cc} ]; then \ - inum=$$(stat -f %i ${WORLDTMP}/usr/bin/${cc}); \ - find ${WORLDTMP}/usr/bin -inum $${inum} -delete; \ - fi -.endfor -.endif # ${USING_SYSTEM_COMPILER} == "yes" - # Our current approach to dependency tracking cannot cope with certain source # tree changes, particularly with respect to removing source files and # replacing generated files. Handle these cases here in an ad-hoc fashion. -# +_cleanobj_fast_depend_hack: .PHONY # Syscall stubs rewritten in C # Date SVN Rev Syscalls # 20160829 r305012 ptrace @@ -841,6 +810,36 @@ _worldtmp: .PHONY .endif .endfor +_worldtmp: .PHONY + @echo + @echo "--------------------------------------------------------------" + @echo ">>> Rebuilding the temporary build tree" + @echo "--------------------------------------------------------------" +.if !defined(NO_CLEAN) + rm -rf ${WORLDTMP} +.if defined(LIBCOMPAT) + rm -rf ${LIBCOMPATTMP} +.endif +.else +.if exists(${WORLDTMP}) + @echo ">>> Deleting stale files in build tree..." + ${_+_}cd ${.CURDIR}; ${WMAKE} -DBATCH_DELETE_OLD_FILES \ + delete-old delete-old-libs >/dev/null +.endif +.if defined(LIBCOMPAT) && exists(${LIBCOMPATTMP}) + ${_+_}cd ${.CURDIR}; ${WMAKE} -DBATCH_DELETE_OLD_FILES \ + DESTDIR=${LIBCOMPATTMP} \ + delete-old delete-old-libs >/dev/null +.endif + rm -rf ${WORLDTMP}/legacy/usr/include +.if ${USING_SYSTEM_COMPILER} == "yes" +.for cc in cc c++ + if [ -x ${WORLDTMP}/usr/bin/${cc} ]; then \ + inum=$$(stat -f %i ${WORLDTMP}/usr/bin/${cc}); \ + find ${WORLDTMP}/usr/bin -inum $${inum} -delete; \ + fi +.endfor +.endif # ${USING_SYSTEM_COMPILER} == "yes" .endif # !defined(NO_CLEAN) .for _dir in \ @@ -898,7 +897,9 @@ _cleanobj: .if defined(LIBCOMPAT) ${_+_}cd ${.CURDIR}; ${LIBCOMPATWMAKE} -f Makefile.inc1 ${CLEANDIR} .endif -.endif +.else + ${_+_}cd ${.CURDIR}; ${WMAKE} _cleanobj_fast_depend_hack +.endif # !defined(NO_CLEAN) _obj: @echo @echo "--------------------------------------------------------------" From owner-svn-src-all@freebsd.org Sun Oct 29 01:20:57 2017 Return-Path: Delivered-To: svn-src-all@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 D7D8DE53D33; Sun, 29 Oct 2017 01:20:57 +0000 (UTC) (envelope-from bdrewery@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 9AF273FC1; Sun, 29 Oct 2017 01:20:57 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T1KuDr067918; Sun, 29 Oct 2017 01:20:56 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T1KudM067917; Sun, 29 Oct 2017 01:20:56 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710290120.v9T1KudM067917@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sun, 29 Oct 2017 01:20:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325072 - head X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 325072 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 01:20:58 -0000 Author: bdrewery Date: Sun Oct 29 01:20:56 2017 New Revision: 325072 URL: https://svnweb.freebsd.org/changeset/base/325072 Log: FAST_DEPEND clean hack: Remove lib32/soft files properly. Only remove them if the option is enabled and also handle libsoft by using the proper LIBCOMPAT_OBJTREE. LIBCOMPAT:D will expand the text after it as a proper glob to the command line if LIBCOMPAT is defined. Sponsored by: Dell EMC Isilon Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Sun Oct 29 01:20:53 2017 (r325071) +++ head/Makefile.inc1 Sun Oct 29 01:20:56 2017 (r325072) @@ -782,7 +782,7 @@ _cleanobj_fast_depend_hack: .PHONY ${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.o; then \ echo Removing stale dependencies for ${f} syscall wrappers; \ rm -f ${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.* \ - ${OBJTREE}${.CURDIR}/world32/${.CURDIR}/lib/libc/.depend.${f}.*; \ + ${LIBCOMPAT:D${LIBCOMPAT_OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.*}; \ fi .endif .endfor @@ -793,7 +793,7 @@ _cleanobj_fast_depend_hack: .PHONY ${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.o; then \ echo Removing stale dependencies for ${f} syscall wrappers; \ rm -f ${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.* \ - ${OBJTREE}${.CURDIR}/world32/${.CURDIR}/lib/libc/.depend.${f}.*; \ + ${LIBCOMPAT:D${LIBCOMPAT_OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.*}; \ fi .endif .endfor @@ -805,8 +805,8 @@ _cleanobj_fast_depend_hack: .PHONY @echo Removing stale generated ${f} syscall files @rm -f ${OBJTREE}${.CURDIR}/lib/libc/${f}.* \ ${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.* \ - ${OBJTREE}${.CURDIR}/world32/${.CURDIR}/lib/libc/${f}.* \ - ${OBJTREE}${.CURDIR}/world32/${.CURDIR}/lib/libc/.depend.${f}.* + ${LIBCOMPAT:D${LIBCOMPAT_OBJTREE}${.CURDIR}/lib/libc/${f}.*} \ + ${LIBCOMPAT:D${LIBCOMPAT_OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.*} .endif .endfor From owner-svn-src-all@freebsd.org Sun Oct 29 01:21:00 2017 Return-Path: Delivered-To: svn-src-all@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 E9634E53D55; Sun, 29 Oct 2017 01:21:00 +0000 (UTC) (envelope-from bdrewery@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 ABC06632E4; Sun, 29 Oct 2017 01:21:00 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T1KxaA067963; Sun, 29 Oct 2017 01:20:59 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T1KxUd067962; Sun, 29 Oct 2017 01:20:59 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710290120.v9T1KxUd067962@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sun, 29 Oct 2017 01:20:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325073 - head X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 325073 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 01:21:01 -0000 Author: bdrewery Date: Sun Oct 29 01:20:59 2017 New Revision: 325073 URL: https://svnweb.freebsd.org/changeset/base/325073 Log: MK_TESTS is disabled in early phases, no need for TESTBASE extraction here. Sponsored by: Dell EMC Isilon Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Sun Oct 29 01:20:56 2017 (r325072) +++ head/Makefile.inc1 Sun Oct 29 01:20:59 2017 (r325073) @@ -862,16 +862,6 @@ _worldtmp: .PHONY mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \ -p ${WORLDTMP}/usr/lib >/dev/null .endif -.if ${MK_TESTS} != "no" - mkdir -p ${WORLDTMP}${TESTSBASE} - mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \ - -p ${WORLDTMP}${TESTSBASE} >/dev/null -.if ${MK_DEBUG_FILES} != "no" - mkdir -p ${WORLDTMP}/usr/lib/debug/${TESTSBASE} - mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \ - -p ${WORLDTMP}/usr/lib/debug/${TESTSBASE} >/dev/null -.endif -.endif .for _mtree in ${LOCAL_MTREE} mtree -deU -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null .endfor From owner-svn-src-all@freebsd.org Sun Oct 29 01:21:04 2017 Return-Path: Delivered-To: svn-src-all@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 51558E53DB0; Sun, 29 Oct 2017 01:21:04 +0000 (UTC) (envelope-from bdrewery@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 0B17F63360; Sun, 29 Oct 2017 01:21:03 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T1L38s068014; Sun, 29 Oct 2017 01:21:03 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T1L26o068012; Sun, 29 Oct 2017 01:21:02 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710290121.v9T1L26o068012@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sun, 29 Oct 2017 01:21:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325074 - head X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 325074 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 01:21:04 -0000 Author: bdrewery Date: Sun Oct 29 01:21:02 2017 New Revision: 325074 URL: https://svnweb.freebsd.org/changeset/base/325074 Log: Move some LIBCOMPAT tmpdir logic setup to its own build target. Its own build target was already handling mtree extractions just as _worldtmp did, so the other cleaning of the tmpdir makes sense here as well. Sponsored by: Dell EMC Isilon Modified: head/Makefile.inc1 head/Makefile.libcompat Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Sun Oct 29 01:20:59 2017 (r325073) +++ head/Makefile.inc1 Sun Oct 29 01:21:02 2017 (r325074) @@ -817,18 +817,10 @@ _worldtmp: .PHONY @echo "--------------------------------------------------------------" .if !defined(NO_CLEAN) rm -rf ${WORLDTMP} -.if defined(LIBCOMPAT) - rm -rf ${LIBCOMPATTMP} -.endif .else .if exists(${WORLDTMP}) @echo ">>> Deleting stale files in build tree..." ${_+_}cd ${.CURDIR}; ${WMAKE} -DBATCH_DELETE_OLD_FILES \ - delete-old delete-old-libs >/dev/null -.endif -.if defined(LIBCOMPAT) && exists(${LIBCOMPATTMP}) - ${_+_}cd ${.CURDIR}; ${WMAKE} -DBATCH_DELETE_OLD_FILES \ - DESTDIR=${LIBCOMPATTMP} \ delete-old delete-old-libs >/dev/null .endif rm -rf ${WORLDTMP}/legacy/usr/include Modified: head/Makefile.libcompat ============================================================================== --- head/Makefile.libcompat Sun Oct 29 01:20:59 2017 (r325073) +++ head/Makefile.libcompat Sun Oct 29 01:21:02 2017 (r325074) @@ -148,6 +148,16 @@ build${libcompat}: .PHONY @echo "--------------------------------------------------------------" @echo ">>> stage 5.1: building lib${libcompat} shim libraries" @echo "--------------------------------------------------------------" +.if !defined(NO_CLEAN) + rm -rf ${LIBCOMPATTMP} +.else +.if exists(${LIBCOMPATTMP}) + ${_+_}cd ${.CURDIR}; ${WMAKE} -DBATCH_DELETE_OLD_FILES \ + DESTDIR=${LIBCOMPATTMP} \ + delete-old delete-old-libs >/dev/null +.endif +.endif # !defined(NO_CLEAN) + mkdir -p ${LIBCOMPATTMP}/usr/include mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ -p ${LIBCOMPATTMP}/usr >/dev/null From owner-svn-src-all@freebsd.org Sun Oct 29 01:21:07 2017 Return-Path: Delivered-To: svn-src-all@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 7A860E53DF5; Sun, 29 Oct 2017 01:21:07 +0000 (UTC) (envelope-from bdrewery@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 299D4633CE; Sun, 29 Oct 2017 01:21:07 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T1L62W068061; Sun, 29 Oct 2017 01:21:06 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T1L6to068060; Sun, 29 Oct 2017 01:21:06 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710290121.v9T1L6to068060@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sun, 29 Oct 2017 01:21:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325075 - head X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 325075 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 01:21:07 -0000 Author: bdrewery Date: Sun Oct 29 01:21:06 2017 New Revision: 325075 URL: https://svnweb.freebsd.org/changeset/base/325075 Log: Remove comment: debug files can be useful for build tools. Sponsored by: Dell EMC Isilon Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Sun Oct 29 01:21:02 2017 (r325074) +++ head/Makefile.inc1 Sun Oct 29 01:21:06 2017 (r325075) @@ -848,7 +848,6 @@ _worldtmp: .PHONY -p ${WORLDTMP}/usr/include >/dev/null ln -sf ${.CURDIR}/sys ${WORLDTMP} .if ${MK_DEBUG_FILES} != "no" - # We could instead disable debug files for these build stages mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \ -p ${WORLDTMP}/legacy/usr/lib >/dev/null mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \ From owner-svn-src-all@freebsd.org Sun Oct 29 01:21:10 2017 Return-Path: Delivered-To: svn-src-all@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 AFA46E53E42; Sun, 29 Oct 2017 01:21:10 +0000 (UTC) (envelope-from bdrewery@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 766F86342F; Sun, 29 Oct 2017 01:21:10 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T1L9n0068106; Sun, 29 Oct 2017 01:21:09 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T1L9Jg068105; Sun, 29 Oct 2017 01:21:09 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710290121.v9T1L9Jg068105@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sun, 29 Oct 2017 01:21:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325076 - head/release/scripts X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/release/scripts X-SVN-Commit-Revision: 325076 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 01:21:10 -0000 Author: bdrewery Date: Sun Oct 29 01:21:09 2017 New Revision: 325076 URL: https://svnweb.freebsd.org/changeset/base/325076 Log: Rework r254951 to not reach into private OBJDIR areas. The original change was dealing with the build wanting to run a newer install(1) that was not yet installed. The solution to look into the private legacy directory of the existing build conflicts with 2 upcoming features: a changed OBJDIR format, and splitting the host tools into arch-dependent and arch-independent directories. Rather than hardcoding and changing the paths in this script, just let kernel-toolchain do the work, while disabling much of the meat. With -j15 this finishes in 25 seconds for me and 117 seconds with -j1. All that is really needed is bootstrap-tools, but the system is not currently written in a way that all previous dependent steps will have ran. The previous steps, such as _worldtmp, are being reworked and renamed and so cannot be relied upon to be right. Sponsored by: Dell EMC Isilon Modified: head/release/scripts/mm-mtree.sh Modified: head/release/scripts/mm-mtree.sh ============================================================================== --- head/release/scripts/mm-mtree.sh Sun Oct 29 01:21:06 2017 (r325075) +++ head/release/scripts/mm-mtree.sh Sun Oct 29 01:21:09 2017 (r325076) @@ -81,11 +81,6 @@ if [ ! -f ${SOURCEDIR}/Makefile.inc1 -a \ fi # Setup make to use system files from SOURCEDIR -objp=${MAKEOBJDIRPREFIX} -[ -z "${objp}" ] && objp=/usr/obj -legacydir=${objp}${SOURCEDIR}/tmp/legacy -legacypath=${legacydir}/usr/sbin:${legacydir}/usr/bin:${legacydir}/bin -MM_MAKE_ARGS="${MM_MAKE_ARGS} PATH=${legacypath}:${PATH}" MM_MAKE="make ${ARCHSTRING} ${MM_MAKE_ARGS} -m ${SOURCEDIR}/share/mk" delete_temproot () { @@ -121,6 +116,9 @@ echo '' esac od=${TEMPROOT}/usr/obj ${MM_MAKE} DESTDIR=${TEMPROOT} distrib-dirs && + MAKEOBJDIRPREFIX=$od ${MM_MAKE} kernel-toolchain \ + MK_TOOLCHAIN=no MK_CROSS_COMPILER=no \ + MK_CDDL=no MK_TESTS=no MK_RESCUE=no && MAKEOBJDIRPREFIX=$od ${MM_MAKE} _obj SUBDIR_OVERRIDE=etc && MAKEOBJDIRPREFIX=$od ${MM_MAKE} everything SUBDIR_OVERRIDE=etc && MAKEOBJDIRPREFIX=$od ${MM_MAKE} DESTDIR=${TEMPROOT} distribution;} || From owner-svn-src-all@freebsd.org Sun Oct 29 01:21:13 2017 Return-Path: Delivered-To: svn-src-all@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 E4052E53E6F; Sun, 29 Oct 2017 01:21:13 +0000 (UTC) (envelope-from bdrewery@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 AC7E763491; Sun, 29 Oct 2017 01:21:13 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T1LC5S068154; Sun, 29 Oct 2017 01:21:12 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T1LCTc068153; Sun, 29 Oct 2017 01:21:12 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710290121.v9T1LCTc068153@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sun, 29 Oct 2017 01:21:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325077 - head/share/mk X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/share/mk X-SVN-Commit-Revision: 325077 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 01:21:14 -0000 Author: bdrewery Date: Sun Oct 29 01:21:12 2017 New Revision: 325077 URL: https://svnweb.freebsd.org/changeset/base/325077 Log: MAKEOBJDIR should be an absolute path, not any path with a slash. Using MAKEOBJDIR=foo did not work but MAKEOBJDIR=foo/ did, but really it needs to be absolute. Sponsored by: Dell EMC Isilon Modified: head/share/mk/local.meta.sys.mk Modified: head/share/mk/local.meta.sys.mk ============================================================================== --- head/share/mk/local.meta.sys.mk Sun Oct 29 01:21:09 2017 (r325076) +++ head/share/mk/local.meta.sys.mk Sun Oct 29 01:21:12 2017 (r325077) @@ -107,7 +107,7 @@ TARGET_OBJ_SPEC:= ${TARGET_SPEC:S;,;.;g} OBJTOP:= ${OBJROOT}${TARGET_OBJ_SPEC} .if defined(MAKEOBJDIR) -.if ${MAKEOBJDIR:M*/*} == "" +.if ${MAKEOBJDIR:M/*} == "" .error Cannot use MAKEOBJDIR=${MAKEOBJDIR}${.newline}Unset MAKEOBJDIR to get default: MAKEOBJDIR='${_default_makeobjdir}' .endif .endif From owner-svn-src-all@freebsd.org Sun Oct 29 01:21:20 2017 Return-Path: Delivered-To: svn-src-all@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 E3A72E53F0A; Sun, 29 Oct 2017 01:21:20 +0000 (UTC) (envelope-from bdrewery@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 81D8D6358B; Sun, 29 Oct 2017 01:21:20 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T1LJQJ068249; Sun, 29 Oct 2017 01:21:19 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T1LJTn068247; Sun, 29 Oct 2017 01:21:19 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710290121.v9T1LJTn068247@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sun, 29 Oct 2017 01:21:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325079 - head X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 325079 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 01:21:21 -0000 Author: bdrewery Date: Sun Oct 29 01:21:19 2017 New Revision: 325079 URL: https://svnweb.freebsd.org/changeset/base/325079 Log: Fix xdev TARGET/TARGET_ARCH assertion and expand to native-xtools. The top of Makefile.inc1 requires TARGET/TARGET_ARCH be defined. Just building 'make xdev' would already set them, so this error was never triggered. Moving it to Makefile fixes the problem. MFC after: 2 weeks Sponsored by: Dell EMC Isilon Modified: head/Makefile head/Makefile.inc1 Modified: head/Makefile ============================================================================== --- head/Makefile Sun Oct 29 01:21:15 2017 (r325078) +++ head/Makefile Sun Oct 29 01:21:19 2017 (r325079) @@ -135,6 +135,9 @@ TGTS= all all-man buildenv buildenvvars buildkernel bu packages installconfig real-packages sign-packages package-pkg \ print-dir test-system-compiler +# These targets require a TARGET and TARGET_ARCH be defined. +XTGTS= native-xtools xdev xdev-build xdev-install xdev-links + # XXX: r156740: This can't work since bsd.subdir.mk is not included ever. # It will only work for SUBDIR_TARGETS in make.conf. TGTS+= ${SUBDIR_TARGETS} @@ -270,6 +273,11 @@ _TARGET= ${XDEV} .if defined(XDEV_ARCH) _TARGET_ARCH= ${XDEV_ARCH} .endif +# Some targets require a set TARGET/TARGET_ARCH, check before the default +# MACHINE and after the compatibility handling. +.if !defined(_TARGET) || !defined(_TARGET_ARCH) +${XTGTS}: _assert_target +.endif # Otherwise, default to current machine type and architecture. _TARGET?= ${MACHINE} _TARGET_ARCH?= ${MACHINE_ARCH} @@ -277,6 +285,14 @@ _TARGET_ARCH?= ${MACHINE_ARCH} .if make(print-dir) .SILENT: .endif + +_assert_target: .PHONY .MAKE +.for _tgt in ${XTGTS} +.if make(${_tgt}) + @echo "*** Error: Both TARGET and TARGET_ARCH must be defined for \"${_tgt}\" target" + @false +.endif +.endfor # # Make sure we have an up-to-date make(1). Only world and buildworld Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Sun Oct 29 01:21:15 2017 (r325078) +++ head/Makefile.inc1 Sun Oct 29 01:21:19 2017 (r325079) @@ -2760,8 +2760,6 @@ cleanworld: .PHONY ${_+_}@cd ${.CURDIR}; ${MAKE} cleandir .endif -.if defined(TARGET) && defined(TARGET_ARCH) - .if ${TARGET} == ${MACHINE} && ${TARGET_ARCH} == ${MACHINE_ARCH} XDEV_CPUTYPE?=${CPUTYPE} .else @@ -2908,7 +2906,3 @@ xdev-links: .PHONY ln -sf ../../${XDTP}/usr/bin/$$i \ ../../../../usr/bin/${XDDIR}${_REVISION}-$$i; \ done -.else -xdev xdev-build xdev-install xdev-links: .PHONY - @echo "*** Error: Both TARGET and TARGET_ARCH must be defined for \"${.TARGET}\" target" -.endif From owner-svn-src-all@freebsd.org Sun Oct 29 01:21:17 2017 Return-Path: Delivered-To: svn-src-all@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 5146BE53EB1; Sun, 29 Oct 2017 01:21:17 +0000 (UTC) (envelope-from bdrewery@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 0CE376350E; Sun, 29 Oct 2017 01:21:16 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T1LGKh068200; Sun, 29 Oct 2017 01:21:16 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T1LFw8068198; Sun, 29 Oct 2017 01:21:15 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710290121.v9T1LFw8068198@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sun, 29 Oct 2017 01:21:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325078 - head X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 325078 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 01:21:17 -0000 Author: bdrewery Date: Sun Oct 29 01:21:15 2017 New Revision: 325078 URL: https://svnweb.freebsd.org/changeset/base/325078 Log: Disable AUTO_OBJ as a make argument to ensure it really is disabled. If the user sets this to yes as a make argument too we still want to ensure these do not get enabled. Sponsored by: Dell EMC Isilon Modified: head/Makefile head/Makefile.inc1 Modified: head/Makefile ============================================================================== --- head/Makefile Sun Oct 29 01:21:12 2017 (r325077) +++ head/Makefile Sun Oct 29 01:21:15 2017 (r325078) @@ -179,7 +179,7 @@ META_TGT_WHITELIST+= \ PATH= /sbin:/bin:/usr/sbin:/usr/bin MAKEOBJDIRPREFIX?= /usr/obj -_MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} MK_AUTO_OBJ=no ${MAKE} \ +_MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE} MK_AUTO_OBJ=no \ ${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} __MAKE_CONF=${__MAKE_CONF} \ -f /dev/null -V MAKEOBJDIRPREFIX dummy .if !empty(_MAKEOBJDIRPREFIX) Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Sun Oct 29 01:21:12 2017 (r325077) +++ head/Makefile.inc1 Sun Oct 29 01:21:15 2017 (r325078) @@ -365,11 +365,11 @@ OSRELDATE= 0 # Set VERSION for CTFMERGE to use via the default CTFFLAGS=-L VERSION. .if !defined(_REVISION) -_REVISION!= MK_AUTO_OBJ=no ${MAKE} -C ${SRCDIR}/release -V REVISION +_REVISION!= ${MAKE} -C ${SRCDIR}/release MK_AUTO_OBJ=no -V REVISION .export _REVISION .endif .if !defined(_BRANCH) -_BRANCH!= MK_AUTO_OBJ=no ${MAKE} -C ${SRCDIR}/release -V BRANCH +_BRANCH!= ${MAKE} -C ${SRCDIR}/release MK_AUTO_OBJ=no -V BRANCH .export _BRANCH .endif .if !defined(SRCRELDATE) @@ -439,8 +439,8 @@ _TARGET_CPUTYPE=${TARGET_CPUTYPE} .else _TARGET_CPUTYPE=dummy .endif -_CPUTYPE!= MK_AUTO_OBJ=no MAKEFLAGS= CPUTYPE=${_TARGET_CPUTYPE} ${MAKE} \ - -f /dev/null -m ${.CURDIR}/share/mk -V CPUTYPE +_CPUTYPE!= MAKEFLAGS= CPUTYPE=${_TARGET_CPUTYPE} ${MAKE} -f /dev/null \ + -m ${.CURDIR}/share/mk MK_AUTO_OBJ=no -V CPUTYPE .if ${_CPUTYPE} != ${_TARGET_CPUTYPE} .error CPUTYPE global should be set with ?=. .endif From owner-svn-src-all@freebsd.org Sun Oct 29 01:21:31 2017 Return-Path: Delivered-To: svn-src-all@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 60CADE54000; Sun, 29 Oct 2017 01:21:31 +0000 (UTC) (envelope-from bdrewery@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 35B1E63713; Sun, 29 Oct 2017 01:21:31 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T1LUKV068393; Sun, 29 Oct 2017 01:21:30 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T1LTti068389; Sun, 29 Oct 2017 01:21:29 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710290121.v9T1LTti068389@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sun, 29 Oct 2017 01:21:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325082 - in head: . share/man/man7 X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in head: . share/man/man7 X-SVN-Commit-Revision: 325082 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 01:21:31 -0000 Author: bdrewery Date: Sun Oct 29 01:21:29 2017 New Revision: 325082 URL: https://svnweb.freebsd.org/changeset/base/325082 Log: Change native-xtools to not install by default; add a native-xtools-install. Without this the user has to mess with 'make -f Makefile.inc1 ...' to figure out where the files are installed in the OBJDIR and then they need to copy them to where they really wanted them. Using DESTDIR may be problematic after r325001 as well. The files will be installed to DESTDIR/NXTP where NXTP defaults to /nxb-bin. MFC after: 2 weeks Sponsored by: Dell EMC Isilon Modified: head/Makefile head/Makefile.inc1 head/UPDATING head/share/man/man7/build.7 Modified: head/Makefile ============================================================================== --- head/Makefile Sun Oct 29 01:21:26 2017 (r325081) +++ head/Makefile Sun Oct 29 01:21:29 2017 (r325082) @@ -39,9 +39,11 @@ # xdev-install - Install cross-development tools. # xdev-links - Create traditional links in /usr/bin for cc, etc # native-xtools - Create host binaries that produce target objects -# for use in qemu user-mode jails. Override -# target location with NXBDESTDIR. TARGET and +# for use in qemu user-mode jails. TARGET and # TARGET_ARCH should be defined. +# native-xtools-install +# - Install the files to the given DESTDIR/NXTP where +# NXTP defaults to /nxb-bin. # # "quick" way to test all kernel builds: # _jflag=`sysctl -n hw.ncpu` @@ -132,13 +134,15 @@ TGTS= all all-man buildenv buildenvvars buildkernel bu _build-tools _build-metadata _cross-tools _includes _libraries \ build32 distribute32 install32 buildsoft distributesoft installsoft \ builddtb xdev xdev-build xdev-install \ - xdev-links native-xtools stageworld stagekernel stage-packages \ + xdev-links native-xtools native-xtools-install stageworld stagekernel \ + stage-packages \ create-packages-world create-packages-kernel create-packages \ packages installconfig real-packages sign-packages package-pkg \ print-dir test-system-compiler # These targets require a TARGET and TARGET_ARCH be defined. -XTGTS= native-xtools xdev xdev-build xdev-install xdev-links +XTGTS= native-xtools native-xtools-install xdev xdev-build xdev-install \ + xdev-links # XXX: r156740: This can't work since bsd.subdir.mk is not included ever. # It will only work for SUBDIR_TARGETS in make.conf. Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Sun Oct 29 01:21:26 2017 (r325081) +++ head/Makefile.inc1 Sun Oct 29 01:21:29 2017 (r325082) @@ -2098,7 +2098,11 @@ cross-tools: .MAKE .PHONY # to pickup. # NXBOBJDIR= ${MAKEOBJDIRPREFIX}/nxb/${TARGET}.${TARGET_ARCH} -NXBDESTDIR= ${NXBOBJDIR}${.CURDIR}/nxb-bin +NXTP?= /nxb-bin +.if ${NXTP:N/*} +.error NXTP variable should be an absolute path +.endif +NXBDESTDIR?= ${DESTDIR}${NXTP} # This is the list of tools to be built/installed as static and where # appropriate to build for the given TARGET.TARGET_ARCH. @@ -2227,6 +2231,9 @@ native-xtools: .PHONY .endif ${_+_}cd ${.CURDIR}; ${NXBMAKE} SUBDIR_OVERRIDE="${NXBDIRS:M*}" \ everything + @echo ">> native-xtools done. Use 'make native-xtools-install' to install to a given DESTDIR" + +native-xtools-install: .PHONY mkdir -p ${NXBDESTDIR}/bin ${NXBDESTDIR}/sbin ${NXBDESTDIR}/usr mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ -p ${NXBDESTDIR}/usr >/dev/null Modified: head/UPDATING ============================================================================== --- head/UPDATING Sun Oct 29 01:21:26 2017 (r325081) +++ head/UPDATING Sun Oct 29 01:21:29 2017 (r325082) @@ -51,6 +51,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: ****************************** SPECIAL WARNING: ****************************** +20171028: + The native-xtools target no longer installs the files by default to the + OBJDIR. Use the native-xtools-install target with a DESTDIR to install + to ${DESTDIR}/${NXTP} where NXTP defaults to /nxb-bin. + 20171021: As part of the boot loader infrastructure cleanup, LOADER_*_SUPPORT options are changing from controlling the build if defined / undefined Modified: head/share/man/man7/build.7 ============================================================================== --- head/share/man/man7/build.7 Sun Oct 29 01:21:26 2017 (r325081) +++ head/share/man/man7/build.7 Sun Oct 29 01:21:29 2017 (r325082) @@ -234,6 +234,17 @@ performance by avoiding emulating binaries that do not and .Sy TARGET_ARCH should be defined. +.It Cm native-xtools-install +Installs the results to +.Pa ${DESTDIR}/${NXTP} +where +.Va NXTP +defaults to +.Pa nxb-bin . +.Sy TARGET +and +.Sy TARGET_ARCH +must be defined. .It Cm packageworld Archive the results of .Cm distributeworld , From owner-svn-src-all@freebsd.org Sun Oct 29 01:21:47 2017 Return-Path: Delivered-To: svn-src-all@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 99A58E5417D; Sun, 29 Oct 2017 01:21:47 +0000 (UTC) (envelope-from bdrewery@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 50F6C6393E; Sun, 29 Oct 2017 01:21:47 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T1Lk5b068628; Sun, 29 Oct 2017 01:21:46 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T1LkZc068627; Sun, 29 Oct 2017 01:21:46 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710290121.v9T1LkZc068627@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sun, 29 Oct 2017 01:21:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325087 - head X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 325087 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 01:21:47 -0000 Author: bdrewery Date: Sun Oct 29 01:21:46 2017 New Revision: 325087 URL: https://svnweb.freebsd.org/changeset/base/325087 Log: xdev: Fix build for platforms needing LLD. MFC after: 2 weeks Sponsored by: Dell EMC Isilon Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Sun Oct 29 01:21:42 2017 (r325086) +++ head/Makefile.inc1 Sun Oct 29 01:21:46 2017 (r325087) @@ -2848,6 +2848,7 @@ _xb-build-tools: .PHONY _xb-cross-tools: .PHONY .for _tool in \ + ${_lld} \ ${_binutils} \ ${_elftctools} \ usr.bin/ar \ @@ -2885,6 +2886,7 @@ xdev-install: xdev-build _xi-mtree _xi-cross-tools _xi _xi-cross-tools: .PHONY @echo "_xi-cross-tools" .for _tool in \ + ${_lld} \ ${_binutils} \ ${_elftctools} \ usr.bin/ar \ From owner-svn-src-all@freebsd.org Sun Oct 29 01:21:27 2017 Return-Path: Delivered-To: svn-src-all@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 9F075E53FAD; Sun, 29 Oct 2017 01:21:27 +0000 (UTC) (envelope-from bdrewery@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 5C2B263680; Sun, 29 Oct 2017 01:21:27 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T1LQDO068342; Sun, 29 Oct 2017 01:21:26 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T1LQ7v068341; Sun, 29 Oct 2017 01:21:26 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710290121.v9T1LQ7v068341@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sun, 29 Oct 2017 01:21:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325081 - head/share/man/man7 X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/share/man/man7 X-SVN-Commit-Revision: 325081 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 01:21:28 -0000 Author: bdrewery Date: Sun Oct 29 01:21:26 2017 New Revision: 325081 URL: https://svnweb.freebsd.org/changeset/base/325081 Log: build(7): Document xdev targets. MFC after: 2 weeks Sponsored by: Dell EMC Isilon Modified: head/share/man/man7/build.7 Modified: head/share/man/man7/build.7 ============================================================================== --- head/share/man/man7/build.7 Sun Oct 29 01:21:22 2017 (r325080) +++ head/share/man/man7/build.7 Sun Oct 29 01:21:26 2017 (r325081) @@ -288,6 +288,43 @@ In addition print a summary of all failed targets at t exit with an error if there were any. .It Cm toolchains Create a build toolchain for each architecture supported by the build system. +.It Cm xdev +Builds and installs a cross-toolchain and sysroot for the given +.Sy TARGET +and +.Sy TARGET_ARCH . +The sysroot contains target library and headers. +The target is an alias for +.Cm xdev-build +and +.Cm xdev-install . +The location of the files installed can be controlled with +.Va DESTDIR . +The target location in +.Va DESTDIR +is +.Pa ${DESTDIR}/${XDTP} +where +.Va XDTP +defaults to +.Pa /usr/${XDDIR} +and +.Va XDDIR +defaults to +.Pa ${TARGET_ARCH}-freebsd . +.It Cm xdev-build +Builds for the +.Cm xdev +target. +.It Cm xdev-install +Installs the files for the +.Cm xdev +target. +.It Cm xdev-links +Installs autoconf-style symlinks to +.Pa ${DESTDIR}/usr/bin +pointing into the xdev toolchain in +.Pa ${DESTDIR}/${XDTP} . .El .Pp Kernel specific build targets in From owner-svn-src-all@freebsd.org Sun Oct 29 01:21:44 2017 Return-Path: Delivered-To: svn-src-all@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 39884E54135; Sun, 29 Oct 2017 01:21:44 +0000 (UTC) (envelope-from bdrewery@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 00668638CF; Sun, 29 Oct 2017 01:21:43 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T1LheW068579; Sun, 29 Oct 2017 01:21:43 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T1LhB5068578; Sun, 29 Oct 2017 01:21:43 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710290121.v9T1LhB5068578@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sun, 29 Oct 2017 01:21:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325086 - head X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 325086 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 01:21:44 -0000 Author: bdrewery Date: Sun Oct 29 01:21:42 2017 New Revision: 325086 URL: https://svnweb.freebsd.org/changeset/base/325086 Log: xdev: Add missing 'make obj' treewalk for 'make includes'. It is possible that building headers requires an OBJDIR. The other phases of xdev have their own 'make obj' calls where needed, such as inside 'make libraries' itself. MFC after: 2 weeks Sponsored by: Dell EMC Isilon Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Sun Oct 29 01:21:39 2017 (r325085) +++ head/Makefile.inc1 Sun Oct 29 01:21:42 2017 (r325086) @@ -2897,6 +2897,10 @@ _xi-cross-tools: .PHONY .endfor _xi-includes: .PHONY +.if !defined(NO_OBJ) + ${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 _obj \ + DESTDIR=${XDDESTDIR} +.endif ${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 includes \ DESTDIR=${XDDESTDIR} From owner-svn-src-all@freebsd.org Sun Oct 29 01:21:24 2017 Return-Path: Delivered-To: svn-src-all@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 2B3E2E53F51; Sun, 29 Oct 2017 01:21:24 +0000 (UTC) (envelope-from bdrewery@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 E6DC463601; Sun, 29 Oct 2017 01:21:23 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T1LMVq068297; Sun, 29 Oct 2017 01:21:22 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T1LM9Z068295; Sun, 29 Oct 2017 01:21:22 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710290121.v9T1LM9Z068295@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sun, 29 Oct 2017 01:21:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325080 - in head: . share/man/man7 X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in head: . share/man/man7 X-SVN-Commit-Revision: 325080 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 01:21:24 -0000 Author: bdrewery Date: Sun Oct 29 01:21:22 2017 New Revision: 325080 URL: https://svnweb.freebsd.org/changeset/base/325080 Log: build(7): Document native-xtools. MFC after: 2 weeks Sponsored by: Dell EMC Isilon Modified: head/Makefile head/share/man/man7/build.7 Modified: head/Makefile ============================================================================== --- head/Makefile Sun Oct 29 01:21:19 2017 (r325079) +++ head/Makefile Sun Oct 29 01:21:22 2017 (r325080) @@ -39,7 +39,9 @@ # xdev-install - Install cross-development tools. # xdev-links - Create traditional links in /usr/bin for cc, etc # native-xtools - Create host binaries that produce target objects -# for use in qemu user-mode jails. +# for use in qemu user-mode jails. Override +# target location with NXBDESTDIR. TARGET and +# TARGET_ARCH should be defined. # # "quick" way to test all kernel builds: # _jflag=`sysctl -n hw.ncpu` Modified: head/share/man/man7/build.7 ============================================================================== --- head/share/man/man7/build.7 Sun Oct 29 01:21:19 2017 (r325079) +++ head/share/man/man7/build.7 Sun Oct 29 01:21:22 2017 (r325080) @@ -222,6 +222,18 @@ variable .Va DISTDIR . This target is used while building a release; see .Xr release 7 . +.It Cm native-xtools +This target builds a cross-toolchain for the given +.Sy TARGET +and +.Sy TARGET_ARCH , +as well as a select list of static userland tools for the host system. +This is intended to be used in a jail where QEMU is used to improve +performance by avoiding emulating binaries that do not need to be emulated. +.Sy TARGET +and +.Sy TARGET_ARCH +should be defined. .It Cm packageworld Archive the results of .Cm distributeworld , From owner-svn-src-all@freebsd.org Sun Oct 29 01:21:38 2017 Return-Path: Delivered-To: svn-src-all@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 02214E540B1; Sun, 29 Oct 2017 01:21:38 +0000 (UTC) (envelope-from bdrewery@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 BA2816380A; Sun, 29 Oct 2017 01:21:37 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T1LaOW068485; Sun, 29 Oct 2017 01:21:36 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T1Laux068484; Sun, 29 Oct 2017 01:21:36 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710290121.v9T1Laux068484@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sun, 29 Oct 2017 01:21:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325084 - head/share/mk X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/share/mk X-SVN-Commit-Revision: 325084 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 01:21:38 -0000 Author: bdrewery Date: Sun Oct 29 01:21:36 2017 New Revision: 325084 URL: https://svnweb.freebsd.org/changeset/base/325084 Log: AUTO_OBJ: auto.obj.mk mkdir -p simplification Sponsored by: Dell EMC Isilon Modified: head/share/mk/local.sys.env.mk Modified: head/share/mk/local.sys.env.mk ============================================================================== --- head/share/mk/local.sys.env.mk Sun Oct 29 01:21:33 2017 (r325083) +++ head/share/mk/local.sys.env.mk Sun Oct 29 01:21:36 2017 (r325084) @@ -40,4 +40,8 @@ TIME_STAMP = ${TIME_STAMP_FMT:localtime} TIME_STAMP_DATE = `date '+${TIME_STAMP_FMT}'` TIME_STAMP_END?= ${TIME_STAMP_DATE} +# Simplify auto.obj.mk mkdir -p handling and avoid unneeded/redundant +# error spam and show a proper error. +Mkdirs= Mkdirs() { mkdir -p $$* || :; } + .include "src.sys.env.mk" From owner-svn-src-all@freebsd.org Sun Oct 29 01:21:41 2017 Return-Path: Delivered-To: svn-src-all@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 156B3E540FF; Sun, 29 Oct 2017 01:21:41 +0000 (UTC) (envelope-from bdrewery@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 D1D4763875; Sun, 29 Oct 2017 01:21:40 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T1LdoM068531; Sun, 29 Oct 2017 01:21:39 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T1LdYT068530; Sun, 29 Oct 2017 01:21:39 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710290121.v9T1LdYT068530@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sun, 29 Oct 2017 01:21:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325085 - head X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 325085 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 01:21:41 -0000 Author: bdrewery Date: Sun Oct 29 01:21:39 2017 New Revision: 325085 URL: https://svnweb.freebsd.org/changeset/base/325085 Log: lib32/libsoft: Store object files in a more consistent structure. Having objects in world32 and a sysroot in lib32 was confusing and inconsistent with the normal build. Now objects are stored in obj-lib32 (or obj-libsoft) and the sysroot (analagous to WORLDTMP) is stored in obj-lib32/tmp. Sponsored by: Dell EMC Isilon Modified: head/Makefile.libcompat Modified: head/Makefile.libcompat ============================================================================== --- head/Makefile.libcompat Sun Oct 29 01:21:36 2017 (r325084) +++ head/Makefile.libcompat Sun Oct 29 01:21:39 2017 (r325085) @@ -79,8 +79,8 @@ LIBCOMPAT${_var}?= ${LIB${LIBCOMPAT}${_var}} .endfor # Shared flags -LIBCOMPAT_OBJTREE?= ${OBJTREE}${.CURDIR}/world${libcompat} -LIBCOMPATTMP?= ${OBJTREE}${.CURDIR}/lib${libcompat} +LIBCOMPAT_OBJTREE?= ${OBJTREE}${.CURDIR}/obj-lib${libcompat} +LIBCOMPATTMP?= ${LIBCOMPAT_OBJTREE}/tmp LIBCOMPATCFLAGS+= ${LIBCOMPATCPUFLAGS} \ -L${LIBCOMPATTMP}/usr/lib${libcompat} \ From owner-svn-src-all@freebsd.org Sun Oct 29 01:21:34 2017 Return-Path: Delivered-To: svn-src-all@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 ADCE6E54043; Sun, 29 Oct 2017 01:21:34 +0000 (UTC) (envelope-from bdrewery@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 6FE706378A; Sun, 29 Oct 2017 01:21:34 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T1LXxR068438; Sun, 29 Oct 2017 01:21:33 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T1LXNU068437; Sun, 29 Oct 2017 01:21:33 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710290121.v9T1LXNU068437@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sun, 29 Oct 2017 01:21:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325083 - head X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 325083 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 01:21:34 -0000 Author: bdrewery Date: Sun Oct 29 01:21:33 2017 New Revision: 325083 URL: https://svnweb.freebsd.org/changeset/base/325083 Log: Suggest TARGET/TARGET_ARCH, XDEV/XDEV_ARCH are depcrecated in r269031. MFC after: 2 weeks Sponsored by: Dell EMC Isilon Modified: head/Makefile Modified: head/Makefile ============================================================================== --- head/Makefile Sun Oct 29 01:21:29 2017 (r325082) +++ head/Makefile Sun Oct 29 01:21:33 2017 (r325083) @@ -34,7 +34,7 @@ # for world and kernel targets. # toolchains - Build a toolchain for all world and kernel targets. # xdev - xdev-build + xdev-install for the architecture -# specified with XDEV and XDEV_ARCH. +# specified with TARGET and TARGET_ARCH. # xdev-build - Build cross-development tools. # xdev-install - Install cross-development tools. # xdev-links - Create traditional links in /usr/bin for cc, etc From owner-svn-src-all@freebsd.org Sun Oct 29 01:21:50 2017 Return-Path: Delivered-To: svn-src-all@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 B854FE541BC; Sun, 29 Oct 2017 01:21:50 +0000 (UTC) (envelope-from bdrewery@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 7D32A639A3; Sun, 29 Oct 2017 01:21:50 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T1LntU068673; Sun, 29 Oct 2017 01:21:49 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T1Lnnj068672; Sun, 29 Oct 2017 01:21:49 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710290121.v9T1Lnnj068672@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sun, 29 Oct 2017 01:21:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325088 - head X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 325088 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 01:21:50 -0000 Author: bdrewery Date: Sun Oct 29 01:21:49 2017 New Revision: 325088 URL: https://svnweb.freebsd.org/changeset/base/325088 Log: xdev: Remove excess '/' since XDTP is asserted to be an absolute path. MFC after: 2 weeks Sponsored by: Dell EMC Isilon Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Sun Oct 29 01:21:46 2017 (r325087) +++ head/Makefile.inc1 Sun Oct 29 01:21:49 2017 (r325088) @@ -2817,7 +2817,7 @@ CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDDESTDIR}/u # Don't rebuild build-tools targets during normal build. CD2MAKE+= BUILD_TOOLS_META=.NOMETA .endif -XDDESTDIR=${DESTDIR}/${XDTP} +XDDESTDIR=${DESTDIR}${XDTP} .ORDER: xdev-build xdev-install xdev-links xdev: xdev-build xdev-install .PHONY From owner-svn-src-all@freebsd.org Sun Oct 29 01:21:53 2017 Return-Path: Delivered-To: svn-src-all@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 CBBC4E541E9; Sun, 29 Oct 2017 01:21:53 +0000 (UTC) (envelope-from bdrewery@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 7FC3B63A14; Sun, 29 Oct 2017 01:21:53 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T1LqNs068719; Sun, 29 Oct 2017 01:21:52 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T1LqiS068718; Sun, 29 Oct 2017 01:21:52 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710290121.v9T1LqiS068718@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sun, 29 Oct 2017 01:21:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325089 - head X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 325089 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 01:21:54 -0000 Author: bdrewery Date: Sun Oct 29 01:21:52 2017 New Revision: 325089 URL: https://svnweb.freebsd.org/changeset/base/325089 Log: xdev: Consolidate duplicate cross-tools build/install list into XDEVDIRS. MFC after: 2 weeks Sponsored by: Dell EMC Isilon Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Sun Oct 29 01:21:49 2017 (r325088) +++ head/Makefile.inc1 Sun Oct 29 01:21:52 2017 (r325089) @@ -2846,8 +2846,7 @@ _xb-build-tools: .PHONY ${_+_}@cd ${.CURDIR}; \ ${CDBENV} ${MAKE} -f Makefile.inc1 ${NOFUN} build-tools -_xb-cross-tools: .PHONY -.for _tool in \ +XDEVDIRS= \ ${_lld} \ ${_binutils} \ ${_elftctools} \ @@ -2855,6 +2854,9 @@ _xb-cross-tools: .PHONY ${_clang_libs} \ ${_clang} \ ${_gcc} + +_xb-cross-tools: .PHONY +.for _tool in ${XDEVDIRS} ${_+_}@${ECHODIR} "===> xdev ${_tool} (obj,all)"; \ cd ${.CURDIR}/${_tool}; \ if [ -z "${NO_OBJ}" ]; then ${CDMAKE} DIRPRFX=${_tool}/ obj; fi; \ @@ -2885,14 +2887,7 @@ xdev-install: xdev-build _xi-mtree _xi-cross-tools _xi _xi-cross-tools: .PHONY @echo "_xi-cross-tools" -.for _tool in \ - ${_lld} \ - ${_binutils} \ - ${_elftctools} \ - usr.bin/ar \ - ${_clang_libs} \ - ${_clang} \ - ${_gcc} +.for _tool in ${XDEVDIRS} ${_+_}@${ECHODIR} "===> xdev ${_tool} (install)"; \ cd ${.CURDIR}/${_tool}; \ ${CDMAKE} DIRPRFX=${_tool}/ install DESTDIR=${XDDESTDIR} From owner-svn-src-all@freebsd.org Sun Oct 29 04:33:51 2017 Return-Path: Delivered-To: svn-src-all@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 B0926E589FB; Sun, 29 Oct 2017 04:33:51 +0000 (UTC) (envelope-from cy@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 7F0906A65F; Sun, 29 Oct 2017 04:33:51 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T4XoS1051916; Sun, 29 Oct 2017 04:33:50 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T4XoUZ051915; Sun, 29 Oct 2017 04:33:50 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201710290433.v9T4XoUZ051915@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Sun, 29 Oct 2017 04:33:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r325090 - in stable: 10/include 11/include X-SVN-Group: stable-11 X-SVN-Commit-Author: cy X-SVN-Commit-Paths: in stable: 10/include 11/include X-SVN-Commit-Revision: 325090 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 04:33:51 -0000 Author: cy Date: Sun Oct 29 04:33:50 2017 New Revision: 325090 URL: https://svnweb.freebsd.org/changeset/base/325090 Log: Sync (make same) the offsetof macro definition in include/ with the definition of the same in sys/sys/. The problem was discovered while working on implementing a new C11 gets_s() for libc. (The new gets_s() requires rsize_t found in include/stddef.h.) The solution to sync the two definitions was suggested by ed@ while discussing D12667. Suggested by: ed Modified: stable/11/include/stddef.h Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/10/include/stddef.h Directory Properties: stable/10/ (props changed) Modified: stable/11/include/stddef.h ============================================================================== --- stable/11/include/stddef.h Sun Oct 29 01:21:52 2017 (r325089) +++ stable/11/include/stddef.h Sun Oct 29 04:33:50 2017 (r325090) @@ -70,7 +70,7 @@ typedef __max_align_t max_align_t; #endif #endif -#define offsetof(type, member) __offsetof(type, member) +#define offsetof(type, field) __offsetof(type, field) #if __EXT1_VISIBLE /* ISO/IEC 9899:2011 K.3.3.2 */ From owner-svn-src-all@freebsd.org Sun Oct 29 04:33:51 2017 Return-Path: Delivered-To: svn-src-all@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 EFB5EE58A01; Sun, 29 Oct 2017 04:33:51 +0000 (UTC) (envelope-from cy@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 B9BB36A660; Sun, 29 Oct 2017 04:33:51 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T4XobN051922; Sun, 29 Oct 2017 04:33:50 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T4Xoju051921; Sun, 29 Oct 2017 04:33:50 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201710290433.v9T4Xoju051921@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Sun, 29 Oct 2017 04:33: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: r325090 - in stable: 10/include 11/include X-SVN-Group: stable-10 X-SVN-Commit-Author: cy X-SVN-Commit-Paths: in stable: 10/include 11/include X-SVN-Commit-Revision: 325090 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 04:33:52 -0000 Author: cy Date: Sun Oct 29 04:33:50 2017 New Revision: 325090 URL: https://svnweb.freebsd.org/changeset/base/325090 Log: Sync (make same) the offsetof macro definition in include/ with the definition of the same in sys/sys/. The problem was discovered while working on implementing a new C11 gets_s() for libc. (The new gets_s() requires rsize_t found in include/stddef.h.) The solution to sync the two definitions was suggested by ed@ while discussing D12667. Suggested by: ed Modified: stable/10/include/stddef.h Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/11/include/stddef.h Directory Properties: stable/11/ (props changed) Modified: stable/10/include/stddef.h ============================================================================== --- stable/10/include/stddef.h Sun Oct 29 01:21:52 2017 (r325089) +++ stable/10/include/stddef.h Sun Oct 29 04:33:50 2017 (r325090) @@ -67,6 +67,6 @@ typedef __max_align_t max_align_t; #endif #endif -#define offsetof(type, member) __offsetof(type, member) +#define offsetof(type, field) __offsetof(type, field) #endif /* _STDDEF_H_ */ From owner-svn-src-all@freebsd.org Sun Oct 29 04:41:02 2017 Return-Path: Delivered-To: svn-src-all@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 850B4E58BB4; Sun, 29 Oct 2017 04:41:02 +0000 (UTC) (envelope-from eadler@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 53BB96AB51; Sun, 29 Oct 2017 04:41:02 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T4f1Ht052373; Sun, 29 Oct 2017 04:41:01 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T4f1WM052372; Sun, 29 Oct 2017 04:41:01 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201710290441.v9T4f1WM052372@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Sun, 29 Oct 2017 04:41:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325091 - head/usr.bin/fortune/datfiles X-SVN-Group: head X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: head/usr.bin/fortune/datfiles X-SVN-Commit-Revision: 325091 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 04:41:02 -0000 Author: eadler Date: Sun Oct 29 04:41:01 2017 New Revision: 325091 URL: https://svnweb.freebsd.org/changeset/base/325091 Log: Prefer using https over http Modified: head/usr.bin/fortune/datfiles/freebsd-tips Modified: head/usr.bin/fortune/datfiles/freebsd-tips ============================================================================== --- head/usr.bin/fortune/datfiles/freebsd-tips Sun Oct 29 04:33:50 2017 (r325090) +++ head/usr.bin/fortune/datfiles/freebsd-tips Sun Oct 29 04:41:01 2017 (r325091) @@ -69,7 +69,7 @@ If you need a reminder to leave your terminal, type "l % If you need to ask a question on the FreeBSD-questions mailing list then - http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/\ + https://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/\ freebsd-questions/index.html contains lots of useful advice to help you get the best results. @@ -100,7 +100,7 @@ environment variable in order to make cdcontrol want t If you'd like to keep track of applications in the FreeBSD ports tree, take a look at FreshPorts; - http://www.freshports.org/ + https://www.freshports.org/ % In order to make fetch (the FreeBSD downloading tool) ask for username/password when it encounters a password-protected web page, you can set @@ -455,7 +455,7 @@ You can use "pkg info" to see a list of packages you h % You can use the 'fetch' command to retrieve files over ftp, http or https. - fetch http://www.FreeBSD.org/index.html + fetch https://www.FreeBSD.org/index.html will download the front page of the FreeBSD web site. % From owner-svn-src-all@freebsd.org Sun Oct 29 04:53:34 2017 Return-Path: Delivered-To: svn-src-all@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 AADBCE590CF; Sun, 29 Oct 2017 04:53:34 +0000 (UTC) (envelope-from eadler@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 5E0C16B260; Sun, 29 Oct 2017 04:53:34 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T4rXRf060011; Sun, 29 Oct 2017 04:53:33 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T4rX3E060010; Sun, 29 Oct 2017 04:53:33 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201710290453.v9T4rX3E060010@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Sun, 29 Oct 2017 04:53:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325092 - head/usr.bin/fortune/datfiles X-SVN-Group: head X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: head/usr.bin/fortune/datfiles X-SVN-Commit-Revision: 325092 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 04:53:34 -0000 Author: eadler Date: Sun Oct 29 04:53:33 2017 New Revision: 325092 URL: https://svnweb.freebsd.org/changeset/base/325092 Log: Modernize freebsd-tips a bit - Prefer UTF-8 over ISO-8859-1 - Remove some references to printing man pages - Combine duplicate '!!' tips - 'rehash' is no longer needed Modified: head/usr.bin/fortune/datfiles/freebsd-tips Modified: head/usr.bin/fortune/datfiles/freebsd-tips ============================================================================== --- head/usr.bin/fortune/datfiles/freebsd-tips Sun Oct 29 04:41:01 2017 (r325091) +++ head/usr.bin/fortune/datfiles/freebsd-tips Sun Oct 29 04:53:33 2017 (r325092) @@ -47,10 +47,6 @@ reinstall it with gpart(8). See If you accidentally end up inside vi, you can quit it by pressing Escape, colon (:), q (q), bang (!) and pressing return. % -If you are in the C shell and have just installed a new program, you won't -be able to run it unless you first type "rehash". - -- Dru -% If you do not want to get beeps in X11 (X Windows), you can turn them off with xset b off @@ -115,7 +111,7 @@ also do a lot more advanced searches - type 'man grep' % In order to support national characters for European languages in tools like less without creating other nationalisation aspects, set the environment -variable LC_ALL to 'en_US.ISO8859-1'. +variable LC_ALL to 'en_US.UTF-8'. % "man firewall" will give advice for building a FreeBSD firewall using ipfw(8). -- David Scheidt @@ -154,11 +150,6 @@ Use "lock -p". When you return, use your password as t terminal. -- Dru % -Need to print a manpage? Use - - man name_of_manpage | col -bx | lpr - -- Dru -% Need to quickly empty a file? Use ": > filename". -- Dru % @@ -256,9 +247,6 @@ To read a compressed file without having to first unco and "xzless". -- Dru % -To repeat the last command in the C shell, type "!!". - -- Dru -% To save disk space in your home directory, compress files you rarely use with "gzip filename". -- Dru @@ -467,7 +455,7 @@ Try "whereis firefox" and "whereis whereis". -- Konstantinos Konstantinidis % Want to run the same command again? -In tcsh you can type "!!". +Type "!!". % Want to go the directory you were just in? Type "cd -" From owner-svn-src-all@freebsd.org Sun Oct 29 05:27:00 2017 Return-Path: Delivered-To: svn-src-all@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 670E0E598CF; Sun, 29 Oct 2017 05:27:00 +0000 (UTC) (envelope-from oshogbo.vx@gmail.com) Received: from mail-pg0-x22a.google.com (mail-pg0-x22a.google.com [IPv6:2607:f8b0:400e:c05::22a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 344A76BDDF; Sun, 29 Oct 2017 05:27:00 +0000 (UTC) (envelope-from oshogbo.vx@gmail.com) Received: by mail-pg0-x22a.google.com with SMTP id y5so8475500pgq.7; Sat, 28 Oct 2017 22:27:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc:content-transfer-encoding; bh=SjBIhgsJvT1Mveu0UZdHBHb5rBaFPwAGcOp+YjJ6DTE=; b=BghhA7kfnie7aGt7+8QNECNCtxa1m5BEjc+6sK6CeNDBf26UU6lGfIVGMkBqTK/OL8 OMvk3fA3GuDUYde5tgWMutQuNKbj0ZOcAlrWnIQPonARU6lqdC2UB5VESn8pUuLMA0NT MQNOxVUMgU/z9IMiBmRPmhPQ4lJup4ED1uPL1ZqiySHxq7A7ZV/KwI7JmkIg12OnLHHo 6UZrP8Z6x1r4TOUb6nw/zHDMpHIi0sqm2jUqWNydBY6HywUiLt2kP7b1fXBK3YqrIItn 1OYAvZhnp3CalMR8RA6e504qhtfgYcGKHZ4DFoBgvAmypNC7ibgROhvwNdx+t3sBSf6U MnFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc:content-transfer-encoding; bh=SjBIhgsJvT1Mveu0UZdHBHb5rBaFPwAGcOp+YjJ6DTE=; b=OgUt9ISFCXqQGikotF7myx/R+TPdK6+kZdkYsxg3qwE10tNPTSs1SDRIinDYHEgeIs YmJEk9Y9hPdcf8u/AaUdaF9a2nXeOwLKJBSbpu71DX5Qfx2MqRdTEpgdbbXAL8Q5xJSD th4A8fzHB2aguI9baWDcRjZHSlCfnvpabez+3ZGG128y3+ozkMD00O3IGDQtfdYIXmeC B/nud3daDuaM0hJkri881KC3/tmKcm8KGvW7xBJjRCu7tX6pOvPdDCFFLDjmCHqhJjMQ c7JmcHM5lVw1cDCCO2rDmAwz34CvEvGGGgkh906K/6689KMTfxjmKm8PMiDmGE662wvm 5ZqA== X-Gm-Message-State: AMCzsaV7MpUJTFd7V9czH2Cx+DcqoGIvxJ2vWfoogPYOeiju1AsB4bum iW0NrTSmpYMHvVPXhX1fGOoMyMShIIcqlmtOc6fkzq6m X-Google-Smtp-Source: ABhQp+TyFf4Y+a4EF3r2/HwIzpfTNu6QxlOJqaEOthJUuv7BUG3LkYa0fAlZ/Niy1+oerF0Io5REQxADyJ2wTGsXNA4= X-Received: by 10.84.128.70 with SMTP id 64mr4213926pla.329.1509254819453; Sat, 28 Oct 2017 22:26:59 -0700 (PDT) MIME-Version: 1.0 Sender: oshogbo.vx@gmail.com Received: by 10.100.130.73 with HTTP; Sat, 28 Oct 2017 22:26:58 -0700 (PDT) In-Reply-To: References: <201710281923.v9SJNvE5021346@repo.freebsd.org> From: Mariusz Zaborski Date: Sun, 29 Oct 2017 06:26:58 +0100 X-Google-Sender-Auth: nuFb-KnIIAVU8xzgsCrv78wZKVE Message-ID: Subject: Re: svn commit: r325062 - in head/lib: . libcasper libcasper/libcasper libcasper/services libcasper/services/cap_dns libcasper/services/cap_dns/tests libcasper/services/cap_grp libcasper/services/cap_g... To: cem@freebsd.org Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 05:27:00 -0000 On 29 October 2017 at 01:49, Conrad Meyer wrote: > Hi, > > On Sat, Oct 28, 2017 at 12:23 PM, Mariusz Zaborski = wrote: >> Author: oshogbo >> Date: Sat Oct 28 19:23:57 2017 >> New Revision: 325062 >> URL: https://svnweb.freebsd.org/changeset/base/325062 >> >> Log: >> Introduce caspermocks. >> >> The idea behinds mocks is that we don't need to ifdef a lot of code in >> tools itself but those defines are hidden in the casper library. >> Right now the mocks are implemented as define/inlines functions. >> There was a very long discussion how this should be implemented. >> This approach has some advantages like we don't need to link to any ad= ditional >> libraries. Unfortunately there are also some disadvantages for example= it is >> easy to get library out of sync between two versions of functions or t= hat we >> need extra define to compile program with casper support. >> This isn't an ideal solution but it's good enough for now and should s= implify >> capsicumizing programs. This also doesn't close us any other ways to d= o those >> mocks and this should evolve in time. >> >> Discussed with: pjd, emaste, ed, rwatson, bapt, cem, bdrewery >> Differential Revision: https://reviews.freebsd.org/D8753 > > It's worth pointing out "discussed with" here very much does not mean > "approved by" =E2=80=94 several of the people mentioned above raised conc= erns > with this approach and only one person explicitly supported the > change. Sorry for my in precision, Approved by: pjd, emaste, ed, rwatson Discussed with: pjd, emaste, ed, rwatson, bapt, cem, bdrewery Like I mention in a commit log there were some concerns. This is also the reason why I wouldn't commit it with only one 'go for it'. Thanks, Mariusz > > Best, > Conrad From owner-svn-src-all@freebsd.org Sun Oct 29 05:27:01 2017 Return-Path: Delivered-To: svn-src-all@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 55896E598DA; Sun, 29 Oct 2017 05:27:01 +0000 (UTC) (envelope-from imp@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 2E3E46BDE0; Sun, 29 Oct 2017 05:27:01 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T5QxF6072602; Sun, 29 Oct 2017 05:26:59 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T5QxQW072592; Sun, 29 Oct 2017 05:26:59 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201710290526.v9T5QxQW072592@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sun, 29 Oct 2017 05:26:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325093 - in head/sys/boot: . efi/boot1 efi/fdt efi/libefi efi/loader efi/loader/arch/amd64 efi/loader/arch/arm64 efi/loader/arch/i386 X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/sys/boot: . efi/boot1 efi/fdt efi/libefi efi/loader efi/loader/arch/amd64 efi/loader/arch/arm64 efi/loader/arch/i386 X-SVN-Commit-Revision: 325093 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 05:27:01 -0000 Author: imp Date: Sun Oct 29 05:26:59 2017 New Revision: 325093 URL: https://svnweb.freebsd.org/changeset/base/325093 Log: Define new EFI variables Define EFISRC, EFIINC and EFIINCMD. Use them, as well as using other symbols defined in defs.mk. Prefer to ../../Makefile.inc or . Sponsored by: Netflix Modified: head/sys/boot/defs.mk head/sys/boot/efi/boot1/Makefile head/sys/boot/efi/fdt/Makefile head/sys/boot/efi/libefi/Makefile head/sys/boot/efi/loader/Makefile head/sys/boot/efi/loader/arch/amd64/Makefile.inc head/sys/boot/efi/loader/arch/arm64/Makefile.inc head/sys/boot/efi/loader/arch/i386/Makefile.inc Modified: head/sys/boot/defs.mk ============================================================================== --- head/sys/boot/defs.mk Sun Oct 29 04:53:33 2017 (r325092) +++ head/sys/boot/defs.mk Sun Oct 29 05:26:59 2017 (r325093) @@ -6,6 +6,9 @@ __BOOT_DEFS_MK__=${MFILE} BOOTSRC= ${SRCTOP}/sys/boot +EFISRC= ${BOOTSRC}/efi +EFIINC= ${EFISRC}/include +EFIINCMD= ${EFIINC}/${MACHINE} FDTSRC= ${BOOTSRC}/fdt FICLSRC= ${BOOTSRC}/ficl LDRSRC= ${BOOTSRC}/common Modified: head/sys/boot/efi/boot1/Makefile ============================================================================== --- head/sys/boot/efi/boot1/Makefile Sun Oct 29 04:53:33 2017 (r325092) +++ head/sys/boot/efi/boot1/Makefile Sun Oct 29 05:26:59 2017 (r325093) @@ -2,7 +2,7 @@ MAN= -.include "../Makefile.inc" +.include MK_SSP= no MK_FORTH= no @@ -40,7 +40,7 @@ SRCS+= zfs_module.c SRCS+= skein.c skein_block.c # Do not unroll skein loops, reduce code size CFLAGS+= -DSKEIN_LOOP=111 -.PATH: ${.CURDIR}/../../../crypto/skein +.PATH: ${SYSDIR}/crypto/skein .endif .if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} > 40201 @@ -48,32 +48,32 @@ CWARNFLAGS.self_reloc.c+= -Wno-error=maybe-uninitializ .endif CFLAGS+= -I. -CFLAGS+= -I${.CURDIR}/../include -CFLAGS+= -I${.CURDIR}/../include/${MACHINE} -CFLAGS+= -I${.CURDIR}/../../../contrib/dev/acpica/include -CFLAGS+= -I${.CURDIR}/../../.. +CFLAGS+= -I${EFIINC} +CFLAGS+= -I${EFIINCMD} +CFLAGS+= -I${SYSDIR}/contrib/dev/acpica/include +CFLAGS+= -I${SYSDIR} CFLAGS+= -DEFI_UFS_BOOT .ifdef(EFI_DEBUG) CFLAGS+= -DEFI_DEBUG .endif .if ${MK_ZFS} != "no" -CFLAGS+= -I${.CURDIR}/../../zfs/ -CFLAGS+= -I${.CURDIR}/../../../cddl/boot/zfs/ -CFLAGS+= -I${.CURDIR}/../../../crypto/skein +CFLAGS+= -I${BOOTSRC}/zfs/ +CFLAGS+= -I${SYSDIR}/cddl/boot/zfs/ +CFLAGS+= -I${SYSDIR}/crypto/skein CFLAGS+= -DEFI_ZFS_BOOT .endif # Always add MI sources and REGULAR efi loader bits -.PATH: ${.CURDIR}/../loader/arch/${MACHINE} -.PATH: ${.CURDIR}/../loader -.PATH: ${.CURDIR}/../../common -CFLAGS+= -I${.CURDIR}/../../common +.PATH: ${EFISRC}/loader/arch/${MACHINE} +.PATH: ${EFISRC}/loader +.PATH: ${LDRSRC} +CFLAGS+= -I${LDRSRC} FILES= boot1.efi boot1.efifat FILESMODE_boot1.efi= ${BINMODE} -LDSCRIPT= ${.CURDIR}/../loader/arch/${MACHINE}/ldscript.${MACHINE} +LDSCRIPT= ${EFISRC}/loader/arch/${MACHINE}/ldscript.${MACHINE} LDFLAGS+= -Wl,-T${LDSCRIPT},-Bsymbolic,-znotext -shared .if ${MACHINE_CPUARCH} == "aarch64" @@ -84,7 +84,7 @@ CFLAGS+= -fPIC LDFLAGS+= -Wl,-znocombreloc .endif -LIBEFI= ${.OBJDIR}/../libefi/libefi.a +LIBEFI= ${BOOTOBJ}/efi/libefi/libefi.a # # Add libstand for the runtime functions used by the compiler - for example @@ -148,12 +148,12 @@ beforedepend ${OBJS}: machine CLEANFILES+= machine machine: .NOMETA - ln -sf ${.CURDIR}/../../../${MACHINE}/include machine + ln -sf ${SYSDIR}/${MACHINE}/include machine .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" beforedepend ${OBJS}: x86 CLEANFILES+= x86 x86: .NOMETA - ln -sf ${.CURDIR}/../../../x86/include x86 + ln -sf ${SYSDIR}/x86/include x86 .endif Modified: head/sys/boot/efi/fdt/Makefile ============================================================================== --- head/sys/boot/efi/fdt/Makefile Sun Oct 29 04:53:33 2017 (r325092) +++ head/sys/boot/efi/fdt/Makefile Sun Oct 29 05:26:59 2017 (r325093) @@ -1,8 +1,8 @@ # $FreeBSD$ -.include +.include -.PATH: ${.CURDIR}/../../common +.PATH: ${LDRSRC} LIB= efi_fdt INTERNALLIB= @@ -18,17 +18,17 @@ CFLAGS+= -msoft-float .endif # EFI library headers -CFLAGS+= -I${.CURDIR}/../include -CFLAGS+= -I${.CURDIR}/../include/${MACHINE} +CFLAGS+= -I${EFISRC}/include +CFLAGS+= -I${EFISRC}/include/${MACHINE} # libfdt headers -CFLAGS+= -I${.CURDIR}/../../fdt +CFLAGS+= -I${FDTSRC} # Pick up the bootstrap header for some interface items -CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I. +CFLAGS+= -I${LDRSRC} -I${SYSDIR} -I. machine: .NOMETA - ln -sf ${.CURDIR}/../../../${MACHINE}/include machine + ln -sf ${SYSDIR}/${MACHINE}/include machine CLEANFILES+= machine Modified: head/sys/boot/efi/libefi/Makefile ============================================================================== --- head/sys/boot/efi/libefi/Makefile Sun Oct 29 04:53:33 2017 (r325092) +++ head/sys/boot/efi/libefi/Makefile Sun Oct 29 05:26:59 2017 (r325093) @@ -1,9 +1,9 @@ # $FreeBSD$ -.include +.include .if ${MK_FORTH} != "no" -.include "../../ficl.mk" +.include "${BOOTSRC}/ficl.mk" .endif LIB= efi @@ -35,17 +35,17 @@ CFLAGS+= -mgeneral-regs-only CFLAGS+= -fPIC -mno-red-zone .endif CFLAGS+= -I${SYSDIR} -CFLAGS+= -I${.CURDIR}/../include -CFLAGS+= -I${.CURDIR}/../include/${MACHINE} +CFLAGS+= -I${EFIINC} +CFLAGS+= -I${EFIINCMD} .if ${MK_ZFS} != "no" -CFLAGS+= -I${.CURDIR}/../../zfs -CFLAGS+= -I${.CURDIR}/../../../cddl/boot/zfs -CFLAGS+= -I${.CURDIR}/../../../crypto/skein +CFLAGS+= -I${BOOTSRC}/zfs +CFLAGS+= -I${SYSDIR}/cddl/boot/zfs +CFLAGS+= -I${SYSDIR}/crypto/skein CFLAGS+= -DEFI_ZFS_BOOT .endif # Pick up the bootstrap header for some interface items -CFLAGS+= -I${.CURDIR}/../../common +CFLAGS+= -I${LDRSRC} # Handle FreeBSD specific %b and %D printf format specifiers CFLAGS+= ${FORMAT_EXTENSIONS} Modified: head/sys/boot/efi/loader/Makefile ============================================================================== --- head/sys/boot/efi/loader/Makefile Sun Oct 29 04:53:33 2017 (r325092) +++ head/sys/boot/efi/loader/Makefile Sun Oct 29 05:26:59 2017 (r325093) @@ -2,7 +2,7 @@ MAN= -.include +.include MK_SSP= no @@ -30,11 +30,11 @@ SRCS= autoload.c \ .if ${MK_ZFS} != "no" SRCS+= zfs.c -.PATH: ${.CURDIR}/../../zfs +.PATH: ${BOOTSRC}/zfs SRCS+= skein.c skein_block.c # Do not unroll skein loops, reduce code size CFLAGS+= -DSKEIN_LOOP=111 -.PATH: ${.CURDIR}/../../../crypto/skein +.PATH: ${SYSDIR}/crypto/skein # Disable warnings that are currently incompatible with the zfs boot code CWARNFLAGS.zfs.c+= -Wno-sign-compare @@ -55,20 +55,20 @@ CWARNFLAGS.main.c+= -Wno-format .PATH: ${.CURDIR}/arch/${MACHINE} # For smbios.c -.PATH: ${.CURDIR}/../../i386/libi386 +.PATH: ${BOOTSRC}/i386/libi386 .include "${.CURDIR}/arch/${MACHINE}/Makefile.inc" CFLAGS+= -I${.CURDIR} CFLAGS+= -I${.CURDIR}/arch/${MACHINE} -CFLAGS+= -I${.CURDIR}/../include -CFLAGS+= -I${.CURDIR}/../include/${MACHINE} -CFLAGS+= -I${.CURDIR}/../../../contrib/dev/acpica/include -CFLAGS+= -I${.CURDIR}/../../.. -CFLAGS+= -I${.CURDIR}/../../i386/libi386 +CFLAGS+= -I${EFISRC}/include +CFLAGS+= -I${EFISRC}/include/${MACHINE} +CFLAGS+= -I${SYSDIR}/contrib/dev/acpica/include +CFLAGS+= -I${SYSDIR} +CFLAGS+= -I${BOOTSRC}/i386/libi386 .if ${MK_ZFS} != "no" -CFLAGS+= -I${.CURDIR}/../../zfs -CFLAGS+= -I${.CURDIR}/../../../cddl/boot/zfs -CFLAGS+= -I${.CURDIR}/../../../crypto/skein +CFLAGS+= -I${BOOTSRC}/zfs +CFLAGS+= -I${SYSDIR}/cddl/boot/zfs +CFLAGS+= -I${SYSDIR}/crypto/skein CFLAGS+= -DEFI_ZFS_BOOT .endif CFLAGS+= -DNO_PCI -DEFI @@ -87,11 +87,11 @@ CFLAGS+= -DSMBIOS_NETWORK_ENDIAN_UUID LOADER_FDT_SUPPORT?= no .if ${MK_FDT} != "no" && ${LOADER_FDT_SUPPORT} != "no" -CFLAGS+= -I${.CURDIR}/../../fdt -CFLAGS+= -I${.OBJDIR}/../../fdt +CFLAGS+= -I${BOOTSRC}/fdt +CFLAGS+= -I${BOOTSRC}/fdt CFLAGS+= -DLOADER_FDT_SUPPORT -LIBEFI_FDT= ${.OBJDIR}/../../efi/fdt/libefi_fdt.a -LIBFDT= ${.OBJDIR}/../../fdt/libfdt.a +LIBEFI_FDT= ${BOOTOBJ}/efi/fdt/libefi_fdt.a +LIBFDT= ${BOOTOBJ}/fdt/libfdt.a .endif # Include bcache code. @@ -102,7 +102,7 @@ CFLAGS+= -DEFI_STAGING_SIZE=${EFI_STAGING_SIZE} .endif # Always add MI sources -.include "../../loader.mk" +.include "${BOOTSRC}/loader.mk" FILES+= loader.efi FILESMODE_loader.efi= ${BINMODE} @@ -140,7 +140,7 @@ loader.efi: ${PROG} -j set_Xficl_compile_set \ --output-target=${EFI_TARGET} ${.ALLSRC} ${.TARGET} -LIBEFI= ${.OBJDIR}/../libefi/libefi.a +LIBEFI= ${BOOTOBJ}/efi/libefi/libefi.a DPADD= ${LIBFICL} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} ${LIBSA} \ ${LDSCRIPT} @@ -153,12 +153,12 @@ beforedepend ${OBJS}: machine CLEANFILES+= machine machine: .NOMETA - ln -sf ${.CURDIR}/../../../${MACHINE}/include machine + ln -sf ${SYSDIR}/${MACHINE}/include machine .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" beforedepend ${OBJS}: x86 CLEANFILES+= x86 x86: .NOMETA - ln -sf ${.CURDIR}/../../../x86/include x86 + ln -sf ${SYSDIR}/x86/include x86 .endif Modified: head/sys/boot/efi/loader/arch/amd64/Makefile.inc ============================================================================== --- head/sys/boot/efi/loader/arch/amd64/Makefile.inc Sun Oct 29 04:53:33 2017 (r325092) +++ head/sys/boot/efi/loader/arch/amd64/Makefile.inc Sun Oct 29 05:26:59 2017 (r325093) @@ -6,7 +6,7 @@ SRCS+= amd64_tramp.S \ trap.c \ exc.S -.PATH: ${.CURDIR}/../../i386/libi386 +.PATH: ${BOOTSRC}/i386/libi386 SRCS+= nullconsole.c \ comconsole.c \ spinconsole.c Modified: head/sys/boot/efi/loader/arch/arm64/Makefile.inc ============================================================================== --- head/sys/boot/efi/loader/arch/arm64/Makefile.inc Sun Oct 29 04:53:33 2017 (r325092) +++ head/sys/boot/efi/loader/arch/arm64/Makefile.inc Sun Oct 29 05:26:59 2017 (r325093) @@ -4,8 +4,8 @@ LOADER_FDT_SUPPORT=yes SRCS+= exec.c \ start.S -.PATH: ${.CURDIR}/../../arm64/libarm64 -CFLAGS+=-I${.CURDIR}/../../arm64/libarm64 +.PATH: ${BOOTSRC}/arm64/libarm64 +CFLAGS+=-I${BOOTSRC}/arm64/libarm64 SRCS+= cache.c CFLAGS+= -mgeneral-regs-only @@ -14,11 +14,11 @@ CLEANFILES+= loader.help loader.help: help.common cat ${.ALLSRC} | \ - awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET} + awk -f ${LDRSRC}/merge_help.awk > ${.TARGET} .if !defined(LOADER_ONLY) -.PATH: ${.CURDIR}/../../forth -.include "${.CURDIR}/../../forth/Makefile.inc" +.PATH: ${BOOTSRC}/forth +.include "${BOOTSRC}/forth/Makefile.inc" FILES+= loader.rc .endif Modified: head/sys/boot/efi/loader/arch/i386/Makefile.inc ============================================================================== --- head/sys/boot/efi/loader/arch/i386/Makefile.inc Sun Oct 29 04:53:33 2017 (r325092) +++ head/sys/boot/efi/loader/arch/i386/Makefile.inc Sun Oct 29 05:26:59 2017 (r325093) @@ -5,7 +5,7 @@ SRCS+= start.S \ elf32_freebsd.c \ exec.c -.PATH: ${.CURDIR}/../../i386/libi386 +.PATH: ${BOOTSRC}/i386/libi386 SRCS+= nullconsole.c \ comconsole.c \ spinconsole.c From owner-svn-src-all@freebsd.org Sun Oct 29 05:27:24 2017 Return-Path: Delivered-To: svn-src-all@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 544E4E59974; Sun, 29 Oct 2017 05:27:24 +0000 (UTC) (envelope-from imp@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 2F84A6BFA9; Sun, 29 Oct 2017 05:27:24 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T5RNeN072673; Sun, 29 Oct 2017 05:27:23 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T5RMaT072665; Sun, 29 Oct 2017 05:27:22 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201710290527.v9T5RMaT072665@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sun, 29 Oct 2017 05:27:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325094 - in head/sys/boot: . fdt ficl geli ofw/libofw uboot/fdt uboot/lib zfs X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/sys/boot: . fdt ficl geli ofw/libofw uboot/fdt uboot/lib zfs X-SVN-Commit-Revision: 325094 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 05:27:24 -0000 Author: imp Date: Sun Oct 29 05:27:22 2017 New Revision: 325094 URL: https://svnweb.freebsd.org/changeset/base/325094 Log: Cleanup non-arch Makefiles Use SYSDIR, BOOTSRC, LDRSRC and FDTSRC in preference to relative paths. Also, use bsd.init.mk where needed. Sponsored by: Netflix Modified: head/sys/boot/fdt/Makefile head/sys/boot/ficl.mk head/sys/boot/ficl/Makefile head/sys/boot/geli/Makefile head/sys/boot/ofw/libofw/Makefile head/sys/boot/uboot/fdt/Makefile head/sys/boot/uboot/lib/Makefile head/sys/boot/zfs/Makefile Modified: head/sys/boot/fdt/Makefile ============================================================================== --- head/sys/boot/fdt/Makefile Sun Oct 29 05:26:59 2017 (r325093) +++ head/sys/boot/fdt/Makefile Sun Oct 29 05:27:22 2017 (r325094) @@ -14,7 +14,7 @@ SRCS+= fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt # Loader's fdt commands extension sources. SRCS+= fdt_loader_cmd.c fdt_overlay.c -CFLAGS+= -I${SYSDIR}/contrib/libfdt/ -I${BOOTSRC}/common/ +CFLAGS+= -I${SYSDIR}/contrib/libfdt/ -I${LDRSRC} CFLAGS+= -ffreestanding Modified: head/sys/boot/ficl.mk ============================================================================== --- head/sys/boot/ficl.mk Sun Oct 29 05:26:59 2017 (r325093) +++ head/sys/boot/ficl.mk Sun Oct 29 05:27:22 2017 (r325094) @@ -38,7 +38,7 @@ beforedepend ${OBJS}: machine .endif machine: .NOMETA - ln -sf ${.CURDIR}/../../i386/include machine + ln -sf ${SYSDIR}/i386/include machine CLEANFILES+= machine .endif Modified: head/sys/boot/ficl/Makefile ============================================================================== --- head/sys/boot/ficl/Makefile Sun Oct 29 05:26:59 2017 (r325093) +++ head/sys/boot/ficl/Makefile Sun Oct 29 05:27:22 2017 (r325094) @@ -1,7 +1,8 @@ # $FreeBSD$ # -.include "../ficl.mk" +.include +.include "${BOOTSRC}/ficl.mk" BASE_SRCS= dict.c ficl.c fileaccess.c float.c loader.c math64.c \ prefix.c search.c stack.c tools.c vm.c words.c Modified: head/sys/boot/geli/Makefile ============================================================================== --- head/sys/boot/geli/Makefile Sun Oct 29 05:26:59 2017 (r325093) +++ head/sys/boot/geli/Makefile Sun Oct 29 05:27:22 2017 (r325094) @@ -40,7 +40,7 @@ SRCS+= md5c.c # AES implementation from sys/crypto .PATH: ${SYSDIR}/crypto/rijndael CFLAGS+= -I${SYSDIR} -CFLAGS+= -I${.CURDIR}/../common/ +CFLAGS+= -I${LDRSRC} # Remove asserts CFLAGS+= -DNDEBUG SRCS+= rijndael-alg-fst.c rijndael-api-fst.c rijndael-api.c Modified: head/sys/boot/ofw/libofw/Makefile ============================================================================== --- head/sys/boot/ofw/libofw/Makefile Sun Oct 29 05:26:59 2017 (r325093) +++ head/sys/boot/ofw/libofw/Makefile Sun Oct 29 05:27:22 2017 (r325094) @@ -6,11 +6,11 @@ INTERNALLIB= SRCS= devicename.c elf_freebsd.c ofw_console.c ofw_copy.c ofw_disk.c \ ofw_memory.c ofw_module.c ofw_net.c ofw_reboot.c \ ofw_time.c openfirm.c -.PATH: ${.CURDIR}/../../zfs +.PATH: ${BOOTSRC}/zfs SRCS+= devicename_stubs.c # Pick up the bootstrap header for some interface items -CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I. +CFLAGS+= -I${LDRSRC} -I${SYSDIR} -I. CFLAGS+= -ffreestanding .if ${MACHINE_CPUARCH} == "powerpc" @@ -24,7 +24,7 @@ CFLAGS+= -DDISK_DEBUG .endif machine: .NOMETA - ln -sf ${.CURDIR}/../../../${MACHINE_CPUARCH}/include machine + ln -sf ${SYSDIR}/${MACHINE_CPUARCH}/include machine CLEANFILES+= machine Modified: head/sys/boot/uboot/fdt/Makefile ============================================================================== --- head/sys/boot/uboot/fdt/Makefile Sun Oct 29 05:26:59 2017 (r325093) +++ head/sys/boot/uboot/fdt/Makefile Sun Oct 29 05:27:22 2017 (r325094) @@ -1,8 +1,8 @@ # $FreeBSD$ -.include +.include -.PATH: ${.CURDIR}/../../common +.PATH: ${LDRSRC} LIB= uboot_fdt INTERNALLIB= @@ -13,16 +13,16 @@ SRCS= uboot_fdt.c CFLAGS+= -ffreestanding -msoft-float # U-Boot library headers -CFLAGS+= -I${.CURDIR}/../lib +CFLAGS+= -I${UBOOTSRC}/lib # libfdt headers -CFLAGS+= -I${.CURDIR}/../../fdt +CFLAGS+= -I${FDTSRC} # Pick up the bootstrap header for some interface items -CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I. +CFLAGS+= -I${LDRSRC} -I${SYSDIR} -I. machine: .NOMETA - ln -sf ${.CURDIR}/../../../${MACHINE_CPUARCH}/include machine + ln -sf ${SYSDIR}/${MACHINE_CPUARCH}/include machine CLEANFILES+= machine Modified: head/sys/boot/uboot/lib/Makefile ============================================================================== --- head/sys/boot/uboot/lib/Makefile Sun Oct 29 05:26:59 2017 (r325093) +++ head/sys/boot/uboot/lib/Makefile Sun Oct 29 05:27:22 2017 (r325094) @@ -1,8 +1,8 @@ # $FreeBSD$ -.include +.include -.PATH: ${.CURDIR}/../../common +.PATH: ${LDRSRC} LIB= uboot INTERNALLIB= @@ -24,14 +24,14 @@ LOADER_FDT_SUPPORT= no .endif .if ${LOADER_FDT_SUPPORT} == "yes" -CFLAGS+= -DLOADER_FDT_SUPPORT -I${.CURDIR}/../../fdt +CFLAGS+= -DLOADER_FDT_SUPPORT -I${FDTSRC} .endif # Pick up FDT includes CFLAGS+= -I${SYSDIR}/contrib/libfdt/ # Pick up the bootstrap header for some interface items -CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I. +CFLAGS+= -I${LDRSRC} -I${SYSDIR} -I. .ifdef(BOOT_DISK_DEBUG) # Make the disk code more talkative @@ -39,7 +39,7 @@ CFLAGS+= -DDISK_DEBUG .endif machine: .NOMETA - ln -sf ${.CURDIR}/../../../${MACHINE_CPUARCH}/include machine + ln -sf ${SYSDIR}/${MACHINE_CPUARCH}/include machine CLEANFILES+= machine Modified: head/sys/boot/zfs/Makefile ============================================================================== --- head/sys/boot/zfs/Makefile Sun Oct 29 05:26:59 2017 (r325093) +++ head/sys/boot/zfs/Makefile Sun Oct 29 05:27:22 2017 (r325094) @@ -1,5 +1,7 @@ # $FreeBSD$ +.include + LIB= zfsboot INTERNALLIB= @@ -8,12 +10,12 @@ SRCS+= zfs.c SRCS+= skein.c skein_block.c # Do not unroll skein loops, reduce code size CFLAGS+= -DSKEIN_LOOP=111 -.PATH: ${.CURDIR}/../../crypto/skein +.PATH: ${SYSDIR}/crypto/skein CFLAGS+= -DBOOTPROG=\"zfsloader\" -CFLAGS+= -I${.CURDIR}/../common -I${.CURDIR}/../.. -I. -CFLAGS+= -I${.CURDIR}/../../cddl/boot/zfs -CFLAGS+= -I${.CURDIR}/../../crypto/skein +CFLAGS+= -I${LDRSRC} -I${SYSDIR} -I. +CFLAGS+= -I${SYSDIR}/cddl/boot/zfs +CFLAGS+= -I${SYSDIR}/crypto/skein .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" CFLAGS+= -march=i386 @@ -27,7 +29,7 @@ CFLAGS+= -Wformat -Wall .if ${MACHINE_CPUARCH} == "amd64" CLEANFILES+= machine machine: .NOMETA - ln -sf ${.CURDIR}/../../i386/include machine + ln -sf ${SYSDIR}/i386/include machine .endif .include From owner-svn-src-all@freebsd.org Sun Oct 29 08:03:23 2017 Return-Path: Delivered-To: svn-src-all@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 E4D1CE5D03E; Sun, 29 Oct 2017 08:03:23 +0000 (UTC) (envelope-from eadler@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 BED94707D9; Sun, 29 Oct 2017 08:03:23 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T83MV8039051; Sun, 29 Oct 2017 08:03:22 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T83M30039043; Sun, 29 Oct 2017 08:03:22 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201710290803.v9T83M30039043@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Sun, 29 Oct 2017 08:03:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325095 - in head/usr.bin: calendar calendar/calendars/pt_BR.UTF-8 fortune/datfiles mkcsmapper unifdef units xohtml X-SVN-Group: head X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: in head/usr.bin: calendar calendar/calendars/pt_BR.UTF-8 fortune/datfiles mkcsmapper unifdef units xohtml X-SVN-Commit-Revision: 325095 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 08:03:24 -0000 Author: eadler Date: Sun Oct 29 08:03:21 2017 New Revision: 325095 URL: https://svnweb.freebsd.org/changeset/base/325095 Log: Update URLs in usr.bin - http -> https - contents have moved locations - removal of URL if I could not find new location Modified: head/usr.bin/calendar/calendars/pt_BR.UTF-8/calendar.commemorative head/usr.bin/calendar/sunpos.c head/usr.bin/fortune/datfiles/fortunes head/usr.bin/mkcsmapper/mkcsmapper.1 head/usr.bin/unifdef/unifdef.1 head/usr.bin/unifdef/unifdef.c head/usr.bin/units/definitions.units head/usr.bin/xohtml/xohtml.sh Modified: head/usr.bin/calendar/calendars/pt_BR.UTF-8/calendar.commemorative ============================================================================== --- head/usr.bin/calendar/calendars/pt_BR.UTF-8/calendar.commemorative Sun Oct 29 05:27:22 2017 (r325094) +++ head/usr.bin/calendar/calendars/pt_BR.UTF-8/calendar.commemorative Sun Oct 29 08:03:21 2017 (r325095) @@ -4,8 +4,6 @@ * Originally submitted by Renato Tambellini * * Brazilian commemorative days - * - * http://www.ibge.gov.br/ibgeteen/datas/home.html */ #ifndef _pt_BR_UTF_8_commemorative_ Modified: head/usr.bin/calendar/sunpos.c ============================================================================== --- head/usr.bin/calendar/sunpos.c Sun Oct 29 05:27:22 2017 (r325094) +++ head/usr.bin/calendar/sunpos.c Sun Oct 29 08:03:21 2017 (r325095) @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); /* * This code is created to match the formulas available at: * Formula and examples obtained from "How to Calculate alt/az: SAAO" at - * http://www.saao.ac.za/public-info/sun-moon-stars/sun-index/how-to-calculate-altaz/ + * http://old.saao.ac.za/public-info/sun-moon-stars/sun-index/how-to-calculate-altaz/ */ #include Modified: head/usr.bin/fortune/datfiles/fortunes ============================================================================== --- head/usr.bin/fortune/datfiles/fortunes Sun Oct 29 05:27:22 2017 (r325094) +++ head/usr.bin/fortune/datfiles/fortunes Sun Oct 29 08:03:21 2017 (r325095) @@ -46260,7 +46260,7 @@ error: The operation completed successfully. For more information, see Help and Support Center at -http://go.microsoft.com/fwlink/events.asp. +https://go.microsoft.com/fwlink/events.asp. % The minute a man is convinced that he is interesting, he isn't. % Modified: head/usr.bin/mkcsmapper/mkcsmapper.1 ============================================================================== --- head/usr.bin/mkcsmapper/mkcsmapper.1 Sun Oct 29 05:27:22 2017 (r325094) +++ head/usr.bin/mkcsmapper/mkcsmapper.1 Sun Oct 29 08:03:21 2017 (r325095) @@ -29,8 +29,8 @@ .\" Electrical and Electronics Engineers, Inc and The Open Group. In the .\" event of any discrepancy between this version and the original IEEE and .\" The Open Group Standard, the original IEEE and The Open Group Standard is -.\" the referee document. The original Standard can be obtained online at -.\" http://www.opengroup.org/unix/online.html. +.\" the referee document. The original Standard can be obtained at +.\" http://www.opengroup.org/standards/unix. .\" .\" $FreeBSD$ .\" Modified: head/usr.bin/unifdef/unifdef.1 ============================================================================== --- head/usr.bin/unifdef/unifdef.1 Sun Oct 29 05:27:22 2017 (r325094) +++ head/usr.bin/unifdef/unifdef.1 Sun Oct 29 08:03:21 2017 (r325095) @@ -477,7 +477,7 @@ Unterminated char or string literal .Xr diff 1 .Pp The unifdef home page is -.Pa http://dotat.at/prog/unifdef +.Pa https://dotat.at/prog/unifdef .Sh HISTORY The .Nm Modified: head/usr.bin/unifdef/unifdef.c ============================================================================== --- head/usr.bin/unifdef/unifdef.c Sun Oct 29 05:27:22 2017 (r325094) +++ head/usr.bin/unifdef/unifdef.c Sun Oct 29 08:03:21 2017 (r325095) @@ -49,7 +49,7 @@ static const char copyright[] = "@(#) $Version: unifdef-2.11 $\n" "@(#) $FreeBSD$\n" "@(#) $Author: Tony Finch (dot@dotat.at) $\n" - "@(#) $URL: http://dotat.at/prog/unifdef $\n" + "@(#) $URL: https://dotat.at/prog/unifdef $\n" ; /* types of input lines: */ Modified: head/usr.bin/units/definitions.units ============================================================================== --- head/usr.bin/units/definitions.units Sun Oct 29 05:27:22 2017 (r325094) +++ head/usr.bin/units/definitions.units Sun Oct 29 08:03:21 2017 (r325095) @@ -332,7 +332,7 @@ lumen cd sr lux cd sr/m2 # EMU currencies have constant exchange rate against Euro since 1.1.1999. -# See http://en.wikipedia.org/wiki/Euro for details. +# See https://en.wikipedia.org/wiki/Euro for details. austriaschilling 1|13.7603 euro belgiumfranc 1|40.3399 euro finlandmarkka 1|5.94573 euro @@ -351,7 +351,7 @@ malteselira 1|0.429300 euro slovakkoruna 1|30.1260 euro # These ones are pegged to the Euro -# See http://en.wikipedia.org/wiki/Euro for details. +# See https://en.wikipedia.org/wiki/Euro for details. bosniaherzegovinamark 1|1.95583 euro bulgarianlev 1|1.95583 euro capeverdeanescudo 1|110.265 euro @@ -528,7 +528,7 @@ ZMW zambiakwacha ZWL zimbabwedollar # These ones are pegged on the US Dollar -# See http://en.wikipedia.org/wiki/USD for details. +# See https://en.wikipedia.org/wiki/USD for details. dollar usdollar arubanflorin 1|1.75 usdollar bahamiandollar 1|1 usdollar Modified: head/usr.bin/xohtml/xohtml.sh ============================================================================== --- head/usr.bin/xohtml/xohtml.sh Sun Oct 29 05:27:22 2017 (r325094) +++ head/usr.bin/xohtml/xohtml.sh Sun Oct 29 08:03:21 2017 (r325095) @@ -15,7 +15,7 @@ BASE=/usr/share/libxo VERSION=0.8.4 CMD=cat DONE= -WEB=http://juniper.github.io/libxo/${VERSION}/xohtml +WEB=https://juniper.github.io/libxo/${VERSION}/xohtml do_help () { echo "xohtml: wrap libxo-enabled output in HTML" From owner-svn-src-all@freebsd.org Sun Oct 29 08:17:11 2017 Return-Path: Delivered-To: svn-src-all@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 A6A5AE5D342; Sun, 29 Oct 2017 08:17:11 +0000 (UTC) (envelope-from eadler@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 1FB7770C67; Sun, 29 Oct 2017 08:17:11 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T8HAF3043255; Sun, 29 Oct 2017 08:17:10 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T8H3pJ043184; Sun, 29 Oct 2017 08:17:03 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201710290817.v9T8H3pJ043184@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Sun, 29 Oct 2017 08:17:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325096 - in head: . etc lib/csu/arm lib/csu/powerpc lib/csu/powerpc64 lib/libusb release/amd64 release/i386 release/powerpc release/sparc64 share/doc/papers/contents share/examples/BSD... X-SVN-Group: head X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: in head: . etc lib/csu/arm lib/csu/powerpc lib/csu/powerpc64 lib/libusb release/amd64 release/i386 release/powerpc release/sparc64 share/doc/papers/contents share/examples/BSD_daemon share/man/man4 sh... X-SVN-Commit-Revision: 325096 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 08:17:11 -0000 Author: eadler Date: Sun Oct 29 08:17:03 2017 New Revision: 325096 URL: https://svnweb.freebsd.org/changeset/base/325096 Log: Update several more URLs - Primarily http -> https - Primarily FreeBSD project URLs Modified: head/README head/README.md head/etc/printcap head/lib/csu/arm/crt1.c head/lib/csu/powerpc/crt1.c head/lib/csu/powerpc64/crt1.c head/lib/libusb/libusb10.c head/release/amd64/mkisoimages.sh head/release/i386/mkisoimages.sh head/release/powerpc/mkisoimages.sh head/release/sparc64/mkisoimages.sh head/share/doc/papers/contents/contents.ms head/share/examples/BSD_daemon/poster.sh head/share/man/man4/lge.4 head/share/man/man4/mac.4 head/share/man/man7/ports.7 head/share/man/man7/release.7 head/share/man/man7/tests.7 head/share/man/man8/crash.8 head/share/man/man9/mac.9 head/share/man/man9/own.9 head/share/man/man9/pci.9 head/share/misc/bsd-family-tree head/share/misc/iso3166 head/share/misc/organization.dot head/sys/amd64/conf/GENERIC head/sys/amd64/conf/GENERIC-NODEBUG head/sys/amd64/conf/MINIMAL head/sys/arm/conf/ALLWINNER_UP head/sys/arm/conf/ALPINE head/sys/arm/conf/AML8726 head/sys/arm/conf/APALIS-IMX6 head/sys/arm/conf/ARMADAXP head/sys/arm/conf/ARNDALE head/sys/arm/conf/ARNDALE-OCTA head/sys/arm/conf/AVILA head/sys/arm/conf/BEAGLEBONE head/sys/arm/conf/BWCT head/sys/arm/conf/CAMBRIA head/sys/arm/conf/CHROMEBOOK head/sys/arm/conf/CHROMEBOOK-PEACH-PIT head/sys/arm/conf/CHROMEBOOK-SNOW head/sys/arm/conf/CHROMEBOOK-SPRING head/sys/arm/conf/CNS11XXNAS head/sys/arm/conf/COLIBRI-VF50 head/sys/arm/conf/COSMIC head/sys/arm/conf/CRB head/sys/arm/conf/DOCKSTAR head/sys/arm/conf/DREAMPLUG-1001 head/sys/arm/conf/EB9200 head/sys/arm/conf/EFIKA_MX head/sys/arm/conf/ETHERNUT5 head/sys/arm/conf/EXYNOS5.common head/sys/arm/conf/EXYNOS5250 head/sys/arm/conf/EXYNOS5420 head/sys/arm/conf/GENERIC head/sys/arm/conf/GENERIC-NODEBUG head/sys/arm/conf/GUMSTIX head/sys/arm/conf/GUMSTIX-QEMU head/sys/arm/conf/HL200 head/sys/arm/conf/HL201 head/sys/arm/conf/IMX53 head/sys/arm/conf/IMX6 head/sys/arm/conf/JETSON-TK1 head/sys/arm/conf/KB920X head/sys/arm/conf/NSLU head/sys/arm/conf/ODROIDC1 head/sys/arm/conf/PANDABOARD head/sys/arm/conf/QILA9G20 head/sys/arm/conf/QUARTZ head/sys/arm/conf/RADXA head/sys/arm/conf/RADXA-LITE head/sys/arm/conf/RK3188 head/sys/arm/conf/RPI-B head/sys/arm/conf/RPI2 head/sys/arm/conf/SAM9260EK head/sys/arm/conf/SAM9G20EK head/sys/arm/conf/SAM9X25EK head/sys/arm/conf/SN9G45 head/sys/arm/conf/SOCDK head/sys/arm/conf/SOCFPGA head/sys/arm/conf/SOCKIT head/sys/arm/conf/SOCKIT-BERI head/sys/arm/conf/TEGRA124 head/sys/arm/conf/VERSATILEPB head/sys/arm/conf/VIRT head/sys/arm/conf/VSATV102 head/sys/arm/conf/VYBRID head/sys/arm/conf/YYHD18 head/sys/arm/conf/ZEDBOARD head/sys/arm64/conf/GENERIC head/sys/arm64/conf/GENERIC-NODEBUG head/sys/arm64/conf/GENERIC-UP head/sys/dev/isp/DriverManual.txt head/sys/dev/sk/if_sk.c head/sys/i386/conf/GENERIC head/sys/i386/conf/GENERIC-NODEBUG head/sys/mips/conf/ADM5120 head/sys/mips/conf/ALCHEMY head/sys/mips/conf/ERL head/sys/mips/conf/MT7620 head/sys/mips/conf/OCTEON1 head/sys/mips/conf/QEMU head/sys/mips/conf/RT305X head/sys/mips/conf/RT5350 head/sys/mips/conf/XLP head/sys/mips/conf/XLP64 head/sys/mips/conf/XLPN32 head/sys/mips/conf/XLR head/sys/mips/conf/XLR64 head/sys/mips/conf/XLRN32 head/sys/powerpc/conf/GENERIC head/sys/powerpc/conf/GENERIC-NODEBUG head/sys/powerpc/conf/GENERIC64 head/sys/riscv/conf/GENERIC head/sys/sparc64/conf/GENERIC head/sys/sparc64/conf/GENERIC-NODEBUG head/tools/tools/cd2dvd/cd2dvd.sh head/tools/tools/portsinfo/portsinfo.sh head/usr.sbin/bhyve/xmsr.c head/usr.sbin/bsdconfig/networking/share/hostname.subr head/usr.sbin/makefs/tests/makefs_cd9660_tests.sh head/usr.sbin/mergemaster/mergemaster.8 head/usr.sbin/ppp/ppp.8 Modified: head/README ============================================================================== --- head/README Sun Oct 29 08:03:21 2017 (r325095) +++ head/README Sun Oct 29 08:17:03 2017 (r325096) @@ -9,7 +9,7 @@ more information). The Makefile in this directory supports a number of targets for building components (or all) of the FreeBSD source tree. See build(7) -and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html +and https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html for more information, including setting make(1) variables. The `buildkernel` and `installkernel` targets build and install @@ -18,7 +18,7 @@ the Makefile in this directory for more information on standard build targets and compile-time flags. Building a kernel is a somewhat more involved process. See build(7), config(8), -and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html +and https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html for more information. Note: If you want to build and install the kernel with the Modified: head/README.md ============================================================================== --- head/README.md Sun Oct 29 08:03:21 2017 (r325095) +++ head/README.md Sun Oct 29 08:17:03 2017 (r325096) @@ -11,7 +11,7 @@ more information). The Makefile in this directory supports a number of targets for building components (or all) of the FreeBSD source tree. See build(7) -and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html +and https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html for more information, including setting make(1) variables. The `buildkernel` and `installkernel` targets build and install @@ -20,7 +20,7 @@ the Makefile in this directory for more information on standard build targets and compile-time flags. Building a kernel is a somewhat more involved process. See build(7), config(8), -and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html +and https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html for more information. Note: If you want to build and install the kernel with the @@ -83,4 +83,4 @@ usr.sbin System administration commands. For information on synchronizing your source tree with one or more of the FreeBSD Project's development branches, please see: - http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/synching.html + https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/synching.html Modified: head/etc/printcap ============================================================================== --- head/etc/printcap Sun Oct 29 08:03:21 2017 (r325095) +++ head/etc/printcap Sun Oct 29 08:17:03 2017 (r325096) @@ -22,7 +22,7 @@ # # Do also refer to the "printing" section of the handbook. # -# http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/printing.html +# https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/printing.html # # A local copy can be found under # Modified: head/lib/csu/arm/crt1.c ============================================================================== --- head/lib/csu/arm/crt1.c Sun Oct 29 08:03:21 2017 (r325095) +++ head/lib/csu/arm/crt1.c Sun Oct 29 08:17:03 2017 (r325096) @@ -19,7 +19,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed for the - * FreeBSD Project. See http://www.freebsd.org/ for + * FreeBSD Project. See https://www.freebsd.org/ for * information about FreeBSD. * This product includes software developed for the * NetBSD Project. See http://www.netbsd.org/ for Modified: head/lib/csu/powerpc/crt1.c ============================================================================== --- head/lib/csu/powerpc/crt1.c Sun Oct 29 08:03:21 2017 (r325095) +++ head/lib/csu/powerpc/crt1.c Sun Oct 29 08:17:03 2017 (r325096) @@ -19,7 +19,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed for the - * FreeBSD Project. See http://www.freebsd.org/ for + * FreeBSD Project. See https://www.freebsd.org/ for * information about FreeBSD. * This product includes software developed for the * NetBSD Project. See http://www.netbsd.org/ for Modified: head/lib/csu/powerpc64/crt1.c ============================================================================== --- head/lib/csu/powerpc64/crt1.c Sun Oct 29 08:03:21 2017 (r325095) +++ head/lib/csu/powerpc64/crt1.c Sun Oct 29 08:17:03 2017 (r325096) @@ -19,7 +19,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed for the - * FreeBSD Project. See http://www.freebsd.org/ for + * FreeBSD Project. See https://www.freebsd.org/ for * information about FreeBSD. * This product includes software developed for the * NetBSD Project. See http://www.netbsd.org/ for Modified: head/lib/libusb/libusb10.c ============================================================================== --- head/lib/libusb/libusb10.c Sun Oct 29 08:03:21 2017 (r325095) +++ head/lib/libusb/libusb10.c Sun Oct 29 08:17:03 2017 (r325096) @@ -75,7 +75,7 @@ static const struct libusb_version libusb_version = { .micro = 0, .nano = 2016, .rc = "", - .describe = "http://www.freebsd.org" + .describe = "https://www.freebsd.org" }; const struct libusb_version * Modified: head/release/amd64/mkisoimages.sh ============================================================================== --- head/release/amd64/mkisoimages.sh Sun Oct 29 08:03:21 2017 (r325095) +++ head/release/amd64/mkisoimages.sh Sun Oct 29 08:17:03 2017 (r325096) @@ -53,7 +53,7 @@ fi LABEL=`echo "$1" | tr '[:lower:]' '[:upper:]'`; shift NAME="$1"; shift -publisher="The FreeBSD Project. http://www.FreeBSD.org/" +publisher="The FreeBSD Project. https://www.FreeBSD.org/" echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "$1/etc/fstab" makefs -t cd9660 $bootable -o rockridge -o label="$LABEL" -o publisher="$publisher" "$NAME" "$@" rm -f "$1/etc/fstab" Modified: head/release/i386/mkisoimages.sh ============================================================================== --- head/release/i386/mkisoimages.sh Sun Oct 29 08:03:21 2017 (r325095) +++ head/release/i386/mkisoimages.sh Sun Oct 29 08:17:03 2017 (r325096) @@ -39,7 +39,7 @@ fi LABEL=`echo "$1" | tr '[:lower:]' '[:upper:]'`; shift NAME="$1"; shift -publisher="The FreeBSD Project. http://www.FreeBSD.org/" +publisher="The FreeBSD Project. https://www.FreeBSD.org/" echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "$1/etc/fstab" makefs -t cd9660 $bootable -o rockridge -o label="$LABEL" -o publisher="$publisher" "$NAME" "$@" rm -f "$1/etc/fstab" Modified: head/release/powerpc/mkisoimages.sh ============================================================================== --- head/release/powerpc/mkisoimages.sh Sun Oct 29 08:03:21 2017 (r325095) +++ head/release/powerpc/mkisoimages.sh Sun Oct 29 08:17:03 2017 (r325096) @@ -61,7 +61,7 @@ fi LABEL=`echo "$1" | tr '[:lower:]' '[:upper:]'`; shift NAME="$1"; shift -publisher="The FreeBSD Project. http://www.FreeBSD.org/" +publisher="The FreeBSD Project. https://www.FreeBSD.org/" echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "$1/etc/fstab" makefs -t cd9660 $bootable -o rockridge -o label="$LABEL" -o publisher="$publisher" "$NAME" "$@" rm -f "$1/etc/fstab" Modified: head/release/sparc64/mkisoimages.sh ============================================================================== --- head/release/sparc64/mkisoimages.sh Sun Oct 29 08:03:21 2017 (r325095) +++ head/release/sparc64/mkisoimages.sh Sun Oct 29 08:17:03 2017 (r325096) @@ -35,7 +35,7 @@ NAME="$1"; shift BASEBITSDIR="$1" # Create an ISO image -publisher="The FreeBSD Project. http://www.FreeBSD.org/" +publisher="The FreeBSD Project. https://www.FreeBSD.org/" echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "$BASEBITSDIR/etc/fstab" makefs -t cd9660 -o rockridge -o label="$LABEL" -o publisher="$publisher" "$NAME.tmp" "$@" rm -f "$BASEBITSDIR/etc/fstab" Modified: head/share/doc/papers/contents/contents.ms ============================================================================== --- head/share/doc/papers/contents/contents.ms Sun Oct 29 08:03:21 2017 (r325095) +++ head/share/doc/papers/contents/contents.ms Sun Oct 29 08:17:03 2017 (r325096) @@ -31,8 +31,8 @@ UNIX Papers coming with FreeBSD These papers are of both historic and current interest, but most of them are many years old. More recent documentation is available from -.>> -http://www.FreeBSD.org/docs/ +.>> +https://www.FreeBSD.org/docs/ .>> .IP Modified: head/share/examples/BSD_daemon/poster.sh ============================================================================== --- head/share/examples/BSD_daemon/poster.sh Sun Oct 29 08:03:21 2017 (r325095) +++ head/share/examples/BSD_daemon/poster.sh Sun Oct 29 08:17:03 2017 (r325096) @@ -50,7 +50,7 @@ center 90 moveto /FreeBSD findfont 50 scalefont setfont center 50 moveto -(http://www.FreeBSD.org) cshow +(https://www.FreeBSD.org) cshow % Do not forget Kirks copyright string. 10 105 moveto Modified: head/share/man/man4/lge.4 ============================================================================== --- head/share/man/man4/lge.4 Sun Oct 29 08:03:21 2017 (r325095) +++ head/share/man/man4/lge.4 Sun Oct 29 08:17:03 2017 (r325096) @@ -143,7 +143,7 @@ the network connection (cable). .Xr ifconfig 8 .Rs .%T Level 1 LXT1001 Programming Manual -.%U http://www.FreeBSD.org/~wpaul/Level1/LXT1001SRM.pdf +.%U https://www.FreeBSD.org/~wpaul/Level1/LXT1001SRM.pdf .Re .Sh HISTORY The Modified: head/share/man/man4/mac.4 ============================================================================== --- head/share/man/man4/mac.4 Sun Oct 29 08:03:21 2017 (r325095) +++ head/share/man/man4/mac.4 Sun Oct 29 08:17:03 2017 (r325096) @@ -219,7 +219,7 @@ man page. .Rs .%B "The FreeBSD Handbook" .%T "Mandatory Access Control" -.%U http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mac.html +.%U https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mac.html .Re .Sh HISTORY The Modified: head/share/man/man7/ports.7 ============================================================================== --- head/share/man/man7/ports.7 Sun Oct 29 08:03:21 2017 (r325095) +++ head/share/man/man7/ports.7 Sun Oct 29 08:17:03 2017 (r325096) @@ -62,12 +62,12 @@ in .%B "The FreeBSD Handbook" , .Pa ( file:/usr/share/doc/en_US.ISO8859-1/books/handbook/ports.html or -.Pa http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/ports.html ) . +.Pa https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/ports.html ) . For information about creating new ports, see .%B "The Porter's Handbook" .Pa ( file:/usr/share/doc/en_US.ISO8859-1/books/porters-handbook/index.html or -.Pa http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/porters-handbook/ ) . +.Pa https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/porters-handbook/ ) . .Sh TARGETS Some of the targets work recursively through subdirectories. This lets you, for example, install all of the @@ -430,7 +430,7 @@ cluster (for .Cm fetchindex target). Defaults to -.Pa http://www.FreeBSD.org/ports/ . +.Pa https://www.FreeBSD.org/ports/ . .It Va FETCHINDEX Command to get .Pa INDEX @@ -545,7 +545,7 @@ The following are part of the ports collection: .%B "The FreeBSD Handbook" .Re .Pp -.Pa http://www.FreeBSD.org/ports +.Pa https://www.FreeBSD.org/ports (searchable index of all ports) .Sh HISTORY The Ports Collection Modified: head/share/man/man7/release.7 ============================================================================== --- head/share/man/man7/release.7 Sun Oct 29 08:03:21 2017 (r325095) +++ head/share/man/man7/release.7 Sun Oct 29 08:17:03 2017 (r325096) @@ -717,11 +717,11 @@ variable in .Xr sysctl 8 .Rs .%T "FreeBSD Release Engineering" -.%U http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/releng/ +.%U https://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/releng/ .Re .Rs .%T "FreeBSD Developers' Handbook" -.%U http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/developers-handbook/ +.%U https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/developers-handbook/ .Re .Sh HISTORY .Fx Modified: head/share/man/man7/tests.7 ============================================================================== --- head/share/man/man7/tests.7 Sun Oct 29 08:03:21 2017 (r325095) +++ head/share/man/man7/tests.7 Sun Oct 29 08:17:03 2017 (r325096) @@ -200,7 +200,7 @@ For more details please refer to: .It .Lk http://lists.freebsd.org/ "FreeBSD Mailing Lists" .It -.Lk http://www.freebsd.org/support.html "Problem Reporting" +.Lk https://www.freebsd.org/support.html "Problem Reporting" .El .Sh FILES .Bl -tag -compact -width usrXlocalXetcXkyuaXkyuaXconfXX Modified: head/share/man/man8/crash.8 ============================================================================== --- head/share/man/man8/crash.8 Sun Oct 29 08:03:21 2017 (r325095) +++ head/share/man/man8/crash.8 Sun Oct 29 08:17:03 2017 (r325096) @@ -203,7 +203,7 @@ the panic message is printed. For more details consult the chapter on kernel debugging in the .%B "FreeBSD Developers' Handbook" -.Pq Pa http://www.freebsd.org/doc/en/books/developers-handbook/ . +.Pq Pa https://www.freebsd.org/doc/en/books/developers-handbook/ . .Sh SEE ALSO .Xr kgdb 1 , .Xr dumpon 8 , Modified: head/share/man/man9/mac.9 ============================================================================== --- head/share/man/man9/mac.9 Sun Oct 29 08:03:21 2017 (r325095) +++ head/share/man/man9/mac.9 Sun Oct 29 08:17:03 2017 (r325096) @@ -165,7 +165,7 @@ for information on the MAC Framework APIs. .Xr VFS 9 .Rs .%T "The FreeBSD Architecture Handbook" -.%U "http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/arch-handbook/" +.%U "https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/arch-handbook/" .Re .Sh HISTORY The Modified: head/share/man/man9/own.9 ============================================================================== --- head/share/man/man9/own.9 Sun Oct 29 08:03:21 2017 (r325095) +++ head/share/man/man9/own.9 Sun Oct 29 08:17:03 2017 (r325096) @@ -214,7 +214,7 @@ driver. .Xr ow 4 , .Xr owc 4 , .Xr owll 9 -.Pa http://pdfserv.maximintegrated.com/en/an/AN937.pdf +.Pa https://pdfserv.maximintegrated.com/en/an/AN937.pdf .Sh LEGAL .Tn 1-Wire is a registered trademark of Maxim Integrated Products, Inc. Modified: head/share/man/man9/pci.9 ============================================================================== --- head/share/man/man9/pci.9 Sun Oct 29 08:03:21 2017 (r325095) +++ head/share/man/man9/pci.9 Sun Oct 29 08:17:03 2017 (r325096) @@ -1047,7 +1047,7 @@ is unattached but with valid instance variables. .Rs .%B FreeBSD Developers' Handbook .%T NewBus -.%U http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/developers-handbook/ +.%U https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/developers-handbook/ .Re .Rs .%A Shanley Modified: head/share/misc/bsd-family-tree ============================================================================== --- head/share/misc/bsd-family-tree Sun Oct 29 08:03:21 2017 (r325095) +++ head/share/misc/bsd-family-tree Sun Oct 29 08:17:03 2017 (r325096) @@ -371,7 +371,7 @@ was the announcement in Usenet or if it was available [44B] McKusick, Marshall Kirk, Keith Bostic, Michael J Karels, and John Quarterman. The Design and Implementation of the 4.4BSD Operating System. -[APL] Apple website [http://www.apple.com/macosx/] +[APL] Apple website [https://www.apple.com/macosx/] [BSDI] Berkeley Software Design, Inc. [DFB] DragonFlyBSD Project, The. [DOC] README, COPYRIGHT on tape. @@ -757,10 +757,10 @@ Andreas Klemm, Lars Köller. If you're going to San Fr Die freien BSD-Varianten von Unix. c't April 1997, page 368ff. BSD Release Announcements collection. -URL: http://www.FreeBSD.org/releases/ +URL: https://www.FreeBSD.org/releases/ BSD Hypertext Man Pages -URL: http://www.FreeBSD.org/cgi/man.cgi +URL: https://www.FreeBSD.org/cgi/man.cgi UNIX history graphing project URL: http://minnie.tuhs.org/Unix_History/index.html Modified: head/share/misc/iso3166 ============================================================================== --- head/share/misc/iso3166 Sun Oct 29 08:03:21 2017 (r325095) +++ head/share/misc/iso3166 Sun Oct 29 08:17:03 2017 (r325096) @@ -1,6 +1,6 @@ # $FreeBSD$ # -# Please consult with http://www.FreeBSD.org/internal/i18n.html before +# Please consult with https://www.FreeBSD.org/internal/i18n.html before # making changes to this file. # # ISO 3166 country codes Modified: head/share/misc/organization.dot ============================================================================== --- head/share/misc/organization.dot Sun Oct 29 08:03:21 2017 (r325095) +++ head/share/misc/organization.dot Sun Oct 29 08:17:03 2017 (r325096) @@ -5,7 +5,7 @@ # each other. # For a detailed description of the responsibilities and duties of the listed # teams, please see our Administration page at -# http://www.freebsd.org/administration.html . +# https://www.freebsd.org/administration.html . # # The graphical output can be generated from this file with the following # command: Modified: head/sys/amd64/conf/GENERIC ============================================================================== --- head/sys/amd64/conf/GENERIC Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/amd64/conf/GENERIC Sun Oct 29 08:17:03 2017 (r325096) @@ -4,11 +4,11 @@ # For more information on this file, please read the config(5) manual page, # and/or the handbook section on Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/amd64/conf/GENERIC-NODEBUG ============================================================================== --- head/sys/amd64/conf/GENERIC-NODEBUG Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/amd64/conf/GENERIC-NODEBUG Sun Oct 29 08:17:03 2017 (r325096) @@ -12,11 +12,11 @@ # For more information on this file, please read the config(5) manual page, # and/or the handbook section on Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/amd64/conf/MINIMAL ============================================================================== --- head/sys/amd64/conf/MINIMAL Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/amd64/conf/MINIMAL Sun Oct 29 08:17:03 2017 (r325096) @@ -18,11 +18,11 @@ # For more information on this file, please read the config(5) manual page, # and/or the handbook section on Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/ALLWINNER_UP ============================================================================== --- head/sys/arm/conf/ALLWINNER_UP Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/ALLWINNER_UP Sun Oct 29 08:17:03 2017 (r325096) @@ -4,11 +4,11 @@ # For more information on this file, please read the config(5) manual page, # and/or the handbook section on Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/ALPINE ============================================================================== --- head/sys/arm/conf/ALPINE Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/ALPINE Sun Oct 29 08:17:03 2017 (r325096) @@ -3,11 +3,11 @@ # For more information on this file, please read the config(5) manual page, # and/or the handbook section on Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/AML8726 ============================================================================== --- head/sys/arm/conf/AML8726 Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/AML8726 Sun Oct 29 08:17:03 2017 (r325096) @@ -4,11 +4,11 @@ # For more information on this file, please read the config(5) manual page, # and/or the handbook section on Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/APALIS-IMX6 ============================================================================== --- head/sys/arm/conf/APALIS-IMX6 Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/APALIS-IMX6 Sun Oct 29 08:17:03 2017 (r325096) @@ -3,11 +3,11 @@ # For more information on this file, please read the config(5) manual page, # and/or the handbook section on Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/ARMADAXP ============================================================================== --- head/sys/arm/conf/ARMADAXP Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/ARMADAXP Sun Oct 29 08:17:03 2017 (r325096) @@ -4,11 +4,11 @@ # For more information on this file, please read the config(5) manual page, # and/or the handbook section on Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/ARNDALE ============================================================================== --- head/sys/arm/conf/ARNDALE Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/ARNDALE Sun Oct 29 08:17:03 2017 (r325096) @@ -3,11 +3,11 @@ # For more information on this file, please read the config(5) manual page, # and/or the handbook section on Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/ARNDALE-OCTA ============================================================================== --- head/sys/arm/conf/ARNDALE-OCTA Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/ARNDALE-OCTA Sun Oct 29 08:17:03 2017 (r325096) @@ -3,11 +3,11 @@ # For more information on this file, please read the config(5) manual page, # and/or the handbook section on Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/AVILA ============================================================================== --- head/sys/arm/conf/AVILA Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/AVILA Sun Oct 29 08:17:03 2017 (r325096) @@ -4,11 +4,11 @@ # For more information on this file, please read the handbook section on # Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/BEAGLEBONE ============================================================================== --- head/sys/arm/conf/BEAGLEBONE Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/BEAGLEBONE Sun Oct 29 08:17:03 2017 (r325096) @@ -7,11 +7,11 @@ # For more information on this file, please read the config(5) manual page, # and/or the handbook section on Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/BWCT ============================================================================== --- head/sys/arm/conf/BWCT Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/BWCT Sun Oct 29 08:17:03 2017 (r325096) @@ -3,11 +3,11 @@ # For more information on this file, please read the handbook section on # Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/CAMBRIA ============================================================================== --- head/sys/arm/conf/CAMBRIA Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/CAMBRIA Sun Oct 29 08:17:03 2017 (r325096) @@ -4,11 +4,11 @@ # For more information on this file, please read the handbook section on # Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/CHROMEBOOK ============================================================================== --- head/sys/arm/conf/CHROMEBOOK Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/CHROMEBOOK Sun Oct 29 08:17:03 2017 (r325096) @@ -3,11 +3,11 @@ # For more information on this file, please read the config(5) manual page, # and/or the handbook section on Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/CHROMEBOOK-PEACH-PIT ============================================================================== --- head/sys/arm/conf/CHROMEBOOK-PEACH-PIT Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/CHROMEBOOK-PEACH-PIT Sun Oct 29 08:17:03 2017 (r325096) @@ -3,11 +3,11 @@ # For more information on this file, please read the config(5) manual page, # and/or the handbook section on Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/CHROMEBOOK-SNOW ============================================================================== --- head/sys/arm/conf/CHROMEBOOK-SNOW Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/CHROMEBOOK-SNOW Sun Oct 29 08:17:03 2017 (r325096) @@ -3,11 +3,11 @@ # For more information on this file, please read the config(5) manual page, # and/or the handbook section on Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/CHROMEBOOK-SPRING ============================================================================== --- head/sys/arm/conf/CHROMEBOOK-SPRING Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/CHROMEBOOK-SPRING Sun Oct 29 08:17:03 2017 (r325096) @@ -3,11 +3,11 @@ # For more information on this file, please read the config(5) manual page, # and/or the handbook section on Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/CNS11XXNAS ============================================================================== --- head/sys/arm/conf/CNS11XXNAS Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/CNS11XXNAS Sun Oct 29 08:17:03 2017 (r325096) @@ -4,11 +4,11 @@ # For more information on this file, please read the handbook section on # Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/COLIBRI-VF50 ============================================================================== --- head/sys/arm/conf/COLIBRI-VF50 Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/COLIBRI-VF50 Sun Oct 29 08:17:03 2017 (r325096) @@ -3,11 +3,11 @@ # For more information on this file, please read the config(5) manual page, # and/or the handbook section on Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/COSMIC ============================================================================== --- head/sys/arm/conf/COSMIC Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/COSMIC Sun Oct 29 08:17:03 2017 (r325096) @@ -3,11 +3,11 @@ # For more information on this file, please read the config(5) manual page, # and/or the handbook section on Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/CRB ============================================================================== --- head/sys/arm/conf/CRB Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/CRB Sun Oct 29 08:17:03 2017 (r325096) @@ -3,11 +3,11 @@ # For more information on this file, please read the handbook section on # Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/DOCKSTAR ============================================================================== --- head/sys/arm/conf/DOCKSTAR Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/DOCKSTAR Sun Oct 29 08:17:03 2017 (r325096) @@ -3,11 +3,11 @@ # # $FreeBSD$ # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/DREAMPLUG-1001 ============================================================================== --- head/sys/arm/conf/DREAMPLUG-1001 Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/DREAMPLUG-1001 Sun Oct 29 08:17:03 2017 (r325096) @@ -6,11 +6,11 @@ # For more information on this file, please read the handbook section on # Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/EB9200 ============================================================================== --- head/sys/arm/conf/EB9200 Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/EB9200 Sun Oct 29 08:17:03 2017 (r325096) @@ -3,7 +3,7 @@ # For more information on this file, please read the handbook section on # Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # An exhaustive list of options and more detailed explanations of the # device lines is also present in the ../../conf/NOTES and NOTES files. Modified: head/sys/arm/conf/EFIKA_MX ============================================================================== --- head/sys/arm/conf/EFIKA_MX Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/EFIKA_MX Sun Oct 29 08:17:03 2017 (r325096) @@ -4,11 +4,11 @@ # For more information on this file, please read the config(5) manual page, # and/or the handbook section on Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/ETHERNUT5 ============================================================================== --- head/sys/arm/conf/ETHERNUT5 Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/ETHERNUT5 Sun Oct 29 08:17:03 2017 (r325096) @@ -3,11 +3,11 @@ # For more information on this file, please read the config(5) manual page, # and/or the handbook section on Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/EXYNOS5.common ============================================================================== --- head/sys/arm/conf/EXYNOS5.common Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/EXYNOS5.common Sun Oct 29 08:17:03 2017 (r325096) @@ -4,11 +4,11 @@ # For more information on this file, please read the config(5) manual page, # and/or the handbook section on Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/EXYNOS5250 ============================================================================== --- head/sys/arm/conf/EXYNOS5250 Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/EXYNOS5250 Sun Oct 29 08:17:03 2017 (r325096) @@ -3,11 +3,11 @@ # For more information on this file, please read the config(5) manual page, # and/or the handbook section on Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/EXYNOS5420 ============================================================================== --- head/sys/arm/conf/EXYNOS5420 Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/EXYNOS5420 Sun Oct 29 08:17:03 2017 (r325096) @@ -3,11 +3,11 @@ # For more information on this file, please read the config(5) manual page, # and/or the handbook section on Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/GENERIC ============================================================================== --- head/sys/arm/conf/GENERIC Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/GENERIC Sun Oct 29 08:17:03 2017 (r325096) @@ -4,11 +4,11 @@ # For more information on this file, please read the config(5) manual page, # and/or the handbook section on Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/GENERIC-NODEBUG ============================================================================== --- head/sys/arm/conf/GENERIC-NODEBUG Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/GENERIC-NODEBUG Sun Oct 29 08:17:03 2017 (r325096) @@ -12,11 +12,11 @@ # For more information on this file, please read the config(5) manual page, # and/or the handbook section on Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/GUMSTIX ============================================================================== --- head/sys/arm/conf/GUMSTIX Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/GUMSTIX Sun Oct 29 08:17:03 2017 (r325096) @@ -4,11 +4,11 @@ # For more information on this file, please read the handbook section on # Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/GUMSTIX-QEMU ============================================================================== --- head/sys/arm/conf/GUMSTIX-QEMU Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/GUMSTIX-QEMU Sun Oct 29 08:17:03 2017 (r325096) @@ -3,11 +3,11 @@ # For more information on this file, please read the handbook section on # Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/HL200 ============================================================================== --- head/sys/arm/conf/HL200 Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/HL200 Sun Oct 29 08:17:03 2017 (r325096) @@ -3,11 +3,11 @@ # For more information on this file, please read the handbook section on # Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/HL201 ============================================================================== --- head/sys/arm/conf/HL201 Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/HL201 Sun Oct 29 08:17:03 2017 (r325096) @@ -3,11 +3,11 @@ # For more information on this file, please read the handbook section on # Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/IMX53 ============================================================================== --- head/sys/arm/conf/IMX53 Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/IMX53 Sun Oct 29 08:17:03 2017 (r325096) @@ -4,11 +4,11 @@ # For more information on this file, please read the config(5) manual page, # and/or the handbook section on Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/IMX6 ============================================================================== --- head/sys/arm/conf/IMX6 Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/IMX6 Sun Oct 29 08:17:03 2017 (r325096) @@ -4,11 +4,11 @@ # For more information on this file, please read the config(5) manual page, # and/or the handbook section on Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/JETSON-TK1 ============================================================================== --- head/sys/arm/conf/JETSON-TK1 Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/JETSON-TK1 Sun Oct 29 08:17:03 2017 (r325096) @@ -3,11 +3,11 @@ # For more information on this file, please read the config(5) manual page, # and/or the handbook section on Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/KB920X ============================================================================== --- head/sys/arm/conf/KB920X Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/KB920X Sun Oct 29 08:17:03 2017 (r325096) @@ -4,11 +4,11 @@ # For more information on this file, please read the handbook section on # Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/NSLU ============================================================================== --- head/sys/arm/conf/NSLU Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/NSLU Sun Oct 29 08:17:03 2017 (r325096) @@ -3,11 +3,11 @@ # For more information on this file, please read the handbook section on # Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the Modified: head/sys/arm/conf/ODROIDC1 ============================================================================== --- head/sys/arm/conf/ODROIDC1 Sun Oct 29 08:03:21 2017 (r325095) +++ head/sys/arm/conf/ODROIDC1 Sun Oct 29 08:17:03 2017 (r325096) @@ -3,11 +3,11 @@ # For more information on this file, please read the config(5) manual page, # and/or the handbook section on Kernel Configuration Files: # -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Sun Oct 29 08:25:33 2017 Return-Path: Delivered-To: svn-src-all@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 019FBE5D600; Sun, 29 Oct 2017 08:25:33 +0000 (UTC) (envelope-from eadler@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 C4DD271247; Sun, 29 Oct 2017 08:25:32 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T8PVEY047520; Sun, 29 Oct 2017 08:25:31 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T8PV3W047519; Sun, 29 Oct 2017 08:25:31 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201710290825.v9T8PV3W047519@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Sun, 29 Oct 2017 08:25:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325097 - head X-SVN-Group: head X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 325097 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 08:25:33 -0000 Author: eadler Date: Sun Oct 29 08:25:31 2017 New Revision: 325097 URL: https://svnweb.freebsd.org/changeset/base/325097 Log: Update UPDATING - Remove FreeBSD 4.x of building the kernel. While it might technically work, it is better to document the 'correct' way than how to shoot oneself in the foot - Remove reference to CVS -P for src. Modified: head/UPDATING Modified: head/UPDATING ============================================================================== --- head/UPDATING Sun Oct 29 08:17:03 2017 (r325096) +++ head/UPDATING Sun Oct 29 08:25:31 2017 (r325097) @@ -1843,21 +1843,6 @@ COMMON ITEMS: make installkernel KERNCONF=YOUR_KERNEL_HERE KODIR=/boot/testkernel nextboot -k testkernel - To just build a kernel when you know that it won't mess you up - -------------------------------------------------------------- - This assumes you are already running a CURRENT system. Replace - ${arch} with the architecture of your machine (e.g. "i386", - "arm", "amd64", "ia64", "pc98", "sparc64", "powerpc", "mips", etc). - - cd src/sys/${arch}/conf - config KERNEL_NAME_HERE - cd ../compile/KERNEL_NAME_HERE - make depend - make - make install - - If this fails, go to the "To build a kernel" section. - To rebuild everything and install it on the current system. ----------------------------------------------------------- # Note: sometimes if you are running current you gotta do more than @@ -1865,7 +1850,8 @@ COMMON ITEMS: make buildworld - make kernel KERNCONF=YOUR_KERNEL_HERE + make buildkernel KERNCONF=YOUR_KERNEL_HERE + make installkernel KERNCONF=YOUR_KERNEL_HERE [1] [3] mergemaster -Fp [5] @@ -1965,10 +1951,7 @@ COMMON ITEMS: Make sure that you merge any new devices from GENERIC since the last time you updated your kernel config file. - [9] When checking out sources, you must include the -P flag to have - cvs prune empty directories. - - If CPUTYPE is defined in your /etc/make.conf, make sure to use the + [9] If CPUTYPE is defined in your /etc/make.conf, make sure to use the "?=" instead of the "=" assignment operator, so that buildworld can override the CPUTYPE if it needs to. From owner-svn-src-all@freebsd.org Sun Oct 29 09:38:43 2017 Return-Path: Delivered-To: svn-src-all@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 849D3E5EBF3; Sun, 29 Oct 2017 09:38:43 +0000 (UTC) (envelope-from kib@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 52870730F8; Sun, 29 Oct 2017 09:38:43 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T9cghj076752; Sun, 29 Oct 2017 09:38:42 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T9cg0U076750; Sun, 29 Oct 2017 09:38:42 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201710290938.v9T9cg0U076750@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sun, 29 Oct 2017 09:38:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r325098 - in stable/11/sys: kern sys X-SVN-Group: stable-11 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: in stable/11/sys: kern sys X-SVN-Commit-Revision: 325098 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 09:38:43 -0000 Author: kib Date: Sun Oct 29 09:38:42 2017 New Revision: 325098 URL: https://svnweb.freebsd.org/changeset/base/325098 Log: MFC r324853: Remove the support for mknod(S_IFMT), which created dummy vnodes with VBAD type. Modified: stable/11/sys/kern/vfs_syscalls.c stable/11/sys/sys/priv.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/kern/vfs_syscalls.c ============================================================================== --- stable/11/sys/kern/vfs_syscalls.c Sun Oct 29 08:25:31 2017 (r325097) +++ stable/11/sys/kern/vfs_syscalls.c Sun Oct 29 09:38:42 2017 (r325098) @@ -1187,9 +1187,6 @@ kern_mknodat(struct thread *td, int fd, char *path, en if (error == 0 && dev == VNOVAL) error = EINVAL; break; - case S_IFMT: - error = priv_check(td, PRIV_VFS_MKNOD_BAD); - break; case S_IFWHT: error = priv_check(td, PRIV_VFS_MKNOD_WHT); break; @@ -1227,9 +1224,6 @@ restart: whiteout = 0; switch (mode & S_IFMT) { - case S_IFMT: /* used by badsect to flag bad sectors */ - vattr.va_type = VBAD; - break; case S_IFCHR: vattr.va_type = VCHR; break; Modified: stable/11/sys/sys/priv.h ============================================================================== --- stable/11/sys/sys/priv.h Sun Oct 29 08:25:31 2017 (r325097) +++ stable/11/sys/sys/priv.h Sun Oct 29 09:38:42 2017 (r325098) @@ -266,7 +266,7 @@ #define PRIV_VFS_GETFH 327 /* Can retrieve file handles. */ #define PRIV_VFS_GETQUOTA 328 /* getquota(). */ #define PRIV_VFS_LINK 329 /* bsd.hardlink_check_uid */ -#define PRIV_VFS_MKNOD_BAD 330 /* Can mknod() to mark bad inodes. */ +#define PRIV_VFS_MKNOD_BAD 330 /* Was: mknod() can mark bad inodes. */ #define PRIV_VFS_MKNOD_DEV 331 /* Can mknod() to create dev nodes. */ #define PRIV_VFS_MKNOD_WHT 332 /* Can mknod() to create whiteout. */ #define PRIV_VFS_MOUNT 333 /* Can mount(). */ From owner-svn-src-all@freebsd.org Sun Oct 29 09:48:29 2017 Return-Path: Delivered-To: svn-src-all@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 682C5E5EE6E; Sun, 29 Oct 2017 09:48:29 +0000 (UTC) (envelope-from kib@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 3566B73630; Sun, 29 Oct 2017 09:48:29 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T9mSTF081067; Sun, 29 Oct 2017 09:48:28 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T9mSUx081065; Sun, 29 Oct 2017 09:48:28 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201710290948.v9T9mSUx081065@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sun, 29 Oct 2017 09:48:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r325099 - in stable/10/sys: kern sys X-SVN-Group: stable-10 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: in stable/10/sys: kern sys X-SVN-Commit-Revision: 325099 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 09:48:29 -0000 Author: kib Date: Sun Oct 29 09:48:28 2017 New Revision: 325099 URL: https://svnweb.freebsd.org/changeset/base/325099 Log: MFC r324853: Remove the support for mknod(S_IFMT), which created dummy vnodes with VBAD type. Modified: stable/10/sys/kern/vfs_syscalls.c stable/10/sys/sys/priv.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/kern/vfs_syscalls.c ============================================================================== --- stable/10/sys/kern/vfs_syscalls.c Sun Oct 29 09:38:42 2017 (r325098) +++ stable/10/sys/kern/vfs_syscalls.c Sun Oct 29 09:48:28 2017 (r325099) @@ -1246,9 +1246,6 @@ kern_mknodat(struct thread *td, int fd, char *path, en if (error == 0 && dev == VNOVAL) error = EINVAL; break; - case S_IFMT: - error = priv_check(td, PRIV_VFS_MKNOD_BAD); - break; case S_IFWHT: error = priv_check(td, PRIV_VFS_MKNOD_WHT); break; @@ -1286,9 +1283,6 @@ restart: whiteout = 0; switch (mode & S_IFMT) { - case S_IFMT: /* used by badsect to flag bad sectors */ - vattr.va_type = VBAD; - break; case S_IFCHR: vattr.va_type = VCHR; break; Modified: stable/10/sys/sys/priv.h ============================================================================== --- stable/10/sys/sys/priv.h Sun Oct 29 09:38:42 2017 (r325098) +++ stable/10/sys/sys/priv.h Sun Oct 29 09:48:28 2017 (r325099) @@ -265,7 +265,7 @@ #define PRIV_VFS_GETFH 327 /* Can retrieve file handles. */ #define PRIV_VFS_GETQUOTA 328 /* getquota(). */ #define PRIV_VFS_LINK 329 /* bsd.hardlink_check_uid */ -#define PRIV_VFS_MKNOD_BAD 330 /* Can mknod() to mark bad inodes. */ +#define PRIV_VFS_MKNOD_BAD 330 /* Was: mknod() can mark bad inodes. */ #define PRIV_VFS_MKNOD_DEV 331 /* Can mknod() to create dev nodes. */ #define PRIV_VFS_MKNOD_WHT 332 /* Can mknod() to create whiteout. */ #define PRIV_VFS_MOUNT 333 /* Can mount(). */ From owner-svn-src-all@freebsd.org Sun Oct 29 09:50:22 2017 Return-Path: Delivered-To: svn-src-all@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 240E5E5EF5A; Sun, 29 Oct 2017 09:50:22 +0000 (UTC) (envelope-from oshogbo@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 E7742737CA; Sun, 29 Oct 2017 09:50:21 +0000 (UTC) (envelope-from oshogbo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T9oLXv081194; Sun, 29 Oct 2017 09:50:21 GMT (envelope-from oshogbo@FreeBSD.org) Received: (from oshogbo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T9oL0G081193; Sun, 29 Oct 2017 09:50:21 GMT (envelope-from oshogbo@FreeBSD.org) Message-Id: <201710290950.v9T9oL0G081193@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to oshogbo@FreeBSD.org using -f From: Mariusz Zaborski Date: Sun, 29 Oct 2017 09:50:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325100 - head/lib/libcasper/libcasper X-SVN-Group: head X-SVN-Commit-Author: oshogbo X-SVN-Commit-Paths: head/lib/libcasper/libcasper X-SVN-Commit-Revision: 325100 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 09:50:22 -0000 Author: oshogbo Date: Sun Oct 29 09:50:20 2017 New Revision: 325100 URL: https://svnweb.freebsd.org/changeset/base/325100 Log: Fix information about nv.h include. MFC after: 1 week Modified: head/lib/libcasper/libcasper/libcasper.3 Modified: head/lib/libcasper/libcasper/libcasper.3 ============================================================================== --- head/lib/libcasper/libcasper/libcasper.3 Sun Oct 29 09:48:28 2017 (r325099) +++ head/lib/libcasper/libcasper/libcasper.3 Sun Oct 29 09:50:20 2017 (r325100) @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 5, 2016 +.Dd October 29, 2017 .Dt LIBCASPER 3 .Os .Sh NAME @@ -47,8 +47,8 @@ .Sh LIBRARY .Lb libcasper .Sh SYNOPSIS +.In sys/nv.h .In libcasper.h -.In nv.h .Ft "cap_channel_t *" .Fn cap_init "void" .Ft "cap_channel_t *" From owner-svn-src-all@freebsd.org Sun Oct 29 11:26:07 2017 Return-Path: Delivered-To: svn-src-all@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 84A3BE60DE9; Sun, 29 Oct 2017 11:26:07 +0000 (UTC) (envelope-from devin@shxd.cx) Received: from shxd.cx (mail.shxd.cx [64.201.244.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7720D761F9; Sun, 29 Oct 2017 11:26:07 +0000 (UTC) (envelope-from devin@shxd.cx) Received: from [64.201.244.132] (port=52639 helo=[10.0.0.105]) by shxd.cx with esmtps (TLSv1:AES256-SHA:256) (Exim 4.77 (FreeBSD)) (envelope-from ) id 1e8jrO-000Oyh-Co; Sun, 29 Oct 2017 09:26:26 +0000 Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (1.0) Subject: Re: svn commit: r325097 - head From: Devin Teske X-Mailer: iPhone Mail (13G36) In-Reply-To: <201710290825.v9T8PV3W047519@repo.freebsd.org> Date: Sun, 29 Oct 2017 04:26:00 -0700 Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <2B94F328-D310-40B1-8B05-79689E0FD664@shxd.cx> References: <201710290825.v9T8PV3W047519@repo.freebsd.org> To: Eitan Adler X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 11:26:07 -0000 Can you describe said shooting of foot? Because... + I still build my kernels that way, because... + config can be given -C to retain the *entire* config file in the kernel, c= omments-and-all, because... + There has traditionally been no knob that can be set during the kernel tar= gets of the top-level Makefile that will enable "config -C" instead of just "= config". We use a version-controlled config file and want lines like "# $Smule: ... $= " retained as well as include lines, etc so we can see hierarchical topology= of the kernel config from a running system in the field simply by running "= config -x $( sysctl -n kern.bootfile ) | less" Thus, I wouldn't even call this a "FreeBSD 4.x [process] of bulding the kern= el" but instead "an alternate proceaa of building kernel" and the people tha= t use it know what they are doing and this there is no foot shooting. NB: I actually use "config -C -g" for full disclosure. --=20 Devin > On Oct 29, 2017, at 1:25 AM, Eitan Adler wrote: >=20 > Author: eadler > Date: Sun Oct 29 08:25:31 2017 > New Revision: 325097 > URL: https://svnweb.freebsd.org/changeset/base/325097 >=20 > Log: > Update UPDATING >=20 > - Remove FreeBSD 4.x of building the kernel. > While it might technically work, it is better to > document the 'correct' way than how to shoot oneself > in the foot >=20 > - Remove reference to CVS -P for src. >=20 > Modified: > head/UPDATING >=20 > Modified: head/UPDATING > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/UPDATING Sun Oct 29 08:17:03 2017 (r325096) > +++ head/UPDATING Sun Oct 29 08:25:31 2017 (r325097) > @@ -1843,21 +1843,6 @@ COMMON ITEMS: > make installkernel KERNCONF=3DYOUR_KERNEL_HERE KODIR=3D/boot/testkernel= > nextboot -k testkernel >=20 > - To just build a kernel when you know that it won't mess you up > - -------------------------------------------------------------- > - This assumes you are already running a CURRENT system. Replace > - ${arch} with the architecture of your machine (e.g. "i386", > - "arm", "amd64", "ia64", "pc98", "sparc64", "powerpc", "mips", etc). > - > - cd src/sys/${arch}/conf > - config KERNEL_NAME_HERE > - cd ../compile/KERNEL_NAME_HERE > - make depend > - make > - make install > - > - If this fails, go to the "To build a kernel" section. > - > To rebuild everything and install it on the current system. > ----------------------------------------------------------- > # Note: sometimes if you are running current you gotta do more than > @@ -1865,7 +1850,8 @@ COMMON ITEMS: >=20 > > make buildworld > - make kernel KERNCONF=3DYOUR_KERNEL_HERE > + make buildkernel KERNCONF=3DYOUR_KERNEL_HERE > + make installkernel KERNCONF=3DYOUR_KERNEL_HERE > [1] > [3] > mergemaster -Fp [5] > @@ -1965,10 +1951,7 @@ COMMON ITEMS: > Make sure that you merge any new devices from GENERIC since the > last time you updated your kernel config file. >=20 > - [9] When checking out sources, you must include the -P flag to have > - cvs prune empty directories. > - > - If CPUTYPE is defined in your /etc/make.conf, make sure to use the > + [9] If CPUTYPE is defined in your /etc/make.conf, make sure to use th= e > "?=3D" instead of the "=3D" assignment operator, so that buildworld can= > override the CPUTYPE if it needs to. >=20 >=20 From owner-svn-src-all@freebsd.org Sun Oct 29 11:57:08 2017 Return-Path: Delivered-To: svn-src-all@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 93B5FE6164C for ; Sun, 29 Oct 2017 11:57:08 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-io0-x230.google.com (mail-io0-x230.google.com [IPv6:2607:f8b0:4001:c06::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6276477012 for ; Sun, 29 Oct 2017 11:57:08 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-io0-x230.google.com with SMTP id n137so21421045iod.6 for ; Sun, 29 Oct 2017 04:57:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=rI3AK9Zr3EANcNT5MMx1YYIvxUhbcVTGWRcEJoxWcSU=; b=ZaWgW9ZmI1fu60gjJxvRA7XsZiAhb8nSDlxQKhb5ywBGy8vcW8WQXfqhNXX5Rn07Bi 7T7i1zFMDh88Wlg3WfukTEb8xRipJC6DFIrTSGkL9QEypCflp4CyVF3bWj3tOYcfVR85 xBcOpq2GIzMNV70G+vurgdeJXWONa2NWlS/9wTtaX8RrnIXz3lX5hY8bBcy0nGckJcOb h4EGEMDckx7ui2Dh9+ukbo5Cm1+SMMdvzBUfqAumegIa6ilD3BmWb0wV+GIQ3T9A/7OB P6gyKRylQEsSX/g66LOBEoWFww13klKN++gSZoZnEPqzeBJR7pSdkzYcXN2fn28qVvTG NtVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=rI3AK9Zr3EANcNT5MMx1YYIvxUhbcVTGWRcEJoxWcSU=; b=TtRmJTGhyqN6L36n7Yvk0XNxqVYSm2STLC+NLVjfVgQuyGKIWZrNMXYNt+27mr/7wE eTOBq0rT9S09XoSHEgsFc3FHFevBPMZa7GL4P1293R2lNBXPyObhZEvIHvl5N1L/U1Gx kOY7Zoz0iKCa5bfekBYproC6IfEAgx43YKAn1lkeZ6I5sNh6qcy4ZVStAuTH9YLOy1FM J578wdVJGtc7cbfvLfdthu5wG8OSoUT3I2Z0zCB5+9dsoTLi3cSo2bUo6gyoH09skaYo JNKOuWwAnajPUzXCzjW+kPeNOcI+TWthL+NStMOGeZL4C29ObVsN4STMBYqj871p/N0C ZuwQ== X-Gm-Message-State: AMCzsaVZpWbQw0zSrZ6IaSg74cR5FAcmGtf2pN0KPyPsjPDSHYDIKAqg YB3LdS8j3eRqJL0Ycx/iQNs4Xy+IFKMLa9gSQOgd2w== X-Google-Smtp-Source: ABhQp+RLM6c1DnNDVDL+8HhYyv0OixLaky2VVl8CNA8xaWjhykUrlsx3JiEPff+5eIqLFPeWncLh2HEwYALSTBgLMjA= X-Received: by 10.36.184.5 with SMTP id m5mr2152288ite.69.1509278227495; Sun, 29 Oct 2017 04:57:07 -0700 (PDT) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.57.22 with HTTP; Sun, 29 Oct 2017 04:57:06 -0700 (PDT) X-Originating-IP: [2603:300b:6:5100:bdfd:3529:aeee:ce4] Received: by 10.79.57.22 with HTTP; Sun, 29 Oct 2017 04:57:06 -0700 (PDT) In-Reply-To: <201710290825.v9T8PV3W047519@repo.freebsd.org> References: <201710290825.v9T8PV3W047519@repo.freebsd.org> From: Warner Losh Date: Sun, 29 Oct 2017 05:57:06 -0600 X-Google-Sender-Auth: lq9Dw_iI_8x9GL5P0bze4SvnNoU Message-ID: Subject: Re: svn commit: r325097 - head To: Eitan Adler Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.23 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 11:57:08 -0000 On Oct 29, 2017 2:25 AM, "Eitan Adler" wrote: Author: eadler Date: Sun Oct 29 08:25:31 2017 New Revision: 325097 URL: https://svnweb.freebsd.org/changeset/base/325097 Log: Update UPDATING - Remove FreeBSD 4.x of building the kernel. It is not the 4.x way of building the kernel. It's a completely supported alte restive for those situations where buildkernel is not a good fit. While it might technically work, it is better to document the 'correct' way than how to shoot oneself in the foot Neither way is more correct. Both have foot shooting issues in different ways. While the removal of the text many be ok for UPDATING, these characterizations are bogus. Warner - Remove reference to CVS -P for src. Modified: head/UPDATING Modified: head/UPDATING ============================================================ ================== --- head/UPDATING Sun Oct 29 08:17:03 2017 (r325096) +++ head/UPDATING Sun Oct 29 08:25:31 2017 (r325097) @@ -1843,21 +1843,6 @@ COMMON ITEMS: make installkernel KERNCONF=YOUR_KERNEL_HERE KODIR=/boot/testkernel nextboot -k testkernel - To just build a kernel when you know that it won't mess you up - -------------------------------------------------------------- - This assumes you are already running a CURRENT system. Replace - ${arch} with the architecture of your machine (e.g. "i386", - "arm", "amd64", "ia64", "pc98", "sparc64", "powerpc", "mips", etc). - - cd src/sys/${arch}/conf - config KERNEL_NAME_HERE - cd ../compile/KERNEL_NAME_HERE - make depend - make - make install - - If this fails, go to the "To build a kernel" section. - To rebuild everything and install it on the current system. ----------------------------------------------------------- # Note: sometimes if you are running current you gotta do more than @@ -1865,7 +1850,8 @@ COMMON ITEMS: make buildworld - make kernel KERNCONF=YOUR_KERNEL_HERE + make buildkernel KERNCONF=YOUR_KERNEL_HERE + make installkernel KERNCONF=YOUR_KERNEL_HERE [1] [3] mergemaster -Fp [5] @@ -1965,10 +1951,7 @@ COMMON ITEMS: Make sure that you merge any new devices from GENERIC since the last time you updated your kernel config file. - [9] When checking out sources, you must include the -P flag to have - cvs prune empty directories. - - If CPUTYPE is defined in your /etc/make.conf, make sure to use the + [9] If CPUTYPE is defined in your /etc/make.conf, make sure to use the "?=" instead of the "=" assignment operator, so that buildworld can override the CPUTYPE if it needs to. From owner-svn-src-all@freebsd.org Sun Oct 29 12:03:07 2017 Return-Path: Delivered-To: svn-src-all@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 90308E61FC0; Sun, 29 Oct 2017 12:03:07 +0000 (UTC) (envelope-from trasz@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 5BE63776CC; Sun, 29 Oct 2017 12:03:07 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9TC36Vi042230; Sun, 29 Oct 2017 12:03:06 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9TC36Zp042229; Sun, 29 Oct 2017 12:03:06 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201710291203.v9TC36Zp042229@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Sun, 29 Oct 2017 12:03:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325101 - head/sys/geom/mountver X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/sys/geom/mountver X-SVN-Commit-Revision: 325101 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 12:03:07 -0000 Author: trasz Date: Sun Oct 29 12:03:06 2017 New Revision: 325101 URL: https://svnweb.freebsd.org/changeset/base/325101 Log: Add back missing MTX_DEF, it still needs to be there. (Although it's defined to be 0, so there's no functional change.) Reported by: glebius MFC after: 2 weeks Modified: head/sys/geom/mountver/g_mountver.c Modified: head/sys/geom/mountver/g_mountver.c ============================================================================== --- head/sys/geom/mountver/g_mountver.c Sun Oct 29 09:50:20 2017 (r325100) +++ head/sys/geom/mountver/g_mountver.c Sun Oct 29 12:03:06 2017 (r325101) @@ -257,7 +257,7 @@ g_mountver_create(struct gctl_req *req, struct g_class } gp = g_new_geomf(mp, "%s", name); sc = g_malloc(sizeof(*sc), M_WAITOK | M_ZERO); - mtx_init(&sc->sc_mtx, "gmountver", NULL, MTX_RECURSE); + mtx_init(&sc->sc_mtx, "gmountver", NULL, MTX_DEF | MTX_RECURSE); TAILQ_INIT(&sc->sc_queue); sc->sc_provider_name = strdup(pp->name, M_GEOM); gp->softc = sc; From owner-svn-src-all@freebsd.org Sun Oct 29 12:07:28 2017 Return-Path: Delivered-To: svn-src-all@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 C2FFDE620F4; Sun, 29 Oct 2017 12:07:28 +0000 (UTC) (envelope-from trasz@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 8FCD9778A3; Sun, 29 Oct 2017 12:07:28 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9TC7Rbh042413; Sun, 29 Oct 2017 12:07:27 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9TC7R1f042412; Sun, 29 Oct 2017 12:07:27 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201710291207.v9TC7R1f042412@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Sun, 29 Oct 2017 12:07:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325102 - head/libexec/rtld-elf X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/libexec/rtld-elf X-SVN-Commit-Revision: 325102 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 12:07:28 -0000 Author: trasz Date: Sun Oct 29 12:07:27 2017 New Revision: 325102 URL: https://svnweb.freebsd.org/changeset/base/325102 Log: Plug memory leak on error case. Reported by: Coverity CID: 1382112 MFC after: 2 weeks Modified: head/libexec/rtld-elf/libmap.c Modified: head/libexec/rtld-elf/libmap.c ============================================================================== --- head/libexec/rtld-elf/libmap.c Sun Oct 29 12:03:06 2017 (r325101) +++ head/libexec/rtld-elf/libmap.c Sun Oct 29 12:07:27 2017 (r325102) @@ -133,6 +133,7 @@ lmc_parse_file(char *path) retval = read(fd, lm_map, st.st_size); if (retval != st.st_size) { close(fd); + free(lm_map); dbg("lm_parse_file: read(\"%s\") failed, %s", path, rtld_strerror(errno)); return; From owner-svn-src-all@freebsd.org Sun Oct 29 14:26:31 2017 Return-Path: Delivered-To: svn-src-all@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 1C270E3AA17; Sun, 29 Oct 2017 14:26:31 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io0-x230.google.com (mail-io0-x230.google.com [IPv6:2607:f8b0:4001:c06::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D76607F8A6; Sun, 29 Oct 2017 14:26:30 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io0-x230.google.com with SMTP id e89so21747136ioi.11; Sun, 29 Oct 2017 07:26:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=AX/B9fCxlahnVDAfiuiJAzKyg9DHG5eWpWddlIJozD8=; b=BwVKgZ5+WUoridhnpoP6OKA2/Nxlw3kiPHoL0SVdaTyoKYjP6uhNcZ/1NwpFybVEiN /eXpA2vo72OAlwOjBydgFTDye/rPCnBNWF1rBVcPfklAEntNHvYpxwlaVtTb9op01BvS rd2yF9yI27ooaBgCsGk0OAJlwRRgN/fKjhmwYOUzd1A2cEOd3IyH4JI3XXkoVUmxpHKG 1E7lNUu/b1u1QT3bwXSW8TGA8PNjI2fsEqhzsit4g0K1c5QH5iUi2WdXvXCHQmwIEETo uIwF3UMg2n0IQS7veddHASQTxkz143BF/ioxfRtjJ/+sIVc+CVnJFRYl3vHjOqhP2tLb zNbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=AX/B9fCxlahnVDAfiuiJAzKyg9DHG5eWpWddlIJozD8=; b=qct3jlvqyuIRAM/vJNIFwG6YW/h4V0rGLE/Go113OpBBJRrVev05ESAsO0Xk9fstUz PXuEpHtlA4mvG/kwWaJZFE61FWoM7PVf8x+t2xZiQhHIqd7el/8wd3mQmFvJZ97D1c8U 6tEwPH9pqU24R2ZV//50hMlwJ/8axMkMJeCuUsgArsMQMkbiDsu/oCYTuwvan99MXJFJ 26lLRv3eCmzG2A3jCDiSR+lB9ZhnUvka/52pbtt5wkt+r7elWI/CMEjs7bUHjZxNwCVk 8C7EAqASJs7H10Bky83r0fK01B8FGLB1tgi+hxyI2vRVQbyrERmyeNipo+x1/GA5rcx1 IzGQ== X-Gm-Message-State: AMCzsaWvic9nflwBEjL0ERROn/5becCGXlmqg5ryd24ARwaLy5aNNQsx TnumEZrLDIub9mkX+kPWtGmTwSaZi9ZUtwVVFIIn51R8 X-Google-Smtp-Source: ABhQp+T5iJfkYbj9FWZutJxAAM907GgQeafTC4pZSRIlsiWOXiVLzT6tAh2SLUgDhvzND2oynMl73EQsd/XRv7zzWWU= X-Received: by 10.107.81.21 with SMTP id f21mr7383995iob.63.1509287190181; Sun, 29 Oct 2017 07:26:30 -0700 (PDT) MIME-Version: 1.0 Sender: carpeddiem@gmail.com Received: by 10.107.14.208 with HTTP; Sun, 29 Oct 2017 07:26:09 -0700 (PDT) In-Reply-To: <201710290453.v9T4rX3E060010@repo.freebsd.org> References: <201710290453.v9T4rX3E060010@repo.freebsd.org> From: Ed Maste Date: Sun, 29 Oct 2017 10:26:09 -0400 X-Google-Sender-Auth: BQ-oNOIFbKdjFhWfwlwGCheuR64 Message-ID: Subject: Re: svn commit: r325092 - head/usr.bin/fortune/datfiles To: Eitan Adler Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 14:26:31 -0000 On 29 October 2017 at 00:53, Eitan Adler wrote: > Author: eadler > Date: Sun Oct 29 04:53:33 2017 > New Revision: 325092 > URL: https://svnweb.freebsd.org/changeset/base/325092 > > Log: > Modernize freebsd-tips a bit ... > % > Want to run the same command again? > -In tcsh you can type "!!". > +Type "!!". > % $ !! sh: !!: not found I doubt many people use /bin/sh as an interactive shell, but the tip ought not lead those who do astray. From owner-svn-src-all@freebsd.org Sun Oct 29 14:26:38 2017 Return-Path: Delivered-To: svn-src-all@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 75B5CE3AA39; Sun, 29 Oct 2017 14:26:38 +0000 (UTC) (envelope-from mmel@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 3FF3C7F8DA; Sun, 29 Oct 2017 14:26:38 +0000 (UTC) (envelope-from mmel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9TEQbMP001148; Sun, 29 Oct 2017 14:26:37 GMT (envelope-from mmel@FreeBSD.org) Received: (from mmel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9TEQbU4001147; Sun, 29 Oct 2017 14:26:37 GMT (envelope-from mmel@FreeBSD.org) Message-Id: <201710291426.v9TEQbU4001147@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmel set sender to mmel@FreeBSD.org using -f From: Michal Meloun Date: Sun, 29 Oct 2017 14:26:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325103 - head/lib/libthr/arch/arm/include X-SVN-Group: head X-SVN-Commit-Author: mmel X-SVN-Commit-Paths: head/lib/libthr/arch/arm/include X-SVN-Commit-Revision: 325103 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 14:26:38 -0000 Author: mmel Date: Sun Oct 29 14:26:37 2017 New Revision: 325103 URL: https://svnweb.freebsd.org/changeset/base/325103 Log: Fix misleading comment. Not a functional change. MFC after: 3 days Modified: head/lib/libthr/arch/arm/include/pthread_md.h Modified: head/lib/libthr/arch/arm/include/pthread_md.h ============================================================================== --- head/lib/libthr/arch/arm/include/pthread_md.h Sun Oct 29 12:07:27 2017 (r325102) +++ head/lib/libthr/arch/arm/include/pthread_md.h Sun Oct 29 14:26:37 2017 (r325103) @@ -40,7 +40,8 @@ #define DTV_OFFSET offsetof(struct tcb, tcb_dtv) /* - * Variant II tcb, first two members are required by rtld. + * Variant I tcb. The structure layout is fixed, don't blindly + * change it. */ struct tcb { void *tcb_dtv; /* required by rtld */ From owner-svn-src-all@freebsd.org Sun Oct 29 14:58:00 2017 Return-Path: Delivered-To: svn-src-all@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 084ADE40797; Sun, 29 Oct 2017 14:58:00 +0000 (UTC) (envelope-from markj@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 CB1F58073E; Sun, 29 Oct 2017 14:57:59 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9TEvx9h013653; Sun, 29 Oct 2017 14:57:59 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9TEvxp0013652; Sun, 29 Oct 2017 14:57:59 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201710291457.v9TEvxp0013652@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Sun, 29 Oct 2017 14:57:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r325104 - stable/11/sys/fs/pseudofs X-SVN-Group: stable-11 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: stable/11/sys/fs/pseudofs X-SVN-Commit-Revision: 325104 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 14:58:00 -0000 Author: markj Date: Sun Oct 29 14:57:58 2017 New Revision: 325104 URL: https://svnweb.freebsd.org/changeset/base/325104 Log: MFC r324868: Delete declarations of struct pfs_bitmap, removed in r143841. Modified: stable/11/sys/fs/pseudofs/pseudofs.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/fs/pseudofs/pseudofs.h ============================================================================== --- stable/11/sys/fs/pseudofs/pseudofs.h Sun Oct 29 14:26:37 2017 (r325103) +++ stable/11/sys/fs/pseudofs/pseudofs.h Sun Oct 29 14:57:58 2017 (r325104) @@ -81,7 +81,6 @@ typedef enum { */ struct pfs_info; struct pfs_node; -struct pfs_bitmap; /* * Init / uninit callback @@ -120,8 +119,6 @@ struct vattr; #define PFS_ATTR_PROTO(name) \ int name(PFS_ATTR_ARGS); typedef int (*pfs_attr_t)(PFS_ATTR_ARGS); - -struct pfs_bitmap; /* opaque */ /* * Visibility callback From owner-svn-src-all@freebsd.org Sun Oct 29 18:03:24 2017 Return-Path: Delivered-To: svn-src-all@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 6E27BE48863 for ; Sun, 29 Oct 2017 18:03:24 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-io0-x22e.google.com (mail-io0-x22e.google.com [IPv6:2607:f8b0:4001:c06::22e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 25C842006 for ; Sun, 29 Oct 2017 18:03:24 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-io0-x22e.google.com with SMTP id 97so22418264iok.7 for ; Sun, 29 Oct 2017 11:03:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=YOjzqMIDD/UqOkI1UqWhuDqVJX7RLTfyc+nq6KhwQ28=; b=AvP/6NYkKHfuS8lUDU8m2X2y34kkmnnCuDEXWFEe35orLtOwdM3L9ZAbHry8N88qN3 ZYZ0KUyv7FwwM/eiEkGbvcN/P5b/3Ule97yclBS+aXwikc1raSBnNk7Qa3dH3xkmtfl4 eVjj0/Hcov8s6dK7Wt3Wgg9XHP7DJ4degxo6sY6l8oN493up5ekyWFYphtKDPH7OoxzV cOS0XCm5h8ZRrTz1D9iwbENxtFkoa8o+71hRGQqsEq40a3KjkdDhGhKucfsDbSW/I9D9 Qe2BTTRaWSVlLtKnFS3bYnP2rkHdNn0wFsI67zR2TivxOyWLqyDp94LvZNDCfMN6DTCK 8r3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=YOjzqMIDD/UqOkI1UqWhuDqVJX7RLTfyc+nq6KhwQ28=; b=Si0NXTtQsUfUnGI81pAlxDTtTjdNBFig2QQUXNfZxhbuK7UZTHMRV2Q5OyYBQX2A8P 7cg3OUUGFzB37F81/aPRd6RbB5qxRLqz06i8EuudGV17duOJp/CkF6xn79Vx1s785h49 fYe4jTgvCdT7oQtwjNX0S5dmk1LgpD5cwl2Th24V0R4vinkHtKgtUo6E1XUlkhfM9wM8 Ygbh0NFJCH821Nq6rgjU4XHYmnzVxoY4fhhto4cNRl65NLexnxmdbdxZYMwEp9Sp+Drb JykFIgqYtw65OzT9EpHBPO5ciTmgKO7jcVxxgTax2VS5R6FGRaaGEVumwtv+Mr8k32Gd ctaQ== X-Gm-Message-State: AMCzsaWbt47Qu4H+py9UXvdQQUKcNhsw53Sew9L/jQEDZkUsf5OpcSm5 i2B67iqy0hpEwSjxePlLpYEo6nhMkIF6Wej75rUq9A== X-Google-Smtp-Source: ABhQp+QhNypvk75EtH8feJMYBGBOnJrbC7Qoal8phBBsP+1VAM46+wlogQyliqyG7HKzzJbhtwr2NaomCqoIjIXidKA= X-Received: by 10.36.184.5 with SMTP id m5mr3239217ite.69.1509300203430; Sun, 29 Oct 2017 11:03:23 -0700 (PDT) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.57.22 with HTTP; Sun, 29 Oct 2017 11:03:22 -0700 (PDT) X-Originating-IP: [2603:300b:6:5100:1c83:d998:8892:5c23] In-Reply-To: References: <201710290453.v9T4rX3E060010@repo.freebsd.org> From: Warner Losh Date: Sun, 29 Oct 2017 12:03:22 -0600 X-Google-Sender-Auth: BlThqdAV_wg7_xvqUperHwn7gJo Message-ID: Subject: Re: svn commit: r325092 - head/usr.bin/fortune/datfiles To: Ed Maste Cc: Eitan Adler , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.23 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 18:03:24 -0000 On Sun, Oct 29, 2017 at 8:26 AM, Ed Maste wrote: > On 29 October 2017 at 00:53, Eitan Adler wrote: > > Author: eadler > > Date: Sun Oct 29 04:53:33 2017 > > New Revision: 325092 > > URL: https://svnweb.freebsd.org/changeset/base/325092 > > > > Log: > > Modernize freebsd-tips a bit > ... > > % > > Want to run the same command again? > > -In tcsh you can type "!!". > > +Type "!!". > > % > > $ !! > sh: !!: not found > > I doubt many people use /bin/sh as an interactive shell, but the tip > ought not lead those who do astray > Yes. /bin/sh on FreeBSD doesn't grok it, though bash and some other shells available as ports do. I think that the old text was a bit better. Warner From owner-svn-src-all@freebsd.org Sun Oct 29 18:51:28 2017 Return-Path: Delivered-To: svn-src-all@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 0B589E49B8A; Sun, 29 Oct 2017 18:51:28 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id EEF1B3ACA; Sun, 29 Oct 2017 18:51:26 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from spqr.komquats.com ([96.50.22.10]) by shaw.ca with SMTP id 8sg7eotlYM9gt8sg8eb7TG; Sun, 29 Oct 2017 12:51:25 -0600 X-Authority-Analysis: v=2.2 cv=a+JAzQaF c=1 sm=1 tr=0 a=jvE2nwUzI0ECrNeyr98KWA==:117 a=jvE2nwUzI0ECrNeyr98KWA==:17 a=kj9zAlcOel0A:10 a=xqWC_Br6kY4A:10 a=02M-m0pO-4AA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=L_DKHdRSA9TXt-jUTpsA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [IPv6:fc00:1:1:1::5b]) by spqr.komquats.com (Postfix) with ESMTPS id DB07B2D5; Sun, 29 Oct 2017 11:51:22 -0700 (PDT) Received: from slippy (localhost [IPv6:0:0:0:0:0:0:0:1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id v9TIpM0I073542; Sun, 29 Oct 2017 11:51:22 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201710291851.v9TIpM0I073542@slippy.cwsent.com> X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.6 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Warner Losh cc: Ed Maste , Eitan Adler , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r325092 - head/usr.bin/fortune/datfiles In-Reply-To: Message from Warner Losh of "Sun, 29 Oct 2017 12:03:22 -0600." Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Sun, 29 Oct 2017 11:51:22 -0700 X-CMAE-Envelope: MS4wfDZkvAKM0QqJgrZR1msa3WI5UuAKb3RojgObKAa8NvPTgvZRgX5H3U8TVW1NGJNb1IucvaLbQGwlZcgGqtLfVYp/aJ3iYQfSfQ68M8ofQIcdbJD9ANsN yE34HJzrLiuvLnI17obFMm7O5d2tJE0oTZuIZALHCEfQpRr186Xpv6t4njcQ2QgXIZyLN8kgvoHBuS32ONqJkaqmVsjF81xhpHYxW1mrerOmzvNC9RZwRQo/ T7QG4TyDTfTMer14JFAv1R3c7KQ56AZdXVDMPkuGmCLUjtcAEHNHWoksFsSdxXJJ/cULapxyBjyONRzgagCKLQ== X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 18:51:28 -0000 In message , Warner Losh writes: > --94eb2c114c9a7c3c21055cb3566c > Content-Type: text/plain; charset="UTF-8" > > On Sun, Oct 29, 2017 at 8:26 AM, Ed Maste wrote: > > > On 29 October 2017 at 00:53, Eitan Adler wrote: > > > Author: eadler > > > Date: Sun Oct 29 04:53:33 2017 > > > New Revision: 325092 > > > URL: https://svnweb.freebsd.org/changeset/base/325092 > > > > > > Log: > > > Modernize freebsd-tips a bit > > ... > > > % > > > Want to run the same command again? > > > -In tcsh you can type "!!". > > > +Type "!!". > > > % > > > > $ !! > > sh: !!: not found > > > > I doubt many people use /bin/sh as an interactive shell, but the tip > > ought not lead those who do astray > > > > Yes. /bin/sh on FreeBSD doesn't grok it, though bash and some other shells > available as ports do. I think that the old text was a bit better. Or better yet, ctrl-r in bash and zsh, or up-arrow in tcsh. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. From owner-svn-src-all@freebsd.org Sun Oct 29 19:37:42 2017 Return-Path: Delivered-To: svn-src-all@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 2FBD8E4AB06 for ; Sun, 29 Oct 2017 19:37:42 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from pmta2.delivery6.ore.mailhop.org (pmta2.delivery6.ore.mailhop.org [54.200.129.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0D2FE63FBF for ; Sun, 29 Oct 2017 19:37:41 +0000 (UTC) (envelope-from ian@freebsd.org) X-MHO-User: 7f92b64e-bce0-11e7-b50b-53dc5ecda239 X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Originating-IP: 73.78.92.27 X-Mail-Handler: DuoCircle Outbound SMTP Received: from ilsoft.org (unknown [73.78.92.27]) by outbound2.ore.mailhop.org (Halon) with ESMTPSA id 7f92b64e-bce0-11e7-b50b-53dc5ecda239; Sun, 29 Oct 2017 19:36:46 +0000 (UTC) Received: from rev (rev [172.22.42.240]) by ilsoft.org (8.15.2/8.15.2) with ESMTP id v9TJ9UeI001655; Sun, 29 Oct 2017 13:09:30 -0600 (MDT) (envelope-from ian@freebsd.org) Message-ID: <1509304170.21609.26.camel@freebsd.org> Subject: Re: svn commit: r325092 - head/usr.bin/fortune/datfiles From: Ian Lepore To: Cy Schubert , Warner Losh Cc: Ed Maste , Eitan Adler , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Date: Sun, 29 Oct 2017 13:09:30 -0600 In-Reply-To: <201710291851.v9TIpM0I073542@slippy.cwsent.com> References: <201710291851.v9TIpM0I073542@slippy.cwsent.com> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.18.5.1 FreeBSD GNOME Team Port Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 19:37:42 -0000 On Sun, 2017-10-29 at 11:51 -0700, Cy Schubert wrote: > In message gmail.c > om> > , Warner Losh writes: > > > > --94eb2c114c9a7c3c21055cb3566c > > Content-Type: text/plain; charset="UTF-8" > > > > On Sun, Oct 29, 2017 at 8:26 AM, Ed Maste > > wrote: > > > > > > > > On 29 October 2017 at 00:53, Eitan Adler > > > wrote: > > > > > > > > Author: eadler > > > > Date: Sun Oct 29 04:53:33 2017 > > > > New Revision: 325092 > > > > URL: https://svnweb.freebsd.org/changeset/base/325092 > > > > > > > > Log: > > > >   Modernize freebsd-tips a bit > > > ... > > > > > > > >  % > > > >  Want to run the same command again? > > > > -In tcsh you can type "!!". > > > > +Type "!!". > > > >  % > > > $ !! > > > sh: !!: not found > > > > > > I doubt many people use /bin/sh as an interactive shell, but the > > > tip > > > ought not lead those who do astray > > > > > Yes. /bin/sh on FreeBSD doesn't grok it, though bash and some other > > shells > > available as ports do. I think that the old text was a bit better. > Or better yet, ctrl-r in bash and zsh, or up-arrow in tcsh. > Up-arrow works in sh and bash too, ^R is for searching history. -- Ian From owner-svn-src-all@freebsd.org Sun Oct 29 19:38:23 2017 Return-Path: Delivered-To: svn-src-all@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 03111E4AB8B for ; Sun, 29 Oct 2017 19:38:23 +0000 (UTC) (envelope-from steven@multiplay.co.uk) Received: from mail-lf0-x229.google.com (mail-lf0-x229.google.com [IPv6:2a00:1450:4010:c07::229]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7A6D46411C for ; Sun, 29 Oct 2017 19:38:22 +0000 (UTC) (envelope-from steven@multiplay.co.uk) Received: by mail-lf0-x229.google.com with SMTP id r129so12553830lff.8 for ; Sun, 29 Oct 2017 12:38:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=multiplay-co-uk.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=gUaWq/vYGu1kspF9q2ns+9eayz8ZnslyFn/eYxaKsxU=; b=W6rNiU0AWZYeJ0YM1O/UPEVyUzGTeEZAdyToT8J/bEOkr4z34bUqv38yeWtL+13yo5 lKY6+34GMmZtZ8ijPiE14I2iqhrQrzH1ym3o0bNsqwY5c3H2w5Orpa3ifhECd6+uN5mi JXa/Xo95FIjMDx6gwYlYnA1ZYtIWxkJb+58XrEz9YDsaDfK8vUBcvWPZY6ov1lfamJ3n n6gAB4dX2FjSfozKUxUS3xwkSJ9eua56KwRfxLlTA6sUkjv026CaoaCCb+olAYfpLzPP eVg11QGrygCLlLurygRbLOpZVlVtABszP1mMhOqfYO54EGTCouYurKKf9TC4QEJmM53n xGJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=gUaWq/vYGu1kspF9q2ns+9eayz8ZnslyFn/eYxaKsxU=; b=cJL5neTaTjsJkolKu9dNB0vnqsAiXa7DPta00Oz9eGdGvWcFgDW0FWn6otN6ggnGht Bp3QG9BYSmBG0x8wGUb8NlbxK8HrHpWrogIVUJmRTmLxQC8k/K1IGrL8D5qqTyAhQ95y 2XaBVxx/I89gZIqAi9EuRQEHc8f+/jsGpces0Vq3aOWFWv8Wv+XpgaIVGdVzMIyZP9n8 W1rU5zcgCe5wt6JxRu3qqwCXuFxZ4Ym2wJJhjCfYspFAnuR25f599Ybmw0xyY1tuYyyG eniHv+M+HtIizIRBR9p/EWqw1PTGIIBO8A+MBjkAuz3JIBria23jdOvupHc5DvJxav1Q ej0Q== X-Gm-Message-State: AMCzsaW7U9OTdk4L4hlnpvab3wxFypOU08It+QvPu+ciPilif9z4qKGS rQgSN+fnHmTMRRJaWl6dpS5gQ4CBkIoPM8gZqYT0IQ== X-Google-Smtp-Source: ABhQp+SDJw09q2JkVC0nGQ+ve0GUUvta4GmlbuVK7mvIsQmHMWGLt/1p1TC2OwbKBJZOeV5ASvnxdJAhp+vq+3htOKw= X-Received: by 10.46.80.83 with SMTP id v19mr2597112ljd.101.1509305900184; Sun, 29 Oct 2017 12:38:20 -0700 (PDT) MIME-Version: 1.0 References: <201710291851.v9TIpM0I073542@slippy.cwsent.com> In-Reply-To: <201710291851.v9TIpM0I073542@slippy.cwsent.com> From: Steven Hartland Date: Sun, 29 Oct 2017 19:38:09 +0000 Message-ID: Subject: Re: svn commit: r325092 - head/usr.bin/fortune/datfiles To: Cy Schubert , Warner Losh Cc: Ed Maste , Eitan Adler , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.23 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 19:38:23 -0000 I=E2=80=99ve still had to use rehash on several occasions for it to detect = new apps, so remove that reference might be a mistake On Sun, 29 Oct 2017 at 18:51, Cy Schubert wrote: > In message > om> > , Warner Losh writes: > > --94eb2c114c9a7c3c21055cb3566c > > Content-Type: text/plain; charset=3D"UTF-8" > > > > On Sun, Oct 29, 2017 at 8:26 AM, Ed Maste wrote: > > > > > On 29 October 2017 at 00:53, Eitan Adler wrote: > > > > Author: eadler > > > > Date: Sun Oct 29 04:53:33 2017 > > > > New Revision: 325092 > > > > URL: https://svnweb.freebsd.org/changeset/base/325092 > > > > > > > > Log: > > > > Modernize freebsd-tips a bit > > > ... > > > > % > > > > Want to run the same command again? > > > > -In tcsh you can type "!!". > > > > +Type "!!". > > > > % > > > > > > $ !! > > > sh: !!: not found > > > > > > I doubt many people use /bin/sh as an interactive shell, but the tip > > > ought not lead those who do astray > > > > > > > Yes. /bin/sh on FreeBSD doesn't grok it, though bash and some other > shells > > available as ports do. I think that the old text was a bit better. > > Or better yet, ctrl-r in bash and zsh, or up-arrow in tcsh. > > > -- > Cheers, > Cy Schubert > FreeBSD UNIX: Web: http://www.FreeBSD.org > > The need of the many outweighs the greed of the few. > > > > From owner-svn-src-all@freebsd.org Sun Oct 29 19:48:01 2017 Return-Path: Delivered-To: svn-src-all@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 AD5DDE4AFE9; Sun, 29 Oct 2017 19:48:01 +0000 (UTC) (envelope-from devin@shxd.cx) Received: from shxd.cx (mail.shxd.cx [64.201.244.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9DAE9646D1; Sun, 29 Oct 2017 19:48:01 +0000 (UTC) (envelope-from devin@shxd.cx) Received: from [64.201.244.132] (port=53895 helo=[10.0.0.105]) by shxd.cx with esmtps (TLSv1:AES256-SHA:256) (Exim 4.77 (FreeBSD)) (envelope-from ) id 1e8rgF-0003a0-Sy; Sun, 29 Oct 2017 17:47:27 +0000 Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (1.0) Subject: Re: svn commit: r325092 - head/usr.bin/fortune/datfiles From: Devin Teske X-Mailer: iPhone Mail (13G36) In-Reply-To: <201710291851.v9TIpM0I073542@slippy.cwsent.com> Date: Sun, 29 Oct 2017 12:47:59 -0700 Cc: Warner Losh , Ed Maste , Eitan Adler , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <201710291851.v9TIpM0I073542@slippy.cwsent.com> To: Cy Schubert X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 19:48:01 -0000 > On Oct 29, 2017, at 11:51 AM, Cy Schubert wrote= : >=20 > In message om> > , Warner Losh writes: >> --94eb2c114c9a7c3c21055cb3566c >> Content-Type: text/plain; charset=3D"UTF-8" >>=20 >>>> On Sun, Oct 29, 2017 at 8:26 AM, Ed Maste wrote: >>>>=20 >>>> On 29 October 2017 at 00:53, Eitan Adler wrote: >>>> Author: eadler >>>> Date: Sun Oct 29 04:53:33 2017 >>>> New Revision: 325092 >>>> URL: https://svnweb.freebsd.org/changeset/base/325092 >>>>=20 >>>> Log: >>>> Modernize freebsd-tips a bit >>> ... >>>> % >>>> Want to run the same command again? >>>> -In tcsh you can type "!!". >>>> +Type "!!". >>>> % >>>=20 >>> $ !! >>> sh: !!: not found >>>=20 >>> I doubt many people use /bin/sh as an interactive shell, but the tip >>> ought not lead those who do astray >>=20 >> Yes. /bin/sh on FreeBSD doesn't grok it, though bash and some other shell= s >> available as ports do. I think that the old text was a bit better. >=20 > Or better yet, ctrl-r in bash and zsh, or up-arrow in tcsh. Since we are responding to emaste's astute observation with random personal f= avorites when it comes to history actions in an interactive shell... How about Esc-P and Esc-N? Never used it, you say? Few people do. Try this: Esc-P (a colon appears) (type a portion of the event you are looking for and press ENTER) Found it? Good. Didn't find it? Esc-P then ENTER to repeat search further back. Keep typing Esc-P, ENTER until you find it. Oh, you went too far? Esc-N, ENTER to search forward from the last matched e= vent. Sometimes I show this to co-workers and they shake their head and go back to= Ctrl-R. Ctrl-R is ok, but doesn't enable an Esc-N-like functionality by default. But= if you execute (or put in your shell profile) "stty -ixon" then you can use= Ctrl-S to reverse the search order during a Ctrl-R search. For example: Ctrl-r (a prompt appears) (type some text; don't hit ENTER) Ctrl-r until you find the one you want Went too far? Ctrl-s to switch from reverse-search to forward-search Ctrl-s until you find one you want Just thought I would share this random info. As for the fortune statement... I agree with emaste, "Type !!" is misleading. Old statement of "in tcsh you c= an type !!" was fine because tcsh is the only shell in base that supports th= at feature. However, possible alternatives to "Type !!" could be: Try "!!" (works in many shells but not all). NB: Trying to make a future-proof statement so the fortune datfile doesn't h= ave to be onerously maintained. --=20 Devin= From owner-svn-src-all@freebsd.org Sun Oct 29 20:20:01 2017 Return-Path: Delivered-To: svn-src-all@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 1D0B2E4B77D for ; Sun, 29 Oct 2017 20:20:01 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-yw0-x236.google.com (mail-yw0-x236.google.com [IPv6:2607:f8b0:4002:c05::236]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C7263653BA for ; Sun, 29 Oct 2017 20:20:00 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: by mail-yw0-x236.google.com with SMTP id k3so9805356ywk.8 for ; Sun, 29 Oct 2017 13:20:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc:content-transfer-encoding; bh=5zCHL8zzhe4LYtiyt2W9s6mTPYDiUlV2W6PZgx3EqcI=; b=ghBbPmdetV/CITxpPdyTLzs2f6XsQkSIq/P7Asy7hNuyN+NPte8cMD9EufJXQV6SWC YrbconY81t5ZWRDycd9Mjlrg7NoR6CIWN+99cLIIcIdrry7KfvgrOTxRlMACQsLgZhlC hExO+Vmvw/oR/WTa5S6afA8xSd6LkHKYJa31g= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd-org.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc:content-transfer-encoding; bh=5zCHL8zzhe4LYtiyt2W9s6mTPYDiUlV2W6PZgx3EqcI=; b=VUhdbkxgNYS+qvwxaBjSG06bVfvzFnElbaAuD4ktGxMV+HHjES1n81dWstuu8Bxxgc 3bHOI6iHmLiPtAUAgfMEM3jWvUq+UFnCEjeIuVb69XsgLzv1Y2VhcPzag7SlWbpSnNWl OWMWSmr63TRv+wfKJ7KmGe76tYe1htiUir16rR46QYS3aNASYJ8T3m3IYGn0Vst/oeAc kuprsH60uameKwPz1EJeScRql+uPDiTmF3/n0yro5y/MVW1mWy9O71WUTS7Tu8Kld7Wt 6nfJH9EM4nE69OkvZC76SDrTgAqeYwf5KU9Hpk6dodGC9WmomLsktih2ON0sPyYzfngh BC/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc:content-transfer-encoding; bh=5zCHL8zzhe4LYtiyt2W9s6mTPYDiUlV2W6PZgx3EqcI=; b=fVv4Gauw3Q13LAEytL3cGx24aqZM7DvyobONjHjZwwSyHXKX5nzMl6N1eI3v3NsqFh lC34LfzH780/dpRkgdQlKSToYLAeT1G3VQMCcn4AyIQBCq6P1jRlvUTtoYnf5S7HrQC4 PMRQDVESoVvbLj1b+DzkUMYQDmAwk5Q2WH9DdhnQo1QIe5kKW4s8wniMJE3eVU+FmTNk CuloW7uMOD94ZONIx9KCY/QYYyjNlRJqqWW+g47J1Go6+l8dZ6l+l6N0nWSIFyfahaeE ngYEzNCzzj3io7TZa3EPvPXf0hHAcL4HIlQLb6tl3azGfH7JIkoQlVpJWVp7RzOZLSab 6M/Q== X-Gm-Message-State: AMCzsaUfHlAgTLbqtTJh8aeGlJYljr+ULH7/fbnG7sNIx8dQE950IsRS yoqbfTRLF+JNwzV1QpZzbB+VnP6CbBLbIhp8algCTA== X-Google-Smtp-Source: ABhQp+TOtycOYeyquUQlKzdcm6KCWFnwAcC4nuFntoG4ho66O6D+hzgGsvBvhwMM67DdrQHNiEzepQAGo/la+cj3c+k= X-Received: by 10.129.77.137 with SMTP id a131mr4926810ywb.107.1509308399733; Sun, 29 Oct 2017 13:19:59 -0700 (PDT) MIME-Version: 1.0 Sender: lists@eitanadler.com Received: by 10.37.56.66 with HTTP; Sun, 29 Oct 2017 13:19:29 -0700 (PDT) In-Reply-To: References: <201710291851.v9TIpM0I073542@slippy.cwsent.com> From: Eitan Adler Date: Sun, 29 Oct 2017 13:19:29 -0700 X-Google-Sender-Auth: 895GLt7SzAlZrPaFrlJ7LHoVtac Message-ID: Subject: Re: svn commit: r325092 - head/usr.bin/fortune/datfiles To: Devin Teske Cc: Cy Schubert , Warner Losh , Ed Maste , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 20:20:01 -0000 On 29 October 2017 at 12:47, Devin Teske wrote: >>>> >>>> I doubt many people use /bin/sh as an interactive shell, but the tip >>>> ought not lead those who do astray Will fix. >>> >>> Yes. /bin/sh on FreeBSD doesn't grok it, though bash and some other she= lls >>> available as ports do. I think that the old text was a bit better. < snip lots of great advice> Lets add new tips to fortune! > I=E2=80=99ve still had to use rehash on several occasions for it to detec= t new apps, so remove that reference might be a mistake After r234823 I expect this to only occur if you install a new binary, with the same as an existing hashed binary, earlier in the PATH. Have you found this not to be the case? --=20 Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams On 29 October 2017 at 12:47, Devin Teske wrote: > >> On Oct 29, 2017, at 11:51 AM, Cy Schubert wro= te: >> >> In message > om> >> , Warner Losh writes: >>> --94eb2c114c9a7c3c21055cb3566c >>> Content-Type: text/plain; charset=3D"UTF-8" >>> >>>>> On Sun, Oct 29, 2017 at 8:26 AM, Ed Maste wrote: >>>>> >>>>> On 29 October 2017 at 00:53, Eitan Adler wrote: >>>>> Author: eadler >>>>> Date: Sun Oct 29 04:53:33 2017 >>>>> New Revision: 325092 >>>>> URL: https://svnweb.freebsd.org/changeset/base/325092 >>>>> >>>>> Log: >>>>> Modernize freebsd-tips a bit >>>> ... >>>>> % >>>>> Want to run the same command again? >>>>> -In tcsh you can type "!!". >>>>> +Type "!!". >>>>> % >>>> >>>> $ !! >>>> sh: !!: not found >>>> >>>> I doubt many people use /bin/sh as an interactive shell, but the tip >>>> ought not lead those who do astray >>> >>> Yes. /bin/sh on FreeBSD doesn't grok it, though bash and some other she= lls >>> available as ports do. I think that the old text was a bit better. >> >> Or better yet, ctrl-r in bash and zsh, or up-arrow in tcsh. > > Since we are responding to emaste's astute observation with random person= al favorites when it comes to history actions in an interactive shell... > > How about Esc-P and Esc-N? > > Never used it, you say? Few people do. > > Try this: > > Esc-P > (a colon appears) > (type a portion of the event you are looking for and press ENTER) > Found it? Good. > Didn't find it? Esc-P then ENTER to repeat search further back. > Keep typing Esc-P, ENTER until you find it. > Oh, you went too far? Esc-N, ENTER to search forward from the last matche= d event. > > Sometimes I show this to co-workers and they shake their head and go back= to Ctrl-R. > > Ctrl-R is ok, but doesn't enable an Esc-N-like functionality by default. = But if you execute (or put in your shell profile) "stty -ixon" then you can= use Ctrl-S to reverse the search order during a Ctrl-R search. > > For example: > > Ctrl-r > (a prompt appears) > (type some text; don't hit ENTER) > Ctrl-r until you find the one you want > Went too far? > Ctrl-s to switch from reverse-search to forward-search > Ctrl-s until you find one you want > > Just thought I would share this random info. > > As for the fortune statement... > > I agree with emaste, "Type !!" is misleading. Old statement of "in tcsh y= ou can type !!" was fine because tcsh is the only shell in base that suppor= ts that feature. However, possible alternatives to "Type !!" could be: > > Try "!!" (works in many shells but not all). > > NB: Trying to make a future-proof statement so the fortune datfile doesn'= t have to be onerously maintained. > -- > Devin --=20 Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams From owner-svn-src-all@freebsd.org Sun Oct 29 20:20:52 2017 Return-Path: Delivered-To: svn-src-all@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 DA5D9E4B7F2; Sun, 29 Oct 2017 20:20:52 +0000 (UTC) (envelope-from eadler@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 A6CB665541; Sun, 29 Oct 2017 20:20:52 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9TKKp7c045941; Sun, 29 Oct 2017 20:20:51 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9TKKpPs045940; Sun, 29 Oct 2017 20:20:51 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201710292020.v9TKKpPs045940@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Sun, 29 Oct 2017 20:20:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325105 - head/usr.bin/fortune/datfiles X-SVN-Group: head X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: head/usr.bin/fortune/datfiles X-SVN-Commit-Revision: 325105 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 20:20:53 -0000 Author: eadler Date: Sun Oct 29 20:20:51 2017 New Revision: 325105 URL: https://svnweb.freebsd.org/changeset/base/325105 Log: The !! trick does not apply to all shells Requested by: emaste Modified: head/usr.bin/fortune/datfiles/freebsd-tips Modified: head/usr.bin/fortune/datfiles/freebsd-tips ============================================================================== --- head/usr.bin/fortune/datfiles/freebsd-tips Sun Oct 29 14:57:58 2017 (r325104) +++ head/usr.bin/fortune/datfiles/freebsd-tips Sun Oct 29 20:20:51 2017 (r325105) @@ -455,7 +455,7 @@ Try "whereis firefox" and "whereis whereis". -- Konstantinos Konstantinidis % Want to run the same command again? -Type "!!". +In many shells (e.g., tcsh, zsh, bash) you can type "!!". % Want to go the directory you were just in? Type "cd -" From owner-svn-src-all@freebsd.org Sun Oct 29 20:29:32 2017 Return-Path: Delivered-To: svn-src-all@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 C2342E4BA5F; Sun, 29 Oct 2017 20:29:32 +0000 (UTC) (envelope-from eadler@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 840B16592A; Sun, 29 Oct 2017 20:29:32 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9TKTVbM050165; Sun, 29 Oct 2017 20:29:31 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9TKTVD7050163; Sun, 29 Oct 2017 20:29:31 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201710292029.v9TKTVD7050163@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Sun, 29 Oct 2017 20:29:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325106 - head X-SVN-Group: head X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 325106 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 20:29:32 -0000 Author: eadler Date: Sun Oct 29 20:29:31 2017 New Revision: 325106 URL: https://svnweb.freebsd.org/changeset/base/325106 Log: Correct the URLs for both READMEs for tracking src Previously there were two different URLs in two different READMEs, neither of which went anywhere. Modified: head/README head/README.md Modified: head/README ============================================================================== --- head/README Sun Oct 29 20:20:51 2017 (r325105) +++ head/README Sun Oct 29 20:29:31 2017 (r325106) @@ -81,4 +81,4 @@ usr.sbin System administration commands. For information on synchronizing your source tree with one or more of the FreeBSD Project's development branches, please see: - https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/updating-src.html + https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/current-stable.html Modified: head/README.md ============================================================================== --- head/README.md Sun Oct 29 20:20:51 2017 (r325105) +++ head/README.md Sun Oct 29 20:29:31 2017 (r325106) @@ -83,4 +83,4 @@ usr.sbin System administration commands. For information on synchronizing your source tree with one or more of the FreeBSD Project's development branches, please see: - https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/synching.html + https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/current-stable.html From owner-svn-src-all@freebsd.org Sun Oct 29 20:40:57 2017 Return-Path: Delivered-To: svn-src-all@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 B2BCBE4C0B8; Sun, 29 Oct 2017 20:40:57 +0000 (UTC) (envelope-from eadler@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 75C4C65E80; Sun, 29 Oct 2017 20:40:57 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9TKeuUB054393; Sun, 29 Oct 2017 20:40:56 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9TKeuGp054392; Sun, 29 Oct 2017 20:40:56 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201710292040.v9TKeuGp054392@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Sun, 29 Oct 2017 20:40:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325107 - head X-SVN-Group: head X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 325107 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 20:40:57 -0000 Author: eadler Date: Sun Oct 29 20:40:56 2017 New Revision: 325107 URL: https://svnweb.freebsd.org/changeset/base/325107 Log: Update the updating URL in UPDATING Also remove references to 9.x Modified: head/UPDATING Modified: head/UPDATING ============================================================================== --- head/UPDATING Sun Oct 29 20:29:31 2017 (r325106) +++ head/UPDATING Sun Oct 29 20:40:56 2017 (r325107) @@ -6,7 +6,7 @@ COMMON ITEMS: section later in the file. These instru basically know what you are doing. If not, then please consult the FreeBSD handbook: - https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/updating-src.html + https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/current-stable.html Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before running portupgrade. @@ -36,7 +36,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: Due to a bug in some versions of clang that's very hard to workaround in the upgrade process, to upgrade to -current you must first upgrade - either stable/9 after r286035 or stable/10 after r286033 (including + stable/10 after r286033 (including 10.3-RELEASE) or current after r286007 (including stable/11 and 11.0-RELEASE). These revisions post-date the 10.2 and 9.3 releases, so you'll need to take the unusual step of upgrading to the tip of the @@ -45,7 +45,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: from the historical situation where one could upgrade from anywhere on the last couple of stable branches, so be careful. - If you're running a hybrid system on 9.x or 10.x with an updated clang + If you're running a hybrid system on 10.x with an updated clang compiler or are using an supported external toolchain, the build system will allow the upgrade. Otherwise it will print a reminder. From owner-svn-src-all@freebsd.org Sun Oct 29 20:49:24 2017 Return-Path: Delivered-To: svn-src-all@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 6C3C9E4C1BD; Sun, 29 Oct 2017 20:49:24 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 161B166309; Sun, 29 Oct 2017 20:49:24 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from spqr.komquats.com ([96.50.22.10]) by shaw.ca with SMTP id 8uWIepLrUM9gt8uWJebRMx; Sun, 29 Oct 2017 14:49:23 -0600 X-Authority-Analysis: v=2.2 cv=a+JAzQaF c=1 sm=1 tr=0 a=jvE2nwUzI0ECrNeyr98KWA==:117 a=jvE2nwUzI0ECrNeyr98KWA==:17 a=kj9zAlcOel0A:10 a=xqWC_Br6kY4A:10 a=02M-m0pO-4AA:10 a=YxBL1-UpAAAA:8 a=6I5d2MoRAAAA:8 a=ZCq8VXJkBJzGjVaCzvQA:9 a=CjuIK1q_8ugA:10 a=6lG7ZUvBjo8A:10 a=Ia-lj3WSrqcvXOmTRaiG:22 a=IjZwj45LgO3ly-622nXo:22 Received: from slippy.cwsent.com (slippy [IPv6:fc00:1:1:1::5b]) by spqr.komquats.com (Postfix) with ESMTPS id 7CDB13E6; Sun, 29 Oct 2017 13:49:22 -0700 (PDT) Received: from slippy (localhost [IPv6:0:0:0:0:0:0:0:1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id v9TKnMuH026367; Sun, 29 Oct 2017 13:49:22 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201710292049.v9TKnMuH026367@slippy.cwsent.com> X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.6 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Eitan Adler cc: Devin Teske , Cy Schubert , Warner Losh , Ed Maste , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r325092 - head/usr.bin/fortune/datfiles In-Reply-To: Message from Eitan Adler of "Sun, 29 Oct 2017 13:19:29 -0700." Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Sun, 29 Oct 2017 13:49:22 -0700 X-CMAE-Envelope: MS4wfHsROazwR76e3MqdtGXKsOByMDfHjbLLNSPmWUKSiS5JRovbMW+P/vj3k8cZeBJGP7atYsElmOr0gu9KQSq1AEZ6TjbgX8jsyiS7ITxRnj/huUE/5v/O NEqvPLzDXKqrFxSnbFV9zhDCzjYnR5RLbw1ww0SayV7XurQha8N3Asi7n0mxhfwUE/caatGVUNVuk2DeHK8x9X8ZC74UymrznmyfIjtzljxRipd4d0XCH8gA wTJ09ol0BzVMU/0LKvVd5Zvu7WqDLhbXu2EcrIySDBHc6UU54bJpkyido+I+VVj0wUkAGuiES6sTsb9vdUyuxQ== X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 20:49:24 -0000 In message , Eitan Adler writes: > On 29 October 2017 at 12:47, Devin Teske wrote: > > >>>> > >>>> I doubt many people use /bin/sh as an interactive shell, but the tip > >>>> ought not lead those who do astray > > Will fix. > > >>> > >>> Yes. /bin/sh on FreeBSD doesn't grok it, though bash and some other shell > s > >>> available as ports do. I think that the old text was a bit better. > > < snip lots of great advice> > > Lets add new tips to fortune! > > > I’ve still had to use rehash on several occasions for it to detect new apps, > so remove that reference might be a mistake > > After r234823 I expect this to only occur if you install a new binary, > with the same as an existing hashed binary, earlier in the PATH. Have > you found this not to be the case? Tangentially, one of the best sources of this stuff for me was the book UNIX Power Tools, which should have had the title Common Sense UNIX. We could steal a lot of great tips from it. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. From owner-svn-src-all@freebsd.org Sun Oct 29 20:50:04 2017 Return-Path: Delivered-To: svn-src-all@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 57FE7E4C237; Sun, 29 Oct 2017 20:50:04 +0000 (UTC) (envelope-from ian@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 2741E6645D; Sun, 29 Oct 2017 20:50:04 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9TKo3ln058457; Sun, 29 Oct 2017 20:50:03 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9TKo3j5058456; Sun, 29 Oct 2017 20:50:03 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201710292050.v9TKo3j5058456@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Sun, 29 Oct 2017 20:50:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325108 - head/sys/amd64/vmm/io X-SVN-Group: head X-SVN-Commit-Author: ian X-SVN-Commit-Paths: head/sys/amd64/vmm/io X-SVN-Commit-Revision: 325108 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 20:50:04 -0000 Author: ian Date: Sun Oct 29 20:50:03 2017 New Revision: 325108 URL: https://svnweb.freebsd.org/changeset/base/325108 Log: Improve the performance of the hpet timer in bhyve guests by making the timer frequency a power of two. This changes the frequency from 10 to 16.7 MHz (2 ^ 24 HZ). Using a power of two avoids roundoff errors when doing arithmetic in sbintime_t units. Testing shows this can fix erratic ntpd behavior in guests using the hpet timer (which is the default for multicore guests). Reported by: bsam@ Modified: head/sys/amd64/vmm/io/vhpet.c Modified: head/sys/amd64/vmm/io/vhpet.c ============================================================================== --- head/sys/amd64/vmm/io/vhpet.c Sun Oct 29 20:40:56 2017 (r325107) +++ head/sys/amd64/vmm/io/vhpet.c Sun Oct 29 20:50:03 2017 (r325108) @@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$"); static MALLOC_DEFINE(M_VHPET, "vhpet", "bhyve virtual hpet"); -#define HPET_FREQ 10000000 /* 10.0 Mhz */ +#define HPET_FREQ 16777216 /* 16.7 (2^24) Mhz */ #define FS_PER_S 1000000000000000ul /* Timer N Configuration and Capabilities Register */ From owner-svn-src-all@freebsd.org Sun Oct 29 20:54:58 2017 Return-Path: Delivered-To: svn-src-all@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 A8529E4C4A5 for ; Sun, 29 Oct 2017 20:54:58 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from pmta2.delivery6.ore.mailhop.org (pmta2.delivery6.ore.mailhop.org [54.200.129.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 894A866929 for ; Sun, 29 Oct 2017 20:54:58 +0000 (UTC) (envelope-from ian@freebsd.org) X-MHO-User: 4b28e1d1-bceb-11e7-b50b-53dc5ecda239 X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Originating-IP: 73.78.92.27 X-Mail-Handler: DuoCircle Outbound SMTP Received: from ilsoft.org (unknown [73.78.92.27]) by outbound2.ore.mailhop.org (Halon) with ESMTPSA id 4b28e1d1-bceb-11e7-b50b-53dc5ecda239; Sun, 29 Oct 2017 20:54:02 +0000 (UTC) Received: from rev (rev [172.22.42.240]) by ilsoft.org (8.15.2/8.15.2) with ESMTP id v9TKstof002004; Sun, 29 Oct 2017 14:54:55 -0600 (MDT) (envelope-from ian@freebsd.org) Message-ID: <1509310495.21609.60.camel@freebsd.org> Subject: Re: svn commit: r325108 - head/sys/amd64/vmm/io From: Ian Lepore To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Date: Sun, 29 Oct 2017 14:54:55 -0600 In-Reply-To: <201710292050.v9TKo3j5058456@repo.freebsd.org> References: <201710292050.v9TKo3j5058456@repo.freebsd.org> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.18.5.1 FreeBSD GNOME Team Port Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 20:54:58 -0000 On Sun, 2017-10-29 at 20:50 +0000, Ian Lepore wrote: > Author: ian > Date: Sun Oct 29 20:50:03 2017 > New Revision: 325108 > URL: https://svnweb.freebsd.org/changeset/base/325108 > > Log: >   Improve the performance of the hpet timer in bhyve guests by making the >   timer frequency a power of two.  This changes the frequency from 10 to >   16.7 MHz (2 ^ 24 HZ).  Using a power of two avoids roundoff errors when >   doing arithmetic in sbintime_t units. >    >   Testing shows this can fix erratic ntpd behavior in guests using the >   hpet timer (which is the default for multicore guests). >    >   Reported by: bsam@ > > Modified: >   head/sys/amd64/vmm/io/vhpet.c > > Modified: head/sys/amd64/vmm/io/vhpet.c > ============================================================================== > --- head/sys/amd64/vmm/io/vhpet.c Sun Oct 29 20:40:56 2017 (r325107) > +++ head/sys/amd64/vmm/io/vhpet.c Sun Oct 29 20:50:03 2017 (r325108) > @@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$"); >   >  static MALLOC_DEFINE(M_VHPET, "vhpet", "bhyve virtual hpet"); >   > -#define HPET_FREQ 10000000 /* 10.0 Mhz */ > +#define HPET_FREQ 16777216 /* 16.7 (2^24) Mhz */ >  #define FS_PER_S 1000000000000000ul >   >  /* Timer N Configuration and Capabilities Register */ > It should be noted that this is really more of a workaround than a fix.  I think the right fix might be to use bintime rather than sbintime to avoid the rounding errors.  I also suspect this problem affects other emulated timers such as atpit/8254 where there is less freedom to wish away the problem with a power-of-two frequency change. Still, I committed this as-is because it was shown to fix a real-world problem and it doesn't prevent doing a better fix later. -- Ian From owner-svn-src-all@freebsd.org Sun Oct 29 21:17:57 2017 Return-Path: Delivered-To: svn-src-all@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 1AFD8E4CA03 for ; Sun, 29 Oct 2017 21:17:57 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-io0-x22f.google.com (mail-io0-x22f.google.com [IPv6:2607:f8b0:4001:c06::22f]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C8B85671F9 for ; Sun, 29 Oct 2017 21:17:56 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-io0-x22f.google.com with SMTP id e89so22932307ioi.11 for ; Sun, 29 Oct 2017 14:17:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=npJ20WeAkSb8Doj/XsMfW1ORsjXFuX53I9FpW+oiAcI=; b=p93iNYjCQqelJauf2c2vTqoo8o7HUU0XlAns/CR8FD2Jub8zF2+Pvo3KOyX0M8/OR+ xkuznb4ay0cRAbAuBzvqScjMYZv0v960kLQXwnaZ+LKpM0BuZg8PrrwM22dfii/eowKP VGKVKU3uAm3aooaFR2KxJhuE7WdcWn2v9bsy4Q54pqUAsTOrsOshadwzAjtA6hVuvxuB B08Nm0xrQMty6kur7xRHtOOnbIcB9RcDIuH5eSVcJFFzCoue+9WbW32fY64KkM5i9Tp5 tjVM5Hm1Ns+DsYKujtpCxoZbXtlWs9U922D9M9U/j0eliPlEHdiC0L24nImjSBLpxM6X oxPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=npJ20WeAkSb8Doj/XsMfW1ORsjXFuX53I9FpW+oiAcI=; b=rpJqVZ1PY85cWpYPyJNsqyhhTOVtvKKueW1krLX1YOpbGVcSVeMnTbhzOL2o2/IB4w wJa9q+aTVfazV65eVcz53q3is9Y5JfCskPyQcSZWXGCCpNQjq7a1udmGyYWoW6FUWoB3 pHo5yDiZ+q+pWLc0yDmwQk18f5g0afuopYreNbCWNeHB4LkHWERttxBLo6hupV0yfEvk mhAf/6bzQYELZyD0OQVv8HDRXNWgkjESfzUNgb1+SNlSvuOWWKBm4FWS8PnpZQYmgKw1 lp5Ypt2lvxev3iOIRSVx8VIVZKNRXDQGVWsF3RgN8AyxoN2QtIzVCyjjbWZZLKBl9qky W9Mw== X-Gm-Message-State: AMCzsaU/wqOFWBXgveJPpt13cV2LZUxDrGPLRhHeq9rFYCYQHtpl3EQ6 IDbZc0mVHxW+QHD4S6Jedr4DCP24/F06oyEPM1iVKQ== X-Google-Smtp-Source: ABhQp+S1WPkr3gjTwt+q/yAsuDPQSV7im+S9lmzTXwQFgcY0J+AAIUcsPAWwyTH9q8RTV44ukFDU1qQqyMmUC3iLDvI= X-Received: by 10.107.114.5 with SMTP id n5mr8665796ioc.291.1509311876130; Sun, 29 Oct 2017 14:17:56 -0700 (PDT) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.57.22 with HTTP; Sun, 29 Oct 2017 14:17:55 -0700 (PDT) X-Originating-IP: [2603:300b:6:5100:817e:dabb:4900:7bcb] In-Reply-To: <201710292040.v9TKeuGp054392@repo.freebsd.org> References: <201710292040.v9TKeuGp054392@repo.freebsd.org> From: Warner Losh Date: Sun, 29 Oct 2017 15:17:55 -0600 X-Google-Sender-Auth: 8oP0uCogpjcfHFhAlaJj-h5qrb8 Message-ID: Subject: Re: svn commit: r325107 - head To: Eitan Adler Cc: src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.23 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 21:17:57 -0000 On Sun, Oct 29, 2017 at 2:40 PM, Eitan Adler wrote: > Author: eadler > Date: Sun Oct 29 20:40:56 2017 > New Revision: 325107 > URL: https://svnweb.freebsd.org/changeset/base/325107 > > Log: > Update the updating URL in UPDATING > That's fine. > Also remove references to 9.x > That's wrong. Please put them back. We "support" building from the tip of releng/9 still. Warner > Modified: > head/UPDATING > > Modified: head/UPDATING > ============================================================ > ================== > --- head/UPDATING Sun Oct 29 20:29:31 2017 (r325106) > +++ head/UPDATING Sun Oct 29 20:40:56 2017 (r325107) > @@ -6,7 +6,7 @@ COMMON ITEMS: section later in the file. These instru > basically know what you are doing. If not, then please consult the > FreeBSD > handbook: > > - https://www.freebsd.org/doc/en_US.ISO8859-1/books/ > handbook/updating-src.html > + https://www.freebsd.org/doc/en_US.ISO8859-1/books/ > handbook/current-stable.html > > Items affecting the ports and packages system can be found in > /usr/ports/UPDATING. Please read that file before running portupgrade. > @@ -36,7 +36,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: > > Due to a bug in some versions of clang that's very hard to > workaround in > the upgrade process, to upgrade to -current you must first upgrade > - either stable/9 after r286035 or stable/10 after r286033 (including > + stable/10 after r286033 (including > 10.3-RELEASE) or current after r286007 (including stable/11 and > 11.0-RELEASE). These revisions post-date the 10.2 and 9.3 > releases, so > you'll need to take the unusual step of upgrading to the tip of the > @@ -45,7 +45,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: > from the historical situation where one could upgrade from > anywhere on > the last couple of stable branches, so be careful. > > - If you're running a hybrid system on 9.x or 10.x with an updated > clang > + If you're running a hybrid system on 10.x with an updated clang > compiler or are using an supported external toolchain, the build > system > will allow the upgrade. Otherwise it will print a reminder. > > > From owner-svn-src-all@freebsd.org Sun Oct 29 21:21:41 2017 Return-Path: Delivered-To: svn-src-all@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 35D41E4CBDC; Sun, 29 Oct 2017 21:21:41 +0000 (UTC) (envelope-from eadler@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 033566751D; Sun, 29 Oct 2017 21:21:40 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9TLLeUs073306; Sun, 29 Oct 2017 21:21:40 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9TLLefD073305; Sun, 29 Oct 2017 21:21:40 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201710292121.v9TLLefD073305@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Sun, 29 Oct 2017 21:21:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325109 - head/rescue X-SVN-Group: head X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: head/rescue X-SVN-Commit-Revision: 325109 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 21:21:41 -0000 Author: eadler Date: Sun Oct 29 21:21:39 2017 New Revision: 325109 URL: https://svnweb.freebsd.org/changeset/base/325109 Log: rescue: say gbye to 'boot floppies' and moderize Modified: head/rescue/README Modified: head/rescue/README ============================================================================== --- head/rescue/README Sun Oct 29 20:50:03 2017 (r325108) +++ head/rescue/README Sun Oct 29 21:21:39 2017 (r325109) @@ -16,8 +16,7 @@ normally found in /bin and /sbin. These Makefiles recompile each of the crunchgen components and include support for overriding specific library entries. Such techniques -should be useful elsewhere. For example, boot floppies could use this -to conditionally compile out features to reduce executable size. +should be useful elsewhere. 3) Produce a toolkit suitable for small distributions. @@ -27,8 +26,8 @@ system. These tools have one big disadvantage: being statically linked, they cannot use some advanced library functions that rely on dynamic -linking. In particular, nsswitch, locales, and pam are likely to all -rely on dynamic linking in the near future. +linking. In particular, nsswitch, locales, and pam all +rely on dynamic linking. To compile: From owner-svn-src-all@freebsd.org Sun Oct 29 21:25:59 2017 Return-Path: Delivered-To: svn-src-all@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 F1ECAE4CCC7; Sun, 29 Oct 2017 21:25:59 +0000 (UTC) (envelope-from eadler@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 C012667734; Sun, 29 Oct 2017 21:25:59 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9TLPwxR075157; Sun, 29 Oct 2017 21:25:58 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9TLPwXf075156; Sun, 29 Oct 2017 21:25:58 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201710292125.v9TLPwXf075156@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Sun, 29 Oct 2017 21:25:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325110 - head X-SVN-Group: head X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 325110 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 21:26:00 -0000 Author: eadler Date: Sun Oct 29 21:25:58 2017 New Revision: 325110 URL: https://svnweb.freebsd.org/changeset/base/325110 Log: Revert removal of 9.x references in UPDATING Requested by: imp Modified: head/UPDATING Modified: head/UPDATING ============================================================================== --- head/UPDATING Sun Oct 29 21:21:39 2017 (r325109) +++ head/UPDATING Sun Oct 29 21:25:58 2017 (r325110) @@ -36,7 +36,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: Due to a bug in some versions of clang that's very hard to workaround in the upgrade process, to upgrade to -current you must first upgrade - stable/10 after r286033 (including + either stable/9 after r286035 or stable/10 after r286033 (including 10.3-RELEASE) or current after r286007 (including stable/11 and 11.0-RELEASE). These revisions post-date the 10.2 and 9.3 releases, so you'll need to take the unusual step of upgrading to the tip of the @@ -45,7 +45,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: from the historical situation where one could upgrade from anywhere on the last couple of stable branches, so be careful. - If you're running a hybrid system on 10.x with an updated clang + If you're running a hybrid system on 9.x or 10.x with an updated clang compiler or are using an supported external toolchain, the build system will allow the upgrade. Otherwise it will print a reminder. From owner-svn-src-all@freebsd.org Sun Oct 29 21:26:50 2017 Return-Path: Delivered-To: svn-src-all@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 D5167E4CD3F for ; Sun, 29 Oct 2017 21:26:50 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-yw0-x230.google.com (mail-yw0-x230.google.com [IPv6:2607:f8b0:4002:c05::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8BF1567884 for ; Sun, 29 Oct 2017 21:26:50 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: by mail-yw0-x230.google.com with SMTP id y75so9909358ywg.0 for ; Sun, 29 Oct 2017 14:26:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc:content-transfer-encoding; bh=zntsYWtNRvpxFjcNxSnfJYQL6Tid5qAua2MIiXUYfoI=; b=jt9v0DLXYh9G3wuJ3tYo3ILHamyr4Z4Q40Y2zfrHk7qpKgHUHrTOlkHO5dKogvvWdV xlkYMhpILaMhh9DJmHWacJzKsSc+IVF2hL6B3wuWImDXojnrG21ezHnA4nETBgCTjURQ iRVG1vHIEGDaP0hrqBjjps77cIl5FQZDYUj68= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd-org.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc:content-transfer-encoding; bh=zntsYWtNRvpxFjcNxSnfJYQL6Tid5qAua2MIiXUYfoI=; b=rsa6NPKwZs5AHykHPbxllUKWp+L7OPq1fTa39GhRMbeSnrtl6j0pssygklZfpo+cf4 RJ5Upxb2fjoGkRseIZXSJX0JET9QPO1UKRU/GPr7NWu5t4sx7A6DMo6+OSrEGeGcalFz itTel/iW7c9FYydFjny7yMsngmu9OQvRE/2pWf3Tei/ie6TyAAlgfl70DN/IGXYTVgyA 90ubGiLBC8mgM03NaFSC6eQ3wPQwNSuCq6fcgHMCNmCtC1dGPrDIxym1BW02hwzfSHHE F/qp+EbyqIoIGpUBo6jotRIbx3xpfd6OSMUU5CIyj8yv/dFVfX+lffbQeK/kEjIsSDpE LGHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc:content-transfer-encoding; bh=zntsYWtNRvpxFjcNxSnfJYQL6Tid5qAua2MIiXUYfoI=; b=Qgb2H/HjPhK2SOybssW8bVXd8JUzcj/jEojT7N5HiAe8S6mjZqp+ZXLBH3BuGw1UaO +NrE0bQT/Uz0E57wH9S/IguwdY9mDf/z3zoxkBtS4M1PhB9LiOYDQAg8WBFWqAHiiT+G ImXkXiUYo74jiL4xqWyisvYXRoiSFI1o8UuRc7YUpe00YezKeXpgABmz+bGad73XZH8Y ZQp7Q7eoqHFiQdXzPKym5s6NDy7mhpxAdC/LXz6l4XAOR6qEyQAzY4V5xbmzx/HzUbUE SIvEz84UzxuLXLq5OcGjnIrN68kw6B+ETxOP6RavJj8IZVYNbkNZywvFihXad1nguKWR cBeg== X-Gm-Message-State: AMCzsaWL6ilq6xs6bXhRJcJoxOc77luzypOxAp/yhWIrSj3pPzsy+H5z AhTSeQ3zck47gk1sheTAGWEHyql6mz9yLszcDof5Eg== X-Google-Smtp-Source: ABhQp+RSaMk+VvUf3lNGDdQqCHd+1sHasp5QJAZn7HEIJmMSEiNEw8Nr7eDqQCqxl+mFsjg/ypSHX85+7UnQBTCeMkY= X-Received: by 10.129.117.9 with SMTP id q9mr4988390ywc.79.1509312409711; Sun, 29 Oct 2017 14:26:49 -0700 (PDT) MIME-Version: 1.0 Sender: lists@eitanadler.com Received: by 10.37.56.66 with HTTP; Sun, 29 Oct 2017 14:26:19 -0700 (PDT) In-Reply-To: References: <201710292040.v9TKeuGp054392@repo.freebsd.org> From: Eitan Adler Date: Sun, 29 Oct 2017 14:26:19 -0700 X-Google-Sender-Auth: 9nLC1GcONLd3G4-n2SvmRJInBW0 Message-ID: Subject: Re: svn commit: r325107 - head To: Warner Losh Cc: src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 21:26:50 -0000 On 29 October 2017 at 14:17, Warner Losh wrote: > >> >> Also remove references to 9.x > > > That's wrong. Please put them back. We "support" building from the tip of > releng/9 still. [60390 14:25:32.777 eax@FlyingEagle ~/svn/fbsd/head]=E2=88=B4svn ci -- UPDATING (svn:head)-[head:325108]-[325108] Sending UPDATING Transmitting file data .done Committing transaction... Committed revision 325110. --=20 Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams From owner-svn-src-all@freebsd.org Sun Oct 29 22:23:07 2017 Return-Path: Delivered-To: svn-src-all@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 00157E4DEC8 for ; Sun, 29 Oct 2017 22:23:06 +0000 (UTC) (envelope-from grehan@freebsd.org) Received: from alto.onthenet.com.au (alto.OntheNet.com.au [203.13.68.12]) by mx1.freebsd.org (Postfix) with ESMTP id A6C78697D9 for ; Sun, 29 Oct 2017 22:23:06 +0000 (UTC) (envelope-from grehan@freebsd.org) Received: from iredmail.onthenet.com.au (iredmail.onthenet.com.au [203.13.68.150]) by alto.onthenet.com.au (Postfix) with ESMTPS id DF92F20ADBEC for ; Mon, 30 Oct 2017 08:15:23 +1000 (AEST) Received: from localhost (iredmail.onthenet.com.au [127.0.0.1]) by iredmail.onthenet.com.au (Postfix) with ESMTP id D8B11281E3E for ; Mon, 30 Oct 2017 08:15:23 +1000 (AEST) X-Amavis-Modified: Mail body modified (using disclaimer) - iredmail.onthenet.com.au Received: from iredmail.onthenet.com.au ([127.0.0.1]) by localhost (iredmail.onthenet.com.au [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id wYjKTdQjAIP7 for ; Mon, 30 Oct 2017 08:15:23 +1000 (AEST) Received: from Peters-MacBook-Pro-2.local (50-0-69-205.dsl.static.fusionbroadband.com [50.0.69.205]) by iredmail.onthenet.com.au (Postfix) with ESMTPSA id 7A63D280910; Mon, 30 Oct 2017 08:15:20 +1000 (AEST) Subject: Re: svn commit: r325108 - head/sys/amd64/vmm/io To: Ian Lepore , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201710292050.v9TKo3j5058456@repo.freebsd.org> <1509310495.21609.60.camel@freebsd.org> From: Peter Grehan Message-ID: <3b1ffc68-def3-04f6-2a1e-af44d6f3b4a5@freebsd.org> Date: Sun, 29 Oct 2017 15:15:17 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <1509310495.21609.60.camel@freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-CMAE-Score: 0 X-CMAE-Analysis: v=2.2 cv=XKlAcUpE c=1 sm=1 tr=0 a=A6CF0fG5TOl4vs6YHvqXgw==:117 a=3jPexO113QScgro132hsCQ==:17 a=IkcTkHD0fZMA:10 a=02M-m0pO-4AA:10 a=mkUh-SqEeZ4b2_Ug4rsA:9 a=QEXdDO2ut3YA:10 wl=host:3 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 22:23:07 -0000 >> =C2=A0 Improve the performance of the hpet timer in bhyve guests by m= aking the >> =C2=A0 timer frequency a power of two.=C2=A0=C2=A0This changes the fr= equency from 10 to >> =C2=A0 16.7 MHz (2 ^ 24 HZ).=C2=A0=C2=A0Using a power of two avoids r= oundoff errors when >> =C2=A0 doing arithmetic in sbintime_t units. >> =20 >> =C2=A0 Testing shows this can fix erratic ntpd behavior in guests usi= ng the >> =C2=A0 hpet timer (which is the default for multicore guests). >> =20 >> =C2=A0 Reported by: bsam@ >> >> Modified: >> =C2=A0 head/sys/amd64/vmm/io/vhpet.c In the future please respect MAINTAINERS and file a phab review for=20 code in this area. later, Peter. From owner-svn-src-all@freebsd.org Mon Oct 30 00:36:09 2017 Return-Path: Delivered-To: svn-src-all@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 D2AE7E5036C; Mon, 30 Oct 2017 00:36:09 +0000 (UTC) (envelope-from eadler@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 888AB6CE30; Mon, 30 Oct 2017 00:36:09 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9U0a8HJ054709; Mon, 30 Oct 2017 00:36:08 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9U0a8ve054708; Mon, 30 Oct 2017 00:36:08 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201710300036.v9U0a8ve054708@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Mon, 30 Oct 2017 00:36:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325111 - head/share/examples/printing X-SVN-Group: head X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: head/share/examples/printing X-SVN-Commit-Revision: 325111 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 00:36:09 -0000 Author: eadler Date: Mon Oct 30 00:36:08 2017 New Revision: 325111 URL: https://svnweb.freebsd.org/changeset/base/325111 Log: Remove now bogus README The SGML referenced was removed in r4719 of the doc repo. Deleted: head/share/examples/printing/README From owner-svn-src-all@freebsd.org Mon Oct 30 01:55:40 2017 Return-Path: Delivered-To: svn-src-all@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 1263FE51932; Mon, 30 Oct 2017 01:55:40 +0000 (UTC) (envelope-from jhibbits@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 CE18B6EABC; Mon, 30 Oct 2017 01:55:39 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9U1tdMA087334; Mon, 30 Oct 2017 01:55:39 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9U1tdjN087333; Mon, 30 Oct 2017 01:55:39 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201710300155.v9U1tdjN087333@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Mon, 30 Oct 2017 01:55:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325112 - head/sys/powerpc/include X-SVN-Group: head X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: head/sys/powerpc/include X-SVN-Commit-Revision: 325112 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 01:55:40 -0000 Author: jhibbits Date: Mon Oct 30 01:55:38 2017 New Revision: 325112 URL: https://svnweb.freebsd.org/changeset/base/325112 Log: Add P5010/P5010E for completeness Modified: head/sys/powerpc/include/spr.h Modified: head/sys/powerpc/include/spr.h ============================================================================== --- head/sys/powerpc/include/spr.h Mon Oct 30 00:36:08 2017 (r325111) +++ head/sys/powerpc/include/spr.h Mon Oct 30 01:55:38 2017 (r325112) @@ -736,6 +736,8 @@ #define SVR_P4040E 0x8208 #define SVR_P4080 0x8201 #define SVR_P4080E 0x8209 +#define SVR_P5010 0x8221 +#define SVR_P5010E 0x8229 #define SVR_P5020 0x8220 #define SVR_P5020E 0x8228 #define SVR_P5021 0x8205 From owner-svn-src-all@freebsd.org Mon Oct 30 02:05:31 2017 Return-Path: Delivered-To: svn-src-all@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 0AAE9E51B22; Mon, 30 Oct 2017 02:05:31 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1F55D6EEC1; Mon, 30 Oct 2017 02:05:30 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id v9U25Qix073181; Sun, 29 Oct 2017 19:05:26 -0700 (PDT) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id v9U25Quk073180; Sun, 29 Oct 2017 19:05:26 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201710300205.v9U25Quk073180@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r325111 - head/share/examples/printing In-Reply-To: <201710300036.v9U0a8ve054708@repo.freebsd.org> To: Eitan Adler Date: Sun, 29 Oct 2017 19:05:26 -0700 (PDT) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 02:05:31 -0000 [ Charset UTF-8 unsupported, converting... ] > Author: eadler > Date: Mon Oct 30 00:36:08 2017 > New Revision: 325111 > URL: https://svnweb.freebsd.org/changeset/base/325111 > > Log: > Remove now bogus README > > The SGML referenced was removed in r4719 of the doc repo. > > Deleted: > head/share/examples/printing/README But the src/tools/tools/epfe/epfe.pl reference is still valid -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-all@freebsd.org Mon Oct 30 02:22:44 2017 Return-Path: Delivered-To: svn-src-all@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 E3E87E51FE6 for ; Mon, 30 Oct 2017 02:22:44 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from pmta2.delivery6.ore.mailhop.org (pmta2.delivery6.ore.mailhop.org [54.200.129.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BD3F06F656 for ; Mon, 30 Oct 2017 02:22:44 +0000 (UTC) (envelope-from ian@freebsd.org) X-MHO-User: 1491f6d5-bd19-11e7-b50b-53dc5ecda239 X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Originating-IP: 73.78.92.27 X-Mail-Handler: DuoCircle Outbound SMTP Received: from ilsoft.org (unknown [73.78.92.27]) by outbound2.ore.mailhop.org (Halon) with ESMTPSA id 1491f6d5-bd19-11e7-b50b-53dc5ecda239; Mon, 30 Oct 2017 02:21:48 +0000 (UTC) Received: from rev (rev [172.22.42.240]) by ilsoft.org (8.15.2/8.15.2) with ESMTP id v9U2Mfep002595; Sun, 29 Oct 2017 20:22:41 -0600 (MDT) (envelope-from ian@freebsd.org) Message-ID: <1509330161.21609.86.camel@freebsd.org> Subject: Re: svn commit: r325108 - head/sys/amd64/vmm/io From: Ian Lepore To: Peter Grehan , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Date: Sun, 29 Oct 2017 20:22:41 -0600 In-Reply-To: <3b1ffc68-def3-04f6-2a1e-af44d6f3b4a5@freebsd.org> References: <201710292050.v9TKo3j5058456@repo.freebsd.org> <1509310495.21609.60.camel@freebsd.org> <3b1ffc68-def3-04f6-2a1e-af44d6f3b4a5@freebsd.org> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.18.5.1 FreeBSD GNOME Team Port Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 02:22:45 -0000 On Sun, 2017-10-29 at 15:15 -0700, Peter Grehan wrote: > > > > > > > >    Improve the performance of the hpet timer in bhyve guests by making the > > >    timer frequency a power of two.  This changes the frequency from 10 to > > >    16.7 MHz (2 ^ 24 HZ).  Using a power of two avoids roundoff errors when > > >    doing arithmetic in sbintime_t units. > > >     > > >    Testing shows this can fix erratic ntpd behavior in guests using the > > >    hpet timer (which is the default for multicore guests). > > >     > > >    Reported by: bsam@ > > > > > > Modified: > > >    head/sys/amd64/vmm/io/vhpet.c >   In the future please respect MAINTAINERS and file a phab review for  > code in this area. > > later, > > Peter. > > In fact I did check maintainers, and I just now checked it again, and seeing nothing on-point, wrote a really snarky reply. Luckily, before hitting send I realized you wouldn't have said anything unless there was an entry in there, so I checked like 4 more times before I noticed the line that begins vmm(4).  I had been looking for a line that began with sys/amd64. So... sorry about that.  Should I revert it and open a review? Longer-term, I was hoping to find some time over the next few weeks to further explore the roundoff errors in the timers and attempt a better fix, and I was definitely intending to put that up for review (especially because it involves math, and I'm always better off asking for help with that). -- Ian From owner-svn-src-all@freebsd.org Mon Oct 30 02:27:27 2017 Return-Path: Delivered-To: svn-src-all@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 9DA0BE52089; Mon, 30 Oct 2017 02:27:27 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7EAD86F7DA; Mon, 30 Oct 2017 02:27:27 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1033) id D3426541F; Mon, 30 Oct 2017 02:27:26 +0000 (UTC) Date: Mon, 30 Oct 2017 02:27:26 +0000 From: Alexey Dokuchaev To: Warner Losh Cc: Eitan Adler , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers Subject: Re: svn commit: r325097 - head Message-ID: <20171030022726.GA63037@FreeBSD.org> References: <201710290825.v9T8PV3W047519@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.8.3 (2017-05-23) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 02:27:27 -0000 On Sun, Oct 29, 2017 at 05:57:06AM -0600, Warner Losh wrote: > On Oct 29, 2017 2:25 AM, "Eitan Adler" wrote: > > New Revision: 325097 > URL: https://svnweb.freebsd.org/changeset/base/325097 > > Log: > Update UPDATING > > - Remove FreeBSD 4.x of building the kernel. > > > It is not the 4.x way of building the kernel. It's a completely supported > alte restive for those situations where buildkernel is not a good fit. +1, it's a lot more straightforward and actually much faster for iterative kernel builds, allows to inject things into the build process [*], etc. I can't imagine doing any kernel hacking without the traditional config/ build way. Would you mind putting the instruction back, perhaps after the "new order" one, with some accompanying text a-la "mostly for developers/hackers' use"? ./danfe [*] 20170408171501.GA96749@FreeBSD.org (-developers@, so no weblink) From owner-svn-src-all@freebsd.org Mon Oct 30 02:30:32 2017 Return-Path: Delivered-To: svn-src-all@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 1FA2AE52167 for ; Mon, 30 Oct 2017 02:30:32 +0000 (UTC) (envelope-from grehan@freebsd.org) Received: from alto.onthenet.com.au (alto.OntheNet.com.au [203.13.68.12]) by mx1.freebsd.org (Postfix) with ESMTP id C14176FA31 for ; Mon, 30 Oct 2017 02:30:31 +0000 (UTC) (envelope-from grehan@freebsd.org) Received: from iredmail.onthenet.com.au (iredmail.onthenet.com.au [203.13.68.150]) by alto.onthenet.com.au (Postfix) with ESMTPS id D681F20ADC0D for ; Mon, 30 Oct 2017 12:30:27 +1000 (AEST) Received: from localhost (iredmail.onthenet.com.au [127.0.0.1]) by iredmail.onthenet.com.au (Postfix) with ESMTP id CD0A3281E00 for ; Mon, 30 Oct 2017 12:30:27 +1000 (AEST) X-Amavis-Modified: Mail body modified (using disclaimer) - iredmail.onthenet.com.au Received: from iredmail.onthenet.com.au ([127.0.0.1]) by localhost (iredmail.onthenet.com.au [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id FU6bDfyaokkY for ; Mon, 30 Oct 2017 12:30:27 +1000 (AEST) Received: from Peters-MacBook-Pro-2.local (c-67-180-92-13.hsd1.ca.comcast.net [67.180.92.13]) by iredmail.onthenet.com.au (Postfix) with ESMTPSA id 9B1862808EE; Mon, 30 Oct 2017 12:30:25 +1000 (AEST) Subject: Re: svn commit: r325108 - head/sys/amd64/vmm/io To: Ian Lepore , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201710292050.v9TKo3j5058456@repo.freebsd.org> <1509310495.21609.60.camel@freebsd.org> <3b1ffc68-def3-04f6-2a1e-af44d6f3b4a5@freebsd.org> <1509330161.21609.86.camel@freebsd.org> From: Peter Grehan Message-ID: <66f496cb-c2c4-3044-333e-84540bdd64c2@freebsd.org> Date: Sun, 29 Oct 2017 19:30:25 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <1509330161.21609.86.camel@freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-CMAE-Score: 0 X-CMAE-Analysis: v=2.2 cv=XKlAcUpE c=1 sm=1 tr=0 a=A6CF0fG5TOl4vs6YHvqXgw==:117 a=5eVCmCvhg37cu/pjidAGzw==:17 a=IkcTkHD0fZMA:10 a=02M-m0pO-4AA:10 a=U6saa0QbdT0wPyApqsAA:9 a=QEXdDO2ut3YA:10 wl=host:3 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 02:30:32 -0000 Hi Ian, > In fact I did check maintainers, and I just now checked it again, and > seeing nothing on-point, wrote a really snarky reply. >=20 > Luckily, before hitting send I realized you wouldn't have said anything > unless there was an entry in there, so I checked like 4 more times > before I noticed the line that begins vmm(4). =C2=A0I had been looking = for a > line that began with sys/amd64. >=20 > So... sorry about that. =C2=A0Should I revert it and open a review? No, it's fine. It's a good idea in general for code in that area since=20 there are often unintended side-effects with guest behaviour, and=20 putting up a review can at least flush out folk who might have more=20 insight into that. I'll update the maintainer's file to include the directory. > Longer-term, I was hoping to find some time over the next few weeks to > further explore the roundoff errors in the timers and attempt a better > fix, and I was definitely intending to put that up for review > (especially because it involves math, and I'm always better off asking > for help with that). I know Rod Grimes is going to be doing some testing this week with=20 clock drift in guests, and I'll do some dtrace work on HPET usage with=20 non-FreeBSD guests. Timer accuracy has long been an issue with bhyve so any help in this=20 area is much appreciated. later, Peter. From owner-svn-src-all@freebsd.org Mon Oct 30 02:31:10 2017 Return-Path: Delivered-To: svn-src-all@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 28090E521CD; Mon, 30 Oct 2017 02:31:10 +0000 (UTC) (envelope-from jhibbits@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 EA12C6FBDA; Mon, 30 Oct 2017 02:31:09 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9U2V9rG099817; Mon, 30 Oct 2017 02:31:09 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9U2V9pp099816; Mon, 30 Oct 2017 02:31:09 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201710300231.v9U2V9pp099816@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Mon, 30 Oct 2017 02:31:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325113 - head/sys/dev/flash X-SVN-Group: head X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: head/sys/dev/flash X-SVN-Commit-Revision: 325113 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 02:31:10 -0000 Author: jhibbits Date: Mon Oct 30 02:31:08 2017 New Revision: 325113 URL: https://svnweb.freebsd.org/changeset/base/325113 Log: Add Microchip 1-MBit SPI flash ID Used on the AmigaOne X5000. Modified: head/sys/dev/flash/mx25l.c Modified: head/sys/dev/flash/mx25l.c ============================================================================== --- head/sys/dev/flash/mx25l.c Mon Oct 30 01:55:38 2017 (r325112) +++ head/sys/dev/flash/mx25l.c Mon Oct 30 02:31:08 2017 (r325113) @@ -122,6 +122,7 @@ struct mx25l_flash_ident flash_devices[] = { { "s25fl064", 0x01, 0x0216, 64 * 1024, 128, FL_NONE }, { "s25fl128", 0x01, 0x2018, 64 * 1024, 256, FL_NONE }, { "s25fl256s", 0x01, 0x0219, 64 * 1024, 512, FL_NONE }, + { "SST25VF010A", 0xbf, 0x2549, 4 * 1024, 32, FL_ERASE_4K | FL_ERASE_32K }, { "SST25VF032B", 0xbf, 0x254a, 64 * 1024, 64, FL_ERASE_4K | FL_ERASE_32K }, /* Winbond -- w25x "blocks" are 64K, "sectors" are 4KiB */ From owner-svn-src-all@freebsd.org Mon Oct 30 03:12:30 2017 Return-Path: Delivered-To: svn-src-all@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 84E15E52C96; Mon, 30 Oct 2017 03:12:30 +0000 (UTC) (envelope-from imp@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 3C5BC7112A; Mon, 30 Oct 2017 03:12:30 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9U3CTf0021307; Mon, 30 Oct 2017 03:12:29 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9U3CSlS021295; Mon, 30 Oct 2017 03:12:28 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201710300312.v9U3CSlS021295@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Mon, 30 Oct 2017 03:12:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325114 - in head/sys/boot: mips/beri/boot2 mips/beri/loader mips/uboot ofw/libofw powerpc/boot1.chrp powerpc/kboot powerpc/ofw powerpc/ps3 powerpc/uboot sparc64/boot1 sparc64/loader X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/sys/boot: mips/beri/boot2 mips/beri/loader mips/uboot ofw/libofw powerpc/boot1.chrp powerpc/kboot powerpc/ofw powerpc/ps3 powerpc/uboot sparc64/boot1 sparc64/loader X-SVN-Commit-Revision: 325114 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 03:12:30 -0000 Author: imp Date: Mon Oct 30 03:12:28 2017 New Revision: 325114 URL: https://svnweb.freebsd.org/changeset/base/325114 Log: Use defs.mk defins in most MD code Use defines from defs.mk in most MD code (the biggest exception is x86, which will be its own commit due to its size). Prefer including bsd.init.mk over the variations (../Makefile.inc and src.opts.mk being the two biggest ones). Sponsored by: Netflix Modified: head/sys/boot/mips/beri/boot2/Makefile head/sys/boot/mips/beri/loader/Makefile head/sys/boot/mips/uboot/Makefile head/sys/boot/ofw/libofw/Makefile head/sys/boot/powerpc/boot1.chrp/Makefile head/sys/boot/powerpc/kboot/Makefile head/sys/boot/powerpc/ofw/Makefile head/sys/boot/powerpc/ps3/Makefile head/sys/boot/powerpc/uboot/Makefile head/sys/boot/sparc64/boot1/Makefile head/sys/boot/sparc64/loader/Makefile Modified: head/sys/boot/mips/beri/boot2/Makefile ============================================================================== --- head/sys/boot/mips/beri/boot2/Makefile Mon Oct 30 02:31:08 2017 (r325113) +++ head/sys/boot/mips/beri/boot2/Makefile Mon Oct 30 03:12:28 2017 (r325114) @@ -29,6 +29,8 @@ # # $FreeBSD$ +.include + INSTALLFLAGS= -b LOADERS= flashboot jtagboot @@ -47,8 +49,9 @@ AFLAGS= -G0 CFLAGS= -ffreestanding \ -I${.CURDIR} \ - -I${.CURDIR}/../../../common \ - -I${.CURDIR}/../../../.. \ + -I${SASRC} \ + -I${LDRSRC} \ + -I${SYSDIR} \ -D_KERNEL \ -Wall \ -G0 \ @@ -62,8 +65,8 @@ LDFLAGS= -nostdlib \ -G0 \ -L${.CURDIR} -.PATH: ${.CURDIR}/../common -CFLAGS+= -I${.CURDIR}/../common +.PATH: ${BOOTSRC}/mips/beri/common +CFLAGS+= -I${BOOTSRC}/mips/beri/common flashboot.elf: relocate.o start.o boot2.o altera_jtag_uart.o cfi.o sdcard.o ${CC} ${LDFLAGS} -T ${.CURDIR}/flashboot.ldscript -o ${.TARGET} \ Modified: head/sys/boot/mips/beri/loader/Makefile ============================================================================== --- head/sys/boot/mips/beri/loader/Makefile Mon Oct 30 02:31:08 2017 (r325113) +++ head/sys/boot/mips/beri/loader/Makefile Mon Oct 30 03:12:28 2017 (r325114) @@ -29,7 +29,8 @@ # # $FreeBSD$ -.include +.include + MK_SSP= no MAN= @@ -67,11 +68,11 @@ LOADER_GZIP_SUPPORT?= yes LOADER_BZIP2_SUPPORT?= yes # Always add MI sources -.include "../../../loader.mk" +.include "${BOOTSRC}/loader.mk" # BERI files common to boot2 and loader -.PATH: ${.CURDIR}/../common -CFLAGS+= -I${.CURDIR}/../common +.PATH: ${BOOTSRC}/mips/beri/common +CFLAGS+= -I${BOOTSRC}/mips/beri/common # Loader-specific MD headers CFLAGS+= -I${.CURDIR} @@ -98,8 +99,8 @@ loader.help: help.common help.mips cat ${.ALLSRC} | \ awk -f ${LDRSRC}/merge_help.awk > ${.TARGET} -.PATH: ${.CURDIR}/../../../forth -.include "${.CURDIR}/../../../forth/Makefile.inc" +.PATH: ${BOOTSRC}/forth +.include "${BOOTSRC}/forth/Makefile.inc" FILES+= loader.rc menu.rc @@ -108,8 +109,8 @@ FILES+= loader.rc menu.rc CFLAGS+= -ffunction-sections -fdata-sections CFLAGS+= -Wl,--gc-sections # Link USB BOOT library -LDADD+= ${.OBJDIR}/../../../usb/libusbboot.a -CFLAGS+= -I${.CURDIR}/../../../usb +LDADD+= ${BOOTOBJ}/usb/libusbboot.a +CFLAGS+= -I${BOOTSRC}/usb # Define USB SUPPORT CFLAGS+= -DLOADER_USB_SUPPORT .endif Modified: head/sys/boot/mips/uboot/Makefile ============================================================================== --- head/sys/boot/mips/uboot/Makefile Mon Oct 30 02:31:08 2017 (r325113) +++ head/sys/boot/mips/uboot/Makefile Mon Oct 30 03:12:28 2017 (r325114) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include FILES= ubldr @@ -26,7 +26,7 @@ LOADER_BZIP2_SUPPORT?= no LOADER_FDT_SUPPORT= ${MK_FDT} # Always add MI sources -.include "../../loader.mk" +.include "${BOOTSRC}/loader.mk" CFLAGS+= -I. CLEANFILES+= loader.help @@ -35,14 +35,14 @@ CFLAGS+= -ffreestanding -msoft-float -g LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.${MACHINE_CPUARCH} -.include "../../uboot.mk" +.include "${BOOTSRC}/uboot.mk" DPADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSA} LDADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSA} OBJS+= ${SRCS:N*.h:R:S/$/.o/g} -loader.help: help.common help.uboot ${.CURDIR}/../../fdt/help.fdt +loader.help: help.common help.uboot ${BOOTSRC}/fdt/help.fdt cat ${.ALLSRC} | \ awk -f ${LDRSRC}/merge_help.awk > ${.TARGET} @@ -60,8 +60,8 @@ ubldr: ${OBJS} ldscript.abs ${.CURDIR}/ldscript.${MACH CLEANFILES+= ldscript.abs ldscript.pie ubldr ubldr.pie ubldr.bin .if !defined(LOADER_ONLY) -.PATH: ${.CURDIR}/../../forth -.include "${.CURDIR}/../../forth/Makefile.inc" +.PATH: ${BOOTSRC}/forth +.include "${BOOTSRC}/forth/Makefile.inc" # Install loader.rc. FILES+= loader.rc Modified: head/sys/boot/ofw/libofw/Makefile ============================================================================== --- head/sys/boot/ofw/libofw/Makefile Mon Oct 30 02:31:08 2017 (r325113) +++ head/sys/boot/ofw/libofw/Makefile Mon Oct 30 03:12:28 2017 (r325114) @@ -1,5 +1,7 @@ # $FreeBSD$ +.include + LIB= ofw INTERNALLIB= Modified: head/sys/boot/powerpc/boot1.chrp/Makefile ============================================================================== --- head/sys/boot/powerpc/boot1.chrp/Makefile Mon Oct 30 02:31:08 2017 (r325113) +++ head/sys/boot/powerpc/boot1.chrp/Makefile Mon Oct 30 03:12:28 2017 (r325114) @@ -1,5 +1,7 @@ # $FreeBSD$ +.include + SSP_CFLAGS= PROG= boot1.elf @@ -12,13 +14,11 @@ SRCS= boot1.c ashldi3.c syncicache.c MAN= CFLAGS= -ffreestanding -msoft-float \ - -I${.CURDIR}/../../common -I${.CURDIR}/../../../ \ + -I${LDRSRC} -I${SYSDIR} -I${SASRC} \ -D_STANDALONE LDFLAGS=-nostdlib -static -Wl,-N -.include "../Makefile.inc" - -.PATH: ${.CURDIR}/../../../libkern ${SRCTOP}/lib/libc/powerpc/gen ${.CURDIR} +.PATH: ${SYSDIR}/libkern ${SRCTOP}/lib/libc/powerpc/gen ${.CURDIR} # The following inserts out objects into a template HFS # created by generate-hfs.sh Modified: head/sys/boot/powerpc/kboot/Makefile ============================================================================== --- head/sys/boot/powerpc/kboot/Makefile Mon Oct 30 02:31:08 2017 (r325113) +++ head/sys/boot/powerpc/kboot/Makefile Mon Oct 30 03:12:28 2017 (r325114) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include MK_SSP= no MAN= @@ -25,19 +25,18 @@ LOADER_FDT_SUPPORT= yes LOADER_BZIP2_SUPPORT?= no .if ${LOADER_FDT_SUPPORT} == "yes" -CFLAGS+= -I${.CURDIR}/../../fdt -CFLAGS+= -I${.OBJDIR}/../../fdt -CFLAGS+= -I${.CURDIR}/../../../contrib/libfdt +CFLAGS+= -I${FDTSRC} +CFLAGS+= -I${SYSDIR}/contrib/libfdt CFLAGS+= -DLOADER_FDT_SUPPORT -LIBFDT= ${.OBJDIR}/../../fdt/libfdt.a +LIBFDT= ${BOOTOBJ}/fdt/libfdt.a .endif CFLAGS+= -mcpu=powerpc64 # Always add MI sources -.include "../../loader.mk" -.PATH: ${.CURDIR}/../../../libkern -CFLAGS+= -I${.CURDIR}/../../.. +.include "${BOOTSRC}/loader.mk" +.PATH: ${SYSDIR}/libkern +CFLAGS+= -I${SYSDIR} CFLAGS+= -I. CLEANFILES+= loader.help @@ -52,19 +51,15 @@ LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.powe # 64-bit bridge extensions CFLAGS+= -Wa,-mppc64bridge -# Pull in common loader code -#.PATH: ${.CURDIR}/../../ofw/common -#.include "${.CURDIR}/../../ofw/common/Makefile.inc" - DPADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA32} LDADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA32} -loader.help: help.common help.kboot ${.CURDIR}/../../fdt/help.fdt +loader.help: help.common help.kboot ${FDTSRC}/help.fdt cat ${.ALLSRC} | \ awk -f ${LDRSRC}/merge_help.awk > ${.TARGET} -.PATH: ${.CURDIR}/../../forth -.include "${.CURDIR}/../../forth/Makefile.inc" +.PATH: ${BOOTSRC}/forth +.include "${BOOTSRC}/forth/Makefile.inc" FILES+= loader.rc menu.rc Modified: head/sys/boot/powerpc/ofw/Makefile ============================================================================== --- head/sys/boot/powerpc/ofw/Makefile Mon Oct 30 02:31:08 2017 (r325113) +++ head/sys/boot/powerpc/ofw/Makefile Mon Oct 30 03:12:28 2017 (r325114) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include MK_SSP= no MAN= @@ -25,18 +25,17 @@ LOADER_FDT_SUPPORT?= yes .if ${LOADER_FDT_SUPPORT} == "yes" SRCS+= ofwfdt.c -CFLAGS+= -I${.CURDIR}/../../fdt -CFLAGS+= -I${.OBJDIR}/../../fdt -CFLAGS+= -I${.CURDIR}/../../../contrib/libfdt +CFLAGS+= -I${FDTSRC} +CFLAGS+= -I${SYSDIR}/contrib/libfdt CFLAGS+= -DLOADER_FDT_SUPPORT -LIBFDT= ${.OBJDIR}/../../fdt/libfdt.a +LIBFDT= ${BOOTOBJ}/fdt/libfdt.a .endif # Always add MI sources -.include "../../loader.mk" +.include "${BOOTSRC}/loader.mk" -.PATH: ${.CURDIR}/../../../libkern -CFLAGS+= -I${.CURDIR}/../../.. +.PATH: ${SYSDIR}/libkern +CFLAGS+= -I${SYSDIR} CFLAGS+= -I. CLEANFILES+= loader.help @@ -49,22 +48,22 @@ CFLAGS+= -DRELOC=${RELOC} LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.powerpc # Pull in common loader code -.PATH: ${.CURDIR}/../../ofw/common -.include "${.CURDIR}/../../ofw/common/Makefile.inc" +.PATH: ${BOOTSRC}/ofw/common +.include "${BOOTSRC}/ofw/common/Makefile.inc" # Open Firmware standalone support library -LIBOFW= ${.OBJDIR}/../../ofw/libofw/libofw.a -CFLAGS+= -I${.CURDIR}/../../ofw/libofw +LIBOFW= ${BOOTOBJ}/ofw/libofw/libofw.a +CFLAGS+= -I${BOOTSRC}/ofw/libofw DPADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA32} LDADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA32} -loader.help: help.common help.ofw ${.CURDIR}/../../fdt/help.fdt +loader.help: help.common help.ofw ${FDTSRC}/help.fdt cat ${.ALLSRC} | \ awk -f ${LDRSRC}/merge_help.awk > ${.TARGET} -.PATH: ${.CURDIR}/../../forth -.include "${.CURDIR}/../../forth/Makefile.inc" +.PATH: ${BOOTSRC}/forth +.include "${BOOTSRC}/forth/Makefile.inc" FILES+= loader.rc menu.rc Modified: head/sys/boot/powerpc/ps3/Makefile ============================================================================== --- head/sys/boot/powerpc/ps3/Makefile Mon Oct 30 02:31:08 2017 (r325113) +++ head/sys/boot/powerpc/ps3/Makefile Mon Oct 30 03:12:28 2017 (r325114) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include MK_SSP= no MAN= @@ -25,18 +25,17 @@ LOADER_FDT_SUPPORT?= no LOADER_BZIP2_SUPPORT?= no .if ${LOADER_FDT_SUPPORT} == "yes" -CFLAGS+= -I${.CURDIR}/../../fdt -CFLAGS+= -I${.OBJDIR}/../../fdt +CFLAGS+= -I${FDTSRC} CFLAGS+= -DLOADER_FDT_SUPPORT -LIBFDT= ${.OBJDIR}/../../fdt/libfdt.a +LIBFDT= ${BOOTOBJ}/fdt/libfdt.a .endif CFLAGS+= -mcpu=powerpc64 # Always add MI sources -.include "../../loader.mk" -.PATH: ${.CURDIR}/../../../libkern -CFLAGS+= -I${.CURDIR}/../../.. +.include "${BOOTSRC}/loader.mk" +.PATH: ${SYSDIR}/libkern +CFLAGS+= -I${SYSDIR} CFLAGS+= -I. CLEANFILES+= loader.help @@ -48,10 +47,6 @@ CFLAGS+= -DRELOC=${RELOC} LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.powerpc -# Pull in common loader code -#.PATH: ${.CURDIR}/../../ofw/common -#.include "${.CURDIR}/../../ofw/common/Makefile.inc" - DPADD= ${LIBFICL} ${LIBOFW} ${LIBSA32} LDADD= ${LIBFICL} ${LIBOFW} ${LIBSA32} @@ -60,12 +55,12 @@ SC_DFLT_FONT=cp437 font.h: uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h -loader.help: help.common help.ps3 ${.CURDIR}/../../fdt/help.fdt +loader.help: help.common help.ps3 ${FDTSRC}/help.fdt cat ${.ALLSRC} | \ awk -f ${LDRSRC}/merge_help.awk > ${.TARGET} -.PATH: ${.CURDIR}/../../forth -.include "${.CURDIR}/../../forth/Makefile.inc" +.PATH: ${BOOTSRC}/forth +.include "${BOOTSRC}/forth/Makefile.inc" FILES+= loader.rc menu.rc Modified: head/sys/boot/powerpc/uboot/Makefile ============================================================================== --- head/sys/boot/powerpc/uboot/Makefile Mon Oct 30 02:31:08 2017 (r325113) +++ head/sys/boot/powerpc/uboot/Makefile Mon Oct 30 03:12:28 2017 (r325114) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include PROG= ubldr NEWVERSWHAT= "U-Boot loader" ${MACHINE_ARCH} @@ -22,9 +22,9 @@ LOADER_BZIP2_SUPPORT?= no LOADER_FDT_SUPPORT= ${MK_FDT} # Always add MI sources -.include "../../loader.mk" -.PATH: ${.CURDIR}/../../../libkern -CFLAGS+= -I${.CURDIR}/../../.. +.include "${BOOTSRC}/loader.mk" +.PATH: ${SYSDIR}/libkern +CFLAGS+= -I${SYSDIR} CFLAGS+= -I. CLEANFILES+= ${PROG}.help @@ -33,16 +33,16 @@ CFLAGS+= -ffreestanding LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.powerpc -.include "../../uboot.mk" +.include "${BOOTSRC}/uboot.mk" DPADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSA32} LDADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSA32} -loader.help: help.common help.uboot ${.CURDIR}/../../fdt/help.fdt +loader.help: help.common help.uboot ${BOOTSRC}/fdt/help.fdt cat ${.ALLSRC} | \ awk -f ${LDRSRC}/merge_help.awk > ${.TARGET} -.PATH: ${.CURDIR}/../../forth +.PATH: ${BOOTSRC}/forth FILES= loader.help .include Modified: head/sys/boot/sparc64/boot1/Makefile ============================================================================== --- head/sys/boot/sparc64/boot1/Makefile Mon Oct 30 02:31:08 2017 (r325113) +++ head/sys/boot/sparc64/boot1/Makefile Mon Oct 30 03:12:28 2017 (r325114) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include "../Makefile.inc" +.include PROG= boot1.elf INTERNALPROG= @@ -13,7 +13,7 @@ BOOTBLOCKBASE= 0x4000 CFLAGS.clang+=-mcmodel=small CFLAGS.gcc+=-mcmodel=medlow -CFLAGS+=-Os -I${.CURDIR}/../../common +CFLAGS+=-Os -I${LDRSRC} -nostdlib LDFLAGS=-Ttext ${BOOTBLOCKBASE} -Wl,-N # Construct boot1. sunlabel expects it to contain zeroed-out space for the Modified: head/sys/boot/sparc64/loader/Makefile ============================================================================== --- head/sys/boot/sparc64/loader/Makefile Mon Oct 30 02:31:08 2017 (r325113) +++ head/sys/boot/sparc64/loader/Makefile Mon Oct 30 03:12:28 2017 (r325114) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include MK_SSP= no MAN= @@ -25,18 +25,20 @@ LOADER_GZIP_SUPPORT?= yes LOADER_BZIP2_SUPPORT?= no LOADER_DEBUG?= no +CFLAGS+=-nostdlib + .if ${LOADER_DEBUG} == "yes" CFLAGS+= -DLOADER_DEBUG .endif .if ${LOADER_ZFS_SUPPORT} == "yes" CFLAGS+= -DLOADER_ZFS_SUPPORT -CFLAGS+= -I${.CURDIR}/../../zfs -CFLAGS+= -I${.CURDIR}/../../../cddl/boot/zfs -LIBZFSBOOT= ${.OBJDIR}/../../zfs/libzfsboot.a +CFLAGS+= -I${BOOTSRC}/zfs +CFLAGS+= -I${SYSDIR}/cddl/boot/zfs +LIBZFSBOOT= ${BOOTOBJ}/zfs/libzfsboot.a .endif # Always add MI sources -.include "../../loader.mk" +.include "${BOOTSRC}/loader.mk" CFLAGS+= -I. CLEANFILES+= loader.help @@ -44,8 +46,8 @@ CLEANFILES+= loader.help LDFLAGS= -static # Open Firmware standalone support library -LIBOFW= ${.OBJDIR}/../../ofw/libofw/libofw.a -CFLAGS+= -I${.CURDIR}/../../ofw/libofw/ +LIBOFW= ${BOOTOBJ}/ofw/libofw/libofw.a +CFLAGS+= -I${BOOTSRC}/ofw/libofw/ # Need sys/ for crypto/intake.h CFLAGS+= -I${SRCTOP}/sys @@ -57,8 +59,8 @@ loader.help: help.common help.sparc64 cat ${.ALLSRC} | \ awk -f ${LDRSRC}/merge_help.awk > ${.TARGET} -.PATH: ${.CURDIR}/../../forth -.include "${.CURDIR}/../../forth/Makefile.inc" +.PATH: ${BOOTSRC}/forth +.include "${BOOTSRC}/forth/Makefile.inc" FILES+= loader.rc menu.rc From owner-svn-src-all@freebsd.org Mon Oct 30 03:12:35 2017 Return-Path: Delivered-To: svn-src-all@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 4E472E52C9F; Mon, 30 Oct 2017 03:12:35 +0000 (UTC) (envelope-from imp@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 1B6A771139; Mon, 30 Oct 2017 03:12:34 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9U3CYeG021362; Mon, 30 Oct 2017 03:12:34 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9U3CYXJ021361; Mon, 30 Oct 2017 03:12:34 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201710300312.v9U3CYXJ021361@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Mon, 30 Oct 2017 03:12:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325115 - head/tools/boot X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/tools/boot X-SVN-Commit-Revision: 325115 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 03:12:35 -0000 Author: imp Date: Mon Oct 30 03:12:34 2017 New Revision: 325115 URL: https://svnweb.freebsd.org/changeset/base/325115 Log: Fix parallel build issues and add MK_ZFS=no case To ensure that I don't break the MK_ZFS=no case (currently working), add that to the build, at least for i386 and amd64. Also, out of an abundance of caution, clean single threaded, and then build in a separate make. Otherwise, I hit a race where we build before objdir has been created, which breaks at the moment. Sponsored by: Netflix Modified: head/tools/boot/universe.sh Modified: head/tools/boot/universe.sh ============================================================================== --- head/tools/boot/universe.sh Mon Oct 30 03:12:28 2017 (r325114) +++ head/tools/boot/universe.sh Mon Oct 30 03:12:34 2017 (r325115) @@ -33,9 +33,33 @@ for i in \ ; do ta=${i##*/} echo -n "Building $ta..." - ( ( make buildenv TARGET_ARCH=$ta BUILDENV_SHELL="make -j 20 clean cleandepend cleandir obj depend all" \ - > _.boot.${ta}.log 2>&1 ) && echo Success ) || echo Fail + if ! make buildenv TARGET_ARCH=$ta BUILDENV_SHELL="make clean cleandepend cleandir obj depend" \ + > _.boot.${ta}.log 2>&1; then + echo "Fail (cleanup)" + continue + fi + if ! make buildenv TARGET_ARCH=$ta BUILDENV_SHELL="make -j 20 all" \ + >> _.boot.${ta}.log 2>&1; then + echo "Fail (build)" + continue + fi + echo "Success" done - - - +for i in \ + amd64/amd64 \ + i386/i386 \ + ; do + ta=${i##*/} + echo -n "Building $ta MK_ZFS=no..." + if ! make buildenv TARGET_ARCH=$ta BUILDENV_SHELL="make clean cleandepend cleandir obj depend" \ + > _.boot.${ta}.noZFS.log 2>&1; then + echo "Fail (cleanup)" + continue + fi + if ! make buildenv TARGET_ARCH=$ta BUILDENV_SHELL="make MK_ZFS=no -j 20 all" \ + >> _.boot.${ta}.noZFS.log 2>&1; then + echo "Fail (build)" + continue + fi + echo "Success" +done From owner-svn-src-all@freebsd.org Mon Oct 30 03:12:42 2017 Return-Path: Delivered-To: svn-src-all@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 BD457E52CE7; Mon, 30 Oct 2017 03:12:42 +0000 (UTC) (envelope-from imp@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 B9EDC71172; Mon, 30 Oct 2017 03:12:39 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9U3CcSJ021417; Mon, 30 Oct 2017 03:12:38 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9U3CcCT021416; Mon, 30 Oct 2017 03:12:38 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201710300312.v9U3CcCT021416@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Mon, 30 Oct 2017 03:12:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325116 - head X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 325116 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 03:12:43 -0000 Author: imp Date: Mon Oct 30 03:12:38 2017 New Revision: 325116 URL: https://svnweb.freebsd.org/changeset/base/325116 Log: Return proper status from buildenv. make buildenv BUILDENV_SHELL= more useful. Remove '|| true' from the command line so that errors are properly returned. There appears to be no reason for it, and it dates back to the original commit by ru@. Sponsored by: Netflix Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Mon Oct 30 03:12:34 2017 (r325115) +++ head/Makefile.inc1 Mon Oct 30 03:12:38 2017 (r325116) @@ -991,8 +991,7 @@ buildenv: .PHONY .if ${BUILDENV_SHELL:M*zsh*} @echo For ZSH you must run: export CPUTYPE=${TARGET_CPUTYPE} .endif - @cd ${BUILDENV_DIR} && env ${WMAKEENV} BUILDENV=1 ${BUILDENV_SHELL} \ - || true + @cd ${BUILDENV_DIR} && env ${WMAKEENV} BUILDENV=1 ${BUILDENV_SHELL} TOOLCHAIN_TGTS= ${WMAKE_TGTS:Neverything:Nbuild${libcompat}} toolchain: ${TOOLCHAIN_TGTS} .PHONY From owner-svn-src-all@freebsd.org Mon Oct 30 03:25:24 2017 Return-Path: Delivered-To: svn-src-all@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 4AB5DE530E0; Mon, 30 Oct 2017 03:25:24 +0000 (UTC) (envelope-from imp@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 13B447188E; Mon, 30 Oct 2017 03:25:24 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9U3PNqd025476; Mon, 30 Oct 2017 03:25:23 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9U3PNDS025475; Mon, 30 Oct 2017 03:25:23 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201710300325.v9U3PNDS025475@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Mon, 30 Oct 2017 03:25:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325117 - head/sys/cam/ata X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sys/cam/ata X-SVN-Commit-Revision: 325117 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 03:25:24 -0000 Author: imp Date: Mon Oct 30 03:25:22 2017 New Revision: 325117 URL: https://svnweb.freebsd.org/changeset/base/325117 Log: Send IDLE IMMEDIATE for warm boot. We must send either an IDLE IMMEDIATE or a STANDBY IMMEDIATE to drives on warm boot so their SMART and other volatile data is persisted. However, for a warm boot we don't want to send STANDBY IMMEDIATE to some spinning drives because they will spin down. If there's a lot of these drives on the system, that can cause a thundering herd problem at startup time (that in extreme cases causes timeout in device discovery). Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D12811 Modified: head/sys/cam/ata/ata_da.c Modified: head/sys/cam/ata/ata_da.c ============================================================================== --- head/sys/cam/ata/ata_da.c Mon Oct 30 03:12:38 2017 (r325116) +++ head/sys/cam/ata/ata_da.c Mon Oct 30 03:25:22 2017 (r325117) @@ -3534,17 +3534,29 @@ adaspindown(uint8_t cmd, int flags) static void adashutdown(void *arg, int howto) { + int how; adaflush(); /* - * STANDBY IMMEDIATE flushes any volatile data to the drive so - * do this always to ensure we flush a cosnsistent state to - * the drive. adaspindown will ensure that we don't send this - * to a drive that doesn't support it. + * STANDBY IMMEDIATE saves any volatile data to the drive. It also spins + * down hard drives. IDLE IMMEDIATE also saves the volatile data without + * a spindown. We send the former when we expect to lose power soon. For + * a warm boot, we send the latter to avoid a thundering herd of spinups + * just after the kernel loads while probing. We have to do something to + * flush the data because the BIOS in many systems resets the HBA + * causing a COMINIT/COMRESET negotiation, which some drives interpret + * as license to toss the volatile data, and others count as unclean + * shutdown when in the Active PM state in SMART attributes. + * + * adaspindown will ensure that we don't send this to a drive that + * doesn't support it. */ - if (ada_spindown_shutdown != 0) - adaspindown(ATA_STANDBY_IMMEDIATE, 0); + if (ada_spindown_shutdown != 0) { + how = (howto & (RB_HALT | RB_POWEROFF | RB_POWERCYCLE)) ? + ATA_STANDBY_IMMEDIATE : ATA_IDLE_IMMEDIATE; + adaspindown(how, 0); + } } static void From owner-svn-src-all@freebsd.org Mon Oct 30 03:41:06 2017 Return-Path: Delivered-To: svn-src-all@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 3C24FE53328; Mon, 30 Oct 2017 03:41:06 +0000 (UTC) (envelope-from jhibbits@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 A56A571E75; Mon, 30 Oct 2017 03:41:05 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9U3f4x5029826; Mon, 30 Oct 2017 03:41:04 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9U3f4T8029819; Mon, 30 Oct 2017 03:41:04 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201710300341.v9U3f4T8029819@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Mon, 30 Oct 2017 03:41:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325118 - in head/sys: contrib/ncsw/Peripherals/BM contrib/ncsw/Peripherals/FM contrib/ncsw/Peripherals/FM/HC contrib/ncsw/Peripherals/FM/MAC contrib/ncsw/Peripherals/FM/MACSEC contrib/... X-SVN-Group: head X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: in head/sys: contrib/ncsw/Peripherals/BM contrib/ncsw/Peripherals/FM contrib/ncsw/Peripherals/FM/HC contrib/ncsw/Peripherals/FM/MAC contrib/ncsw/Peripherals/FM/MACSEC contrib/ncsw/Peripherals/FM/Pcd c... X-SVN-Commit-Revision: 325118 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 03:41:06 -0000 Author: jhibbits Date: Mon Oct 30 03:41:04 2017 New Revision: 325118 URL: https://svnweb.freebsd.org/changeset/base/325118 Log: Update DPAA SDK to SDK 2.0 This adds some support for ARM as well as 64-bit. 64-bit on PowerPC is currently not working, and ARM support has not been completed or tested on the FreeBSD side. As this was imported from a Linux tree, it includes some Linux-isms (ioread/iowrite), so compile with the LinuxKPI for now. This may change in the future. Added: head/sys/contrib/ncsw/Peripherals/FM/MAC/fman_crc32.c (contents, props changed) head/sys/contrib/ncsw/Peripherals/FM/MAC/fman_crc32.h (contents, props changed) head/sys/contrib/ncsw/Peripherals/FM/MAC/fman_dtsec.c (contents, props changed) head/sys/contrib/ncsw/Peripherals/FM/MAC/fman_dtsec_mii_acc.c (contents, props changed) head/sys/contrib/ncsw/Peripherals/FM/MAC/fman_memac.c (contents, props changed) head/sys/contrib/ncsw/Peripherals/FM/MAC/fman_memac_mii_acc.c (contents, props changed) head/sys/contrib/ncsw/Peripherals/FM/MAC/fman_tgec.c (contents, props changed) head/sys/contrib/ncsw/Peripherals/FM/MAC/memac.c (contents, props changed) head/sys/contrib/ncsw/Peripherals/FM/MAC/memac.h (contents, props changed) head/sys/contrib/ncsw/Peripherals/FM/MAC/memac_mii_acc.c (contents, props changed) head/sys/contrib/ncsw/Peripherals/FM/MAC/memac_mii_acc.h (contents, props changed) head/sys/contrib/ncsw/Peripherals/FM/MACSEC/ head/sys/contrib/ncsw/Peripherals/FM/MACSEC/fm_macsec.c (contents, props changed) head/sys/contrib/ncsw/Peripherals/FM/MACSEC/fm_macsec.h (contents, props changed) head/sys/contrib/ncsw/Peripherals/FM/MACSEC/fm_macsec_guest.c (contents, props changed) head/sys/contrib/ncsw/Peripherals/FM/MACSEC/fm_macsec_master.c (contents, props changed) head/sys/contrib/ncsw/Peripherals/FM/MACSEC/fm_macsec_master.h (contents, props changed) head/sys/contrib/ncsw/Peripherals/FM/MACSEC/fm_macsec_secy.c (contents, props changed) head/sys/contrib/ncsw/Peripherals/FM/MACSEC/fm_macsec_secy.h (contents, props changed) head/sys/contrib/ncsw/Peripherals/FM/Pcd/crc64.h (contents, props changed) head/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_kg.h (contents, props changed) head/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_plcr.h (contents, props changed) head/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_prs.h (contents, props changed) head/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_replic.c (contents, props changed) head/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_replic.h (contents, props changed) head/sys/contrib/ncsw/Peripherals/FM/Pcd/fman_kg.c (contents, props changed) head/sys/contrib/ncsw/Peripherals/FM/Pcd/fman_prs.c (contents, props changed) head/sys/contrib/ncsw/Peripherals/FM/Port/fm_port_dsar.h (contents, props changed) head/sys/contrib/ncsw/Peripherals/FM/Port/fman_port.c (contents, props changed) head/sys/contrib/ncsw/Peripherals/FM/Rtc/fman_rtc.c (contents, props changed) head/sys/contrib/ncsw/Peripherals/FM/SP/ head/sys/contrib/ncsw/Peripherals/FM/SP/fm_sp.c (contents, props changed) head/sys/contrib/ncsw/Peripherals/FM/SP/fm_sp.h (contents, props changed) head/sys/contrib/ncsw/Peripherals/FM/SP/fman_sp.c (contents, props changed) head/sys/contrib/ncsw/Peripherals/FM/fman_ncsw.c (contents, props changed) head/sys/contrib/ncsw/Peripherals/FM/inc/fm_sp_common.h (contents, props changed) head/sys/contrib/ncsw/inc/Peripherals/fm_macsec_ext.h (contents, props changed) head/sys/contrib/ncsw/inc/Peripherals/fm_vsp_ext.h (contents, props changed) head/sys/contrib/ncsw/inc/Peripherals/mii_acc_ext.h (contents, props changed) head/sys/contrib/ncsw/inc/cores/arm_ext.h (contents, props changed) head/sys/contrib/ncsw/inc/flib/ head/sys/contrib/ncsw/inc/flib/common/ head/sys/contrib/ncsw/inc/flib/common/arch/ head/sys/contrib/ncsw/inc/flib/common/arch/ppc_access.h (contents, props changed) head/sys/contrib/ncsw/inc/flib/common/general.h (contents, props changed) head/sys/contrib/ncsw/inc/flib/fman_common.h (contents, props changed) head/sys/contrib/ncsw/inc/flib/fsl_enet.h (contents, props changed) head/sys/contrib/ncsw/inc/flib/fsl_fman.h (contents, props changed) head/sys/contrib/ncsw/inc/flib/fsl_fman_dtsec.h (contents, props changed) head/sys/contrib/ncsw/inc/flib/fsl_fman_dtsec_mii_acc.h (contents, props changed) head/sys/contrib/ncsw/inc/flib/fsl_fman_kg.h (contents, props changed) head/sys/contrib/ncsw/inc/flib/fsl_fman_memac.h (contents, props changed) head/sys/contrib/ncsw/inc/flib/fsl_fman_memac_mii_acc.h (contents, props changed) head/sys/contrib/ncsw/inc/flib/fsl_fman_port.h (contents, props changed) head/sys/contrib/ncsw/inc/flib/fsl_fman_prs.h (contents, props changed) head/sys/contrib/ncsw/inc/flib/fsl_fman_rtc.h (contents, props changed) head/sys/contrib/ncsw/inc/flib/fsl_fman_sp.h (contents, props changed) head/sys/contrib/ncsw/inc/flib/fsl_fman_tgec.h (contents, props changed) head/sys/contrib/ncsw/inc/xx_common.h (contents, props changed) Deleted: head/sys/contrib/ncsw/Peripherals/FM/fm_guest.c head/sys/contrib/ncsw/etc/sprint.c head/sys/contrib/ncsw/inc/math_ext.h Modified: head/sys/contrib/ncsw/Peripherals/BM/bm.h head/sys/contrib/ncsw/Peripherals/BM/bm_pool.c head/sys/contrib/ncsw/Peripherals/BM/bman_low.c head/sys/contrib/ncsw/Peripherals/BM/bman_private.h head/sys/contrib/ncsw/Peripherals/FM/HC/hc.c head/sys/contrib/ncsw/Peripherals/FM/MAC/dtsec.c head/sys/contrib/ncsw/Peripherals/FM/MAC/dtsec.h head/sys/contrib/ncsw/Peripherals/FM/MAC/dtsec_mii_acc.c head/sys/contrib/ncsw/Peripherals/FM/MAC/dtsec_mii_acc.h head/sys/contrib/ncsw/Peripherals/FM/MAC/fm_mac.c head/sys/contrib/ncsw/Peripherals/FM/MAC/fm_mac.h head/sys/contrib/ncsw/Peripherals/FM/MAC/tgec.c head/sys/contrib/ncsw/Peripherals/FM/MAC/tgec.h head/sys/contrib/ncsw/Peripherals/FM/MAC/tgec_mii_acc.c head/sys/contrib/ncsw/Peripherals/FM/MAC/tgec_mii_acc.h head/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_cc.c head/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_cc.h head/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_kg.c head/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_manip.c head/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_manip.h head/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_pcd.c head/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_pcd.h head/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_pcd_ipc.h head/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_plcr.c head/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_prs.c head/sys/contrib/ncsw/Peripherals/FM/Port/fm_port.c head/sys/contrib/ncsw/Peripherals/FM/Port/fm_port.h head/sys/contrib/ncsw/Peripherals/FM/Port/fm_port_im.c head/sys/contrib/ncsw/Peripherals/FM/Rtc/fm_rtc.c head/sys/contrib/ncsw/Peripherals/FM/Rtc/fm_rtc.h head/sys/contrib/ncsw/Peripherals/FM/fm.c head/sys/contrib/ncsw/Peripherals/FM/fm.h head/sys/contrib/ncsw/Peripherals/FM/fm_ipc.h head/sys/contrib/ncsw/Peripherals/FM/fm_muram.c head/sys/contrib/ncsw/Peripherals/FM/inc/fm_common.h head/sys/contrib/ncsw/Peripherals/FM/inc/fm_hc.h head/sys/contrib/ncsw/Peripherals/QM/fsl_qman.h head/sys/contrib/ncsw/Peripherals/QM/qm.c head/sys/contrib/ncsw/Peripherals/QM/qm.h head/sys/contrib/ncsw/Peripherals/QM/qm_portal_fqr.c head/sys/contrib/ncsw/Peripherals/QM/qman_low.h head/sys/contrib/ncsw/Peripherals/QM/qman_private.h head/sys/contrib/ncsw/etc/error.c head/sys/contrib/ncsw/etc/list.c head/sys/contrib/ncsw/etc/memcpy.c head/sys/contrib/ncsw/etc/mm.c head/sys/contrib/ncsw/etc/mm.h head/sys/contrib/ncsw/etc/ncsw_mem.c head/sys/contrib/ncsw/inc/Peripherals/bm_ext.h head/sys/contrib/ncsw/inc/Peripherals/crc_mac_addr_ext.h head/sys/contrib/ncsw/inc/Peripherals/dpaa_ext.h head/sys/contrib/ncsw/inc/Peripherals/fm_ext.h head/sys/contrib/ncsw/inc/Peripherals/fm_mac_ext.h head/sys/contrib/ncsw/inc/Peripherals/fm_muram_ext.h head/sys/contrib/ncsw/inc/Peripherals/fm_pcd_ext.h head/sys/contrib/ncsw/inc/Peripherals/fm_port_ext.h head/sys/contrib/ncsw/inc/Peripherals/fm_rtc_ext.h head/sys/contrib/ncsw/inc/Peripherals/qm_ext.h head/sys/contrib/ncsw/inc/core_ext.h head/sys/contrib/ncsw/inc/cores/e500v2_ext.h head/sys/contrib/ncsw/inc/cores/ppc_ext.h head/sys/contrib/ncsw/inc/ddr_std_ext.h head/sys/contrib/ncsw/inc/debug_ext.h head/sys/contrib/ncsw/inc/endian_ext.h head/sys/contrib/ncsw/inc/enet_ext.h head/sys/contrib/ncsw/inc/error_ext.h head/sys/contrib/ncsw/inc/etc/list_ext.h head/sys/contrib/ncsw/inc/etc/mem_ext.h head/sys/contrib/ncsw/inc/etc/memcpy_ext.h head/sys/contrib/ncsw/inc/etc/mm_ext.h head/sys/contrib/ncsw/inc/etc/sprint_ext.h head/sys/contrib/ncsw/inc/integrations/dpaa_integration_ext.h head/sys/contrib/ncsw/inc/integrations/part_ext.h head/sys/contrib/ncsw/inc/ncsw_ext.h head/sys/contrib/ncsw/inc/net_ext.h head/sys/contrib/ncsw/inc/std_ext.h head/sys/contrib/ncsw/inc/stdarg_ext.h head/sys/contrib/ncsw/inc/stdlib_ext.h head/sys/contrib/ncsw/inc/string_ext.h head/sys/contrib/ncsw/inc/types_ext.h head/sys/contrib/ncsw/inc/xx_ext.h head/sys/contrib/ncsw/user/env/xx.c head/sys/dev/dpaa/bman.c head/sys/dev/dpaa/fman.c head/sys/dev/dpaa/fman.h head/sys/dev/dpaa/fman_fdt.c head/sys/dev/dpaa/if_dtsec.c head/sys/dev/dpaa/if_dtsec_im.c head/sys/dev/dpaa/if_dtsec_rm.c head/sys/dev/dpaa/portals.h head/sys/powerpc/conf/dpaa/config.dpaa head/sys/powerpc/conf/dpaa/files.dpaa Modified: head/sys/contrib/ncsw/Peripherals/BM/bm.h ============================================================================== --- head/sys/contrib/ncsw/Peripherals/BM/bm.h Mon Oct 30 03:25:22 2017 (r325117) +++ head/sys/contrib/ncsw/Peripherals/BM/bm.h Mon Oct 30 03:41:04 2017 (r325118) @@ -41,6 +41,7 @@ #ifndef __BM_H #define __BM_H +#include "xx_common.h" #include "bm_ext.h" #include "mm_ext.h" @@ -261,7 +262,7 @@ typedef struct { t_Handle h_Bm; struct bm_portal *p_BmPortalLow; t_BmPortalCallbacks cbs[BM_NUM_OF_RINGS]; - int irq; + uintptr_t irq; int cpu; /* This is used for any "core-affine" portals, ie. default portals * associated to the corresponding cpu. -1 implies that there is no core * affinity configured. */ @@ -303,7 +304,7 @@ typedef struct { uint32_t exceptions; t_BmExceptionsCallback *f_Exception; t_Handle h_App; - int errIrq; /**< error interrupt line; NO_IRQ if interrupts not used */ + uintptr_t errIrq; /**< error interrupt line; NO_IRQ if interrupts not used */ t_BmDriverParams *p_BmDriverParams; } t_Bm; @@ -339,7 +340,7 @@ static __inline__ void BmCommit(t_BmPortal *p_BmPortal static __inline__ uint32_t BmBpidGet(t_Bm *p_Bm, bool force, uint32_t base) { uint64_t ans, size = 1; - uint32_t alignment = 1; + uint64_t alignment = 1; if (force) { @@ -347,7 +348,7 @@ static __inline__ uint32_t BmBpidGet(t_Bm *p_Bm, bool { ans = MM_GetForce(p_Bm->h_BpidMm, base, - (int)size, + size, "BM BPID MEM"); ans = base; } @@ -394,6 +395,7 @@ static __inline__ uint32_t BmBpidGet(t_Bm *p_Bm, bool size, alignment, "BM BPID MEM"); + KASSERT(ans < UINT32_MAX, ("Oops, %lx > UINT32_MAX!\n", ans)); return (uint32_t)ans; } Modified: head/sys/contrib/ncsw/Peripherals/BM/bm_pool.c ============================================================================== --- head/sys/contrib/ncsw/Peripherals/BM/bm_pool.c Mon Oct 30 03:25:22 2017 (r325117) +++ head/sys/contrib/ncsw/Peripherals/BM/bm_pool.c Mon Oct 30 03:41:04 2017 (r325118) @@ -545,26 +545,6 @@ t_Handle BM_POOL_GetBufferContext(t_Handle h_BmPool, v return *(t_Handle *)PTR_MOVE(p_Buff, -(sizeof(t_Handle))); } -void * BM_POOL_PhysToVirt(t_Handle h_BmPool, physAddress_t addr) -{ - t_BmPool *p_BmPool = (t_BmPool *)h_BmPool; - - SANITY_CHECK_RETURN_VALUE(p_BmPool, E_INVALID_HANDLE, NULL); - SANITY_CHECK_RETURN_VALUE(!p_BmPool->p_BmPoolDriverParams, E_INVALID_HANDLE, NULL); - - return p_BmPool->bufferPoolInfo.f_PhysToVirt(addr); -} - -physAddress_t BM_POOL_VirtToPhys(t_Handle h_BmPool, void *p_Buff) -{ - t_BmPool *p_BmPool = (t_BmPool *)h_BmPool; - - SANITY_CHECK_RETURN_VALUE(p_BmPool, E_INVALID_HANDLE, (physAddress_t)0); - SANITY_CHECK_RETURN_VALUE(!p_BmPool->p_BmPoolDriverParams, E_INVALID_HANDLE, (physAddress_t)0); - - return p_BmPool->bufferPoolInfo.f_VirtToPhys(p_Buff); -} - uint32_t BM_POOL_GetCounter(t_Handle h_BmPool, e_BmPoolCounters counter) { t_BmPool *p_BmPool = (t_BmPool *)h_BmPool; Modified: head/sys/contrib/ncsw/Peripherals/BM/bman_low.c ============================================================================== --- head/sys/contrib/ncsw/Peripherals/BM/bman_low.c Mon Oct 30 03:25:22 2017 (r325117) +++ head/sys/contrib/ncsw/Peripherals/BM/bman_low.c Mon Oct 30 03:41:04 2017 (r325118) @@ -38,6 +38,10 @@ @Description BM low-level implementation *//***************************************************************************/ +#include +#include +#include + #include "std_ext.h" #include "core_ext.h" #include "xx_ext.h" @@ -259,7 +263,7 @@ void bm_rcr_pci_commit(struct bm_portal *portal, uint8 rcr->cursor->__dont_write_directly__verb = (uint8_t)(myverb | rcr->vbit); RCR_INC(rcr); rcr->available--; - hwsync(); + mb(); bm_out(RCR_PI_CINH, RCR_PTR2IDX(rcr->cursor)); #ifdef BM_CHECKING rcr->busy = 0; @@ -281,7 +285,7 @@ void bm_rcr_pce_commit(struct bm_portal *portal, uint8 rcr->cursor->__dont_write_directly__verb = (uint8_t)(myverb | rcr->vbit); RCR_INC(rcr); rcr->available--; - lwsync(); + wmb(); bm_cl_out(RCR_PI, RCR_PTR2IDX(rcr->cursor)); #ifdef BM_CHECKING rcr->busy = 0; @@ -294,7 +298,7 @@ void bm_rcr_pvb_commit(struct bm_portal *portal, uint8 struct bm_rcr_entry *rcursor; ASSERT_COND(rcr->busy); ASSERT_COND(rcr->pmode == e_BmPortalPVB); - lwsync(); + rmb(); rcursor = rcr->cursor; rcursor->__dont_write_directly__verb = (uint8_t)(myverb | rcr->vbit); dcbf_64(rcursor); @@ -432,7 +436,7 @@ void bm_mc_commit(struct bm_portal *portal, uint8_t my { register struct bm_mc *mc = &portal->mc; ASSERT_COND(mc->state == mc_user); - lwsync(); + rmb(); mc->cr->__dont_write_directly__verb = (uint8_t)(myverb | mc->vbit); dcbf_64(mc->cr); dcbit_ro(mc->rr + mc->rridx); Modified: head/sys/contrib/ncsw/Peripherals/BM/bman_private.h ============================================================================== --- head/sys/contrib/ncsw/Peripherals/BM/bman_private.h Mon Oct 30 03:25:22 2017 (r325117) +++ head/sys/contrib/ncsw/Peripherals/BM/bman_private.h Mon Oct 30 03:41:04 2017 (r325118) @@ -54,76 +54,13 @@ * and that dcbzl(), dcbfl(), and dcbi() won't fall victim to compiler or * execution reordering with respect to other code/instructions that manipulate * the same cacheline. */ -#ifdef CORE_E500MC -#if defined(_DIAB_TOOL) -#define hwsync() \ -do { \ -__asm__ __volatile__ ("sync"); \ -} while(0) - -#define lwsync() \ -do { \ -__asm__ __volatile__ ("lwsync"); \ -} while(0) - -__asm__ __volatile__ void dcbf (volatile void * addr) -{ -%reg addr - dcbf r0, addr -} - -__asm__ __volatile__ void dcbt_ro (volatile void * addr) -{ -%reg addr - dcbt r0, addr -} - -__asm__ __volatile__ void dcbt_rw (volatile void * addr) -{ -%reg addr - dcbtst r0, addr -} - -__asm__ __volatile__ void dcbzl (volatile void * addr) -{ -%reg addr - dcbzl r0, addr -} - -#define dcbz_64(p) \ - do { \ - dcbzl(p); \ - } while (0) - -#define dcbf_64(p) \ - do { \ - dcbf(p); \ - } while (0) - -/* Commonly used combo */ -#define dcbit_ro(p) \ - do { \ - dcbi(p); \ - dcbt_ro(p); \ - } while (0) - -#else /* GNU C */ -#define hwsync() \ - do { \ - __asm__ __volatile__ ("sync" : : : "memory"); \ - } while(0) - -#define lwsync() \ - do { \ - __asm__ __volatile__ ("lwsync" : : : "memory"); \ - } while(0) - #define dcbf(addr) \ do { \ __asm__ __volatile__ ("dcbf 0, %0" : : "r" (addr)); \ } while(0) +#ifdef CORE_E500MC #define dcbt_ro(addr) \ do { \ __asm__ __volatile__ ("dcbt 0, %0" : : "r" (addr)); \ @@ -156,46 +93,34 @@ __asm__ __volatile__ void dcbzl (volatile void * addr) dcbt_ro(p); \ } while (0) -#endif /* _DIAB_TOOL */ - #else -#define hwsync CORE_MemoryBarrier -#define lwsync hwsync -#define dcbf(p) \ - do { \ - __asm__ __volatile__ ("dcbf 0,%0" : : "r" (p)); \ - } while(0) #define dcbt_ro(p) \ do { \ __asm__ __volatile__ ("dcbt 0,%0" : : "r" (p)); \ lwsync(); \ } while(0) -#define dcbt_rw(p) \ - do { \ - __asm__ __volatile__ ("dcbtst 0,%0" : : "r" (p)); \ - } while(0) #define dcbz(p) \ do { \ __asm__ __volatile__ ("dcbz 0,%0" : : "r" (p)); \ } while (0) #define dcbz_64(p) \ do { \ - dcbz((uint32_t)p + 32); \ + dcbz((char *)p + 32); \ dcbz(p); \ } while (0) #define dcbf_64(p) \ do { \ - dcbf((uint32_t)p + 32); \ + dcbf((char *)p + 32); \ dcbf(p); \ } while (0) /* Commonly used combo */ #define dcbit_ro(p) \ do { \ dcbi(p); \ - dcbi((uint32_t)p + 32); \ + dcbi((char *)p + 32); \ dcbt_ro(p); \ - dcbt_ro((uint32_t)p + 32); \ + dcbt_ro((char *)p + 32); \ } while (0) #endif /* CORE_E500MC */ Modified: head/sys/contrib/ncsw/Peripherals/FM/HC/hc.c ============================================================================== --- head/sys/contrib/ncsw/Peripherals/FM/HC/hc.c Mon Oct 30 03:25:22 2017 (r325117) +++ head/sys/contrib/ncsw/Peripherals/FM/HC/hc.c Mon Oct 30 03:41:04 2017 (r325118) @@ -1,5 +1,5 @@ -/* Copyright (c) 2008-2011 Freescale Semiconductor, Inc. - * All rights reserved. +/* + * Copyright 2008-2012 Freescale Semiconductor Inc. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -30,6 +30,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + #include "std_ext.h" #include "error_ext.h" #include "sprint_ext.h" @@ -39,24 +40,54 @@ #include "fm_hc.h" +/**************************************************************************//** + @Description defaults +*//***************************************************************************/ +#define DEFAULT_dataMemId 0 + #define HC_HCOR_OPCODE_PLCR_PRFL 0x0 #define HC_HCOR_OPCODE_KG_SCM 0x1 #define HC_HCOR_OPCODE_SYNC 0x2 #define HC_HCOR_OPCODE_CC 0x3 +#define HC_HCOR_OPCODE_CC_AGE_MASK 0x4 #define HC_HCOR_OPCODE_CC_CAPWAP_REASSM_TIMEOUT 0x5 +#define HC_HCOR_OPCODE_CC_REASSM_TIMEOUT 0x10 +#define HC_HCOR_OPCODE_CC_IP_FRAG_INITIALIZATION 0x11 +#define HC_HCOR_OPCODE_CC_UPDATE_WITH_AGING 0x13 +#define HC_HCOR_ACTION_REG_REASSM_TIMEOUT_ACTIVE_SHIFT 24 +#define HC_HCOR_EXTRA_REG_REASSM_TIMEOUT_TSBS_SHIFT 24 +#define HC_HCOR_EXTRA_REG_CC_AGING_ADD 0x80000000 +#define HC_HCOR_EXTRA_REG_CC_AGING_REMOVE 0x40000000 +#define HC_HCOR_EXTRA_REG_CC_AGING_CHANGE_MASK 0xC0000000 +#define HC_HCOR_EXTRA_REG_CC_REMOVE_INDX_SHIFT 24 +#define HC_HCOR_EXTRA_REG_CC_REMOVE_INDX_MASK 0x1F000000 +#define HC_HCOR_ACTION_REG_REASSM_TIMEOUT_RES_SHIFT 16 +#define HC_HCOR_ACTION_REG_REASSM_TIMEOUT_RES_MASK 0xF +#define HC_HCOR_ACTION_REG_IP_FRAG_SCRATCH_POOL_CMD_SHIFT 24 +#define HC_HCOR_ACTION_REG_IP_FRAG_SCRATCH_POOL_BPID 16 #define HC_HCOR_GBL 0x20000000 -#define SIZE_OF_HC_FRAME_PORT_REGS (sizeof(t_HcFrame)-sizeof(t_FmPcdKgInterModuleSchemeRegs)+sizeof(t_FmPcdKgPortRegs)) +#define HC_HCOR_KG_SCHEME_COUNTER 0x00000400 + +#if (DPAA_VERSION == 10) +#define HC_HCOR_KG_SCHEME_REGS_MASK 0xFFFFF800 +#else +#define HC_HCOR_KG_SCHEME_REGS_MASK 0xFFFFFE00 +#endif /* (DPAA_VERSION == 10) */ + +#define SIZE_OF_HC_FRAME_PORT_REGS (sizeof(t_HcFrame)-sizeof(struct fman_kg_scheme_regs)+sizeof(t_FmPcdKgPortRegs)) #define SIZE_OF_HC_FRAME_SCHEME_REGS sizeof(t_HcFrame) -#define SIZE_OF_HC_FRAME_PROFILES_REGS (sizeof(t_HcFrame)-sizeof(t_FmPcdKgInterModuleSchemeRegs)+sizeof(t_FmPcdPlcrInterModuleProfileRegs)) -#define SIZE_OF_HC_FRAME_PROFILE_CNT (sizeof(t_HcFrame)-sizeof(t_FmPcdPlcrInterModuleProfileRegs)+sizeof(uint32_t)) +#define SIZE_OF_HC_FRAME_PROFILES_REGS (sizeof(t_HcFrame)-sizeof(struct fman_kg_scheme_regs)+sizeof(t_FmPcdPlcrProfileRegs)) +#define SIZE_OF_HC_FRAME_PROFILE_CNT (sizeof(t_HcFrame)-sizeof(t_FmPcdPlcrProfileRegs)+sizeof(uint32_t)) #define SIZE_OF_HC_FRAME_READ_OR_CC_DYNAMIC 16 +#define HC_CMD_POOL_SIZE (INTG_MAX_NUM_OF_CORES) + #define BUILD_FD(len) \ do { \ memset(&fmFd, 0, sizeof(t_DpaaFD)); \ - DPAA_FD_SET_ADDR(&fmFd, p_HcFrame); \ + DPAA_FD_SET_ADDR(&fmFd, p_HcFrame); \ DPAA_FD_SET_OFFSET(&fmFd, 0); \ DPAA_FD_SET_LENGTH(&fmFd, len); \ } while (0) @@ -65,50 +96,29 @@ do { \ #if defined(__MWERKS__) && !defined(__GNUC__) #pragma pack(push,1) #endif /* defined(__MWERKS__) && ... */ -#define MEM_MAP_START -/**************************************************************************//** - @Description PCD KG scheme registers -*//***************************************************************************/ -typedef _Packed struct t_FmPcdKgSchemeRegsWithoutCounter { - volatile uint32_t kgse_mode; /**< MODE */ - volatile uint32_t kgse_ekfc; /**< Extract Known Fields Command */ - volatile uint32_t kgse_ekdv; /**< Extract Known Default Value */ - volatile uint32_t kgse_bmch; /**< Bit Mask Command High */ - volatile uint32_t kgse_bmcl; /**< Bit Mask Command Low */ - volatile uint32_t kgse_fqb; /**< Frame Queue Base */ - volatile uint32_t kgse_hc; /**< Hash Command */ - volatile uint32_t kgse_ppc; /**< Policer Profile Command */ - volatile uint32_t kgse_gec[FM_PCD_KG_NUM_OF_GENERIC_REGS]; - /**< Generic Extract Command */ - volatile uint32_t kgse_dv0; /**< KeyGen Scheme Entry Default Value 0 */ - volatile uint32_t kgse_dv1; /**< KeyGen Scheme Entry Default Value 1 */ - volatile uint32_t kgse_ccbs; /**< KeyGen Scheme Entry Coarse Classification Bit*/ - volatile uint32_t kgse_mv; /**< KeyGen Scheme Entry Match vector */ -} _PackedType t_FmPcdKgSchemeRegsWithoutCounter; - -typedef _Packed struct t_FmPcdKgPortRegs { +typedef struct t_FmPcdKgPortRegs { volatile uint32_t spReg; volatile uint32_t cppReg; -} _PackedType t_FmPcdKgPortRegs; +} t_FmPcdKgPortRegs; -typedef _Packed struct t_HcFrame { +typedef struct t_HcFrame { volatile uint32_t opcode; volatile uint32_t actionReg; volatile uint32_t extraReg; volatile uint32_t commandSequence; union { - t_FmPcdKgInterModuleSchemeRegs schemeRegs; - t_FmPcdKgInterModuleSchemeRegs schemeRegsWithoutCounter; - t_FmPcdPlcrInterModuleProfileRegs profileRegs; + struct fman_kg_scheme_regs schemeRegs; + struct fman_kg_scheme_regs schemeRegsWithoutCounter; + t_FmPcdPlcrProfileRegs profileRegs; volatile uint32_t singleRegForWrite; /* for writing SP, CPP, profile counter */ t_FmPcdKgPortRegs portRegsForRead; volatile uint32_t clsPlanEntries[CLS_PLAN_NUM_PER_GRP]; t_FmPcdCcCapwapReassmTimeoutParams ccCapwapReassmTimeout; + t_FmPcdCcReassmTimeoutParams ccReassmTimeout; } hcSpecificData; -} _PackedType t_HcFrame; +} t_HcFrame; -#define MEM_MAP_END #if defined(__MWERKS__) && !defined(__GNUC__) #pragma pack(pop) #endif /* defined(__MWERKS__) && ... */ @@ -119,114 +129,108 @@ typedef struct t_FmHc { t_Handle h_HcPortDev; t_FmPcdQmEnqueueCallback *f_QmEnqueue; /**< A callback for enqueuing frames to the QM */ t_Handle h_QmArg; /**< A handle to the QM module */ - uint8_t padTill16; + uint8_t dataMemId; /**< Memory partition ID for data buffers */ - uint32_t seqNum; - volatile bool wait[32]; + uint32_t seqNum[HC_CMD_POOL_SIZE]; /* FIFO of seqNum to use when + taking buffer */ + uint32_t nextSeqNumLocation; /* seqNum location in seqNum[] for next buffer */ + volatile bool enqueued[HC_CMD_POOL_SIZE]; /* HC is active - frame is enqueued + and not confirmed yet */ + t_HcFrame *p_Frm[HC_CMD_POOL_SIZE]; } t_FmHc; -static __inline__ t_Error EnQFrm(t_FmHc *p_FmHc, t_DpaaFD *p_FmFd, volatile uint32_t *p_SeqNum) +static t_Error FillBufPool(t_FmHc *p_FmHc) { - t_Error err = E_OK; - uint32_t savedSeqNum; - uint32_t intFlags; - uint32_t timeout=100; + uint32_t i; - intFlags = FmPcdLock(p_FmHc->h_FmPcd); - *p_SeqNum = p_FmHc->seqNum; - savedSeqNum = p_FmHc->seqNum; - p_FmHc->seqNum = (uint32_t)((p_FmHc->seqNum+1)%32); - ASSERT_COND(!p_FmHc->wait[savedSeqNum]); - p_FmHc->wait[savedSeqNum] = TRUE; - FmPcdUnlock(p_FmHc->h_FmPcd, intFlags); - DBG(TRACE, ("Send Hc, SeqNum %d, FD@0x%x, fd offset 0x%x", - savedSeqNum,DPAA_FD_GET_ADDR(p_FmFd),DPAA_FD_GET_OFFSET(p_FmFd))); - err = p_FmHc->f_QmEnqueue(p_FmHc->h_QmArg, (void *)p_FmFd); - if(err) - RETURN_ERROR(MINOR, err, ("HC enqueue failed")); + ASSERT_COND(p_FmHc); - while (p_FmHc->wait[savedSeqNum] && --timeout) - XX_UDelay(100); + for (i = 0; i < HC_CMD_POOL_SIZE; i++) + { +#ifdef FM_LOCKUP_ALIGNMENT_ERRATA_FMAN_SW004 + p_FmHc->p_Frm[i] = (t_HcFrame *)XX_MallocSmart((sizeof(t_HcFrame) + (16 - (sizeof(t_FmHc) % 16))), + p_FmHc->dataMemId, + 16); +#else + p_FmHc->p_Frm[i] = (t_HcFrame *)XX_MallocSmart(sizeof(t_HcFrame), + p_FmHc->dataMemId, + 16); +#endif /* FM_LOCKUP_ALIGNMENT_ERRATA_FMAN_SW004 */ + if (!p_FmHc->p_Frm[i]) + RETURN_ERROR(MAJOR, E_NO_MEMORY, ("FM HC frames!")); + } - if (!timeout) - RETURN_ERROR(MINOR, E_TIMEOUT, ("HC Callback, timeout exceeded")); + /* Initialize FIFO of seqNum to use during GetBuf */ + for (i = 0; i < HC_CMD_POOL_SIZE; i++) + { + p_FmHc->seqNum[i] = i; + } + p_FmHc->nextSeqNumLocation = 0; - return err; + return E_OK; } -static t_Error CcHcDoDynamicChange(t_FmHc *p_FmHc, t_Handle p_OldPointer, t_Handle p_NewPointer) +static __inline__ t_HcFrame * GetBuf(t_FmHc *p_FmHc, uint32_t *p_SeqNum) { - t_HcFrame *p_HcFrame; - t_DpaaFD fmFd; - t_Error err = E_OK; + uint32_t intFlags; ASSERT_COND(p_FmHc); - p_HcFrame = (t_HcFrame *)XX_MallocSmart((sizeof(t_HcFrame) + p_FmHc->padTill16), 0, 16); - if (!p_HcFrame) - RETURN_ERROR(MINOR, E_NO_MEMORY, ("HC Frame obj")); + intFlags = FmPcdLock(p_FmHc->h_FmPcd); - memset(p_HcFrame, 0, sizeof(t_HcFrame)); - p_HcFrame->opcode = (uint32_t)(HC_HCOR_GBL | HC_HCOR_OPCODE_CC); - p_HcFrame->actionReg = FmPcdCcGetNodeAddrOffsetFromNodeInfo(p_FmHc->h_FmPcd, p_NewPointer); - if(p_HcFrame->actionReg == (uint32_t)ILLEGAL_BASE) + if (p_FmHc->nextSeqNumLocation == HC_CMD_POOL_SIZE) { - XX_FreeSmart(p_HcFrame); - RETURN_ERROR(MAJOR, E_INVALID_VALUE, ("Something wrong with base address")); + /* No more buffers */ + FmPcdUnlock(p_FmHc->h_FmPcd, intFlags); + return NULL; } - p_HcFrame->actionReg |= 0xc0000000; - p_HcFrame->extraReg = FmPcdCcGetNodeAddrOffsetFromNodeInfo(p_FmHc->h_FmPcd, p_OldPointer); - if(p_HcFrame->extraReg == (uint32_t)ILLEGAL_BASE) - { - XX_FreeSmart(p_HcFrame); - RETURN_ERROR(MAJOR, E_INVALID_VALUE, ("Something wrong with base address")); - } + *p_SeqNum = p_FmHc->seqNum[p_FmHc->nextSeqNumLocation]; + p_FmHc->nextSeqNumLocation++; - BUILD_FD(SIZE_OF_HC_FRAME_READ_OR_CC_DYNAMIC); + FmPcdUnlock(p_FmHc->h_FmPcd, intFlags); + return p_FmHc->p_Frm[*p_SeqNum]; +} - if ((err = EnQFrm(p_FmHc, &fmFd, &p_HcFrame->commandSequence)) != E_OK) - { - XX_FreeSmart(p_HcFrame); - RETURN_ERROR(MINOR, err, NO_MSG); - } +static __inline__ void PutBuf(t_FmHc *p_FmHc, t_HcFrame *p_Buf, uint32_t seqNum) +{ + uint32_t intFlags; - XX_FreeSmart(p_HcFrame); + UNUSED(p_Buf); - return E_OK; + intFlags = FmPcdLock(p_FmHc->h_FmPcd); + ASSERT_COND(p_FmHc->nextSeqNumLocation); + p_FmHc->nextSeqNumLocation--; + p_FmHc->seqNum[p_FmHc->nextSeqNumLocation] = seqNum; + FmPcdUnlock(p_FmHc->h_FmPcd, intFlags); } -static t_Error HcDynamicChange(t_FmHc *p_FmHc,t_List *h_OldPointersLst, t_List *h_NewPointersLst, t_Handle *h_Params) +static __inline__ t_Error EnQFrm(t_FmHc *p_FmHc, t_DpaaFD *p_FmFd, uint32_t seqNum) { - - t_List *p_PosOld, *p_PosNew; - uint16_t i = 0; t_Error err = E_OK; - uint8_t numOfModifiedPtr; + uint32_t intFlags; + uint32_t timeout=100; - SANITY_CHECK_RETURN_ERROR((LIST_NumOfObjs(h_NewPointersLst) == LIST_NumOfObjs(h_OldPointersLst)),E_INVALID_STATE); + intFlags = FmPcdLock(p_FmHc->h_FmPcd); + ASSERT_COND(!p_FmHc->enqueued[seqNum]); + p_FmHc->enqueued[seqNum] = TRUE; + FmPcdUnlock(p_FmHc->h_FmPcd, intFlags); + DBG(TRACE, ("Send Hc, SeqNum %d, buff@0x%x, fd offset 0x%x", + seqNum, + DPAA_FD_GET_ADDR(p_FmFd), + DPAA_FD_GET_OFFSET(p_FmFd))); + err = p_FmHc->f_QmEnqueue(p_FmHc->h_QmArg, (void *)p_FmFd); + if (err) + RETURN_ERROR(MINOR, err, ("HC enqueue failed")); - numOfModifiedPtr = (uint8_t)LIST_NumOfObjs(h_NewPointersLst); - p_PosNew = NCSW_LIST_FIRST(h_NewPointersLst); - p_PosOld = NCSW_LIST_FIRST(h_OldPointersLst); - for(i = 0; i < numOfModifiedPtr; i++) - { - err = CcHcDoDynamicChange(p_FmHc, p_PosOld, p_PosNew); - if(err) - { - FmPcdCcReleaseModifiedDataStructure(p_FmHc->h_FmPcd, h_OldPointersLst, h_NewPointersLst, i, h_Params); - RETURN_ERROR(MAJOR, err, ("For part of nodes changes are done - situation is danger")); - } - p_PosNew = NCSW_LIST_NEXT(p_PosNew); - p_PosOld = NCSW_LIST_NEXT(p_PosOld); - } + while (p_FmHc->enqueued[seqNum] && --timeout) + XX_UDelay(100); - err = FmPcdCcReleaseModifiedDataStructure(p_FmHc->h_FmPcd, h_OldPointersLst, h_NewPointersLst, i, h_Params); - if(err) - RETURN_ERROR(MAJOR, err, NO_MSG); + if (!timeout) + RETURN_ERROR(MINOR, E_TIMEOUT, ("HC Callback, timeout exceeded")); - return E_OK; + return err; } @@ -234,7 +238,7 @@ t_Handle FmHcConfigAndInit(t_FmHcParams *p_FmHcParams) { t_FmHc *p_FmHc; t_FmPortParams fmPortParam; - t_Error err = E_OK; + t_Error err; p_FmHc = (t_FmHc *)XX_Malloc(sizeof(t_FmHc)); if (!p_FmHc) @@ -247,17 +251,19 @@ t_Handle FmHcConfigAndInit(t_FmHcParams *p_FmHcParams) p_FmHc->h_FmPcd = p_FmHcParams->h_FmPcd; p_FmHc->f_QmEnqueue = p_FmHcParams->params.f_QmEnqueue; p_FmHc->h_QmArg = p_FmHcParams->params.h_QmArg; + p_FmHc->dataMemId = DEFAULT_dataMemId; + err = FillBufPool(p_FmHc); + if (err != E_OK) + { + REPORT_ERROR(MAJOR, err, NO_MSG); + FmHcFree(p_FmHc); + return NULL; + } + if (!FmIsMaster(p_FmHcParams->h_Fm)) return (t_Handle)p_FmHc; -/* -TKT056919 - axi12axi0 can hang if read request follows the single byte write on the very next cycle -TKT038900 - FM dma lockup occur due to AXI slave protocol violation -*/ -#ifdef FM_LOCKUP_ALIGNMENT_ERRATA_FMAN_SW004 - p_FmHc->padTill16 = 16 - (sizeof(t_FmHc) % 16); -#endif /* FM_LOCKUP_ALIGNMENT_ERRATA_FMAN_SW004 */ memset(&fmPortParam, 0, sizeof(fmPortParam)); fmPortParam.baseAddr = p_FmHcParams->params.portBaseAddr; fmPortParam.portType = e_FM_PORT_TYPE_OH_HOST_COMMAND; @@ -270,24 +276,36 @@ TKT038900 - FM dma lockup occur due to AXI slave proto fmPortParam.specificParams.nonRxParams.qmChannel = p_FmHcParams->params.qmChannel; p_FmHc->h_HcPortDev = FM_PORT_Config(&fmPortParam); - if(!p_FmHc->h_HcPortDev) + if (!p_FmHc->h_HcPortDev) { REPORT_ERROR(MAJOR, E_INVALID_HANDLE, ("FM HC port!")); XX_Free(p_FmHc); return NULL; } + err = FM_PORT_ConfigMaxFrameLength(p_FmHc->h_HcPortDev, + (uint16_t)sizeof(t_HcFrame)); + + if (err != E_OK) + { + REPORT_ERROR(MAJOR, err, ("FM HC port init!")); + FmHcFree(p_FmHc); + return NULL; + } + /* final init */ - if ((err = FM_PORT_Init(p_FmHc->h_HcPortDev)) != E_OK) + err = FM_PORT_Init(p_FmHc->h_HcPortDev); + if (err != E_OK) { - REPORT_ERROR(MAJOR, err, ("FM HC port!")); + REPORT_ERROR(MAJOR, err, ("FM HC port init!")); FmHcFree(p_FmHc); return NULL; } - if ((err = FM_PORT_Enable(p_FmHc->h_HcPortDev)) != E_OK) + err = FM_PORT_Enable(p_FmHc->h_HcPortDev); + if (err != E_OK) { - REPORT_ERROR(MAJOR, err, ("FM HC port!")); + REPORT_ERROR(MAJOR, err, ("FM HC port enable!")); FmHcFree(p_FmHc); return NULL; } @@ -298,28 +316,40 @@ TKT038900 - FM dma lockup occur due to AXI slave proto void FmHcFree(t_Handle h_FmHc) { t_FmHc *p_FmHc = (t_FmHc*)h_FmHc; + int i; if (!p_FmHc) return; + for (i=0; ip_Frm[i]) + XX_FreeSmart(p_FmHc->p_Frm[i]); + else + break; + if (p_FmHc->h_HcPortDev) FM_PORT_Free(p_FmHc->h_HcPortDev); XX_Free(p_FmHc); } -#if (defined(DEBUG_ERRORS) && (DEBUG_ERRORS > 0)) -t_Error FmHcDumpRegs(t_Handle h_FmHc) +/*****************************************************************************/ +t_Error FmHcSetFramesDataMemory(t_Handle h_FmHc, + uint8_t memId) { t_FmHc *p_FmHc = (t_FmHc*)h_FmHc; + int i; SANITY_CHECK_RETURN_ERROR(p_FmHc, E_INVALID_HANDLE); - SANITY_CHECK_RETURN_ERROR(p_FmHc->h_HcPortDev, E_INVALID_HANDLE); - return FM_PORT_DumpRegs(p_FmHc->h_HcPortDev); + p_FmHc->dataMemId = memId; + for (i=0; ip_Frm[i]) + XX_FreeSmart(p_FmHc->p_Frm[i]); + + return FillBufPool(p_FmHc); } -#endif /* (defined(DEBUG_ERRORS) && ... */ void FmHcTxConf(t_Handle h_FmHc, t_DpaaFD *p_Fd) { @@ -335,134 +365,55 @@ void FmHcTxConf(t_Handle h_FmHc, t_DpaaFD *p_Fd) DBG(TRACE, ("Hc Conf, SeqNum %d, FD@0x%x, fd offset 0x%x", p_HcFrame->commandSequence, DPAA_FD_GET_ADDR(p_Fd), DPAA_FD_GET_OFFSET(p_Fd))); - if (!(p_FmHc->wait[p_HcFrame->commandSequence])) + if (!(p_FmHc->enqueued[p_HcFrame->commandSequence])) REPORT_ERROR(MINOR, E_INVALID_FRAME, ("Not an Host-Command frame received!")); else - p_FmHc->wait[p_HcFrame->commandSequence] = FALSE; + p_FmHc->enqueued[p_HcFrame->commandSequence] = FALSE; FmPcdUnlock(p_FmHc->h_FmPcd, intFlags); } -t_Handle FmHcPcdKgSetScheme(t_Handle h_FmHc, t_FmPcdKgSchemeParams *p_Scheme) +t_Error FmHcPcdKgSetScheme(t_Handle h_FmHc, + t_Handle h_Scheme, + struct fman_kg_scheme_regs *p_SchemeRegs, + bool updateCounter) { t_FmHc *p_FmHc = (t_FmHc*)h_FmHc; t_Error err = E_OK; - t_FmPcdKgInterModuleSchemeRegs schemeRegs; t_HcFrame *p_HcFrame; t_DpaaFD fmFd; - uint32_t intFlags; - uint8_t physicalSchemeId, relativeSchemeId; + uint8_t physicalSchemeId; + uint32_t seqNum; - p_HcFrame = (t_HcFrame *)XX_MallocSmart((sizeof(t_HcFrame) + p_FmHc->padTill16), 0, 16); + p_HcFrame = GetBuf(p_FmHc, &seqNum); if (!p_HcFrame) - { - REPORT_ERROR(MINOR, E_NO_MEMORY, ("HC Frame obj")); - return NULL; - } + RETURN_ERROR(MINOR, E_NO_MEMORY, ("HC Frame object")); - if(!p_Scheme->modify) - { - /* check that schemeId is in range */ - if(p_Scheme->id.relativeSchemeId >= FmPcdKgGetNumOfPartitionSchemes(p_FmHc->h_FmPcd)) - { - REPORT_ERROR(MAJOR, E_NOT_IN_RANGE, ("Scheme is out of range")); - XX_FreeSmart(p_HcFrame); - return NULL; - } + physicalSchemeId = FmPcdKgGetSchemeId(h_Scheme); - relativeSchemeId = p_Scheme->id.relativeSchemeId; - - if (FmPcdKgSchemeTryLock(p_FmHc->h_FmPcd, relativeSchemeId, FALSE)) - { - XX_FreeSmart(p_HcFrame); - return NULL; - } - - physicalSchemeId = FmPcdKgGetPhysicalSchemeId(p_FmHc->h_FmPcd, relativeSchemeId); - - memset(p_HcFrame, 0, sizeof(t_HcFrame)); - p_HcFrame->opcode = (uint32_t)(HC_HCOR_GBL | HC_HCOR_OPCODE_KG_SCM); - p_HcFrame->actionReg = FmPcdKgBuildReadSchemeActionReg(physicalSchemeId); - p_HcFrame->extraReg = 0xFFFFF800; - - BUILD_FD(SIZE_OF_HC_FRAME_READ_OR_CC_DYNAMIC); - - if ((err = EnQFrm(p_FmHc, &fmFd, &p_HcFrame->commandSequence)) != E_OK) - { - FmPcdKgReleaseSchemeLock(p_FmHc->h_FmPcd, relativeSchemeId); - REPORT_ERROR(MINOR, err, NO_MSG); - XX_FreeSmart(p_HcFrame); - return NULL; - } - - /* check if this scheme is already used */ - if (FmPcdKgHwSchemeIsValid(p_HcFrame->hcSpecificData.schemeRegs.kgse_mode)) - { - FmPcdKgReleaseSchemeLock(p_FmHc->h_FmPcd, relativeSchemeId); - REPORT_ERROR(MAJOR, E_ALREADY_EXISTS, ("Scheme is already used")); - XX_FreeSmart(p_HcFrame); - return NULL; - } - } - else - { - intFlags = FmPcdLock(p_FmHc->h_FmPcd); - physicalSchemeId = (uint8_t)(PTR_TO_UINT(p_Scheme->id.h_Scheme)-1); - relativeSchemeId = FmPcdKgGetRelativeSchemeId(p_FmHc->h_FmPcd, physicalSchemeId); - if( relativeSchemeId == FM_PCD_KG_NUM_OF_SCHEMES) - { - FmPcdUnlock(p_FmHc->h_FmPcd, intFlags); - REPORT_ERROR(MAJOR, E_NOT_IN_RANGE, NO_MSG); - XX_FreeSmart(p_HcFrame); - return NULL; - } - err = FmPcdKgSchemeTryLock(p_FmHc->h_FmPcd, relativeSchemeId, TRUE); - FmPcdUnlock(p_FmHc->h_FmPcd, intFlags); - if (err) - { - XX_FreeSmart(p_HcFrame); - return NULL; - } - } - - err = FmPcdKgBuildScheme(p_FmHc->h_FmPcd, p_Scheme, &schemeRegs); - if(err) - { - FmPcdKgReleaseSchemeLock(p_FmHc->h_FmPcd, relativeSchemeId); - REPORT_ERROR(MAJOR, err, NO_MSG); - XX_FreeSmart(p_HcFrame); - return NULL; - } - memset(p_HcFrame, 0, sizeof(t_HcFrame)); p_HcFrame->opcode = (uint32_t)(HC_HCOR_GBL | HC_HCOR_OPCODE_KG_SCM); - p_HcFrame->actionReg = FmPcdKgBuildWriteSchemeActionReg(physicalSchemeId, p_Scheme->schemeCounter.update); - p_HcFrame->extraReg = 0xFFFFF800; - memcpy(&p_HcFrame->hcSpecificData.schemeRegs, &schemeRegs, sizeof(t_FmPcdKgInterModuleSchemeRegs)); - if(!p_Scheme->schemeCounter.update) + p_HcFrame->actionReg = FmPcdKgBuildWriteSchemeActionReg(physicalSchemeId, updateCounter); + p_HcFrame->extraReg = HC_HCOR_KG_SCHEME_REGS_MASK; + memcpy(&p_HcFrame->hcSpecificData.schemeRegs, p_SchemeRegs, sizeof(struct fman_kg_scheme_regs)); + if (!updateCounter) { - p_HcFrame->hcSpecificData.schemeRegs.kgse_dv0 = schemeRegs.kgse_dv0; - p_HcFrame->hcSpecificData.schemeRegs.kgse_dv1 = schemeRegs.kgse_dv1; - p_HcFrame->hcSpecificData.schemeRegs.kgse_ccbs = schemeRegs.kgse_ccbs; - p_HcFrame->hcSpecificData.schemeRegs.kgse_mv = schemeRegs.kgse_mv; + p_HcFrame->hcSpecificData.schemeRegs.kgse_dv0 = p_SchemeRegs->kgse_dv0; + p_HcFrame->hcSpecificData.schemeRegs.kgse_dv1 = p_SchemeRegs->kgse_dv1; + p_HcFrame->hcSpecificData.schemeRegs.kgse_ccbs = p_SchemeRegs->kgse_ccbs; + p_HcFrame->hcSpecificData.schemeRegs.kgse_mv = p_SchemeRegs->kgse_mv; } + p_HcFrame->commandSequence = seqNum; BUILD_FD(sizeof(t_HcFrame)); - if ((err = EnQFrm(p_FmHc, &fmFd, &p_HcFrame->commandSequence)) != E_OK) - { - FmPcdKgReleaseSchemeLock(p_FmHc->h_FmPcd, relativeSchemeId); - REPORT_ERROR(MINOR, err, NO_MSG); - XX_FreeSmart(p_HcFrame); - return NULL; - } + err = EnQFrm(p_FmHc, &fmFd, seqNum); - FmPcdKgValidateSchemeSw(p_FmHc->h_FmPcd, relativeSchemeId); + PutBuf(p_FmHc, p_HcFrame, seqNum); - FmPcdKgReleaseSchemeLock(p_FmHc->h_FmPcd, relativeSchemeId); + if (err != E_OK) + RETURN_ERROR(MINOR, err, NO_MSG); - XX_FreeSmart(p_HcFrame); - - return (t_Handle)(UINT_TO_PTR(physicalSchemeId + 1)); + return E_OK; } t_Error FmHcPcdKgDeleteScheme(t_Handle h_FmHc, t_Handle h_Scheme) @@ -471,213 +422,182 @@ t_Error FmHcPcdKgDeleteScheme(t_Handle h_FmHc, t_Handl t_Error err = E_OK; t_HcFrame *p_HcFrame; t_DpaaFD fmFd; - uint8_t relativeSchemeId; - uint8_t physicalSchemeId = (uint8_t)(PTR_TO_UINT(h_Scheme)-1); + uint8_t physicalSchemeId = FmPcdKgGetSchemeId(h_Scheme); + uint32_t seqNum; - relativeSchemeId = FmPcdKgGetRelativeSchemeId(p_FmHc->h_FmPcd, physicalSchemeId); - - if ((err = FmPcdKgSchemeTryLock(p_FmHc->h_FmPcd, relativeSchemeId, FALSE)) != E_OK) - RETURN_ERROR(MAJOR, err, NO_MSG); - - if(relativeSchemeId == FM_PCD_KG_NUM_OF_SCHEMES) - { - FmPcdKgReleaseSchemeLock(p_FmHc->h_FmPcd, relativeSchemeId); - RETURN_ERROR(MAJOR, E_NOT_IN_RANGE, NO_MSG); - } - - err = FmPcdKgCheckInvalidateSchemeSw(p_FmHc->h_FmPcd, relativeSchemeId); - if (err) - { - FmPcdKgReleaseSchemeLock(p_FmHc->h_FmPcd, relativeSchemeId); - RETURN_ERROR(MAJOR, err, NO_MSG); - } - - p_HcFrame = (t_HcFrame *)XX_MallocSmart((sizeof(t_HcFrame) + p_FmHc->padTill16), 0, 16); + p_HcFrame = GetBuf(p_FmHc, &seqNum); if (!p_HcFrame) - { - FmPcdKgReleaseSchemeLock(p_FmHc->h_FmPcd, relativeSchemeId); - RETURN_ERROR(MINOR, E_NO_MEMORY, ("HC Frame obj")); - } + RETURN_ERROR(MINOR, E_NO_MEMORY, ("HC Frame object")); + memset(p_HcFrame, 0, sizeof(t_HcFrame)); p_HcFrame->opcode = (uint32_t)(HC_HCOR_GBL | HC_HCOR_OPCODE_KG_SCM); p_HcFrame->actionReg = FmPcdKgBuildWriteSchemeActionReg(physicalSchemeId, TRUE); - p_HcFrame->extraReg = 0xFFFFF800; - memset(&p_HcFrame->hcSpecificData.schemeRegs, 0, sizeof(t_FmPcdKgInterModuleSchemeRegs)); + p_HcFrame->extraReg = HC_HCOR_KG_SCHEME_REGS_MASK; + memset(&p_HcFrame->hcSpecificData.schemeRegs, 0, sizeof(struct fman_kg_scheme_regs)); + p_HcFrame->commandSequence = seqNum; BUILD_FD(sizeof(t_HcFrame)); - if ((err = EnQFrm(p_FmHc, &fmFd, &p_HcFrame->commandSequence)) != E_OK) - { - FmPcdKgReleaseSchemeLock(p_FmHc->h_FmPcd, relativeSchemeId); - XX_FreeSmart(p_HcFrame); - RETURN_ERROR(MINOR, err, NO_MSG); - } + err = EnQFrm(p_FmHc, &fmFd, seqNum); - FmPcdKgInvalidateSchemeSw(p_FmHc->h_FmPcd, relativeSchemeId); + PutBuf(p_FmHc, p_HcFrame, seqNum); - FmPcdKgReleaseSchemeLock(p_FmHc->h_FmPcd, relativeSchemeId); + if (err != E_OK) + RETURN_ERROR(MINOR, err, NO_MSG); - XX_FreeSmart(p_HcFrame); - return E_OK; } -t_Error FmHcPcdKgCcGetSetParams(t_Handle h_FmHc, t_Handle h_Scheme, uint32_t requiredAction) +t_Error FmHcPcdKgCcGetSetParams(t_Handle h_FmHc, t_Handle h_Scheme, uint32_t requiredAction, uint32_t value) { t_FmHc *p_FmHc = (t_FmHc*)h_FmHc; t_Error err = E_OK; t_HcFrame *p_HcFrame; t_DpaaFD fmFd; uint8_t relativeSchemeId; - uint8_t physicalSchemeId = (uint8_t)(PTR_TO_UINT(h_Scheme)-1); + uint8_t physicalSchemeId = FmPcdKgGetSchemeId(h_Scheme); uint32_t tmpReg32 = 0; + uint32_t seqNum; + /* Scheme is locked by calling routine */ + /* WARNING - this lock will not be efficient if other HC routine will attempt to change + * "kgse_mode" or "kgse_om" without locking scheme ! + */ + relativeSchemeId = FmPcdKgGetRelativeSchemeId(p_FmHc->h_FmPcd, physicalSchemeId); - if( relativeSchemeId == FM_PCD_KG_NUM_OF_SCHEMES) + if ( relativeSchemeId == FM_PCD_KG_NUM_OF_SCHEMES) RETURN_ERROR(MAJOR, E_NOT_IN_RANGE, NO_MSG); - if (FmPcdKgSchemeTryLock(p_FmHc->h_FmPcd, relativeSchemeId, FALSE)) - RETURN_ERROR(MAJOR, E_INVALID_STATE, ("Lock of the scheme FAILED")); - - if(!FmPcdKgGetPointedOwners(p_FmHc->h_FmPcd, relativeSchemeId) || + if (!FmPcdKgGetRequiredActionFlag(p_FmHc->h_FmPcd, relativeSchemeId) || !(FmPcdKgGetRequiredAction(p_FmHc->h_FmPcd, relativeSchemeId) & requiredAction)) { - - if(requiredAction & UPDATE_NIA_ENQ_WITHOUT_DMA) + if ((requiredAction & UPDATE_NIA_ENQ_WITHOUT_DMA) && + (FmPcdKgGetNextEngine(p_FmHc->h_FmPcd, relativeSchemeId) == e_FM_PCD_PLCR)) + { + if ((FmPcdKgIsDirectPlcr(p_FmHc->h_FmPcd, relativeSchemeId) == FALSE) || + (FmPcdKgIsDistrOnPlcrProfile(p_FmHc->h_FmPcd, relativeSchemeId) == TRUE)) + RETURN_ERROR(MAJOR, E_NOT_SUPPORTED, ("In this situation PP can not be with distribution and has to be shared")); + err = FmPcdPlcrCcGetSetParams(p_FmHc->h_FmPcd, FmPcdKgGetRelativeProfileId(p_FmHc->h_FmPcd, relativeSchemeId), requiredAction); + if (err) + RETURN_ERROR(MAJOR, err, NO_MSG); + } + else /* From here we deal with KG-Schemes only */ { - if((FmPcdKgGetNextEngine(p_FmHc->h_FmPcd, relativeSchemeId) == e_FM_PCD_DONE) && (FmPcdKgGetDoneAction(p_FmHc->h_FmPcd, relativeSchemeId) == e_FM_PCD_ENQ_FRAME)) - + /* Pre change general code */ + p_HcFrame = GetBuf(p_FmHc, &seqNum); + if (!p_HcFrame) + RETURN_ERROR(MINOR, E_NO_MEMORY, ("HC Frame object")); + memset(p_HcFrame, 0, sizeof(t_HcFrame)); + p_HcFrame->opcode = (uint32_t)(HC_HCOR_GBL | HC_HCOR_OPCODE_KG_SCM); + p_HcFrame->actionReg = FmPcdKgBuildReadSchemeActionReg(physicalSchemeId); + p_HcFrame->extraReg = HC_HCOR_KG_SCHEME_REGS_MASK; + p_HcFrame->commandSequence = seqNum; + BUILD_FD(SIZE_OF_HC_FRAME_READ_OR_CC_DYNAMIC); + if ((err = EnQFrm(p_FmHc, &fmFd, seqNum)) != E_OK) { - p_HcFrame = (t_HcFrame *)XX_MallocSmart((sizeof(t_HcFrame) + p_FmHc->padTill16), 0, 16); - if (!p_HcFrame) - { - FmPcdKgReleaseSchemeLock(p_FmHc->h_FmPcd, relativeSchemeId); - RETURN_ERROR(MINOR, E_NO_MEMORY, ("HC Frame obj")); - } *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Mon Oct 30 04:30:35 2017 Return-Path: Delivered-To: svn-src-all@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 99DB8E53CD8; Mon, 30 Oct 2017 04:30:35 +0000 (UTC) (envelope-from eadler@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 5DBA972ECA; Mon, 30 Oct 2017 04:30:35 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9U4UYFv050663; Mon, 30 Oct 2017 04:30:34 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9U4UYlp050662; Mon, 30 Oct 2017 04:30:34 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201710300430.v9U4UYlp050662@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Mon, 30 Oct 2017 04:30:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325119 - head/share/examples X-SVN-Group: head X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: head/share/examples X-SVN-Commit-Revision: 325119 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 04:30:35 -0000 Author: eadler Date: Mon Oct 30 04:30:34 2017 New Revision: 325119 URL: https://svnweb.freebsd.org/changeset/base/325119 Log: Unbreak install Reported by: cy Modified: head/share/examples/Makefile Modified: head/share/examples/Makefile ============================================================================== --- head/share/examples/Makefile Mon Oct 30 03:41:04 2017 (r325118) +++ head/share/examples/Makefile Mon Oct 30 04:30:34 2017 (r325119) @@ -136,7 +136,6 @@ XFILES= BSD_daemon/FreeBSD.pfa \ ppp/ppp.secret.sample \ ppp/ppp.secret.span-isp \ ppp/ppp.secret.span-isp.working \ - printing/README \ printing/diablo-if-net \ printing/hpdf \ printing/hpif \ From owner-svn-src-all@freebsd.org Mon Oct 30 04:46:50 2017 Return-Path: Delivered-To: svn-src-all@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 D21F0E53F9C; Mon, 30 Oct 2017 04:46:50 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from smtp-out-so.shaw.ca (smtp-out-so.shaw.ca [64.59.136.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 16FB573684; Mon, 30 Oct 2017 04:46:50 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from spqr.komquats.com ([96.50.22.10]) by shaw.ca with SMTP id 91yJe3OoC8LPZ91yLeQjcs; Sun, 29 Oct 2017 22:46:49 -0600 X-Authority-Analysis: v=2.2 cv=e552ceh/ c=1 sm=1 tr=0 a=jvE2nwUzI0ECrNeyr98KWA==:117 a=jvE2nwUzI0ECrNeyr98KWA==:17 a=kj9zAlcOel0A:10 a=xqWC_Br6kY4A:10 a=02M-m0pO-4AA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=ULjmA8eK4gz7aPiUh2YA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [IPv6:fc00:1:1:1::5b]) by spqr.komquats.com (Postfix) with ESMTPS id A22051F6; Sun, 29 Oct 2017 21:46:47 -0700 (PDT) Received: from slippy (localhost [IPv6:0:0:0:0:0:0:0:1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id v9U4kl0L070302; Sun, 29 Oct 2017 21:46:47 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201710300446.v9U4kl0L070302@slippy.cwsent.com> X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.6 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Eitan Adler cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r325119 - head/share/examples In-Reply-To: Message from Eitan Adler of "Mon, 30 Oct 2017 04:30:34 -0000." <201710300430.v9U4UYlp050662@repo.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Sun, 29 Oct 2017 21:46:46 -0700 X-CMAE-Envelope: MS4wfA+sPDYxZZFwB80CjtU4alKz+5uG7vfSrBojDTX4O2UkoQo2sMM0rmA9nbTjr31Ww3SWSJFZ6rdPp4NH1lJTfhknEj4csxO9PRGPvH5V4Cxne1aNtlvg 3F+4OoVAbp0iaFLeNVVUWhXE06s5843HYLUgtL2GlUjr1I6lou3wjR2acHe5x4PYI1GAeEX10dx9i+WKsmG8Mes/3UnA/1yhv+bBbbuPn5epIiJDDfZLeyuE xgBw4hexxUn1NWdhw2mC4LXiPzrjN8qTMJZx6Qz8ul/AJbS7z9eYO3VoZvAIML5F X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 04:46:50 -0000 In message <201710300430.v9U4UYlp050662@repo.freebsd.org>, Eitan Adler writes: > Author: eadler > Date: Mon Oct 30 04:30:34 2017 > New Revision: 325119 > URL: https://svnweb.freebsd.org/changeset/base/325119 > > Log: > Unbreak install > > Reported by: cy > > Modified: > head/share/examples/Makefile > > Modified: head/share/examples/Makefile > ============================================================================= > = > --- head/share/examples/Makefile Mon Oct 30 03:41:04 2017 (r32511 > 8) > +++ head/share/examples/Makefile Mon Oct 30 04:30:34 2017 (r32511 > 9) > @@ -136,7 +136,6 @@ XFILES= BSD_daemon/FreeBSD.pfa \ > ppp/ppp.secret.sample \ > ppp/ppp.secret.span-isp \ > ppp/ppp.secret.span-isp.working \ > - printing/README \ > printing/diablo-if-net \ > printing/hpdf \ > printing/hpif \ > ;) -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. From owner-svn-src-all@freebsd.org Mon Oct 30 06:06:38 2017 Return-Path: Delivered-To: svn-src-all@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 BF6A6E55026; Mon, 30 Oct 2017 06:06:38 +0000 (UTC) (envelope-from ngie@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 8187875457; Mon, 30 Oct 2017 06:06:38 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9U66bgK091227; Mon, 30 Oct 2017 06:06:37 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9U66b8f091226; Mon, 30 Oct 2017 06:06:37 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710300606.v9U66b8f091226@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Mon, 30 Oct 2017 06:06:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325121 - head/share/man/man4 X-SVN-Group: head X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: head/share/man/man4 X-SVN-Commit-Revision: 325121 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 06:06:38 -0000 Author: ngie Date: Mon Oct 30 06:06:37 2017 New Revision: 325121 URL: https://svnweb.freebsd.org/changeset/base/325121 Log: iwmfw(4): update support info - Document iwm8265fw firmware knobs. - Note that 8000 series cards are also covered by the iwmfw(4) firmware module set. Modified: head/share/man/man4/iwmfw.4 Modified: head/share/man/man4/iwmfw.4 ============================================================================== --- head/share/man/man4/iwmfw.4 Mon Oct 30 05:52:26 2017 (r325120) +++ head/share/man/man4/iwmfw.4 Mon Oct 30 06:06:37 2017 (r325121) @@ -22,7 +22,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 26, 2016 +.Dd October 29, 2017 .Dt IWMFW 4 .Os .Sh NAME @@ -46,6 +46,7 @@ of the following: .Cd "device iwm7260fw" .Cd "device iwm7265fw" .Cd "device iwm8000Cfw" +.Cd "device iwm8265fw" .Ed .Pp Alternatively, to load the driver as a @@ -57,10 +58,11 @@ iwm7260fw_load="YES" iwm7265fw_load="YES" iwm7265Dfw_load="YES" iwm8000Cfw_load="YES" +iwm8265fw_load="YES" .Ed .Sh DESCRIPTION This module provides access to firmware sets for the -Intel Dual Band Wireless WiFi 3160, 3165, 7260, 7265 and 8260 series of +Intel Dual Band Wireless WiFi 3160, 3165, 7260, 7265, 8000, and 8260 series of IEEE 802.11n/11ac adapters. It may be statically linked into the kernel, or loaded as a module. From owner-svn-src-all@freebsd.org Mon Oct 30 06:35:10 2017 Return-Path: Delivered-To: svn-src-all@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 A8C87E55759; Mon, 30 Oct 2017 06:35:10 +0000 (UTC) (envelope-from ngie@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 76F1975F6B; Mon, 30 Oct 2017 06:35:10 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9U6Z9Ih003667; Mon, 30 Oct 2017 06:35:09 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9U6Z930003666; Mon, 30 Oct 2017 06:35:09 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710300635.v9U6Z930003666@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Mon, 30 Oct 2017 06:35:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325122 - head/sys/conf X-SVN-Group: head X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: head/sys/conf X-SVN-Commit-Revision: 325122 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 06:35:10 -0000 Author: ngie Date: Mon Oct 30 06:35:09 2017 New Revision: 325122 URL: https://svnweb.freebsd.org/changeset/base/325122 Log: Fill in the blanks for iwm8265fw(4) rules, missed in r324434 Now using "device iwmfw" or "device iwm8265fw" in one's kernel configuration will potentially result in a working IWM8265 series wireless SoC. This is an alternative to the fix that was made in r324470 for `sys/modules/iwmfw`. MFC after: 1 month Modified: head/sys/conf/files Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Mon Oct 30 06:06:37 2017 (r325121) +++ head/sys/conf/files Mon Oct 30 06:35:09 2017 (r325122) @@ -2010,6 +2010,20 @@ iwm8000C.fw optional iwm8000Cfw | iwmfw \ compile-with "${NORMAL_FW}" \ no-obj no-implicit-rule \ clean "iwm8000C.fw" +iwm8265.fw optional iwm8265fw | iwmfw \ + dependency "$S/contrib/dev/iwm/iwm-8265-22.fw.uu" \ + compile-with "${NORMAL_FW}" \ + no-obj no-implicit-rule \ + clean "iwm8265.fw" +iwm8265fw.c optional iwm8265fw | iwmfw \ + compile-with "${AWK} -f $S/tools/fw_stub.awk iwm8265.fw:iwm8265fw -miwm8265fw -c${.TARGET}" \ + no-implicit-rule before-depend local \ + clean "iwm8265fw.c" +iwm8265Cfw.fwo optional iwm8265fw | iwmfw \ + dependency "iwm8265.fw" \ + compile-with "${NORMAL_FWO}" \ + no-implicit-rule \ + clean "iwm8000Cfw.fwo" dev/iwn/if_iwn.c optional iwn iwn1000fw.c optional iwn1000fw | iwnfw \ compile-with "${AWK} -f $S/tools/fw_stub.awk iwn1000.fw:iwn1000fw -miwn1000fw -c${.TARGET}" \ From owner-svn-src-all@freebsd.org Mon Oct 30 06:43:41 2017 Return-Path: Delivered-To: svn-src-all@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 401F3E559F6; Mon, 30 Oct 2017 06:43:41 +0000 (UTC) (envelope-from ngie@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 0FAAD763E5; Mon, 30 Oct 2017 06:43:40 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9U6he0Y007757; Mon, 30 Oct 2017 06:43:40 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9U6heLa007756; Mon, 30 Oct 2017 06:43:40 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710300643.v9U6heLa007756@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Mon, 30 Oct 2017 06:43:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325123 - head/share/man/man4 X-SVN-Group: head X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: head/share/man/man4 X-SVN-Commit-Revision: 325123 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 06:43:41 -0000 Author: ngie Date: Mon Oct 30 06:43:40 2017 New Revision: 325123 URL: https://svnweb.freebsd.org/changeset/base/325123 Log: Reference iwm8265fw support in iwm(4) as well This documentation update is similar to what was done in iwmfw(4) in r325121. MFC after: 1 month MFC with: r325121 Modified: head/share/man/man4/iwm.4 Modified: head/share/man/man4/iwm.4 ============================================================================== --- head/share/man/man4/iwm.4 Mon Oct 30 06:35:09 2017 (r325122) +++ head/share/man/man4/iwm.4 Mon Oct 30 06:43:40 2017 (r325123) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 26, 2016 +.Dd October 29, 2017 .Dt IWM 4 .Os .Sh NAME @@ -49,6 +49,7 @@ Choose one from: .Cd "device iwm7260fw" .Cd "device iwm7265fw" .Cd "device iwm8000Cfw" +.Cd "device iwm8265fw" .Ed .Pp Or you can use @@ -67,6 +68,7 @@ iwm3160fw_load="YES" iwm7260fw_load="YES" iwm7265fw_load="YES" iwm8000Cfw_load="YES" +iwm8265fw_load="YES" .Ed .Sh DESCRIPTION The From owner-svn-src-all@freebsd.org Mon Oct 30 06:48:40 2017 Return-Path: Delivered-To: svn-src-all@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 3B35AE55C0F; Mon, 30 Oct 2017 06:48:40 +0000 (UTC) (envelope-from ngie@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 0B0AB76729; Mon, 30 Oct 2017 06:48:39 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9U6md30007980; Mon, 30 Oct 2017 06:48:39 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9U6mdAW007979; Mon, 30 Oct 2017 06:48:39 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710300648.v9U6mdAW007979@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Mon, 30 Oct 2017 06:48:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325124 - head/sys/conf X-SVN-Group: head X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: head/sys/conf X-SVN-Commit-Revision: 325124 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 06:48:40 -0000 Author: ngie Date: Mon Oct 30 06:48:38 2017 New Revision: 325124 URL: https://svnweb.freebsd.org/changeset/base/325124 Log: Fix a bad copy-paste (8000C -> 8265) done in r325122 This fixes the clean rule for "device iwm8265fw". MFC after: 1 month MFC with: r325122 Modified: head/sys/conf/files Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Mon Oct 30 06:43:40 2017 (r325123) +++ head/sys/conf/files Mon Oct 30 06:48:38 2017 (r325124) @@ -2023,7 +2023,7 @@ iwm8265Cfw.fwo optional iwm8265fw | iwmfw \ dependency "iwm8265.fw" \ compile-with "${NORMAL_FWO}" \ no-implicit-rule \ - clean "iwm8000Cfw.fwo" + clean "iwm8265Cfw.fwo" dev/iwn/if_iwn.c optional iwn iwn1000fw.c optional iwn1000fw | iwnfw \ compile-with "${AWK} -f $S/tools/fw_stub.awk iwn1000.fw:iwn1000fw -miwn1000fw -c${.TARGET}" \ From owner-svn-src-all@freebsd.org Mon Oct 30 06:51:04 2017 Return-Path: Delivered-To: svn-src-all@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 DF8B7E55CBC; Mon, 30 Oct 2017 06:51:04 +0000 (UTC) (envelope-from ngie@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 AF943768FD; Mon, 30 Oct 2017 06:51:04 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9U6p3hZ010945; Mon, 30 Oct 2017 06:51:03 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9U6p3cE010944; Mon, 30 Oct 2017 06:51:03 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710300651.v9U6p3cE010944@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Mon, 30 Oct 2017 06:51:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325125 - head/sys/conf X-SVN-Group: head X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: head/sys/conf X-SVN-Commit-Revision: 325125 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 06:51:05 -0000 Author: ngie Date: Mon Oct 30 06:51:03 2017 New Revision: 325125 URL: https://svnweb.freebsd.org/changeset/base/325125 Log: Remove unnecessary C in .fwo file I accidentally made consistent MFC after: 1 month MFC with: r325122, r325124 Modified: head/sys/conf/files Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Mon Oct 30 06:48:38 2017 (r325124) +++ head/sys/conf/files Mon Oct 30 06:51:03 2017 (r325125) @@ -2019,11 +2019,11 @@ iwm8265fw.c optional iwm8265fw | iwmfw \ compile-with "${AWK} -f $S/tools/fw_stub.awk iwm8265.fw:iwm8265fw -miwm8265fw -c${.TARGET}" \ no-implicit-rule before-depend local \ clean "iwm8265fw.c" -iwm8265Cfw.fwo optional iwm8265fw | iwmfw \ +iwm8265fw.fwo optional iwm8265fw | iwmfw \ dependency "iwm8265.fw" \ compile-with "${NORMAL_FWO}" \ no-implicit-rule \ - clean "iwm8265Cfw.fwo" + clean "iwm8265fw.fwo" dev/iwn/if_iwn.c optional iwn iwn1000fw.c optional iwn1000fw | iwnfw \ compile-with "${AWK} -f $S/tools/fw_stub.awk iwn1000.fw:iwn1000fw -miwn1000fw -c${.TARGET}" \ From owner-svn-src-all@freebsd.org Mon Oct 30 08:25:25 2017 Return-Path: Delivered-To: svn-src-all@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 BA98DE57367; Mon, 30 Oct 2017 08:25:25 +0000 (UTC) (envelope-from kib@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 88B967D4CD; Mon, 30 Oct 2017 08:25:25 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9U8POeb049031; Mon, 30 Oct 2017 08:25:24 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9U8POho049030; Mon, 30 Oct 2017 08:25:24 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201710300825.v9U8POho049030@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Mon, 30 Oct 2017 08:25:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r325130 - stable/11/share/man/man9 X-SVN-Group: stable-11 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: stable/11/share/man/man9 X-SVN-Commit-Revision: 325130 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 08:25:25 -0000 Author: kib Date: Mon Oct 30 08:25:24 2017 New Revision: 325130 URL: https://svnweb.freebsd.org/changeset/base/325130 Log: MFC r324926: Expand explanation of atomicity. Modified: stable/11/share/man/man9/atomic.9 Directory Properties: stable/11/ (props changed) Modified: stable/11/share/man/man9/atomic.9 ============================================================================== --- stable/11/share/man/man9/atomic.9 Mon Oct 30 08:23:48 2017 (r325129) +++ stable/11/share/man/man9/atomic.9 Mon Oct 30 08:25:24 2017 (r325130) @@ -23,7 +23,7 @@ .\" .\" $FreeBSD$ .\" -.Dd Jan 3, 2017 +.Dd March 23, 2017 .Dt ATOMIC 9 .Os .Sh NAME @@ -76,10 +76,41 @@ .Ft int .Fn atomic_testandset_ "volatile *p" "u_int v" .Sh DESCRIPTION -Each of the atomic operations is guaranteed to be atomic across multiple -threads and in the presence of interrupts. -They can be used to implement reference counts or as building blocks for more -advanced synchronization primitives such as mutexes. +All of these operations are performed atomically across multiple +threads and in the presence of interrupts, meaning that they are +performed in an indivisible manner from the perspective of concurrently +running threads and interrupt handlers. +.Pp +When atomic operations are performed on cache-coherent memory, all +operations on the same location are totally ordered. +.Pp +When an atomic load is performed on a location in cache-coherent memory, +it reads the entire value that was defined by the last atomic store to +each byte of the location. +An atomic load will never return a value out of thin air. +When an atomic store is performed on a location, no other thread or +interrupt handler will observe a +.Em torn write , +or partial modification of the location. +.Pp +On all architectures supported by +.Fx , +ordinary loads and stores of naturally aligned integer types +are atomic, as executed by the processor. +.Pp +Atomic operations can be used to implement reference counts or as +building blocks for synchronization primitives such as mutexes. +.Pp +The semantics of +.Fx Ns 's +atomic operations are almost identical to those of the similarly named +C11 operations. +The one important difference is that the C11 standard does not +require ordinary loads and stores to ever be atomic. +This is is why the +.Fn atomic_load_explicit memory_order_relaxed +operation exists in the C11 standard, but is not provided by +.In machine/atomic.h . .Ss Types Each atomic operation operates on a specific .Fa type . From owner-svn-src-all@freebsd.org Mon Oct 30 08:44:10 2017 Return-Path: Delivered-To: svn-src-all@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 28086E577D8; Mon, 30 Oct 2017 08:44:10 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pf0-x235.google.com (mail-pf0-x235.google.com [IPv6:2607:f8b0:400e:c00::235]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E79297DDF4; Mon, 30 Oct 2017 08:44:09 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pf0-x235.google.com with SMTP id b6so10453324pfh.7; Mon, 30 Oct 2017 01:44:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:subject:from:in-reply-to:date:cc:message-id:references :to; bh=JXPJBoS6un+nKxjtgfHsybGo2pRprVrBzHwlhuWjr5E=; b=Ta8L+A7WaF2FOiS417PqvPO3CjC7mzqo9rfuH4abHHWacUPj5eyhiciDFh/Kli+jEX HNKXuURGKrzUXJHsKzfX0Otofo6QyCRqaRpT2e+2MbwLAhSzYWMg1t6iUPSNgWZzBXm+ Tz5jaE+tlfyynXHVuukeyzVUjbSk1+4EfRlN+/TS7EbDlaKDSnlVqGCg/NL1fUOQKocp Qpq0zLbCdaqR/VGYz0xBKVIcN9502uIJDajrxMxdEBPSbLIh8fC7SOU5Fq1rPVNmrPqj v7XUEOI6Ij25FbPnXZXEM7muB1SuOMcAk9A/y7Oz6w62ivq32YWvgau8cdY9C3TOnz4f jwAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :message-id:references:to; bh=JXPJBoS6un+nKxjtgfHsybGo2pRprVrBzHwlhuWjr5E=; b=CMSuSK89Oyo3/xVQrY+VghqnNT2DdPjiQxc5wPsYrGZNm7PUs9VBCMUicfqa3MpBnK odjHGKUfWnePjid232Be8vdcS7+1jMvC4Y924C+DgalJbqYXa5S3bB+p9ZaPzhAL0n/q XM/VtQsyPG6srt4H5SaiEeJDrg1fMFqUkK2f6u4HAV6rGCLs37GEjFQEawmJQ24orIIK zk9aBwLY0mjQq7qu7gPmnOW9WaZinXEuDIQHDcB6CHQkB1j8sl6ab2p6smoPy5KtfhJ/ ARqbCyTApBl+LagLUtfjQqiR4b+qJ3zC2DH+6SrKV54jXqpIo4I9XmAV2wKh0UdWTFtk Wejw== X-Gm-Message-State: AMCzsaW/NnfbqXrPGit7ydXrWXssO3xCmWZr9DmILKm/P+Y4zQuEpJJL MnpXzPoXYY3fZEfAtZuKV/V1G29c X-Google-Smtp-Source: ABhQp+QSuNtvLWNu+x9CmLu0EKe7jV3Vx4XD0rbeVfmyBN0qOHRhtbgHZAMLm/KS4um7MygeAiEvbg== X-Received: by 10.84.248.133 with SMTP id q5mr6695876pll.419.1509353049140; Mon, 30 Oct 2017 01:44:09 -0700 (PDT) Received: from pinklady.local (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id q2sm20394150pgp.81.2017.10.30.01.44.08 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 30 Oct 2017 01:44:08 -0700 (PDT) Content-Type: multipart/signed; boundary="Apple-Mail=_3D4D2AF8-6B40-45E9-ACAC-1632A5527153"; protocol="application/pgp-signature"; micalg=pgp-sha512 Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) Subject: Re: svn commit: r322951 - head From: "Ngie Cooper (yaneurabeya)" In-Reply-To: Date: Mon, 30 Oct 2017 01:44:07 -0700 Cc: Ngie Cooper , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-Id: References: <201708271615.v7RGFcKs033967@repo.freebsd.org> To: Bryan Drewery X-Mailer: Apple Mail (2.3124) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 08:44:10 -0000 --Apple-Mail=_3D4D2AF8-6B40-45E9-ACAC-1632A5527153 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Oct 25, 2017, at 13:34, Bryan Drewery wrote: =E2=80=A6 > I don't understand what you're saying here. If I build with = MK_TCSH=3Dyes > and the host does not have tcsh, a failure occurs AFTER or BEFORE this > change? > Neither case makes sense to me. > What is the failure? >=20 > The change here is to build-tools which just calls 'make build-tools' = in > bin/csh which just builds 'gethost'. Yes. The relnotes concerns I mentioned are bogus. Yeah, a ~400 line C file isn=E2=80=99t that bad, I agree. I really don=E2=80=99t care about arguing this or debating it. Yes, = you=E2=80=99re right on all counts. It=E2=80=99s a micro optimization. --Apple-Mail=_3D4D2AF8-6B40-45E9-ACAC-1632A5527153 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEE5bk3FaGcY5rvqmb79YOpJmkwhhUFAln25lcACgkQ9YOpJmkw hhW6AxAAx4EpoGV0ld+ndstszLW+Dwno1nGigg+LTZ+pXQYvBJ6GaPkTJYSXvod1 fliN5YDa9fZN7AC7lcTwGOXHL3AWZifLW6jokrWJzNqev/QM1Y8Gi/Bz9DLA7VC5 CX5Yut4RkuYZRd2e4Ov+jUKW+wquB3eaju48j+ZIpOA/na8r9rBq5Kb4VGNKhwBy 1DAZHFFlrVPuC6lNF+XU8RGbEHkH4x5ZFyo6lTljK5uDfiOQ3dTZpBhpx7dQWJuF +8b+7h8XPFPsmwMpFDe0FUO/7Gn4v0g0/coTCIJmTSnV/cBgvvrvYDd5Qa8LEZ4N HqOckMrd3i6y+iP3YM8H+YWyaKEaA4gfLvgJ0FA8bmbjoDQ9a5VJAgIbImEBBf/u lIhRZzBM3OIl4qq1k9ziXw5V8B76YUjceeJZE84v+Kh2nl64RSfpC976J9sb3TDe fZE/gNYqqPbwNclnskaksKENKmuzIJpWP/z9p6414fsavYgCx0JrrAVkEfWh75Y6 kSyQeI2oW6u5q2liUHjZwwX9M5YmvRFWxNjzXpBHrR4ljqBNV2z3vnFdHsptPAW0 WEzDikK4BVXRiiX4RFRgcfmm6R8ALe4d/HcH5K/vrJgCVuiCB4bSsv7YwEfS0MJH fQjp03KaoKOoQ7LdiRYEfxElh+0c9miOsOyLbohNO5H0z2y7B7Y= =XoUE -----END PGP SIGNATURE----- --Apple-Mail=_3D4D2AF8-6B40-45E9-ACAC-1632A5527153-- From owner-svn-src-all@freebsd.org Mon Oct 30 08:53:17 2017 Return-Path: Delivered-To: svn-src-all@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 3DE62E57B57; Mon, 30 Oct 2017 08:53:17 +0000 (UTC) (envelope-from avg@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 E288F7E37E; Mon, 30 Oct 2017 08:53:16 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9U8rGZi061153; Mon, 30 Oct 2017 08:53:16 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9U8rF1e061142; Mon, 30 Oct 2017 08:53:15 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201710300853.v9U8rF1e061142@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 30 Oct 2017 08:53:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r325132 - in stable/11: cddl/contrib/opensolaris/cmd/ztest sys/cddl/compat/opensolaris/sys sys/cddl/contrib/opensolaris/uts/common/fs/zfs sys/cddl/contrib/opensolaris/uts/common/fs/zfs/... X-SVN-Group: stable-11 X-SVN-Commit-Author: avg X-SVN-Commit-Paths: in stable/11: cddl/contrib/opensolaris/cmd/ztest sys/cddl/compat/opensolaris/sys sys/cddl/contrib/opensolaris/uts/common/fs/zfs sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys sys/cddl/contrib/open... X-SVN-Commit-Revision: 325132 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 08:53:17 -0000 Author: avg Date: Mon Oct 30 08:53:15 2017 New Revision: 325132 URL: https://svnweb.freebsd.org/changeset/base/325132 Log: MFC r324011, r324016: MFV r323535: 8585 improve batching done in zil_commit() FreeBSD notes: - this MFV reverts FreeBSD commit r314549 to make the merge easier - at present our emulation of cv_timedwait_hires is rather poor, so I elected to use cv_timedwait_sbt directly Please see the differential revision for details. Unfortunately, I did not get any positive reviews, so there could be bugs in the FreeBSD-specific piece of the merge. Hence, the long MFC timeout. illumos/illumos-gate@1271e4b10dfaaed576c08a812f466f6e81370e5e https://github.com/illumos/illumos-gate/commit/1271e4b10dfaaed576c08a812f466f6e81370e5e https://www.illumos.org/issues/8585 The current implementation of zil_commit() can introduce significant latency, beyond what is inherent due to the latency of the underlying storage. The additional latency comes from two main problems: 1. When there's outstanding ZIL blocks being written (i.e. there's already a "writer thread" in progress), then any new calls to zil_commit() will block waiting for the currently oustanding ZIL blocks to complete. The blocks written for each "writer thread" is coined a "batch", and there can only ever be a single "batch" being written at a time. When a batch is being written, any new ZIL transactions will have to wait for the next batch to be written, which won't occur until the current batch finishes. As a result, the underlying storage may not be used as efficiently as possible. While "new" threads enter zil_commit() and are blocked waiting for the next batch, it's possible that the underlying storage isn't fully utilized by the current batch of ZIL blocks. In that case, it'd be better to allow these new threads to generate (and issue) a new ZIL block, such that it could be serviced by the underlying storage concurrently with the other ZIL blocks that are being serviced. 2. Any call to zil_commit() must wait for all ZIL blocks in its "batch" to complete, prior to zil_commit() returning. The size of any given batch is proportional to the number of ZIL transaction in the queue at the time that the batch starts processing the queue; which doesn't occur until the previous batch completes. Thus, if there's a lot of transactions in the queue, the batch could be composed of many ZIL blocks, and each call to zil_commit() will have to wait for all of these writes to complete (even if the thread calling zil_commit() only cared about one of the transactions in the batch). Reviewed by: Brad Lewis Reviewed by: Matt Ahrens Reviewed by: George Wilson Approved by: Dan McDonald Author: Prakash Surya Modified: stable/11/cddl/contrib/opensolaris/cmd/ztest/ztest.c stable/11/sys/cddl/compat/opensolaris/sys/time.h stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c stable/11/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h Directory Properties: stable/11/ (props changed) Modified: stable/11/cddl/contrib/opensolaris/cmd/ztest/ztest.c ============================================================================== --- stable/11/cddl/contrib/opensolaris/cmd/ztest/ztest.c Mon Oct 30 08:44:47 2017 (r325131) +++ stable/11/cddl/contrib/opensolaris/cmd/ztest/ztest.c Mon Oct 30 08:53:15 2017 (r325132) @@ -1831,13 +1831,14 @@ ztest_get_done(zgd_t *zgd, int error) ztest_object_unlock(zd, object); if (error == 0 && zgd->zgd_bp) - zil_add_block(zgd->zgd_zilog, zgd->zgd_bp); + zil_lwb_add_block(zgd->zgd_lwb, zgd->zgd_bp); umem_free(zgd, sizeof (*zgd)); } static int -ztest_get_data(void *arg, lr_write_t *lr, char *buf, zio_t *zio) +ztest_get_data(void *arg, lr_write_t *lr, char *buf, struct lwb *lwb, + zio_t *zio) { ztest_ds_t *zd = arg; objset_t *os = zd->zd_os; @@ -1851,6 +1852,10 @@ ztest_get_data(void *arg, lr_write_t *lr, char *buf, z zgd_t *zgd; int error; + ASSERT3P(lwb, !=, NULL); + ASSERT3P(zio, !=, NULL); + ASSERT3U(size, !=, 0); + ztest_object_lock(zd, object, RL_READER); error = dmu_bonus_hold(os, object, FTAG, &db); if (error) { @@ -1871,7 +1876,7 @@ ztest_get_data(void *arg, lr_write_t *lr, char *buf, z db = NULL; zgd = umem_zalloc(sizeof (*zgd), UMEM_NOFAIL); - zgd->zgd_zilog = zd->zd_zilog; + zgd->zgd_lwb = lwb; zgd->zgd_private = zd; if (buf != NULL) { /* immediate write */ Modified: stable/11/sys/cddl/compat/opensolaris/sys/time.h ============================================================================== --- stable/11/sys/cddl/compat/opensolaris/sys/time.h Mon Oct 30 08:44:47 2017 (r325131) +++ stable/11/sys/cddl/compat/opensolaris/sys/time.h Mon Oct 30 08:53:15 2017 (r325132) @@ -40,6 +40,9 @@ #define MSEC2NSEC(m) ((hrtime_t)(m) * (NANOSEC / MILLISEC)) #define NSEC2MSEC(n) ((n) / (NANOSEC / MILLISEC)) +#define USEC2NSEC(m) ((hrtime_t)(m) * (NANOSEC / MICROSEC)) +#define NSEC2USEC(n) ((n) / (NANOSEC / MICROSEC)) + #define NSEC2SEC(n) ((n) / (NANOSEC / SEC)) #define SEC2NSEC(m) ((hrtime_t)(m) * (NANOSEC / SEC)) Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c ============================================================================== --- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c Mon Oct 30 08:44:47 2017 (r325131) +++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c Mon Oct 30 08:53:15 2017 (r325132) @@ -1728,6 +1728,13 @@ dmu_sync_late_arrival(zio_t *pio, objset_t *os, dmu_sy return (SET_ERROR(EIO)); } + /* + * In order to prevent the zgd's lwb from being free'd prior to + * dmu_sync_late_arrival_done() being called, we have to ensure + * the lwb's "max txg" takes this tx's txg into account. + */ + zil_lwb_add_txg(zgd->zgd_lwb, dmu_tx_get_txg(tx)); + dsa = kmem_alloc(sizeof (dmu_sync_arg_t), KM_SLEEP); dsa->dsa_dr = NULL; dsa->dsa_done = done; Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h ============================================================================== --- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h Mon Oct 30 08:44:47 2017 (r325131) +++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h Mon Oct 30 08:53:15 2017 (r325132) @@ -920,7 +920,7 @@ uint64_t dmu_tx_get_txg(dmu_tx_t *tx); * {zfs,zvol,ztest}_get_done() args */ typedef struct zgd { - struct zilog *zgd_zilog; + struct lwb *zgd_lwb; struct blkptr *zgd_bp; dmu_buf_t *zgd_db; struct rl *zgd_rl; Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h ============================================================================== --- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h Mon Oct 30 08:44:47 2017 (r325131) +++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h Mon Oct 30 08:53:15 2017 (r325132) @@ -40,6 +40,7 @@ extern "C" { struct dsl_pool; struct dsl_dataset; +struct lwb; /* * Intent log format: @@ -140,6 +141,7 @@ typedef enum zil_create { /* * Intent log transaction types and record structures */ +#define TX_COMMIT 0 /* Commit marker (no on-disk state) */ #define TX_CREATE 1 /* Create file */ #define TX_MKDIR 2 /* Make directory */ #define TX_MKXATTR 3 /* Make XATTR directory */ @@ -388,7 +390,8 @@ typedef int zil_parse_blk_func_t(zilog_t *zilog, blkpt typedef int zil_parse_lr_func_t(zilog_t *zilog, lr_t *lr, void *arg, uint64_t txg); typedef int zil_replay_func_t(); -typedef int zil_get_data_t(void *arg, lr_write_t *lr, char *dbuf, zio_t *zio); +typedef int zil_get_data_t(void *arg, lr_write_t *lr, char *dbuf, + struct lwb *lwb, zio_t *zio); extern int zil_parse(zilog_t *zilog, zil_parse_blk_func_t *parse_blk_func, zil_parse_lr_func_t *parse_lr_func, void *arg, uint64_t txg); @@ -427,7 +430,8 @@ extern void zil_clean(zilog_t *zilog, uint64_t synced_ extern int zil_suspend(const char *osname, void **cookiep); extern void zil_resume(void *cookie); -extern void zil_add_block(zilog_t *zilog, const blkptr_t *bp); +extern void zil_lwb_add_block(struct lwb *lwb, const blkptr_t *bp); +extern void zil_lwb_add_txg(struct lwb *lwb, uint64_t txg); extern int zil_bp_tree_add(zilog_t *zilog, const blkptr_t *bp); extern void zil_set_sync(zilog_t *zilog, uint64_t syncval); Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h ============================================================================== --- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h Mon Oct 30 08:44:47 2017 (r325131) +++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h Mon Oct 30 08:53:15 2017 (r325132) @@ -20,7 +20,7 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2012, 2017 by Delphix. All rights reserved. * Copyright (c) 2014 Integros [integros.com] */ @@ -37,22 +37,76 @@ extern "C" { #endif /* - * Log write buffer. + * Possbile states for a given lwb structure. An lwb will start out in + * the "closed" state, and then transition to the "opened" state via a + * call to zil_lwb_write_open(). After the lwb is "open", it can + * transition into the "issued" state via zil_lwb_write_issue(). After + * the lwb's zio completes, and the vdev's are flushed, the lwb will + * transition into the "done" state via zil_lwb_write_done(), and the + * structure eventually freed. */ +typedef enum { + LWB_STATE_CLOSED, + LWB_STATE_OPENED, + LWB_STATE_ISSUED, + LWB_STATE_DONE, + LWB_NUM_STATES +} lwb_state_t; + +/* + * Log write block (lwb) + * + * Prior to an lwb being issued to disk via zil_lwb_write_issue(), it + * will be protected by the zilog's "zl_writer_lock". Basically, prior + * to it being issued, it will only be accessed by the thread that's + * holding the "zl_writer_lock". After the lwb is issued, the zilog's + * "zl_lock" is used to protect the lwb against concurrent access. + */ typedef struct lwb { zilog_t *lwb_zilog; /* back pointer to log struct */ blkptr_t lwb_blk; /* on disk address of this log blk */ boolean_t lwb_slog; /* lwb_blk is on SLOG device */ int lwb_nused; /* # used bytes in buffer */ int lwb_sz; /* size of block and buffer */ + lwb_state_t lwb_state; /* the state of this lwb */ char *lwb_buf; /* log write buffer */ - zio_t *lwb_zio; /* zio for this buffer */ + zio_t *lwb_write_zio; /* zio for the lwb buffer */ + zio_t *lwb_root_zio; /* root zio for lwb write and flushes */ dmu_tx_t *lwb_tx; /* tx for log block allocation */ uint64_t lwb_max_txg; /* highest txg in this lwb */ list_node_t lwb_node; /* zilog->zl_lwb_list linkage */ + list_t lwb_waiters; /* list of zil_commit_waiter's */ + avl_tree_t lwb_vdev_tree; /* vdevs to flush after lwb write */ + kmutex_t lwb_vdev_lock; /* protects lwb_vdev_tree */ + hrtime_t lwb_issued_timestamp; /* when was the lwb issued? */ } lwb_t; /* + * ZIL commit waiter. + * + * This structure is allocated each time zil_commit() is called, and is + * used by zil_commit() to communicate with other parts of the ZIL, such + * that zil_commit() can know when it safe for it return. For more + * details, see the comment above zil_commit(). + * + * The "zcw_lock" field is used to protect the commit waiter against + * concurrent access. This lock is often acquired while already holding + * the zilog's "zl_writer_lock" or "zl_lock"; see the functions + * zil_process_commit_list() and zil_lwb_flush_vdevs_done() as examples + * of this. Thus, one must be careful not to acquire the + * "zl_writer_lock" or "zl_lock" when already holding the "zcw_lock"; + * e.g. see the zil_commit_waiter_timeout() function. + */ +typedef struct zil_commit_waiter { + kcondvar_t zcw_cv; /* signalled when "done" */ + kmutex_t zcw_lock; /* protects fields of this struct */ + list_node_t zcw_node; /* linkage in lwb_t:lwb_waiter list */ + lwb_t *zcw_lwb; /* back pointer to lwb when linked */ + boolean_t zcw_done; /* B_TRUE when "done", else B_FALSE */ + int zcw_zio_error; /* contains the zio io_error value */ +} zil_commit_waiter_t; + +/* * Intent log transaction lists */ typedef struct itxs { @@ -94,20 +148,20 @@ struct zilog { const zil_header_t *zl_header; /* log header buffer */ objset_t *zl_os; /* object set we're logging */ zil_get_data_t *zl_get_data; /* callback to get object content */ - zio_t *zl_root_zio; /* log writer root zio */ + lwb_t *zl_last_lwb_opened; /* most recent lwb opened */ + hrtime_t zl_last_lwb_latency; /* zio latency of last lwb done */ uint64_t zl_lr_seq; /* on-disk log record sequence number */ uint64_t zl_commit_lr_seq; /* last committed on-disk lr seq */ uint64_t zl_destroy_txg; /* txg of last zil_destroy() */ uint64_t zl_replayed_seq[TXG_SIZE]; /* last replayed rec seq */ uint64_t zl_replaying_seq; /* current replay seq number */ uint32_t zl_suspend; /* log suspend count */ - kcondvar_t zl_cv_writer; /* log writer thread completion */ kcondvar_t zl_cv_suspend; /* log suspend completion */ uint8_t zl_suspending; /* log is currently suspending */ uint8_t zl_keep_first; /* keep first log block in destroy */ uint8_t zl_replay; /* replaying records while set */ uint8_t zl_stop_sync; /* for debugging */ - uint8_t zl_writer; /* boolean: write setup in progress */ + kmutex_t zl_writer_lock; /* single writer, per ZIL, at a time */ uint8_t zl_logbias; /* latency or throughput */ uint8_t zl_sync; /* synchronous or asynchronous */ int zl_parse_error; /* last zil_parse() error */ @@ -115,15 +169,10 @@ struct zilog { uint64_t zl_parse_lr_seq; /* highest lr seq on last parse */ uint64_t zl_parse_blk_count; /* number of blocks parsed */ uint64_t zl_parse_lr_count; /* number of log records parsed */ - uint64_t zl_next_batch; /* next batch number */ - uint64_t zl_com_batch; /* committed batch number */ - kcondvar_t zl_cv_batch[2]; /* batch condition variables */ itxg_t zl_itxg[TXG_SIZE]; /* intent log txg chains */ list_t zl_itx_commit_list; /* itx list to be committed */ uint64_t zl_cur_used; /* current commit log size used */ list_t zl_lwb_list; /* in-flight log write list */ - kmutex_t zl_vdev_lock; /* protects zl_vdev_tree */ - avl_tree_t zl_vdev_tree; /* vdevs to flush in zil_commit() */ avl_tree_t zl_bp_tree; /* track bps during log parse */ clock_t zl_replay_time; /* lbolt of when replay started */ uint64_t zl_replay_blks; /* number of log blocks replayed */ @@ -131,6 +180,7 @@ struct zilog { uint_t zl_prev_blks[ZIL_PREV_BLKS]; /* size - sector rounded */ uint_t zl_prev_rotor; /* rotor for zl_prev[] */ txg_node_t zl_dirty_link; /* protected by dp_dirty_zilogs list */ + uint64_t zl_dirty_max_txg; /* highest txg used to dirty zilog */ }; typedef struct zil_bp_node { Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h ============================================================================== --- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h Mon Oct 30 08:44:47 2017 (r325131) +++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h Mon Oct 30 08:53:15 2017 (r325132) @@ -592,6 +592,7 @@ extern enum zio_checksum zio_checksum_dedup_select(spa extern enum zio_compress zio_compress_select(spa_t *spa, enum zio_compress child, enum zio_compress parent); +extern void zio_cancel(zio_t *zio); extern void zio_suspend(spa_t *spa, zio_t *zio); extern int zio_resume(spa_t *spa); extern void zio_resume_wait(spa_t *spa); Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c ============================================================================== --- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c Mon Oct 30 08:44:47 2017 (r325131) +++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c Mon Oct 30 08:53:15 2017 (r325132) @@ -163,7 +163,7 @@ txg_fini(dsl_pool_t *dp) tx_state_t *tx = &dp->dp_tx; int c; - ASSERT(tx->tx_threads == 0); + ASSERT0(tx->tx_threads); mutex_destroy(&tx->tx_sync_lock); @@ -204,7 +204,7 @@ txg_sync_start(dsl_pool_t *dp) dprintf("pool %p\n", dp); - ASSERT(tx->tx_threads == 0); + ASSERT0(tx->tx_threads); tx->tx_threads = 2; @@ -265,7 +265,7 @@ txg_sync_stop(dsl_pool_t *dp) /* * Finish off any work in progress. */ - ASSERT(tx->tx_threads == 2); + ASSERT3U(tx->tx_threads, ==, 2); /* * We need to ensure that we've vacated the deferred space_maps. @@ -277,7 +277,7 @@ txg_sync_stop(dsl_pool_t *dp) */ mutex_enter(&tx->tx_sync_lock); - ASSERT(tx->tx_threads == 2); + ASSERT3U(tx->tx_threads, ==, 2); tx->tx_exiting = 1; @@ -616,7 +616,7 @@ txg_wait_synced(dsl_pool_t *dp, uint64_t txg) ASSERT(!dsl_pool_config_held(dp)); mutex_enter(&tx->tx_sync_lock); - ASSERT(tx->tx_threads == 2); + ASSERT3U(tx->tx_threads, ==, 2); if (txg == 0) txg = tx->tx_open_txg + TXG_DEFER_SIZE; if (tx->tx_sync_txg_waiting < txg) @@ -641,7 +641,7 @@ txg_wait_open(dsl_pool_t *dp, uint64_t txg) ASSERT(!dsl_pool_config_held(dp)); mutex_enter(&tx->tx_sync_lock); - ASSERT(tx->tx_threads == 2); + ASSERT3U(tx->tx_threads, ==, 2); if (txg == 0) txg = tx->tx_open_txg + 1; if (tx->tx_quiesce_txg_waiting < txg) Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c ============================================================================== --- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Mon Oct 30 08:44:47 2017 (r325131) +++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Mon Oct 30 08:53:15 2017 (r325132) @@ -75,6 +75,7 @@ #include #include #include +#include /* * Programming rules. @@ -1275,7 +1276,7 @@ zfs_get_done(zgd_t *zgd, int error) VN_RELE_ASYNC(ZTOV(zp), dsl_pool_vnrele_taskq(dmu_objset_pool(os))); if (error == 0 && zgd->zgd_bp) - zil_add_block(zgd->zgd_zilog, zgd->zgd_bp); + zil_lwb_add_block(zgd->zgd_lwb, zgd->zgd_bp); kmem_free(zgd, sizeof (zgd_t)); } @@ -1288,7 +1289,7 @@ static int zil_fault_io = 0; * Get data to generate a TX_WRITE intent log record. */ int -zfs_get_data(void *arg, lr_write_t *lr, char *buf, zio_t *zio) +zfs_get_data(void *arg, lr_write_t *lr, char *buf, struct lwb *lwb, zio_t *zio) { zfsvfs_t *zfsvfs = arg; objset_t *os = zfsvfs->z_os; @@ -1300,8 +1301,9 @@ zfs_get_data(void *arg, lr_write_t *lr, char *buf, zio zgd_t *zgd; int error = 0; - ASSERT(zio != NULL); - ASSERT(size != 0); + ASSERT3P(lwb, !=, NULL); + ASSERT3P(zio, !=, NULL); + ASSERT3U(size, !=, 0); /* * Nothing to do if the file has been removed @@ -1319,7 +1321,7 @@ zfs_get_data(void *arg, lr_write_t *lr, char *buf, zio } zgd = (zgd_t *)kmem_zalloc(sizeof (zgd_t), KM_SLEEP); - zgd->zgd_zilog = zfsvfs->z_log; + zgd->zgd_lwb = lwb; zgd->zgd_private = zp; /* Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c ============================================================================== --- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c Mon Oct 30 08:44:47 2017 (r325131) +++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c Mon Oct 30 08:53:15 2017 (r325132) @@ -42,32 +42,53 @@ #include /* - * The zfs intent log (ZIL) saves transaction records of system calls - * that change the file system in memory with enough information - * to be able to replay them. These are stored in memory until - * either the DMU transaction group (txg) commits them to the stable pool - * and they can be discarded, or they are flushed to the stable log - * (also in the pool) due to a fsync, O_DSYNC or other synchronous - * requirement. In the event of a panic or power fail then those log - * records (transactions) are replayed. + * The ZFS Intent Log (ZIL) saves "transaction records" (itxs) of system + * calls that change the file system. Each itx has enough information to + * be able to replay them after a system crash, power loss, or + * equivalent failure mode. These are stored in memory until either: * - * There is one ZIL per file system. Its on-disk (pool) format consists - * of 3 parts: + * 1. they are committed to the pool by the DMU transaction group + * (txg), at which point they can be discarded; or + * 2. they are committed to the on-disk ZIL for the dataset being + * modified (e.g. due to an fsync, O_DSYNC, or other synchronous + * requirement). * - * - ZIL header - * - ZIL blocks - * - ZIL records + * In the event of a crash or power loss, the itxs contained by each + * dataset's on-disk ZIL will be replayed when that dataset is first + * instantianted (e.g. if the dataset is a normal fileystem, when it is + * first mounted). * - * A log record holds a system call transaction. Log blocks can - * hold many log records and the blocks are chained together. - * Each ZIL block contains a block pointer (blkptr_t) to the next - * ZIL block in the chain. The ZIL header points to the first - * block in the chain. Note there is not a fixed place in the pool - * to hold blocks. They are dynamically allocated and freed as - * needed from the blocks available. Figure X shows the ZIL structure: + * As hinted at above, there is one ZIL per dataset (both the in-memory + * representation, and the on-disk representation). The on-disk format + * consists of 3 parts: + * + * - a single, per-dataset, ZIL header; which points to a chain of + * - zero or more ZIL blocks; each of which contains + * - zero or more ZIL records + * + * A ZIL record holds the information necessary to replay a single + * system call transaction. A ZIL block can hold many ZIL records, and + * the blocks are chained together, similarly to a singly linked list. + * + * Each ZIL block contains a block pointer (blkptr_t) to the next ZIL + * block in the chain, and the ZIL header points to the first block in + * the chain. + * + * Note, there is not a fixed place in the pool to hold these ZIL + * blocks; they are dynamically allocated and freed as needed from the + * blocks available on the pool, though they can be preferentially + * allocated from a dedicated "log" vdev. */ /* + * This controls the amount of time that a ZIL block (lwb) will remain + * "open" when it isn't "full", and it has a thread waiting for it to be + * committed to stable storage. Please refer to the zil_commit_waiter() + * function (and the comments within it) for more details. + */ +int zfs_commit_timeout_pct = 5; + +/* * Disable intent logging replay. This global ZIL switch affects all pools. */ int zil_replay_disable = 0; @@ -98,6 +119,7 @@ SYSCTL_QUAD(_vfs_zfs, OID_AUTO, zil_slog_bulk, CTLFLAG &zil_slog_bulk, 0, "Maximal SLOG commit size with sync priority"); static kmem_cache_t *zil_lwb_cache; +static kmem_cache_t *zil_zcw_cache; #define LWB_EMPTY(lwb) ((BP_GET_LSIZE(&lwb->lwb_blk) - \ sizeof (zil_chain_t)) == (lwb->lwb_sz - lwb->lwb_nused)) @@ -445,6 +467,20 @@ zil_free_log_record(zilog_t *zilog, lr_t *lrc, void *t return (0); } +static int +zil_lwb_vdev_compare(const void *x1, const void *x2) +{ + const uint64_t v1 = ((zil_vdev_node_t *)x1)->zv_vdev; + const uint64_t v2 = ((zil_vdev_node_t *)x2)->zv_vdev; + + if (v1 < v2) + return (-1); + if (v1 > v2) + return (1); + + return (0); +} + static lwb_t * zil_alloc_lwb(zilog_t *zilog, blkptr_t *bp, boolean_t slog, uint64_t txg) { @@ -454,10 +490,13 @@ zil_alloc_lwb(zilog_t *zilog, blkptr_t *bp, boolean_t lwb->lwb_zilog = zilog; lwb->lwb_blk = *bp; lwb->lwb_slog = slog; + lwb->lwb_state = LWB_STATE_CLOSED; lwb->lwb_buf = zio_buf_alloc(BP_GET_LSIZE(bp)); lwb->lwb_max_txg = txg; - lwb->lwb_zio = NULL; + lwb->lwb_write_zio = NULL; + lwb->lwb_root_zio = NULL; lwb->lwb_tx = NULL; + lwb->lwb_issued_timestamp = 0; if (BP_GET_CHECKSUM(bp) == ZIO_CHECKSUM_ZILOG2) { lwb->lwb_nused = sizeof (zil_chain_t); lwb->lwb_sz = BP_GET_LSIZE(bp); @@ -470,9 +509,54 @@ zil_alloc_lwb(zilog_t *zilog, blkptr_t *bp, boolean_t list_insert_tail(&zilog->zl_lwb_list, lwb); mutex_exit(&zilog->zl_lock); + ASSERT(!MUTEX_HELD(&lwb->lwb_vdev_lock)); + ASSERT(avl_is_empty(&lwb->lwb_vdev_tree)); + ASSERT(list_is_empty(&lwb->lwb_waiters)); + return (lwb); } +static void +zil_free_lwb(zilog_t *zilog, lwb_t *lwb) +{ + ASSERT(MUTEX_HELD(&zilog->zl_lock)); + ASSERT(!MUTEX_HELD(&lwb->lwb_vdev_lock)); + ASSERT(list_is_empty(&lwb->lwb_waiters)); + + if (lwb->lwb_state == LWB_STATE_OPENED) { + avl_tree_t *t = &lwb->lwb_vdev_tree; + void *cookie = NULL; + zil_vdev_node_t *zv; + + while ((zv = avl_destroy_nodes(t, &cookie)) != NULL) + kmem_free(zv, sizeof (*zv)); + + ASSERT3P(lwb->lwb_root_zio, !=, NULL); + ASSERT3P(lwb->lwb_write_zio, !=, NULL); + + zio_cancel(lwb->lwb_root_zio); + zio_cancel(lwb->lwb_write_zio); + + lwb->lwb_root_zio = NULL; + lwb->lwb_write_zio = NULL; + } else { + ASSERT3S(lwb->lwb_state, !=, LWB_STATE_ISSUED); + } + + ASSERT(avl_is_empty(&lwb->lwb_vdev_tree)); + ASSERT3P(lwb->lwb_write_zio, ==, NULL); + ASSERT3P(lwb->lwb_root_zio, ==, NULL); + + /* + * Clear the zilog's field to indicate this lwb is no longer + * valid, and prevent use-after-free errors. + */ + if (zilog->zl_last_lwb_opened == lwb) + zilog->zl_last_lwb_opened = NULL; + + kmem_cache_free(zil_lwb_cache, lwb); +} + /* * Called when we create in-memory log transactions so that we know * to cleanup the itxs at the end of spa_sync(). @@ -483,12 +567,16 @@ zilog_dirty(zilog_t *zilog, uint64_t txg) dsl_pool_t *dp = zilog->zl_dmu_pool; dsl_dataset_t *ds = dmu_objset_ds(zilog->zl_os); + ASSERT(spa_writeable(zilog->zl_spa)); + if (ds->ds_is_snapshot) panic("dirtying snapshot!"); if (txg_list_add(&dp->dp_dirty_zilogs, zilog, txg)) { /* up the hold count until we can be written out */ dmu_buf_add_ref(ds->ds_dbuf, zilog); + + zilog->zl_dirty_max_txg = MAX(txg, zilog->zl_dirty_max_txg); } } @@ -556,7 +644,7 @@ zil_create(zilog_t *zilog) */ if (BP_IS_HOLE(&blk) || BP_SHOULD_BYTESWAP(&blk)) { tx = dmu_tx_create(zilog->zl_os); - VERIFY(dmu_tx_assign(tx, TXG_WAIT) == 0); + VERIFY0(dmu_tx_assign(tx, TXG_WAIT)); dsl_dataset_dirty(dmu_objset_ds(zilog->zl_os), tx); txg = dmu_tx_get_txg(tx); @@ -573,7 +661,7 @@ zil_create(zilog_t *zilog) } /* - * Allocate a log write buffer (lwb) for the first log block. + * Allocate a log write block (lwb) for the first log block. */ if (error == 0) lwb = zil_alloc_lwb(zilog, &blk, slog, txg); @@ -594,13 +682,13 @@ zil_create(zilog_t *zilog) } /* - * In one tx, free all log blocks and clear the log header. - * If keep_first is set, then we're replaying a log with no content. - * We want to keep the first block, however, so that the first - * synchronous transaction doesn't require a txg_wait_synced() - * in zil_create(). We don't need to txg_wait_synced() here either - * when keep_first is set, because both zil_create() and zil_destroy() - * will wait for any in-progress destroys to complete. + * In one tx, free all log blocks and clear the log header. If keep_first + * is set, then we're replaying a log with no content. We want to keep the + * first block, however, so that the first synchronous transaction doesn't + * require a txg_wait_synced() in zil_create(). We don't need to + * txg_wait_synced() here either when keep_first is set, because both + * zil_create() and zil_destroy() will wait for any in-progress destroys + * to complete. */ void zil_destroy(zilog_t *zilog, boolean_t keep_first) @@ -621,7 +709,7 @@ zil_destroy(zilog_t *zilog, boolean_t keep_first) return; tx = dmu_tx_create(zilog->zl_os); - VERIFY(dmu_tx_assign(tx, TXG_WAIT) == 0); + VERIFY0(dmu_tx_assign(tx, TXG_WAIT)); dsl_dataset_dirty(dmu_objset_ds(zilog->zl_os), tx); txg = dmu_tx_get_txg(tx); @@ -638,8 +726,8 @@ zil_destroy(zilog_t *zilog, boolean_t keep_first) list_remove(&zilog->zl_lwb_list, lwb); if (lwb->lwb_buf != NULL) zio_buf_free(lwb->lwb_buf, lwb->lwb_sz); - zio_free_zil(zilog->zl_spa, txg, &lwb->lwb_blk); - kmem_cache_free(zil_lwb_cache, lwb); + zio_free(zilog->zl_spa, txg, &lwb->lwb_blk); + zil_free_lwb(zilog, lwb); } } else if (!keep_first) { zil_destroy_sync(zilog, tx); @@ -777,24 +865,64 @@ zil_check_log_chain(dsl_pool_t *dp, dsl_dataset_t *ds, return ((error == ECKSUM || error == ENOENT) ? 0 : error); } -static int -zil_vdev_compare(const void *x1, const void *x2) +/* + * When an itx is "skipped", this function is used to properly mark the + * waiter as "done, and signal any thread(s) waiting on it. An itx can + * be skipped (and not committed to an lwb) for a variety of reasons, + * one of them being that the itx was committed via spa_sync(), prior to + * it being committed to an lwb; this can happen if a thread calling + * zil_commit() is racing with spa_sync(). + */ +static void +zil_commit_waiter_skip(zil_commit_waiter_t *zcw) { - const uint64_t v1 = ((zil_vdev_node_t *)x1)->zv_vdev; - const uint64_t v2 = ((zil_vdev_node_t *)x2)->zv_vdev; + mutex_enter(&zcw->zcw_lock); + ASSERT3B(zcw->zcw_done, ==, B_FALSE); + zcw->zcw_done = B_TRUE; + cv_broadcast(&zcw->zcw_cv); + mutex_exit(&zcw->zcw_lock); +} - if (v1 < v2) - return (-1); - if (v1 > v2) - return (1); +/* + * This function is used when the given waiter is to be linked into an + * lwb's "lwb_waiter" list; i.e. when the itx is committed to the lwb. + * At this point, the waiter will no longer be referenced by the itx, + * and instead, will be referenced by the lwb. + */ +static void +zil_commit_waiter_link_lwb(zil_commit_waiter_t *zcw, lwb_t *lwb) +{ + mutex_enter(&zcw->zcw_lock); + ASSERT(!list_link_active(&zcw->zcw_node)); + ASSERT3P(zcw->zcw_lwb, ==, NULL); + ASSERT3P(lwb, !=, NULL); + ASSERT(lwb->lwb_state == LWB_STATE_OPENED || + lwb->lwb_state == LWB_STATE_ISSUED); - return (0); + list_insert_tail(&lwb->lwb_waiters, zcw); + zcw->zcw_lwb = lwb; + mutex_exit(&zcw->zcw_lock); } +/* + * This function is used when zio_alloc_zil() fails to allocate a ZIL + * block, and the given waiter must be linked to the "nolwb waiters" + * list inside of zil_process_commit_list(). + */ +static void +zil_commit_waiter_link_nolwb(zil_commit_waiter_t *zcw, list_t *nolwb) +{ + mutex_enter(&zcw->zcw_lock); + ASSERT(!list_link_active(&zcw->zcw_node)); + ASSERT3P(zcw->zcw_lwb, ==, NULL); + list_insert_tail(nolwb, zcw); + mutex_exit(&zcw->zcw_lock); +} + void -zil_add_block(zilog_t *zilog, const blkptr_t *bp) +zil_lwb_add_block(lwb_t *lwb, const blkptr_t *bp) { - avl_tree_t *t = &zilog->zl_vdev_tree; + avl_tree_t *t = &lwb->lwb_vdev_tree; avl_index_t where; zil_vdev_node_t *zv, zvsearch; int ndvas = BP_GET_NDVAS(bp); @@ -803,14 +931,7 @@ zil_add_block(zilog_t *zilog, const blkptr_t *bp) if (zfs_nocacheflush) return; - ASSERT(zilog->zl_writer); - - /* - * Even though we're zl_writer, we still need a lock because the - * zl_get_data() callbacks may have dmu_sync() done callbacks - * that will run concurrently. - */ - mutex_enter(&zilog->zl_vdev_lock); + mutex_enter(&lwb->lwb_vdev_lock); for (i = 0; i < ndvas; i++) { zvsearch.zv_vdev = DVA_GET_VDEV(&bp->blk_dva[i]); if (avl_find(t, &zvsearch, &where) == NULL) { @@ -819,59 +940,117 @@ zil_add_block(zilog_t *zilog, const blkptr_t *bp) avl_insert(t, zv, where); } } - mutex_exit(&zilog->zl_vdev_lock); + mutex_exit(&lwb->lwb_vdev_lock); } +void +zil_lwb_add_txg(lwb_t *lwb, uint64_t txg) +{ + lwb->lwb_max_txg = MAX(lwb->lwb_max_txg, txg); +} + +/* + * This function is a called after all VDEVs associated with a given lwb + * write have completed their DKIOCFLUSHWRITECACHE command; or as soon + * as the lwb write completes, if "zfs_nocacheflush" is set. + * + * The intention is for this function to be called as soon as the + * contents of an lwb are considered "stable" on disk, and will survive + * any sudden loss of power. At this point, any threads waiting for the + * lwb to reach this state are signalled, and the "waiter" structures + * are marked "done". + */ static void -zil_flush_vdevs(zilog_t *zilog) +zil_lwb_flush_vdevs_done(zio_t *zio) { - spa_t *spa = zilog->zl_spa; - avl_tree_t *t = &zilog->zl_vdev_tree; - void *cookie = NULL; - zil_vdev_node_t *zv; - zio_t *zio = NULL; + lwb_t *lwb = zio->io_private; + zilog_t *zilog = lwb->lwb_zilog; + dmu_tx_t *tx = lwb->lwb_tx; + zil_commit_waiter_t *zcw; - ASSERT(zilog->zl_writer); + spa_config_exit(zilog->zl_spa, SCL_STATE, lwb); + zio_buf_free(lwb->lwb_buf, lwb->lwb_sz); + + mutex_enter(&zilog->zl_lock); + /* - * We don't need zl_vdev_lock here because we're the zl_writer, - * and all zl_get_data() callbacks are done. + * Ensure the lwb buffer pointer is cleared before releasing the + * txg. If we have had an allocation failure and the txg is + * waiting to sync then we want zil_sync() to remove the lwb so + * that it's not picked up as the next new one in + * zil_process_commit_list(). zil_sync() will only remove the + * lwb if lwb_buf is null. */ - if (avl_numnodes(t) == 0) - return; + lwb->lwb_buf = NULL; + lwb->lwb_tx = NULL; - spa_config_enter(spa, SCL_STATE, FTAG, RW_READER); + ASSERT3U(lwb->lwb_issued_timestamp, >, 0); + zilog->zl_last_lwb_latency = gethrtime() - lwb->lwb_issued_timestamp; - while ((zv = avl_destroy_nodes(t, &cookie)) != NULL) { - vdev_t *vd = vdev_lookup_top(spa, zv->zv_vdev); - if (vd != NULL && !vd->vdev_nowritecache) { - if (zio == NULL) - zio = zio_root(spa, NULL, NULL, ZIO_FLAG_CANFAIL); - zio_flush(zio, vd); - } - kmem_free(zv, sizeof (*zv)); + lwb->lwb_root_zio = NULL; + lwb->lwb_state = LWB_STATE_DONE; + + if (zilog->zl_last_lwb_opened == lwb) { + /* + * Remember the highest committed log sequence number + * for ztest. We only update this value when all the log + * writes succeeded, because ztest wants to ASSERT that + * it got the whole log chain. + */ + zilog->zl_commit_lr_seq = zilog->zl_lr_seq; } + while ((zcw = list_head(&lwb->lwb_waiters)) != NULL) { + mutex_enter(&zcw->zcw_lock); + + ASSERT(list_link_active(&zcw->zcw_node)); + list_remove(&lwb->lwb_waiters, zcw); + + ASSERT3P(zcw->zcw_lwb, ==, lwb); + zcw->zcw_lwb = NULL; + + zcw->zcw_zio_error = zio->io_error; + + ASSERT3B(zcw->zcw_done, ==, B_FALSE); + zcw->zcw_done = B_TRUE; + cv_broadcast(&zcw->zcw_cv); + + mutex_exit(&zcw->zcw_lock); + } + + mutex_exit(&zilog->zl_lock); + /* - * Wait for all the flushes to complete. Not all devices actually - * support the DKIOCFLUSHWRITECACHE ioctl, so it's OK if it fails. + * Now that we've written this log block, we have a stable pointer + * to the next block in the chain, so it's OK to let the txg in + * which we allocated the next block sync. */ - if (zio) - (void) zio_wait(zio); - - spa_config_exit(spa, SCL_STATE, FTAG); + dmu_tx_commit(tx); } /* - * Function called when a log block write completes + * This is called when an lwb write completes. This means, this specific + * lwb was written to disk, and all dependent lwb have also been + * written to disk. + * + * At this point, a DKIOCFLUSHWRITECACHE command hasn't been issued to + * the VDEVs involved in writing out this specific lwb. The lwb will be + * "done" once zil_lwb_flush_vdevs_done() is called, which occurs in the + * zio completion callback for the lwb's root zio. */ static void zil_lwb_write_done(zio_t *zio) { lwb_t *lwb = zio->io_private; + spa_t *spa = zio->io_spa; zilog_t *zilog = lwb->lwb_zilog; - dmu_tx_t *tx = lwb->lwb_tx; + avl_tree_t *t = &lwb->lwb_vdev_tree; + void *cookie = NULL; + zil_vdev_node_t *zv; + ASSERT3S(spa_config_held(spa, SCL_STATE, RW_READER), !=, 0); + ASSERT(BP_GET_COMPRESS(zio->io_bp) == ZIO_COMPRESS_OFF); ASSERT(BP_GET_TYPE(zio->io_bp) == DMU_OT_INTENT_LOG); ASSERT(BP_GET_LEVEL(zio->io_bp) == 0); @@ -880,58 +1059,115 @@ zil_lwb_write_done(zio_t *zio) ASSERT(!BP_IS_HOLE(zio->io_bp)); ASSERT(BP_GET_FILL(zio->io_bp) == 0); - /* - * Ensure the lwb buffer pointer is cleared before releasing - * the txg. If we have had an allocation failure and - * the txg is waiting to sync then we want want zil_sync() - * to remove the lwb so that it's not picked up as the next new - * one in zil_commit_writer(). zil_sync() will only remove - * the lwb if lwb_buf is null. - */ abd_put(zio->io_abd); - zio_buf_free(lwb->lwb_buf, lwb->lwb_sz); + + ASSERT3S(lwb->lwb_state, ==, LWB_STATE_ISSUED); + mutex_enter(&zilog->zl_lock); - lwb->lwb_buf = NULL; - lwb->lwb_tx = NULL; + lwb->lwb_write_zio = NULL; mutex_exit(&zilog->zl_lock); + if (avl_numnodes(t) == 0) + return; + /* - * Now that we've written this log block, we have a stable pointer - * to the next block in the chain, so it's OK to let the txg in - * which we allocated the next block sync. + * If there was an IO error, we're not going to call zio_flush() + * on these vdevs, so we simply empty the tree and free the + * nodes. We avoid calling zio_flush() since there isn't any + * good reason for doing so, after the lwb block failed to be + * written out. */ - dmu_tx_commit(tx); + if (zio->io_error != 0) { + while ((zv = avl_destroy_nodes(t, &cookie)) != NULL) + kmem_free(zv, sizeof (*zv)); + return; + } + + while ((zv = avl_destroy_nodes(t, &cookie)) != NULL) { + vdev_t *vd = vdev_lookup_top(spa, zv->zv_vdev); + if (vd != NULL) + zio_flush(lwb->lwb_root_zio, vd); + kmem_free(zv, sizeof (*zv)); + } } /* - * Initialize the io for a log block. + * This function's purpose is to "open" an lwb such that it is ready to + * accept new itxs being committed to it. To do this, the lwb's zio + * structures are created, and linked to the lwb. This function is + * idempotent; if the passed in lwb has already been opened, this + * function is essentially a no-op. */ static void -zil_lwb_write_init(zilog_t *zilog, lwb_t *lwb) +zil_lwb_write_open(zilog_t *zilog, lwb_t *lwb) { zbookmark_phys_t zb; zio_priority_t prio; + ASSERT(MUTEX_HELD(&zilog->zl_writer_lock)); + ASSERT3P(lwb, !=, NULL); + EQUIV(lwb->lwb_root_zio == NULL, lwb->lwb_state == LWB_STATE_CLOSED); + EQUIV(lwb->lwb_root_zio != NULL, lwb->lwb_state == LWB_STATE_OPENED); + SET_BOOKMARK(&zb, lwb->lwb_blk.blk_cksum.zc_word[ZIL_ZC_OBJSET], ZB_ZIL_OBJECT, ZB_ZIL_LEVEL, lwb->lwb_blk.blk_cksum.zc_word[ZIL_ZC_SEQ]); - if (zilog->zl_root_zio == NULL) { - zilog->zl_root_zio = zio_root(zilog->zl_spa, NULL, NULL, - ZIO_FLAG_CANFAIL); - } - if (lwb->lwb_zio == NULL) { + if (lwb->lwb_root_zio == NULL) { abd_t *lwb_abd = abd_get_from_buf(lwb->lwb_buf, BP_GET_LSIZE(&lwb->lwb_blk)); + if (!lwb->lwb_slog || zilog->zl_cur_used <= zil_slog_bulk) prio = ZIO_PRIORITY_SYNC_WRITE; else prio = ZIO_PRIORITY_ASYNC_WRITE; - lwb->lwb_zio = zio_rewrite(zilog->zl_root_zio, zilog->zl_spa, - 0, &lwb->lwb_blk, lwb_abd, BP_GET_LSIZE(&lwb->lwb_blk), - zil_lwb_write_done, lwb, prio, - ZIO_FLAG_CANFAIL | ZIO_FLAG_DONT_PROPAGATE, &zb); + + lwb->lwb_root_zio = zio_root(zilog->zl_spa, + zil_lwb_flush_vdevs_done, lwb, ZIO_FLAG_CANFAIL); + ASSERT3P(lwb->lwb_root_zio, !=, NULL); + + lwb->lwb_write_zio = zio_rewrite(lwb->lwb_root_zio, + zilog->zl_spa, 0, &lwb->lwb_blk, lwb_abd, + BP_GET_LSIZE(&lwb->lwb_blk), zil_lwb_write_done, lwb, + prio, ZIO_FLAG_CANFAIL | ZIO_FLAG_DONT_PROPAGATE, &zb); + ASSERT3P(lwb->lwb_write_zio, !=, NULL); + + lwb->lwb_state = LWB_STATE_OPENED; + + mutex_enter(&zilog->zl_lock); + + /* + * The zilog's "zl_last_lwb_opened" field is used to + * build the lwb/zio dependency chain, which is used to + * preserve the ordering of lwb completions that is + * required by the semantics of the ZIL. Each new lwb + * zio becomes a parent of the "previous" lwb zio, such + * that the new lwb's zio cannot complete until the + * "previous" lwb's zio completes. + * + * This is required by the semantics of zil_commit(); + * the commit waiters attached to the lwbs will be woken + * in the lwb zio's completion callback, so this zio + * dependency graph ensures the waiters are woken in the + * correct order (the same order the lwbs were created). + */ + lwb_t *last_lwb_opened = zilog->zl_last_lwb_opened; + if (last_lwb_opened != NULL && + last_lwb_opened->lwb_state != LWB_STATE_DONE) { + ASSERT(last_lwb_opened->lwb_state == LWB_STATE_OPENED || + last_lwb_opened->lwb_state == LWB_STATE_ISSUED); + ASSERT3P(last_lwb_opened->lwb_root_zio, !=, NULL); + zio_add_child(lwb->lwb_root_zio, + last_lwb_opened->lwb_root_zio); + } + zilog->zl_last_lwb_opened = lwb; + + mutex_exit(&zilog->zl_lock); } + + ASSERT3P(lwb->lwb_root_zio, !=, NULL); + ASSERT3P(lwb->lwb_write_zio, !=, NULL); + ASSERT3S(lwb->lwb_state, ==, LWB_STATE_OPENED); } *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Mon Oct 30 08:56:06 2017 Return-Path: Delivered-To: svn-src-all@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 48BFEE57C09; Mon, 30 Oct 2017 08:56:06 +0000 (UTC) (envelope-from trasz@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 15DA37E5E6; Mon, 30 Oct 2017 08:56:06 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9U8u5ms061416; Mon, 30 Oct 2017 08:56:05 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9U8u51Z061414; Mon, 30 Oct 2017 08:56:05 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201710300856.v9U8u51Z061414@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Mon, 30 Oct 2017 08:56:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325134 - in head: libexec/rtld-elf sbin/ldconfig X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: in head: libexec/rtld-elf sbin/ldconfig X-SVN-Commit-Revision: 325134 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 08:56:06 -0000 Author: trasz Date: Mon Oct 30 08:56:04 2017 New Revision: 325134 URL: https://svnweb.freebsd.org/changeset/base/325134 Log: Use MAP_PRIVATE instead of obsolete MAP_COPY. No functional changes. MFC after: 2 weeks Modified: head/libexec/rtld-elf/malloc.c head/sbin/ldconfig/ldconfig.c Modified: head/libexec/rtld-elf/malloc.c ============================================================================== --- head/libexec/rtld-elf/malloc.c Mon Oct 30 08:55:10 2017 (r325133) +++ head/libexec/rtld-elf/malloc.c Mon Oct 30 08:56:04 2017 (r325134) @@ -479,7 +479,7 @@ int n; if ((pagepool_start = mmap(0, n * pagesz, PROT_READ|PROT_WRITE, - MAP_ANON|MAP_COPY, fd, 0)) == (caddr_t)-1) { + MAP_ANON|MAP_PRIVATE, fd, 0)) == (caddr_t)-1) { rtld_printf("Cannot map anonymous memory\n"); return 0; } Modified: head/sbin/ldconfig/ldconfig.c ============================================================================== --- head/sbin/ldconfig/ldconfig.c Mon Oct 30 08:55:10 2017 (r325133) +++ head/sbin/ldconfig/ldconfig.c Mon Oct 30 08:56:04 2017 (r325134) @@ -550,7 +550,7 @@ readhints(void) } msize = PAGE_SIZE; - addr = mmap(0, msize, PROT_READ, MAP_COPY, fd, 0); + addr = mmap(0, msize, PROT_READ, MAP_PRIVATE, fd, 0); if (addr == MAP_FAILED) { warn("%s", hints_file); @@ -573,7 +573,7 @@ readhints(void) if (hdr->hh_ehints > msize) { fsize = hdr->hh_ehints; munmap(addr, msize); - addr = mmap(0, fsize, PROT_READ, MAP_COPY, fd, 0); + addr = mmap(0, fsize, PROT_READ, MAP_PRIVATE, fd, 0); if (addr == MAP_FAILED) { warn("%s", hints_file); return -1; From owner-svn-src-all@freebsd.org Mon Oct 30 08:56:40 2017 Return-Path: Delivered-To: svn-src-all@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 40FE5E57C68; Mon, 30 Oct 2017 08:56:40 +0000 (UTC) (envelope-from avg@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 F03037E72D; Mon, 30 Oct 2017 08:56:39 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9U8udXD061526; Mon, 30 Oct 2017 08:56:39 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9U8udTE061525; Mon, 30 Oct 2017 08:56:39 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201710300856.v9U8udTE061525@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 30 Oct 2017 08:56:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r325136 - stable/11/cddl/contrib/opensolaris/cmd/zdb X-SVN-Group: stable-11 X-SVN-Commit-Author: avg X-SVN-Commit-Paths: stable/11/cddl/contrib/opensolaris/cmd/zdb X-SVN-Commit-Revision: 325136 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 08:56:40 -0000 Author: avg Date: Mon Oct 30 08:56:39 2017 New Revision: 325136 URL: https://svnweb.freebsd.org/changeset/base/325136 Log: MFC r324343: MFV r316862: 6410 teach zdb to perform object lookups by path Modified: stable/11/cddl/contrib/opensolaris/cmd/zdb/zdb.c Directory Properties: stable/11/ (props changed) Modified: stable/11/cddl/contrib/opensolaris/cmd/zdb/zdb.c ============================================================================== --- stable/11/cddl/contrib/opensolaris/cmd/zdb/zdb.c Mon Oct 30 08:56:37 2017 (r325135) +++ stable/11/cddl/contrib/opensolaris/cmd/zdb/zdb.c Mon Oct 30 08:56:39 2017 (r325136) @@ -23,7 +23,7 @@ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2011, 2016 by Delphix. All rights reserved. * Copyright (c) 2014 Integros [integros.com] - * Copyright 2016 Nexenta Systems, Inc. + * Copyright 2017 Nexenta Systems, Inc. */ #include @@ -121,19 +121,22 @@ static void usage(void) { (void) fprintf(stderr, - "Usage: %s [-CmMdibcsDvhLXFPAG] [-t txg] [-e [-p path...]] " - "[-U config] [-I inflight I/Os] [-x dumpdir] [-o var=value] " - "poolname [object...]\n" - " %s [-divPA] [-e -p path...] [-U config] dataset " - "[object...]\n" - " %s -mM [-LXFPA] [-t txg] [-e [-p path...]] [-U config] " - "poolname [vdev [metaslab...]]\n" - " %s -R [-A] [-e [-p path...]] poolname " - "vdev:offset:size[:flags]\n" - " %s -S [-PA] [-e [-p path...]] [-U config] poolname\n" - " %s -l [-Aqu] device\n" - " %s -C [-A] [-U config]\n\n", - cmdname, cmdname, cmdname, cmdname, cmdname, cmdname, cmdname); + "Usage:\t%s [-AbcdDFGhiLMPsvX] [-e [-p ...]] " + "[-I ]\n" + "\t\t[-o =]... [-t ] [-U ] [-x ]\n" + "\t\t[ [ ...]]\n" + "\t%s [-AdiPv] [-e [-p ...]] [-U ] " + "[ ...]\n" + "\t%s -C [-A] [-U ]\n" + "\t%s -l [-Aqu] \n" + "\t%s -m [-AFLPX] [-e [-p ...]] [-t ] [-U ]\n" + "\t\t [ [ ...]]\n" + "\t%s -O \n" + "\t%s -R [-A] [-e [-p ...]] [-U ]\n" + "\t\t ::[:]\n" + "\t%s -S [-AP] [-e [-p ...]] [-U ] \n\n", + cmdname, cmdname, cmdname, cmdname, cmdname, cmdname, cmdname, + cmdname); (void) fprintf(stderr, " Dataset name must include at least one " "separator character '/' or '@'\n"); @@ -142,52 +145,54 @@ usage(void) (void) fprintf(stderr, " If object numbers are specified, only " "those objects are dumped\n\n"); (void) fprintf(stderr, " Options to control amount of output:\n"); - (void) fprintf(stderr, " -d dataset(s)\n"); - (void) fprintf(stderr, " -i intent logs\n"); - (void) fprintf(stderr, " -C config (or cachefile if alone)\n"); - (void) fprintf(stderr, " -h pool history\n"); (void) fprintf(stderr, " -b block statistics\n"); - (void) fprintf(stderr, " -m metaslabs\n"); - (void) fprintf(stderr, " -M metaslab groups\n"); (void) fprintf(stderr, " -c checksum all metadata (twice for " "all data) blocks\n"); - (void) fprintf(stderr, " -s report stats on zdb's I/O\n"); + (void) fprintf(stderr, " -C config (or cachefile if alone)\n"); + (void) fprintf(stderr, " -d dataset(s)\n"); (void) fprintf(stderr, " -D dedup statistics\n"); - (void) fprintf(stderr, " -S simulate dedup to measure effect\n"); - (void) fprintf(stderr, " -v verbose (applies to all others)\n"); + (void) fprintf(stderr, " -h pool history\n"); + (void) fprintf(stderr, " -i intent logs\n"); (void) fprintf(stderr, " -l read label contents\n"); (void) fprintf(stderr, " -L disable leak tracking (do not " "load spacemaps)\n"); + (void) fprintf(stderr, " -m metaslabs\n"); + (void) fprintf(stderr, " -M metaslab groups\n"); + (void) fprintf(stderr, " -O perform object lookups by path\n"); (void) fprintf(stderr, " -R read and display block from a " - "device\n\n"); + "device\n"); + (void) fprintf(stderr, " -s report stats on zdb's I/O\n"); + (void) fprintf(stderr, " -S simulate dedup to measure effect\n"); + (void) fprintf(stderr, " -v verbose (applies to all " + "others)\n\n"); (void) fprintf(stderr, " Below options are intended for use " "with other options:\n"); (void) fprintf(stderr, " -A ignore assertions (-A), enable " "panic recovery (-AA) or both (-AAA)\n"); - (void) fprintf(stderr, " -F attempt automatic rewind within " - "safe range of transaction groups\n"); - (void) fprintf(stderr, " -U -- use alternate " - "cachefile\n"); - (void) fprintf(stderr, " -X attempt extreme rewind (does not " - "work with dataset)\n"); (void) fprintf(stderr, " -e pool is exported/destroyed/" "has altroot/not in a cachefile\n"); - (void) fprintf(stderr, " -p -- use one or more with " - "-e to specify path to vdev dir\n"); - (void) fprintf(stderr, " -x -- " - "dump all read blocks into specified directory\n"); - (void) fprintf(stderr, " -P print numbers in parseable form\n"); - (void) fprintf(stderr, " -t -- highest txg to use when " - "searching for uberblocks\n"); + (void) fprintf(stderr, " -F attempt automatic rewind within " + "safe range of transaction groups\n"); + (void) fprintf(stderr, " -G dump zfs_dbgmsg buffer before " + "exiting\n"); (void) fprintf(stderr, " -I -- " "specify the maximum number of " "checksumming I/Os [default is 200]\n"); - (void) fprintf(stderr, " -G dump zfs_dbgmsg buffer before " - "exiting\n"); (void) fprintf(stderr, " -o = set global " "variable to an unsigned 32-bit integer value\n"); + (void) fprintf(stderr, " -p -- use one or more with " + "-e to specify path to vdev dir\n"); + (void) fprintf(stderr, " -P print numbers in parseable form\n"); (void) fprintf(stderr, " -q don't print label contents\n"); + (void) fprintf(stderr, " -t -- highest txg to use when " + "searching for uberblocks\n"); (void) fprintf(stderr, " -u uberblock\n"); + (void) fprintf(stderr, " -U -- use alternate " + "cachefile\n"); + (void) fprintf(stderr, " -x -- " + "dump all read blocks into specified directory\n"); + (void) fprintf(stderr, " -X attempt extreme rewind (does not " + "work with dataset)\n\n"); (void) fprintf(stderr, "Specify an option more than once (e.g. -bb) " "to make only that option verbose\n"); (void) fprintf(stderr, "Default is to dump everything non-verbosely\n"); @@ -1603,10 +1608,57 @@ dump_deadlist(dsl_deadlist_t *dl) static avl_tree_t idx_tree; static avl_tree_t domain_tree; static boolean_t fuid_table_loaded; -static boolean_t sa_loaded; -sa_attr_type_t *sa_attr_table; +static objset_t *sa_os = NULL; +static sa_attr_type_t *sa_attr_table = NULL; +static int +open_objset(const char *path, dmu_objset_type_t type, void *tag, objset_t **osp) +{ + int err; + uint64_t sa_attrs = 0; + uint64_t version = 0; + + VERIFY3P(sa_os, ==, NULL); + err = dmu_objset_own(path, type, B_TRUE, tag, osp); + if (err != 0) { + (void) fprintf(stderr, "failed to own dataset '%s': %s\n", path, + strerror(err)); + return (err); + } + + if (dmu_objset_type(*osp) == DMU_OST_ZFS) { + (void) zap_lookup(*osp, MASTER_NODE_OBJ, ZPL_VERSION_STR, + 8, 1, &version); + if (version >= ZPL_VERSION_SA) { + (void) zap_lookup(*osp, MASTER_NODE_OBJ, ZFS_SA_ATTRS, + 8, 1, &sa_attrs); + } + err = sa_setup(*osp, sa_attrs, zfs_attr_table, ZPL_END, + &sa_attr_table); + if (err != 0) { + (void) fprintf(stderr, "sa_setup failed: %s\n", + strerror(err)); + dmu_objset_disown(*osp, tag); + *osp = NULL; + } + } + sa_os = *osp; + + return (0); +} + static void +close_objset(objset_t *os, void *tag) +{ + VERIFY3P(os, ==, sa_os); + if (os->os_sa != NULL) + sa_tear_down(os); + dmu_objset_disown(os, tag); + sa_attr_table = NULL; + sa_os = NULL; +} + +static void fuid_table_destroy() { if (fuid_table_loaded) { @@ -1676,25 +1728,7 @@ dump_znode(objset_t *os, uint64_t object, void *data, int idx = 0; int error; - if (!sa_loaded) { - uint64_t sa_attrs = 0; - uint64_t version; - - VERIFY(zap_lookup(os, MASTER_NODE_OBJ, ZPL_VERSION_STR, - 8, 1, &version) == 0); - if (version >= ZPL_VERSION_SA) { - VERIFY(zap_lookup(os, MASTER_NODE_OBJ, ZFS_SA_ATTRS, - 8, 1, &sa_attrs) == 0); - } - if ((error = sa_setup(os, sa_attrs, zfs_attr_table, - ZPL_END, &sa_attr_table)) != 0) { - (void) printf("sa_setup failed errno %d, can't " - "display znode contents\n", error); - return; - } - sa_loaded = B_TRUE; - } - + VERIFY3P(os, ==, sa_os); if (sa_handle_get(os, object, NULL, SA_HDL_PRIVATE, &hdl)) { (void) printf("Failed to get handle for SA znode\n"); return; @@ -2162,7 +2196,109 @@ dump_label_uberblocks(vdev_label_t *lbl, uint64_t ashi } } +static char curpath[PATH_MAX]; + +/* + * Iterate through the path components, recursively passing + * current one's obj and remaining path until we find the obj + * for the last one. + */ static int +dump_path_impl(objset_t *os, uint64_t obj, char *name) +{ + int err; + int header = 1; + uint64_t child_obj; + char *s; + dmu_buf_t *db; + dmu_object_info_t doi; + + if ((s = strchr(name, '/')) != NULL) + *s = '\0'; + err = zap_lookup(os, obj, name, 8, 1, &child_obj); + + (void) strlcat(curpath, name, sizeof (curpath)); + + if (err != 0) { + (void) fprintf(stderr, "failed to lookup %s: %s\n", + curpath, strerror(err)); + return (err); + } + + child_obj = ZFS_DIRENT_OBJ(child_obj); + err = sa_buf_hold(os, child_obj, FTAG, &db); + if (err != 0) { + (void) fprintf(stderr, + "failed to get SA dbuf for obj %llu: %s\n", + (u_longlong_t)child_obj, strerror(err)); + return (EINVAL); + } + dmu_object_info_from_db(db, &doi); + sa_buf_rele(db, FTAG); + + if (doi.doi_bonus_type != DMU_OT_SA && + doi.doi_bonus_type != DMU_OT_ZNODE) { + (void) fprintf(stderr, "invalid bonus type %d for obj %llu\n", + doi.doi_bonus_type, (u_longlong_t)child_obj); + return (EINVAL); + } + + if (dump_opt['v'] > 6) { + (void) printf("obj=%llu %s type=%d bonustype=%d\n", + (u_longlong_t)child_obj, curpath, doi.doi_type, + doi.doi_bonus_type); + } + + (void) strlcat(curpath, "/", sizeof (curpath)); + + switch (doi.doi_type) { + case DMU_OT_DIRECTORY_CONTENTS: + if (s != NULL && *(s + 1) != '\0') + return (dump_path_impl(os, child_obj, s + 1)); + /*FALLTHROUGH*/ + case DMU_OT_PLAIN_FILE_CONTENTS: + dump_object(os, child_obj, dump_opt['v'], &header); + return (0); + default: + (void) fprintf(stderr, "object %llu has non-file/directory " + "type %d\n", (u_longlong_t)obj, doi.doi_type); + break; + } + + return (EINVAL); +} + +/* + * Dump the blocks for the object specified by path inside the dataset. + */ +static int +dump_path(char *ds, char *path) +{ + int err; + objset_t *os; + uint64_t root_obj; + + err = open_objset(ds, DMU_OST_ZFS, FTAG, &os); + if (err != 0) + return (err); + + err = zap_lookup(os, MASTER_NODE_OBJ, ZFS_ROOT_OBJ, 8, 1, &root_obj); + if (err != 0) { + (void) fprintf(stderr, "can't lookup root znode: %s\n", + strerror(err)); + dmu_objset_disown(os, FTAG); + return (EINVAL); + } + + (void) snprintf(curpath, sizeof (curpath), "dataset=%s path=/", ds); + + err = dump_path_impl(os, root_obj, path); + + close_objset(os, FTAG); + return (err); +} + +static int dump_label(const char *dev) { int fd; @@ -2266,11 +2402,9 @@ dump_one_dir(const char *dsname, void *arg) int error; objset_t *os; - error = dmu_objset_own(dsname, DMU_OST_ANY, B_TRUE, FTAG, &os); - if (error) { - (void) printf("Could not open %s, error %d\n", dsname, error); + error = open_objset(dsname, DMU_OST_ANY, FTAG, &os); + if (error != 0) return (0); - } for (spa_feature_t f = 0; f < SPA_FEATURES; f++) { if (!dmu_objset_ds(os)->ds_feature_inuse[f]) @@ -2281,9 +2415,8 @@ dump_one_dir(const char *dsname, void *arg) } dump_dir(os); - dmu_objset_disown(os, FTAG); + close_objset(os, FTAG); fuid_table_destroy(); - sa_loaded = B_FALSE; return (0); } @@ -3635,35 +3768,37 @@ main(int argc, char **argv) spa_config_path = spa_config_path_env; while ((c = getopt(argc, argv, - "bcdhilmMI:suCDRSAFLXx:evp:t:U:PGo:q")) != -1) { + "AbcCdDeFGhiI:lLmMo:Op:PqRsSt:uU:vx:X")) != -1) { switch (c) { case 'b': case 'c': + case 'C': case 'd': + case 'D': + case 'G': case 'h': case 'i': case 'l': case 'm': - case 's': - case 'u': - case 'C': - case 'D': case 'M': + case 'O': case 'R': + case 's': case 'S': - case 'G': + case 'u': dump_opt[c]++; dump_all = 0; break; case 'A': + case 'e': case 'F': case 'L': - case 'X': - case 'e': case 'P': case 'q': + case 'X': dump_opt[c]++; break; + /* NB: Sort single match options below. */ case 'I': max_inflight = strtoull(optarg, NULL, 0); if (max_inflight == 0) { @@ -3673,6 +3808,11 @@ main(int argc, char **argv) usage(); } break; + case 'o': + error = set_global_var(optarg); + if (error != 0) + usage(); + break; case 'p': if (searchdirs == NULL) { searchdirs = umem_alloc(sizeof (char *), @@ -3705,11 +3845,6 @@ main(int argc, char **argv) case 'x': vn_dumpdir = optarg; break; - case 'o': - error = set_global_var(optarg); - if (error != 0) - usage(); - break; default: usage(); break; @@ -3748,7 +3883,7 @@ main(int argc, char **argv) verbose = MAX(verbose, 1); for (c = 0; c < 256; c++) { - if (dump_all && !strchr("elAFLRSXP", c)) + if (dump_all && strchr("AeFlLOPRSX", c) == NULL) dump_opt[c] = 1; if (dump_opt[c]) dump_opt[c] += verbose; @@ -3773,6 +3908,13 @@ main(int argc, char **argv) if (dump_opt['l']) return (dump_label(argv[0])); + if (dump_opt['O']) { + if (argc != 2) + usage(); + dump_opt['v'] = verbose + 3; + return (dump_path(argv[0], argv[1])); + } + if (dump_opt['X'] || dump_opt['F']) rewind = ZPOOL_DO_REWIND | (dump_opt['X'] ? ZPOOL_EXTREME_REWIND : 0); @@ -3847,8 +3989,7 @@ main(int argc, char **argv) } } } else { - error = dmu_objset_own(target, DMU_OST_ANY, - B_TRUE, FTAG, &os); + error = open_objset(target, DMU_OST_ANY, FTAG, &os); } } nvlist_free(policy); @@ -3891,10 +4032,12 @@ main(int argc, char **argv) zdb_read_block(argv[i], spa); } - (os != NULL) ? dmu_objset_disown(os, FTAG) : spa_close(spa, FTAG); + if (os != NULL) + close_objset(os, FTAG); + else + spa_close(spa, FTAG); fuid_table_destroy(); - sa_loaded = B_FALSE; dump_debug_buffer(); From owner-svn-src-all@freebsd.org Mon Oct 30 08:57:09 2017 Return-Path: Delivered-To: svn-src-all@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 B2F1DE57CC2; Mon, 30 Oct 2017 08:57:09 +0000 (UTC) (envelope-from avos@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 822547E93C; Mon, 30 Oct 2017 08:57:09 +0000 (UTC) (envelope-from avos@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9U8v8jP061614; Mon, 30 Oct 2017 08:57:08 GMT (envelope-from avos@FreeBSD.org) Received: (from avos@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9U8v8IU061612; Mon, 30 Oct 2017 08:57:08 GMT (envelope-from avos@FreeBSD.org) Message-Id: <201710300857.v9U8v8IU061612@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avos set sender to avos@FreeBSD.org using -f From: Andriy Voskoboinyk Date: Mon, 30 Oct 2017 08:57:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325137 - in head/sys/dev: rtwn/usb usb X-SVN-Group: head X-SVN-Commit-Author: avos X-SVN-Commit-Paths: in head/sys/dev: rtwn/usb usb X-SVN-Commit-Revision: 325137 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 08:57:09 -0000 Author: avos Date: Mon Oct 30 08:57:08 2017 New Revision: 325137 URL: https://svnweb.freebsd.org/changeset/base/325137 Log: rtwn_usb(4): add few USB IDs. Submitted by: wfpower@yandex.ru (via github). Modified: head/sys/dev/rtwn/usb/rtwn_usb_attach.h head/sys/dev/usb/usbdevs Modified: head/sys/dev/rtwn/usb/rtwn_usb_attach.h ============================================================================== --- head/sys/dev/rtwn/usb/rtwn_usb_attach.h Mon Oct 30 08:56:39 2017 (r325136) +++ head/sys/dev/rtwn/usb/rtwn_usb_attach.h Mon Oct 30 08:57:08 2017 (r325137) @@ -137,6 +137,8 @@ static const STRUCT_USB_HOST_ID rtwn_devs[] = { RTWN_RTL8812AU_DEV(SENAO, EUB1200AC), RTWN_RTL8812AU_DEV(SITECOMEU, WLA7100), RTWN_RTL8812AU_DEV(TPLINK, T4U), + RTWN_RTL8812AU_DEV(TPLINK, T4UV2), + RTWN_RTL8812AU_DEV(TPLINK, T4UHV2), RTWN_RTL8812AU_DEV(TRENDNET, TEW805UB), RTWN_RTL8812AU_DEV(ZYXEL, NWD6605), #undef RTWN_RTL8812AU_DEV Modified: head/sys/dev/usb/usbdevs ============================================================================== --- head/sys/dev/usb/usbdevs Mon Oct 30 08:56:39 2017 (r325136) +++ head/sys/dev/usb/usbdevs Mon Oct 30 08:57:08 2017 (r325137) @@ -4537,6 +4537,8 @@ product TOSHIBA TRANSMEMORY 0x6545 USB ThumbDrive product TPLINK T4U 0x0101 Archer T4U product TPLINK WN822NV4 0x0108 TL-WN822N v4 product TPLINK WN823NV2 0x0109 TL-WN823N v2 +product TPLINK T4UV2 0x010d Archer T4U ver 2 +product TPLINK T4UHV2 0x010e Archer T4UH ver 2 /* Trek Technology products */ product TREK THUMBDRIVE 0x1111 ThumbDrive From owner-svn-src-all@freebsd.org Mon Oct 30 08:58:40 2017 Return-Path: Delivered-To: svn-src-all@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 7D705E57D9B; Mon, 30 Oct 2017 08:58:40 +0000 (UTC) (envelope-from avg@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 588507EAB1; Mon, 30 Oct 2017 08:58:40 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9U8wdW5061724; Mon, 30 Oct 2017 08:58:39 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9U8wdlL061723; Mon, 30 Oct 2017 08:58:39 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201710300858.v9U8wdlL061723@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 30 Oct 2017 08:58:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r325138 - stable/11/cddl/contrib/opensolaris/cmd/zdb X-SVN-Group: stable-11 X-SVN-Commit-Author: avg X-SVN-Commit-Paths: stable/11/cddl/contrib/opensolaris/cmd/zdb X-SVN-Commit-Revision: 325138 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 08:58:40 -0000 Author: avg Date: Mon Oct 30 08:58:39 2017 New Revision: 325138 URL: https://svnweb.freebsd.org/changeset/base/325138 Log: MFC r324344: MFV r316864: 6392 zdb: introduce -V for verbatim import Modified: stable/11/cddl/contrib/opensolaris/cmd/zdb/zdb.c Directory Properties: stable/11/ (props changed) Modified: stable/11/cddl/contrib/opensolaris/cmd/zdb/zdb.c ============================================================================== --- stable/11/cddl/contrib/opensolaris/cmd/zdb/zdb.c Mon Oct 30 08:57:08 2017 (r325137) +++ stable/11/cddl/contrib/opensolaris/cmd/zdb/zdb.c Mon Oct 30 08:58:39 2017 (r325138) @@ -121,20 +121,21 @@ static void usage(void) { (void) fprintf(stderr, - "Usage:\t%s [-AbcdDFGhiLMPsvX] [-e [-p ...]] " + "Usage:\t%s [-AbcdDFGhiLMPsvX] [-e [-V] [-p ...]] " "[-I ]\n" "\t\t[-o =]... [-t ] [-U ] [-x ]\n" "\t\t[ [ ...]]\n" - "\t%s [-AdiPv] [-e [-p ...]] [-U ] " + "\t%s [-AdiPv] [-e [-V] [-p ...]] [-U ] " "[ ...]\n" "\t%s -C [-A] [-U ]\n" "\t%s -l [-Aqu] \n" - "\t%s -m [-AFLPX] [-e [-p ...]] [-t ] [-U ]\n" - "\t\t [ [ ...]]\n" + "\t%s -m [-AFLPX] [-e [-V] [-p ...]] [-t ] " + "[-U ]\n\t\t [ [ ...]]\n" "\t%s -O \n" - "\t%s -R [-A] [-e [-p ...]] [-U ]\n" + "\t%s -R [-A] [-e [-V] [-p ...]] [-U ]\n" "\t\t ::[:]\n" - "\t%s -S [-AP] [-e [-p ...]] [-U ] \n\n", + "\t%s -S [-AP] [-e [-V] [-p ...]] [-U ] " + "\n\n", cmdname, cmdname, cmdname, cmdname, cmdname, cmdname, cmdname, cmdname); @@ -189,6 +190,7 @@ usage(void) (void) fprintf(stderr, " -u uberblock\n"); (void) fprintf(stderr, " -U -- use alternate " "cachefile\n"); + (void) fprintf(stderr, " -V do verbatim import\n"); (void) fprintf(stderr, " -x -- " "dump all read blocks into specified directory\n"); (void) fprintf(stderr, " -X attempt extreme rewind (does not " @@ -3749,6 +3751,7 @@ main(int argc, char **argv) char *target; nvlist_t *policy = NULL; uint64_t max_txg = UINT64_MAX; + int flags = ZFS_IMPORT_MISSING_LOG; int rewind = ZPOOL_NEVER_REWIND; char *spa_config_path_env; boolean_t target_is_spa = B_TRUE; @@ -3768,7 +3771,7 @@ main(int argc, char **argv) spa_config_path = spa_config_path_env; while ((c = getopt(argc, argv, - "AbcCdDeFGhiI:lLmMo:Op:PqRsSt:uU:vx:X")) != -1) { + "AbcCdDeFGhiI:lLmMo:Op:PqRsSt:uU:vVx:X")) != -1) { switch (c) { case 'b': case 'c': @@ -3842,6 +3845,9 @@ main(int argc, char **argv) case 'v': verbose++; break; + case 'V': + flags = ZFS_IMPORT_VERBATIM; + break; case 'x': vn_dumpdir = optarg; break; @@ -3942,11 +3948,7 @@ main(int argc, char **argv) fatal("can't open '%s': %s", target, strerror(ENOMEM)); } - if ((error = spa_import(name, cfg, NULL, - ZFS_IMPORT_MISSING_LOG)) != 0) { - error = spa_import(name, cfg, NULL, - ZFS_IMPORT_VERBATIM); - } + error = spa_import(name, cfg, NULL, flags); } } From owner-svn-src-all@freebsd.org Mon Oct 30 09:01:04 2017 Return-Path: Delivered-To: svn-src-all@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 12BDBE58024; Mon, 30 Oct 2017 09:01:04 +0000 (UTC) (envelope-from avg@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 D5B2C7EC72; Mon, 30 Oct 2017 09:01:03 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9U913Vq064087; Mon, 30 Oct 2017 09:01:03 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9U913nE064086; Mon, 30 Oct 2017 09:01:03 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201710300901.v9U913nE064086@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 30 Oct 2017 09:01:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r325139 - stable/11/cddl/contrib/opensolaris/lib/libzfs/common X-SVN-Group: stable-11 X-SVN-Commit-Author: avg X-SVN-Commit-Paths: stable/11/cddl/contrib/opensolaris/lib/libzfs/common X-SVN-Commit-Revision: 325139 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 09:01:04 -0000 Author: avg Date: Mon Oct 30 09:01:02 2017 New Revision: 325139 URL: https://svnweb.freebsd.org/changeset/base/325139 Log: MFC r324345: MFV r316877: 7571 non-present readonly numeric ZFS props do not have default value Modified: stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Directory Properties: stable/11/ (props changed) Modified: stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c ============================================================================== --- stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Mon Oct 30 08:58:39 2017 (r325138) +++ stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Mon Oct 30 09:01:02 2017 (r325139) @@ -22,7 +22,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, Joyent, Inc. All rights reserved. - * Copyright (c) 2011, 2015 by Delphix. All rights reserved. + * Copyright (c) 2011, 2016 by Delphix. All rights reserved. * Copyright (c) 2012 DEY Storage Systems, Inc. All rights reserved. * Copyright (c) 2011-2012 Pawel Jakub Dawidek. All rights reserved. * Copyright (c) 2013 Martin Matuska. All rights reserved. @@ -2166,6 +2166,7 @@ get_numeric_property(zfs_handle_t *zhp, zfs_prop_t pro if (zfs_prop_readonly(prop) && *source != NULL && (*source)[0] == '\0') { *source = NULL; + return (-1); } break; From owner-svn-src-all@freebsd.org Mon Oct 30 09:01:54 2017 Return-Path: Delivered-To: svn-src-all@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 2BC3BE581D6; Mon, 30 Oct 2017 09:01:54 +0000 (UTC) (envelope-from avg@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 EC8D27EE8C; Mon, 30 Oct 2017 09:01:53 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9U91qAJ064977; Mon, 30 Oct 2017 09:01:52 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9U91qtf064976; Mon, 30 Oct 2017 09:01:52 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201710300901.v9U91qtf064976@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 30 Oct 2017 09:01: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: r325140 - stable/10/cddl/contrib/opensolaris/lib/libzfs/common X-SVN-Group: stable-10 X-SVN-Commit-Author: avg X-SVN-Commit-Paths: stable/10/cddl/contrib/opensolaris/lib/libzfs/common X-SVN-Commit-Revision: 325140 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 09:01:54 -0000 Author: avg Date: Mon Oct 30 09:01:52 2017 New Revision: 325140 URL: https://svnweb.freebsd.org/changeset/base/325140 Log: MFC r324345: MFV r316877: 7571 non-present readonly numeric ZFS props do not have default valu Modified: stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Directory Properties: stable/10/ (props changed) Modified: stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c ============================================================================== --- stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Mon Oct 30 09:01:02 2017 (r325139) +++ stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Mon Oct 30 09:01:52 2017 (r325140) @@ -22,7 +22,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, Joyent, Inc. All rights reserved. - * Copyright (c) 2011, 2015 by Delphix. All rights reserved. + * Copyright (c) 2011, 2016 by Delphix. All rights reserved. * Copyright (c) 2012 DEY Storage Systems, Inc. All rights reserved. * Copyright (c) 2011-2012 Pawel Jakub Dawidek. All rights reserved. * Copyright (c) 2013 Martin Matuska. All rights reserved. @@ -2068,6 +2068,7 @@ get_numeric_property(zfs_handle_t *zhp, zfs_prop_t pro if (zfs_prop_readonly(prop) && *source != NULL && (*source)[0] == '\0') { *source = NULL; + return (-1); } break; From owner-svn-src-all@freebsd.org Mon Oct 30 10:29:27 2017 Return-Path: Delivered-To: svn-src-all@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 B046DE5978B; Mon, 30 Oct 2017 10:29:27 +0000 (UTC) (envelope-from avg@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 7F0228193E; Mon, 30 Oct 2017 10:29:27 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9UATQC6099930; Mon, 30 Oct 2017 10:29:26 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9UATQts099929; Mon, 30 Oct 2017 10:29:26 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201710301029.v9UATQts099929@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 30 Oct 2017 10:29:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r325147 - stable/11/cddl/contrib/opensolaris/lib/libzfs/common X-SVN-Group: stable-11 X-SVN-Commit-Author: avg X-SVN-Commit-Paths: stable/11/cddl/contrib/opensolaris/lib/libzfs/common X-SVN-Commit-Revision: 325147 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 10:29:27 -0000 Author: avg Date: Mon Oct 30 10:29:26 2017 New Revision: 325147 URL: https://svnweb.freebsd.org/changeset/base/325147 Log: MFC r324346: MFV r316931: 6268 zfs diff confused by moving a file to another directory Modified: stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c Directory Properties: stable/11/ (props changed) Modified: stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c ============================================================================== --- stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c Mon Oct 30 10:08:53 2017 (r325146) +++ stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c Mon Oct 30 10:29:26 2017 (r325147) @@ -55,15 +55,6 @@ #define ZDIFF_REMOVED '-' #define ZDIFF_RENAMED 'R' -static boolean_t -do_name_cmp(const char *fpath, const char *tpath) -{ - char *fname, *tname; - fname = strrchr(fpath, '/') + 1; - tname = strrchr(tpath, '/') + 1; - return (strcmp(fname, tname) == 0); -} - typedef struct differ_info { zfs_handle_t *zhp; char *fromsnap; @@ -262,7 +253,6 @@ static int write_inuse_diffs_one(FILE *fp, differ_info_t *di, uint64_t dobj) { struct zfs_stat fsb, tsb; - boolean_t same_name; mode_t fmode, tmode; char fobjname[MAXPATHLEN], tobjname[MAXPATHLEN]; int fobjerr, tobjerr; @@ -323,7 +313,6 @@ write_inuse_diffs_one(FILE *fp, differ_info_t *di, uin if (fmode != tmode && fsb.zs_gen == tsb.zs_gen) tsb.zs_gen++; /* Force a generational difference */ - same_name = do_name_cmp(fobjname, tobjname); /* Simple modification or no change */ if (fsb.zs_gen == tsb.zs_gen) { @@ -334,7 +323,7 @@ write_inuse_diffs_one(FILE *fp, differ_info_t *di, uin if (change) { print_link_change(fp, di, change, change > 0 ? fobjname : tobjname, &tsb); - } else if (same_name) { + } else if (strcmp(fobjname, tobjname) == 0) { print_file(fp, di, ZDIFF_MODIFIED, fobjname, &tsb); } else { print_rename(fp, di, fobjname, tobjname, &tsb); From owner-svn-src-all@freebsd.org Mon Oct 30 10:29:32 2017 Return-Path: Delivered-To: svn-src-all@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 809B3E597BB; Mon, 30 Oct 2017 10:29:32 +0000 (UTC) (envelope-from avg@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 4A44581955; Mon, 30 Oct 2017 10:29:32 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9UATVt5099984; Mon, 30 Oct 2017 10:29:31 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9UATVkN099983; Mon, 30 Oct 2017 10:29:31 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201710301029.v9UATVkN099983@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 30 Oct 2017 10:29:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r325148 - stable/10/cddl/contrib/opensolaris/lib/libzfs/common X-SVN-Group: stable-10 X-SVN-Commit-Author: avg X-SVN-Commit-Paths: stable/10/cddl/contrib/opensolaris/lib/libzfs/common X-SVN-Commit-Revision: 325148 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 10:29:32 -0000 Author: avg Date: Mon Oct 30 10:29:31 2017 New Revision: 325148 URL: https://svnweb.freebsd.org/changeset/base/325148 Log: MFC r324346: MFV r316931: 6268 zfs diff confused by moving a file to another directory Modified: stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c Directory Properties: stable/10/ (props changed) Modified: stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c ============================================================================== --- stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c Mon Oct 30 10:29:26 2017 (r325147) +++ stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c Mon Oct 30 10:29:31 2017 (r325148) @@ -55,15 +55,6 @@ #define ZDIFF_REMOVED '-' #define ZDIFF_RENAMED 'R' -static boolean_t -do_name_cmp(const char *fpath, const char *tpath) -{ - char *fname, *tname; - fname = strrchr(fpath, '/') + 1; - tname = strrchr(tpath, '/') + 1; - return (strcmp(fname, tname) == 0); -} - typedef struct differ_info { zfs_handle_t *zhp; char *fromsnap; @@ -262,7 +253,6 @@ static int write_inuse_diffs_one(FILE *fp, differ_info_t *di, uint64_t dobj) { struct zfs_stat fsb, tsb; - boolean_t same_name; mode_t fmode, tmode; char fobjname[MAXPATHLEN], tobjname[MAXPATHLEN]; int fobjerr, tobjerr; @@ -323,7 +313,6 @@ write_inuse_diffs_one(FILE *fp, differ_info_t *di, uin if (fmode != tmode && fsb.zs_gen == tsb.zs_gen) tsb.zs_gen++; /* Force a generational difference */ - same_name = do_name_cmp(fobjname, tobjname); /* Simple modification or no change */ if (fsb.zs_gen == tsb.zs_gen) { @@ -334,7 +323,7 @@ write_inuse_diffs_one(FILE *fp, differ_info_t *di, uin if (change) { print_link_change(fp, di, change, change > 0 ? fobjname : tobjname, &tsb); - } else if (same_name) { + } else if (strcmp(fobjname, tobjname) == 0) { print_file(fp, di, ZDIFF_MODIFIED, fobjname, &tsb); } else { print_rename(fp, di, fobjname, tobjname, &tsb); From owner-svn-src-all@freebsd.org Mon Oct 30 10:32:37 2017 Return-Path: Delivered-To: svn-src-all@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 7BA43E59983; Mon, 30 Oct 2017 10:32:37 +0000 (UTC) (envelope-from avg@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 41E9681E34; Mon, 30 Oct 2017 10:32:37 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9UAWaU3003991; Mon, 30 Oct 2017 10:32:36 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9UAWaO1003990; Mon, 30 Oct 2017 10:32:36 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201710301032.v9UAWaO1003990@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 30 Oct 2017 10:32:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r325149 - stable/11/cddl/contrib/opensolaris/lib/libzfs/common X-SVN-Group: stable-11 X-SVN-Commit-Author: avg X-SVN-Commit-Paths: stable/11/cddl/contrib/opensolaris/lib/libzfs/common X-SVN-Commit-Revision: 325149 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 10:32:37 -0000 Author: avg Date: Mon Oct 30 10:32:36 2017 New Revision: 325149 URL: https://svnweb.freebsd.org/changeset/base/325149 Log: MFC r324347: MFV r316933: 5142 libzfs support raidz root pool (loader project) FreeBSD note: we have long supported this feature, this commit only removes a small difference in libzfs. Modified: stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Directory Properties: stable/11/ (props changed) Modified: stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c ============================================================================== --- stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Mon Oct 30 10:29:31 2017 (r325148) +++ stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Mon Oct 30 10:32:36 2017 (r325149) @@ -2295,6 +2295,7 @@ vdev_get_physpaths(nvlist_t *nv, char *physpath, size_ return (ret); } } else if (strcmp(type, VDEV_TYPE_MIRROR) == 0 || + strcmp(type, VDEV_TYPE_RAIDZ) == 0 || strcmp(type, VDEV_TYPE_REPLACING) == 0 || (is_spare = (strcmp(type, VDEV_TYPE_SPARE) == 0))) { nvlist_t **child; From owner-svn-src-all@freebsd.org Mon Oct 30 10:33:06 2017 Return-Path: Delivered-To: svn-src-all@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 C55D0E599ED; Mon, 30 Oct 2017 10:33:06 +0000 (UTC) (envelope-from avg@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 9269881F65; Mon, 30 Oct 2017 10:33:06 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9UAX5Lo004084; Mon, 30 Oct 2017 10:33:05 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9UAX5Xi004083; Mon, 30 Oct 2017 10:33:05 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201710301033.v9UAX5Xi004083@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 30 Oct 2017 10:33: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: r325150 - stable/10/cddl/contrib/opensolaris/lib/libzfs/common X-SVN-Group: stable-10 X-SVN-Commit-Author: avg X-SVN-Commit-Paths: stable/10/cddl/contrib/opensolaris/lib/libzfs/common X-SVN-Commit-Revision: 325150 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 10:33:06 -0000 Author: avg Date: Mon Oct 30 10:33:05 2017 New Revision: 325150 URL: https://svnweb.freebsd.org/changeset/base/325150 Log: MFC r324347: MFV r316933: 5142 libzfs support raidz root pool (loader project) FreeBSD note: we have long supported this feature, this commit only removes a small difference in libzfs. Modified: stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Directory Properties: stable/10/ (props changed) Modified: stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c ============================================================================== --- stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Mon Oct 30 10:32:36 2017 (r325149) +++ stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Mon Oct 30 10:33:05 2017 (r325150) @@ -2272,6 +2272,7 @@ vdev_get_physpaths(nvlist_t *nv, char *physpath, size_ return (ret); } } else if (strcmp(type, VDEV_TYPE_MIRROR) == 0 || + strcmp(type, VDEV_TYPE_RAIDZ) == 0 || strcmp(type, VDEV_TYPE_REPLACING) == 0 || (is_spare = (strcmp(type, VDEV_TYPE_SPARE) == 0))) { nvlist_t **child; From owner-svn-src-all@freebsd.org Mon Oct 30 10:35:04 2017 Return-Path: Delivered-To: svn-src-all@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 B7F40E59A7A; Mon, 30 Oct 2017 10:35:04 +0000 (UTC) (envelope-from avg@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 849B0820BB; Mon, 30 Oct 2017 10:35:04 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9UAZ3tk004226; Mon, 30 Oct 2017 10:35:03 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9UAZ31O004225; Mon, 30 Oct 2017 10:35:03 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201710301035.v9UAZ31O004225@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 30 Oct 2017 10:35:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r325151 - stable/11/cddl/contrib/opensolaris/lib/libzfs/common X-SVN-Group: stable-11 X-SVN-Commit-Author: avg X-SVN-Commit-Paths: stable/11/cddl/contrib/opensolaris/lib/libzfs/common X-SVN-Commit-Revision: 325151 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 10:35:04 -0000 Author: avg Date: Mon Oct 30 10:35:03 2017 New Revision: 325151 URL: https://svnweb.freebsd.org/changeset/base/325151 Log: MFC r324348: MFV r316934: 7340 receive manual origin should override automatic origin Modified: stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Directory Properties: stable/11/ (props changed) Modified: stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c ============================================================================== --- stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Mon Oct 30 10:33:05 2017 (r325150) +++ stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Mon Oct 30 10:35:03 2017 (r325151) @@ -3212,7 +3212,12 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const /* * Determine the name of the origin snapshot, store in zc_string. */ - if (drrb->drr_flags & DRR_FLAG_CLONE) { + if (originsnap) { + (void) strncpy(zc.zc_string, originsnap, sizeof (zc.zc_string)); + if (flags->verbose) + (void) printf("using provided clone origin %s\n", + zc.zc_string); + } else if (drrb->drr_flags & DRR_FLAG_CLONE) { if (guid_to_name(hdl, zc.zc_value, drrb->drr_fromguid, B_FALSE, zc.zc_string) != 0) { zcmd_free_nvlists(&zc); @@ -3223,11 +3228,6 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const } if (flags->verbose) (void) printf("found clone origin %s\n", zc.zc_string); - } else if (originsnap) { - (void) strncpy(zc.zc_string, originsnap, sizeof (zc.zc_string)); - if (flags->verbose) - (void) printf("using provided clone origin %s\n", - zc.zc_string); } boolean_t resuming = DMU_GET_FEATUREFLAGS(drrb->drr_versioninfo) & From owner-svn-src-all@freebsd.org Mon Oct 30 10:35:46 2017 Return-Path: Delivered-To: svn-src-all@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 F063EE59B2A; Mon, 30 Oct 2017 10:35:46 +0000 (UTC) (envelope-from avg@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 B3C2D8222B; Mon, 30 Oct 2017 10:35:46 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9UAZjp1004315; Mon, 30 Oct 2017 10:35:45 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9UAZjaD004314; Mon, 30 Oct 2017 10:35:45 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201710301035.v9UAZjaD004314@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 30 Oct 2017 10:35: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: r325152 - stable/10/cddl/contrib/opensolaris/lib/libzfs/common X-SVN-Group: stable-10 X-SVN-Commit-Author: avg X-SVN-Commit-Paths: stable/10/cddl/contrib/opensolaris/lib/libzfs/common X-SVN-Commit-Revision: 325152 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 10:35:47 -0000 Author: avg Date: Mon Oct 30 10:35:45 2017 New Revision: 325152 URL: https://svnweb.freebsd.org/changeset/base/325152 Log: MFC r324348: MFV r316934: 7340 receive manual origin should override automatic origin Modified: stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Directory Properties: stable/10/ (props changed) Modified: stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c ============================================================================== --- stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Mon Oct 30 10:35:03 2017 (r325151) +++ stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Mon Oct 30 10:35:45 2017 (r325152) @@ -3195,7 +3195,12 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const /* * Determine the name of the origin snapshot, store in zc_string. */ - if (drrb->drr_flags & DRR_FLAG_CLONE) { + if (originsnap) { + (void) strncpy(zc.zc_string, originsnap, sizeof (zc.zc_string)); + if (flags->verbose) + (void) printf("using provided clone origin %s\n", + zc.zc_string); + } else if (drrb->drr_flags & DRR_FLAG_CLONE) { if (guid_to_name(hdl, zc.zc_value, drrb->drr_fromguid, B_FALSE, zc.zc_string) != 0) { zcmd_free_nvlists(&zc); @@ -3206,11 +3211,6 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const } if (flags->verbose) (void) printf("found clone origin %s\n", zc.zc_string); - } else if (originsnap) { - (void) strncpy(zc.zc_string, originsnap, sizeof (zc.zc_string)); - if (flags->verbose) - (void) printf("using provided clone origin %s\n", - zc.zc_string); } boolean_t resuming = DMU_GET_FEATUREFLAGS(drrb->drr_versioninfo) & From owner-svn-src-all@freebsd.org Mon Oct 30 10:37:22 2017 Return-Path: Delivered-To: svn-src-all@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 9CE0DE59C8F; Mon, 30 Oct 2017 10:37:22 +0000 (UTC) (envelope-from avg@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 78C91824AD; Mon, 30 Oct 2017 10:37:22 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9UAbLW9004437; Mon, 30 Oct 2017 10:37:21 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9UAbLMY004434; Mon, 30 Oct 2017 10:37:21 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201710301037.v9UAbLMY004434@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 30 Oct 2017 10:37:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r325153 - in stable/11: cddl/contrib/opensolaris/cmd/zdb sys/cddl/contrib/opensolaris/uts/common/fs/zfs sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys X-SVN-Group: stable-11 X-SVN-Commit-Author: avg X-SVN-Commit-Paths: in stable/11: cddl/contrib/opensolaris/cmd/zdb sys/cddl/contrib/opensolaris/uts/common/fs/zfs sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys X-SVN-Commit-Revision: 325153 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 10:37:22 -0000 Author: avg Date: Mon Oct 30 10:37:21 2017 New Revision: 325153 URL: https://svnweb.freebsd.org/changeset/base/325153 Log: MFC r324349: MFV r322235: 8067 zdb should be able to dump literal embedded block pointer Modified: stable/11/cddl/contrib/opensolaris/cmd/zdb/zdb.c stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/blkptr.c stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/blkptr.h Directory Properties: stable/11/ (props changed) Modified: stable/11/cddl/contrib/opensolaris/cmd/zdb/zdb.c ============================================================================== --- stable/11/cddl/contrib/opensolaris/cmd/zdb/zdb.c Mon Oct 30 10:35:45 2017 (r325152) +++ stable/11/cddl/contrib/opensolaris/cmd/zdb/zdb.c Mon Oct 30 10:37:21 2017 (r325153) @@ -61,6 +61,7 @@ #include #include #include +#include #include #undef verify #include @@ -134,10 +135,11 @@ usage(void) "\t%s -O \n" "\t%s -R [-A] [-e [-V] [-p ...]] [-U ]\n" "\t\t ::[:]\n" + "\t%s -E [-A] word0:word1:...:word15\n" "\t%s -S [-AP] [-e [-V] [-p ...]] [-U ] " "\n\n", cmdname, cmdname, cmdname, cmdname, cmdname, cmdname, cmdname, - cmdname); + cmdname, cmdname); (void) fprintf(stderr, " Dataset name must include at least one " "separator character '/' or '@'\n"); @@ -152,6 +154,8 @@ usage(void) (void) fprintf(stderr, " -C config (or cachefile if alone)\n"); (void) fprintf(stderr, " -d dataset(s)\n"); (void) fprintf(stderr, " -D dedup statistics\n"); + (void) fprintf(stderr, " -E decode and display block from an " + "embedded block pointer\n"); (void) fprintf(stderr, " -h pool history\n"); (void) fprintf(stderr, " -i intent logs\n"); (void) fprintf(stderr, " -l read label contents\n"); @@ -3653,6 +3657,33 @@ out: free(dup); } +static void +zdb_embedded_block(char *thing) +{ + blkptr_t bp = { 0 }; + unsigned long long *words = (void *)&bp; + char buf[SPA_MAXBLOCKSIZE]; + int err; + + err = sscanf(thing, "%llx:%llx:%llx:%llx:%llx:%llx:%llx:%llx:" + "%llx:%llx:%llx:%llx:%llx:%llx:%llx:%llx", + words + 0, words + 1, words + 2, words + 3, + words + 4, words + 5, words + 6, words + 7, + words + 8, words + 9, words + 10, words + 11, + words + 12, words + 13, words + 14, words + 15); + if (err != 16) { + (void) printf("invalid input format\n"); + exit(1); + } + ASSERT3U(BPE_GET_LSIZE(&bp), <=, SPA_MAXBLOCKSIZE); + err = decode_embedded_bp(&bp, buf, BPE_GET_LSIZE(&bp)); + if (err != 0) { + (void) printf("decode failed: %u\n", err); + exit(1); + } + zdb_dump_block_raw(buf, BPE_GET_LSIZE(&bp), 0); +} + static boolean_t pool_match(nvlist_t *cfg, char *tgt) { @@ -3771,13 +3802,14 @@ main(int argc, char **argv) spa_config_path = spa_config_path_env; while ((c = getopt(argc, argv, - "AbcCdDeFGhiI:lLmMo:Op:PqRsSt:uU:vVx:X")) != -1) { + "AbcCdDeEFGhiI:lLmMo:Op:PqRsSt:uU:vVx:X")) != -1) { switch (c) { case 'b': case 'c': case 'C': case 'd': case 'D': + case 'E': case 'G': case 'h': case 'i': @@ -3841,6 +3873,12 @@ main(int argc, char **argv) break; case 'U': spa_config_path = optarg; + if (spa_config_path[0] != '/') { + (void) fprintf(stderr, + "cachefile must be an absolute path " + "(i.e. start with a slash)\n"); + usage(); + } break; case 'v': verbose++; @@ -3889,7 +3927,7 @@ main(int argc, char **argv) verbose = MAX(verbose, 1); for (c = 0; c < 256; c++) { - if (dump_all && strchr("AeFlLOPRSX", c) == NULL) + if (dump_all && strchr("AeEFlLOPRSX", c) == NULL) dump_opt[c] = 1; if (dump_opt[c]) dump_opt[c] += verbose; @@ -3903,6 +3941,14 @@ main(int argc, char **argv) if (argc < 2 && dump_opt['R']) usage(); + + if (dump_opt['E']) { + if (argc != 1) + usage(); + zdb_embedded_block(argv[0]); + return (0); + } + if (argc < 1) { if (!dump_opt['e'] && dump_opt['C']) { dump_cachefile(spa_config_path); Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/blkptr.c ============================================================================== --- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/blkptr.c Mon Oct 30 10:35:45 2017 (r325152) +++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/blkptr.c Mon Oct 30 10:37:21 2017 (r325153) @@ -117,3 +117,36 @@ decode_embedded_bp_compressed(const blkptr_t *bp, void buf8[i] = BF64_GET(w, (i % sizeof (w)) * NBBY, NBBY); } } + +/* + * Fill in the buffer with the (decompressed) payload of the embedded + * blkptr_t. Takes into account compression and byteorder (the payload is + * treated as a stream of bytes). + * Return 0 on success, or ENOSPC if it won't fit in the buffer. + */ +int +decode_embedded_bp(const blkptr_t *bp, void *buf, int buflen) +{ + int lsize, psize; + + ASSERT(BP_IS_EMBEDDED(bp)); + + lsize = BPE_GET_LSIZE(bp); + psize = BPE_GET_PSIZE(bp); + + if (lsize > buflen) + return (ENOSPC); + ASSERT3U(lsize, ==, buflen); + + if (BP_GET_COMPRESS(bp) != ZIO_COMPRESS_OFF) { + uint8_t dstbuf[BPE_PAYLOAD_SIZE]; + decode_embedded_bp_compressed(bp, dstbuf); + VERIFY0(zio_decompress_data_buf(BP_GET_COMPRESS(bp), + dstbuf, buf, psize, buflen)); + } else { + ASSERT3U(lsize, ==, psize); + decode_embedded_bp_compressed(bp, buf); + } + + return (0); +} Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/blkptr.h ============================================================================== --- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/blkptr.h Mon Oct 30 10:35:45 2017 (r325152) +++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/blkptr.h Mon Oct 30 10:37:21 2017 (r325153) @@ -30,6 +30,7 @@ extern "C" { void encode_embedded_bp_compressed(blkptr_t *, void *, enum zio_compress, int, int); void decode_embedded_bp_compressed(const blkptr_t *, void *); +int decode_embedded_bp(const blkptr_t *, void *, int); #ifdef __cplusplus } From owner-svn-src-all@freebsd.org Mon Oct 30 10:39:23 2017 Return-Path: Delivered-To: svn-src-all@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 50138E59E4E; Mon, 30 Oct 2017 10:39:23 +0000 (UTC) (envelope-from avg@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 12E3382750; Mon, 30 Oct 2017 10:39:23 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9UAdMDA004584; Mon, 30 Oct 2017 10:39:22 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9UAdMiw004583; Mon, 30 Oct 2017 10:39:22 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201710301039.v9UAdMiw004583@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 30 Oct 2017 10:39:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r325154 - stable/11/cddl/contrib/opensolaris/cmd/zdb X-SVN-Group: stable-11 X-SVN-Commit-Author: avg X-SVN-Commit-Paths: stable/11/cddl/contrib/opensolaris/cmd/zdb X-SVN-Commit-Revision: 325154 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 10:39:23 -0000 Author: avg Date: Mon Oct 30 10:39:22 2017 New Revision: 325154 URL: https://svnweb.freebsd.org/changeset/base/325154 Log: MFC r324350: zdb.8: replace with the slighly modified upstream version Modified: stable/11/cddl/contrib/opensolaris/cmd/zdb/zdb.8 Directory Properties: stable/11/ (props changed) Modified: stable/11/cddl/contrib/opensolaris/cmd/zdb/zdb.8 ============================================================================== --- stable/11/cddl/contrib/opensolaris/cmd/zdb/zdb.8 Mon Oct 30 10:37:21 2017 (r325153) +++ stable/11/cddl/contrib/opensolaris/cmd/zdb/zdb.8 Mon Oct 30 10:39:22 2017 (r325154) @@ -1,6 +1,3 @@ -'\" te -.\" Copyright (c) 2012, Martin Matuska . -.\" All Rights Reserved. .\" .\" This file and its contents are supplied under the terms of the .\" Common Development and Distribution License ("CDDL"), version 1.0. @@ -13,73 +10,75 @@ .\" .\" .\" Copyright 2012, Richard Lowe. -.\" Copyright (c) 2012, Marcelo Araujo . -.\" Copyright (c) 2012, 2014 by Delphix. All rights reserved. -.\" Copyright 2016 Nexenta Systems, Inc. -.\" All Rights Reserved. +.\" Copyright (c) 2012, 2017 by Delphix. All rights reserved. +.\" Copyright 2017 Nexenta Systems, Inc. .\" -.\" $FreeBSD$ -.\" -.Dd October 1, 2017 +.Dd October 06, 2017 .Dt ZDB 8 .Os .Sh NAME .Nm zdb -.Nd Display zpool debugging and consistency information +.Nd display zpool debugging and consistency information .Sh SYNOPSIS .Nm -.Op Fl CmdibcsDvhLMXFPA -.Op Fl e Op Fl p Ar path... +.Op Fl AbcdDFGhiLMPsvX +.Op Fl e Oo Fl V Oc Op Fl p Ar path ... +.Op Fl I Ar inflight I/Os +.Oo Fl o Ar var Ns = Ns Ar value Oc Ns ... .Op Fl t Ar txg .Op Fl U Ar cache -.Op Fl I Ar inflight I/Os .Op Fl x Ar dumpdir -.Op Fl o Ar var=value -.Ar poolname -.Op Ar object ... +.Op Ar poolname Op Ar object ... .Nm -.Op Fl divPA -.Op Fl e Op Fl p Ar path... +.Op Fl AdiPv +.Op Fl e Oo Fl V Oc Op Fl p Ar path ... .Op Fl U Ar cache -.Ar dataset -.Op Ar object ... +.Ar dataset Op Ar object ... .Nm -.Fl m Op Fl MLXFPA -.Op Fl t Ar txg -.Op Fl e Op Fl p Ar path... +.Fl C +.Op Fl A .Op Fl U Ar cache -.Ar poolname .Nm -.Fl R Op Fl A -.Op Fl e Op Fl p Ar path... -.Op Fl U Ar cache -.Ar poolname -.Ar poolname -.Ar vdev Ns : Ns Ar offset Ns : Ns Ar size Ns Op Ns : Ns Ar flags +.Fl E +.Op Fl A +.Ar word0 Ns \&: Ns Ar word1 Ns :...: Ns Ar word15 .Nm -.Fl S -.Op Fl AP -.Op Fl e Op Fl p Ar path... -.Op Fl U Ar cache -.Ar poolname -.Ar poolname -.Nm .Fl l .Op Fl Aqu .Ar device .Nm -.Fl C +.Fl m +.Op Fl AFLPX +.Op Fl e Oo Fl V Oc Op Fl p Ar path ... +.Op Fl t Ar txg +.Op Fl U Ar cache +.Ar poolname Op Ar vdev Op Ar metaslab ... +.Nm +.Fl O +.Ar dataset path +.Nm +.Fl R .Op Fl A +.Op Fl e Oo Fl V Oc Op Fl p Ar path ... .Op Fl U Ar cache +.Ar poolname vdev Ns \&: Ns Ar offset Ns \&: Ns Ar size Ns Op : Ns Ar flags +.Nm +.Fl S +.Op Fl AP +.Op Fl e Oo Fl V Oc Op Fl p Ar path ... +.Op Fl U Ar cache +.Ar poolname .Sh DESCRIPTION The .Nm -utility displays information about a ZFS pool useful for debugging and -performs some amount of consistency checking. -It is a not a general purpose tool and options (and facilities) may change. +utility displays information about a ZFS pool useful for debugging and performs +some amount of consistency checking. +It is a not a general purpose tool and options +.Pq and facilities +may change. This is neither a .Xr fsck 8 -nor a +nor an .Xr fsdb 8 utility. .Pp @@ -91,81 +90,99 @@ internals is assumed. If the .Ar dataset argument does not contain any -.Sy / +.Qq Sy / or -.Sy @ +.Qq Sy @ characters, it is interpreted as a pool name. The root dataset can be specified as -.Pa pool Ns Sy / -(pool name followed by a slash). +.Ar pool Ns / +.Pq pool name followed by a slash . .Pp When operating on an imported and active pool it is possible, though unlikely, that zdb may interpret inconsistent pool data and behave erratically. .Sh OPTIONS Display options: -.Bl -tag -width indent +.Bl -tag -width Ds .It Fl b -Display statistics regarding the number, size (logical, physical and -allocated) and deduplication of blocks. +Display statistics regarding the number, size +.Pq logical, physical and allocated +and deduplication of blocks. .It Fl c Verify the checksum of all metadata blocks while printing block statistics -(see -.Fl b Ns ). +.Po see +.Fl b +.Pc . .Pp If specified multiple times, verify the checksums of all blocks. .It Fl C -Display information about the configuration. If specified with no other -options, instead display information about the cache file -.Po Pa /etc/zfs/zpool.cache Pc . +Display information about the configuration. +If specified with no other options, instead display information about the cache +file +.Pq Pa /boot/zfs/zpool.cache . To specify the cache file to display, see -.Fl U +.Fl U . .Pp -If specified multiple times, and a pool name is also specified display both -the cached configuration and the on-disk configuration. +If specified multiple times, and a pool name is also specified display both the +cached configuration and the on-disk configuration. If specified multiple times with .Fl e -also display the configuration that would be used were the pool to be -imported. +also display the configuration that would be used were the pool to be imported. .It Fl d -Display information about datasets. Specified once, displays basic dataset -information: ID, create transaction, size, and object count. +Display information about datasets. +Specified once, displays basic dataset information: ID, create transaction, +size, and object count. .Pp If specified multiple times provides greater and greater verbosity. .Pp -If object IDs are specified, display information about those specific objects only. +If object IDs are specified, display information about those specific objects +only. .It Fl D -Display deduplication statistics, including the deduplication ratio (dedup), -compression ratio (compress), inflation due to the zfs copies property -(copies), and an overall effective ratio (dedup * compress / copies). -.Pp -If specified twice, display a histogram of deduplication statistics, showing -the allocated (physically present on disk) and referenced (logically -referenced in the pool) block counts and sizes by reference count. -.Pp -If specified a third time, display the statistics independently for each deduplication table. -.Pp -If specified a fourth time, dump the contents of the deduplication tables describing duplicate blocks. -.Pp -If specified a fifth time, also dump the contents of the deduplication tables describing unique blocks. +Display deduplication statistics, including the deduplication ratio +.Pq Sy dedup , +compression ratio +.Pq Sy compress , +inflation due to the zfs copies property +.Pq Sy copies , +and an overall effective ratio +.Pq Sy dedup No * Sy compress No / Sy copies . +.It Fl DD +Display a histogram of deduplication statistics, showing the allocated +.Pq physically present on disk +and referenced +.Pq logically referenced in the pool +block counts and sizes by reference count. +.It Fl DDD +Display the statistics independently for each deduplication table. +.It Fl DDDD +Dump the contents of the deduplication tables describing duplicate blocks. +.It Fl DDDDD +Also dump the contents of the deduplication tables describing unique blocks. +.It Fl E Ar word0 Ns \&: Ns Ar word1 Ns :...: Ns Ar word15 +Decode and display block from an embedded block pointer specified by the +.Ar word +arguments. .It Fl h Display pool history similar to -.Cm zpool history , +.Nm zpool Cm history , but include internal changes, transaction, and dataset information. .It Fl i -Display information about intent log (ZIL) entries relating to each -dataset. -If specified multiple times, display counts of each intent log transaction -type. +Display information about intent log +.Pq ZIL +entries relating to each dataset. +If specified multiple times, display counts of each intent log transaction type. .It Fl l Ar device Read the vdev labels from the specified device. -Return 0 if a valid label was found, 1 if an error occurred, and 2 if no valid +.Nm Fl l +will return 0 if valid label was found, 1 if error occurred, and 2 if no valid labels were found. +.Pp If the +.Fl q +option is also specified, don't print the labels. +.Pp +If the .Fl u option is also specified, also display the uberblocks on this device. -If the -.Fl q -option is also specified, also display the uberblocks on this device. .It Fl L Disable leak tracing and the loading of space maps. By default, @@ -173,36 +190,55 @@ By default, verifies that all non-free blocks are referenced, which can be very expensive. .It Fl m Display the offset, spacemap, and free space of each metaslab. -When specified twice, also display information about the on-disk free -space histogram associated with each metaslab. When specified three time, -display the maximum contiguous free space, the in-core free space histogram, -and the percentage of free space in each space map. When specified -four times display every spacemap record. +.It Fl mm +Also display information about the on-disk free space histogram associated with +each metaslab. +.It Fl mmm +Display the maximum contiguous free space, the in-core free space histogram, and +the percentage of free space in each space map. +.It Fl mmmm +Display every spacemap record. .It Fl M Display the offset, spacemap, and free space of each metaslab. -When specified twice, also display information about the maximum contiguous -free space and the percentage of free space in each space map. -When specified three times display every spacemap record. +.It Fl MM +Also display information about the maximum contiguous free space and the +percentage of free space in each space map. +.It Fl MMM +Display every spacemap record. +.It Fl O Ar dataset path +Look up the specified +.Ar path +inside of the +.Ar dataset +and display its metadata and indirect blocks. +Specified +.Ar path +must be relative to the root of +.Ar dataset . +This option can be combined with +.Fl v +for increasing verbosity. .It Xo -.Fl R Ar poolname -.Ar vdev Ns : Ns Ar offset Ns : Ns Ar size Ns Op Ns : Ns Ar flags +.Fl R Ar poolname vdev Ns \&: Ns Ar offset Ns \&: Ns Ar size Ns Op : Ns Ar flags .Xc -Read and display a block from the specified device. By default the block is -displayed as a hex dump, but see the description of the -.Fl r +Read and display a block from the specified device. +By default the block is displayed as a hex dump, but see the description of the +.Sy r flag, below. .Pp The block is specified in terms of a colon-separated tuple .Ar vdev -(an integer vdev identifier) +.Pq an integer vdev identifier .Ar offset -(the offset within the vdev) +.Pq the offset within the vdev .Ar size -(the size of the block to read) and, optionally, +.Pq the size of the block to read +and, optionally, .Ar flags -(a set of flags, described below). -.Bl -tag -width indent -.It Sy b offset +.Pq a set of flags, described below . +.Pp +.Bl -tag -compact -width "b offset" +.It Sy b Ar offset Print block pointer .It Sy d Decompress the block @@ -217,19 +253,20 @@ Dump raw uninterpreted block data .El .It Fl s Report statistics on -.Nm Ns 's +.Nm zdb I/O. Display operation counts, bandwidth, and error counts of I/O to the pool from .Nm . .It Fl S Simulate the effects of deduplication, constructing a DDT and then display -that DDT as with \fB-DD\fR. +that DDT as with +.Fl DD . .It Fl u Display the current uberblock. .El .Pp Other options: -.Bl -tag -width indent +.Bl -tag -width Ds .It Fl A Do not abort should any assertion fail. .It Fl AA @@ -237,32 +274,41 @@ Enable panic recovery, certain errors which would othe demoted to warnings. .It Fl AAA Do not abort if asserts fail and also enable panic recovery. -.It Fl e Op Fl p Ar path... +.It Fl e Op Fl p Ar path ... Operate on an exported pool, not present in -.Pa /etc/zfs/zpool.cache . +.Pa /boot/zfs/zpool.cache . The .Fl p flag specifies the path under which devices are to be searched. .It Fl x Ar dumpdir All blocks accessed will be copied to files in the specified directory. The blocks will be placed in sparse files whose name is the same as -that of the file or device read. zdb can be then run on the generated files. +that of the file or device read. +.Nm +can be then run on the generated files. Note that the .Fl bbc -flags are sufficient to access (and thus copy) +flags are sufficient to access +.Pq and thus copy all metadata on the pool. .It Fl F Attempt to make an unreadable pool readable by trying progressively older transactions. +.It Fl G +Dump the contents of the zfs_dbgmsg buffer before exiting +.Nm . +zfs_dbgmsg is a buffer used by ZFS to dump advanced debug information. .It Fl I Ar inflight I/Os Limit the number of outstanding checksum I/Os to the specified value. -The default value is 200. This option affects the performance of the +The default value is 200. +This option affects the performance of the .Fl c option. -.It Fl o Ar var=value -Set the given global libzpool variable to the provided value. The value must be -an unsigned 32-bit integer. Currently only little-endian systems are supported -to avoid accidentally setting the high 32 bits of 64-bit variables. +.It Fl o Ar var Ns = Ns Ar value ... +Set the given global libzpool variable to the provided value. +The value must be an unsigned 32-bit integer. +Currently only little-endian systems are supported to avoid accidentally setting +the high 32 bits of 64-bit variables. .It Fl P Print numbers in an unscaled form more amenable to parsing, eg. 1000000 rather than 1M. @@ -280,9 +326,14 @@ Use a cache file other than .It Fl v Enable verbosity. Specify multiple times for increased verbosity. +.It Fl V +Attempt verbatim import. +This mimics the behavior of the kernel when loading a pool from a cachefile. +Only usable with +.Fl e . .It Fl X Attempt -.Ql extreme +.Qq extreme transaction rewind, that is attempt the same recovery as .Fl F but read transactions otherwise deemed too old. @@ -294,46 +345,58 @@ option, with more occurrences enabling more verbosity. If no options are specified, all information about the named pool will be displayed at default verbosity. .Sh EXAMPLES -.Bl -tag -width 0n -.It Sy Example 1 Display the configuration of imported pool 'rpool' -.Bd -literal -offset 2n -.Li # Ic zdb -C rpool +.Bl -tag -width Ds +.It Xo +.Sy Example 1 +Display the configuration of imported pool +.Pa rpool +.Xc +.Bd -literal +# zdb -C rpool MOS Configuration: version: 28 name: 'rpool' ... .Ed -.It Sy Example 2 Display basic dataset information about 'rpool' -.Bd -literal -offset 2n -.Li # Ic zdb -d rpool +.It Xo +.Sy Example 2 +Display basic dataset information about +.Pa rpool +.Xc +.Bd -literal +# zdb -d rpool Dataset mos [META], ID 0, cr_txg 4, 26.9M, 1051 objects Dataset rpool/swap [ZVOL], ID 59, cr_txg 356, 486M, 2 objects ... .Ed -.It Xo Sy Example 3 Display basic information about object 0 in -.Sy 'rpool/export/home' +.It Xo +.Sy Example 3 +Display basic information about object 0 in +.Pa rpool/export/home .Xc -.Bd -literal -offset 2n -.Li # Ic zdb -d rpool/export/home 0 +.Bd -literal +# zdb -d rpool/export/home 0 Dataset rpool/export/home [ZPL], ID 137, cr_txg 1546, 32K, 8 objects Object lvl iblk dblk dsize lsize %full type 0 7 16K 16K 15.0K 16K 25.00 DMU dnode .Ed -.It Xo Sy Example 4 Display the predicted effect of enabling deduplication on -.Sy 'rpool' +.It Xo +.Sy Example 4 +Display the predicted effect of enabling deduplication on +.Pa rpool .Xc -.Bd -literal -offset 2n -.Li # Ic zdb -S rpool +.Bd -literal +# zdb -S rpool Simulated DDT histogram: -bucket allocated referenced -______ ______________________________ ______________________________ -refcnt blocks LSIZE PSIZE DSIZE blocks LSIZE PSIZE DSIZE ------- ------ ----- ----- ----- ------ ----- ----- ----- - 1 694K 27.1G 15.0G 15.0G 694K 27.1G 15.0G 15.0G - 2 35.0K 1.33G 699M 699M 74.7K 2.79G 1.45G 1.45G +bucket allocated referenced +______ ______________________________ ______________________________ +refcnt blocks LSIZE PSIZE DSIZE blocks LSIZE PSIZE DSIZE +------ ------ ----- ----- ----- ------ ----- ----- ----- + 1 694K 27.1G 15.0G 15.0G 694K 27.1G 15.0G 15.0G + 2 35.0K 1.33G 699M 699M 74.7K 2.79G 1.45G 1.45G ... dedup = 1.11, compress = 1.80, copies = 1.00, dedup * compress / copies = 2.00 .Ed @@ -341,22 +404,3 @@ dedup = 1.11, compress = 1.80, copies = 1.00, dedup * .Sh SEE ALSO .Xr zfs 8 , .Xr zpool 8 -.Sh AUTHORS -This manual page is a -.Xr mdoc 7 -reimplementation of the -.Tn illumos -manual page -.Em zdb(1M) , -modified and customized for -.Fx -and licensed under the -Common Development and Distribution License -.Pq Tn CDDL . -.Pp -The -.Xr mdoc 7 -implementation of this manual page was initially written by -.An Martin Matuska Aq mm@FreeBSD.org -and -.An Marcelo Araujo Aq araujo@FreeBSD.org . From owner-svn-src-all@freebsd.org Mon Oct 30 10:41:02 2017 Return-Path: Delivered-To: svn-src-all@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 B6FB3E59F3A; Mon, 30 Oct 2017 10:41:02 +0000 (UTC) (envelope-from avg@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 85AF0829E4; Mon, 30 Oct 2017 10:41:02 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9UAf1Bk004861; Mon, 30 Oct 2017 10:41:01 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9UAf1RR004860; Mon, 30 Oct 2017 10:41:01 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201710301041.v9UAf1RR004860@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Mon, 30 Oct 2017 10:41:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r325155 - stable/11/sys/cddl/compat/opensolaris/sys X-SVN-Group: stable-11 X-SVN-Commit-Author: avg X-SVN-Commit-Paths: stable/11/sys/cddl/compat/opensolaris/sys X-SVN-Commit-Revision: 325155 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 10:41:02 -0000 Author: avg Date: Mon Oct 30 10:41:01 2017 New Revision: 325155 URL: https://svnweb.freebsd.org/changeset/base/325155 Log: MFC r324425: illumos mutex_init: use SX_NEW instead of bzero Modified: stable/11/sys/cddl/compat/opensolaris/sys/mutex.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/cddl/compat/opensolaris/sys/mutex.h ============================================================================== --- stable/11/sys/cddl/compat/opensolaris/sys/mutex.h Mon Oct 30 10:39:22 2017 (r325154) +++ stable/11/sys/cddl/compat/opensolaris/sys/mutex.h Mon Oct 30 10:41:01 2017 (r325155) @@ -47,9 +47,9 @@ typedef enum { typedef struct sx kmutex_t; #ifndef OPENSOLARIS_WITNESS -#define MUTEX_FLAGS (SX_DUPOK | SX_NOWITNESS) +#define MUTEX_FLAGS (SX_DUPOK | SX_NEW | SX_NOWITNESS) #else -#define MUTEX_FLAGS (SX_DUPOK) +#define MUTEX_FLAGS (SX_DUPOK | SX_NEW) #endif #define mutex_init(lock, desc, type, arg) do { \ @@ -57,7 +57,6 @@ typedef struct sx kmutex_t; ASSERT((type) == 0 || (type) == MUTEX_DEFAULT); \ KASSERT(((lock)->lock_object.lo_flags & LO_ALLMASK) != \ LO_EXPECTED, ("lock %s already initialized", #lock)); \ - bzero((lock), sizeof(struct sx)); \ for (_name = #lock; *_name != '\0'; _name++) { \ if (*_name >= 'a' && *_name <= 'z') \ break; \ From owner-svn-src-all@freebsd.org Mon Oct 30 13:54:55 2017 Return-Path: Delivered-To: svn-src-all@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 948D0E5D7A1; Mon, 30 Oct 2017 13:54:55 +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 590B43D58; Mon, 30 Oct 2017 13:54:55 +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 v9UDssmZ087757; Mon, 30 Oct 2017 13:54:54 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9UDssi8087756; Mon, 30 Oct 2017 13:54:54 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201710301354.v9UDssi8087756@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 30 Oct 2017 13:54:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325156 - head/release/tools X-SVN-Group: head X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: head/release/tools X-SVN-Commit-Revision: 325156 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 13:54:55 -0000 Author: gjb Date: Mon Oct 30 13:54:54 2017 New Revision: 325156 URL: https://svnweb.freebsd.org/changeset/base/325156 Log: Set a default hostname for virtual machine images. A recent bug in security/sudo causes segmentation faults when the system is not configured with a hostname, which causes issues with some virtual machine setups, notably Vagrant. Set the default hostname to the output of 'uname -o'. Submitted by: Nicholas Fiorentini Sponsored by: The FreeBSD Foundation Modified: head/release/tools/vmimage.subr Modified: head/release/tools/vmimage.subr ============================================================================== --- head/release/tools/vmimage.subr Mon Oct 30 10:41:01 2017 (r325155) +++ head/release/tools/vmimage.subr Mon Oct 30 13:54:54 2017 (r325156) @@ -140,6 +140,10 @@ vm_install_base() { >> ${DESTDIR}/etc/fstab fi + local hostname + hostname="$(echo $(uname -o) | tr '[:upper:]' '[:lower:]')" + echo "hostname=\"${hostname}\"" >> ${DESTDIR}/etc/rc.conf + mkdir -p ${DESTDIR}/dev mount -t devfs devfs ${DESTDIR}/dev chroot ${DESTDIR} /usr/bin/newaliases From owner-svn-src-all@freebsd.org Mon Oct 30 14:47:32 2017 Return-Path: Delivered-To: svn-src-all@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 550C1E5EDE9; Mon, 30 Oct 2017 14:47:32 +0000 (UTC) (envelope-from mack@macktronics.com) Received: from borg.macktronics.com (gw.macktronics.com [209.181.253.70]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 10667650F2; Mon, 30 Oct 2017 14:47:31 +0000 (UTC) (envelope-from mack@macktronics.com) Received: from pandora.local (olive.macktronics.com [209.181.253.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by borg.macktronics.com (Postfix) with ESMTPS id 477BB3BB; Mon, 30 Oct 2017 09:47:23 -0500 (CDT) From: Dan Mack To: Devin Teske Cc: Cy Schubert , "src-committers\@freebsd.org" , Eitan Adler , "svn-src-all\@freebsd.org" , "svn-src-head\@freebsd.org" , Ed Maste , Warner Losh Subject: Re: svn commit: r325092 - head/usr.bin/fortune/datfiles References: <201710291851.v9TIpM0I073542@slippy.cwsent.com> Date: Mon, 30 Oct 2017 09:47:22 -0500 In-Reply-To: (Devin Teske's message of "Sun, 29 Oct 2017 12:47:59 -0700") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (darwin) MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Arch